Changeset 16787 in josm

Timestamp:

2020-07-17T21:30:13+02:00 (4 years ago)

Author:

Klumbumbus

Message:

see #19180

• deprecate generator:type=solar_photovoltaic_panels and building=part
• ignore building=home, building=tank, water=pool, historic=farm
• add resource=clay

• adjust fixme icons to avoid possible rendering artifacts

Location:

trunk/resources

Files:

• data/defaultpresets.xml (modified) (5 diffs)
• data/validator/deprecated.mapcss (modified) (1 diff)
• data/validator/ignoretags.cfg (modified) (6 diffs)
• images/presets/misc/fixme.svg (modified) (4 diffs)
• images/presets/misc/fixme_annotation.svg (modified) (4 diffs)

trunk/resources/data/defaultpresets.xml

@@ -5297 +5297 @@
             <optional>
                 <reference ref="name_operator" />
-                <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+                <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
                 <checkgroup columns="3">
                     <check key="covered" text="Covered" />
@@ -5313 +5313 @@
             <text key="depth" text="Depth in meters" />
             <text key="operator" text="Operator" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
             <check key="headframe" text="Visible Headframe" />
             <check key="disused" text="Disused" />
@@ -5324 +5324 @@
             <text key="length" text="Length in meters" />
             <text key="operator" text="Operator" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
             <check key="disused" text="Disused" />
         </item> <!-- Adit -->
@@ -6232 +6232 @@
             <optional>
                 <text key="name" text="Name" />
-                <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+                <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
             </optional>
         </item> <!-- Mine -->
@@ -8119 +8119 @@
             <key key="landuse" value="quarry" />
             <reference ref="name_operator" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
         </item> <!-- Quarry -->
     </group> <!-- Landuse -->

trunk/resources/data/validator/deprecated.mapcss

@@ -2034 +2034 @@
   fixAdd: "lamp_type=electric";
 }
+*[generator:type=solar_photovoltaic_panels] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "generator:type=solar_photovoltaic_panel";
+  group: tr("deprecated tagging");
+  fixAdd: "generator:type=solar_photovoltaic_panel";
+}
+*[building=part] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "building:part=yes";
+  group: tr("deprecated tagging");
+  /* without autofix, it is not clear if a building or a building part is mapped */
+}
+
+/* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/resources/data/validator/ignoretags.cfg

@@ -8 +8 @@
 ; F:  ignore tag if key ends with this string.
 ;
+; This file includes also keys and tags which have a deprecated warning (section
+; at the bottom). This avoids a duplicate warning in severity other (#19180).
 ;
 ; Ignore valid and semi-valid keys that start with...
@@ -199 +201 @@
 K:building=civic
 K:building=clinic
+K:building=home
 K:building=houseboat
 K:building=shop
@@ -205 +208 @@
 K:building=semidetached_house
 K:building=slurry_tank
+K:building=tank
 K:building=trullo
 K:leisure=recreation_ground
@@ -221 +225 @@
 K:land_area=administrative
 K:attraction=summer_toboggan
+K:water=pool
 ;
 ; Highway Key/Value Pairs
@@ -259 +264 @@
 K:historic=wreck
 K:historic=heritage
+K:historic=farm
 ;
 ; Landcover Tags
@@ -682 +688 @@
 K:lanes=-3
 K:lanes=-4
-;
-; Tags not yet decided (to remove from this section when added or deprecated) 
+K:generator:type=solar_photovoltaic_panels
+K:building=part
+;
+; Tags not yet decided (to remove from this section when added or moved up when deprecated) 
 ; see josm tickets: 17770 15309 15774 16315 16658 16793
 ;

trunk/resources/images/presets/misc/fixme.svg

@@ -15 +15 @@
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="fixme1.svg">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="fixme.svg">
   <defs
      id="defs4" />
@@ -26 +26 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="-4.0420854"
-     inkscape:cy="7.1721423"
+     inkscape:zoom="25.584007"
+     inkscape:cx="2.4921117"
+     inkscape:cy="8.7547445"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -34 +34 @@
      units="px"
      inkscape:window-width="1680"
-     inkscape:window-height="988"
+     inkscape:window-height="987"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
@@ -101 +101 @@
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        id="rect4164"
-       width="8"
-       height="2.9998782"
-       x="4"
+       width="9"
+       height="2.9998605"
+       x="3"
        y="1037.3622" />
     <rect
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        id="rect4166"
-       width="6"
-       height="2.9999478"
-       x="4"
+       width="7"
+       height="2.9999826"
+       x="3"
        y="1043.3622" />
   </g>

trunk/resources/images/presets/misc/fixme_annotation.svg

@@ -15 +15 @@
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="fixme4.svg">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="fixme_annotation.svg">
   <defs
      id="defs4" />
@@ -26 +26 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="10.322295"
-     inkscape:cy="18.469253"
+     inkscape:zoom="18.090625"
+     inkscape:cx="3.7830558"
+     inkscape:cy="14.850462"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -34 +34 @@
      units="px"
      inkscape:window-width="1680"
-     inkscape:window-height="988"
+     inkscape:window-height="987"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
@@ -101 +101 @@
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        id="rect4140"
-       width="3"
-       height="1"
-       x="18"
+       width="4"
+       height="0.9999826"
+       x="17"
        y="1030.3622" />
     <rect
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        id="rect4142"
-       width="2"
-       height="1.0001045"
-       x="18"
+       width="3"
+       height="1.0001047"
+       x="17"
        y="1033.3622" />
   </g>