Changeset 10511 in josm

Timestamp:

2016-07-03T20:53:42+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #13101 - deprecate tower=transition and pole=transition in favor of location:transition

Location:

trunk/data

Files:

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

trunk/data/defaultpresets.xml

@@ -6945 +6945 @@
                 <check key="triple_tower" text="Triple tower" />
                 <check key="design:incomplete" text="Incomplete tower" />
-                <check key="tower" text="Location transition" value_on="transition" disable_off="true" />
+                <check key="location:transition" text="Location transition" disable_off="true" />
             </optional>
         </item> <!-- Power Tower -->
@@ -6963 +6963 @@
             <text key="height" text="Height (meters)" />
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
-            <check key="pole" text="Location transition" value_on="transition" disable_off="true" />
+            <check key="location:transition" text="Location transition" disable_off="true" />
             <reference ref="ref_operator_branch" />
         </item> <!-- Pole -->
@@ -6980 +6980 @@
             <text key="height" text="Height (meters)" />
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
-            <check key="pole" text="Location transition" value_on="transition" disable_off="true" />
+            <check key="location:transition" text="Location transition" disable_off="true" />
             <reference ref="ref_operator_branch" />
             <space />

trunk/data/validator/deprecated.mapcss

@@ -855 +855 @@
   suggestAlternative: "species";
 }
+
+/* #13101 */
+node[pole=transition] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "location:transition=yes";
+  fixAdd: "location:transition=yes";
+  fixRemove: "pole";
+}
+node[tower=transition] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "location:transition=yes";
+  fixAdd: "location:transition=yes";
+  fixRemove: "tower";
+}