Changeset 15454 in josm for trunk

Timestamp:

2019-10-11T20:51:47+02:00 (5 years ago)

Author:

Klumbumbus

Message:

fix #17984 - deprecate tower:type=anchor|suspension in favor of line_attachment=anchor|suspension

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (5 diffs)
• validator/deprecated.mapcss (modified) (1 diff)
• validator/geometry.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -373 +373 @@
         <text key="height" text="Height (meters)" />
         <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+        <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
         <check key="location:transition" text="Location transition" disable_off="true" />
         <reference ref="ref_operator" />
@@ -5378 +5379 @@
             <key key="power" value="terminal" />
             <optional>
+                <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
                 <text key="ref" text="Reference" />
                 <text key="operator" text="Operator" />
@@ -5392 +5394 @@
             <reference ref="ref_operator" />
             <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
+            <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
         </item> <!-- Power Portal -->
         <item name="Power Tower" icon="presets/power/tower.svg" type="node" preset_name_label="true">
@@ -5403 +5406 @@
             <reference ref="ref_operator" />
             <optional>
-                <combo key="tower:type" text="Tower type" values="suspension,anchor,termination,branch,transposing,crossing,transition" text_context="power" values_context="power" />
+                <combo key="tower:type" text="Tower type" values="termination,branch,transposing,crossing,transition" text_context="power" values_context="power" />
                 <combo key="branch:type" text="Branch tower type" values="tap,split,loop,cross" values_context="power" />
                 <combo key="design" text="Tower design" values="one-level,two-level,donau,three-level,barrel,asymmetric,triangle,flag,donau;one-level,four-level,six-level,nine-level,delta,delta_two-level,y-frame,x-frame,h-frame,guyed_h-frame,portal,portal_two-level,portal_three-level,guyed_v-frame,bipole,monopolar" values_context="power" />
+                <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
                 <check key="triple_tower" text="Triple tower" />
                 <check key="design:incomplete" text="Incomplete tower" />
@@ -5456 +5460 @@
             <space />
             <key key="power" value="insulator" />
+            <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
             <reference ref="ref_operator" />
         </item> <!-- Insulator -->

trunk/data/validator/deprecated.mapcss

@@ -1802 +1802 @@
   group: tr("deprecated tagging");
 }
+
+/* #17984 */
+*[tower:type=anchor],
+*[tower:type=suspension] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: concat("line_attachment=", "{0.value}");
+  fixChangeKey: "tower:type => line_attachment";
+  group: tr("deprecated tagging");
+}

trunk/data/validator/geometry.mapcss

@@ -96 +96 @@
 
 /* {0} on a way, should be a node */
+way[line_attachment],
 way[emergency=fire_hydrant],
 way[entrance],