Changeset 14998 in josm

Timestamp:

2019-04-18T21:52:34+02:00 (6 years ago)

Author:

Klumbumbus

Message:

• fix #17604 - raise addr:street together with addr:place to warning level
• fix #17484 - warn about type=associatedStreet in germany
• add icon for craft=sawmill (icon from ​https://openclipart.org/detail/246405/saw-blade, resized, CC0 and PD licensed)
• update wiki preset links

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (3 diffs)
• data/validator/combinations.mapcss (modified) (1 diff)
• data/validator/territories.mapcss (modified) (1 diff)
• images/presets/craft/sawmill.svg (added)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -1193 +1193 @@
         </item> <!-- Turning Loop -->
         <item name="City Limit Sign" icon="presets/vehicle/restriction/city_limit.svg" type="node" preset_name_label="true">
-            <link wiki="Key:traffic_sign" />
+            <link wiki="Tag:traffic_sign=city_limit" />
             <space />
             <key key="traffic_sign" value="city_limit" />
@@ -6443 +6443 @@
     </item> <!-- Shoemaker -->
     <separator/> <!-- other "soft"/art craft group -->
-    <item name="Sawmill" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Sawmill" icon="presets/craft/sawmill.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=sawmill" />
         <space />
@@ -7439 +7439 @@
         </group> <!-- Routes -->
         <item name="Route Network" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
-            <link wiki="Relations/Proposed/Network" />
+            <link wiki="Relation:network" />
             <space />
             <key key="type" value="network" />

trunk/data/validator/combinations.mapcss

@@ -267 +267 @@
 }
 
-/* {0.key} together with {1.key} (info level) */
+/* {0.key} together with {1.key}, #17604 */
 *[addr:street][addr:place] {
-  throwOther: tr("{0} together with {1}", "{0.key}", "{1.key}");
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
   group: tr("suspicious tag combination");
 }

trunk/data/validator/territories.mapcss

@@ -23 +23 @@
   assertNoMatch: "way name=Hauptstrasse";
 }
+
+/* #17484 */
+relation[type=associatedStreet][inside("DE")] {
+  throwWarning: tr("{0} is deprecated in {1}", "{0.tag}", "Deutschland");
+  suggestAlternative: "addr:street";
+  group: tr("deprecated tagging");
+}

trunk/styles/standard/elemstyles.mapcss

@@ -3017 +3017 @@
     set icon_z17;
 }
-node[craft=sawmill][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=sawmill] {
+    icon-image: "presets/craft/sawmill.svg";
     set icon_z17;
 }