Changeset 9434 in josm for trunk

Timestamp:

2016-01-13T19:48:25+01:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #11507, see #12297 - deprecate power=cable_distribution_cabinet in favor of man_made=street_cabinet + street_cabinet=power

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -6447 +6447 @@
         </item> <!-- Power Compensator -->
         <separator/>
-        <item name="Cable Distribution Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable_distribution_cabinet" />
-            <space />
-            <key key="power" value="cable_distribution_cabinet" />
+        <item name="Power Street Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=street_cabinet" />
+            <space />
+            <key key="man_made" value="street_cabinet" />
+            <key key="street_cabinet" value="power" />
             <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
             <reference ref="ref_operator_branch" />
-        </item> <!-- Cable Distribution Cabinet -->
+        </item> <!-- Power Street Cabinet -->
         <separator/>
         <item name="Transformer Tower" icon="styles/standard/power/transformer_tower.svg" type="node,closedway" preset_name_label="true">

trunk/data/validator/deprecated.mapcss

@@ -642 +642 @@
   fixChangeKey: "type => studio";
 }
+
+/* #11507, #12297 */
+*[power=cable_distribution_cabinet] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "man_made=street_cabinet + street_cabinet=power";
+  fixAdd: "man_made=street_cabinet";
+  fixAdd: "street_cabinet=power";
+  fixRemove: "power";
+}

trunk/styles/standard/elemstyles.mapcss

@@ -1187 +1187 @@
     fill-color: power#eeeeee;
 }
-node[power=cable_distribution_cabinet] {
+node[man_made=street_cabinet][street_cabinet=power] {
     icon-image: "power/cable_distribution_cabinet.svg";
     set icon_z17;