Changeset 14123 in josm

Timestamp:

2018-08-11T18:46:32+02:00 (6 years ago)

Author:

Klumbumbus

Message:

fix #15769, see #12297, see #12386 - Add power=catenary_mast and power=terminal

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• data/validator/geometry.mapcss (modified) (1 diff)
• data/validator/ignoretags.cfg (modified) (1 diff)
• images/presets/power/catenary_mast.svg (moved) (moved from trunk/images_nodist/presets/catenary_mast.svg )
• images/presets/power/terminal.svg (moved) (moved from trunk/images_nodist/presets/terminal.svg )
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -7940 +7940 @@
             <preset_link preset_name="Power Substation" />
         </item> <!-- Transformer Tower -->
+        <item name="Terminal" icon="presets/power/terminal.svg" type="node" preset_name_label="true">
+            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=terminal" />
+            <space />
+            <key key="power" value="terminal" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="operator" text="Operator" />
+            </optional>
+        </item> <!-- Terminal -->
         <item name="Power Portal" icon="presets/power/portal.svg" type="node,way" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:power=portal"
@@ -8035 +8044 @@
             <reference ref="optional_transformer_rating_phases_devices_windings" />
         </item> <!-- Pole with Transformer -->
+        <item name="Catenary mast" icon="presets/power/catenary_mast.svg" type="node" preset_name_label="true">
+            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=catenary_mast" />
+            <space />
+            <key key="power" value="catenary_mast" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="operator" text="Operator" />
+            </optional>
+        </item> <!-- Catenary mast -->
         <item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:power=insulator"

trunk/data/validator/geometry.mapcss

@@ -97 +97 @@
 way[power=transformer],
 way[power=pole],
+way[power=catenary_mast],
+way[power=terminal],
 way[power=tower]!:closed,
 way[amenity=vending_machine],

trunk/data/validator/ignoretags.cfg

@@ -325 +325 @@
 ;
 ; Tags not yet decided (to remove from this section when added or deprecated) 
-; see josm tickets: 10759 15769 16315
+; see josm tickets: 10759 16315
 ;
 K:man_made=mast
 K:amenity=childcare
 K:landuse=logging
-K:power=catenary_mast
 K:indoor=room

trunk/styles/standard/elemstyles.mapcss

@@ -1180 +1180 @@
     set icon_z17;
 }
+node[power=catenary_mast] {
+    icon-image: "presets/power/catenary_mast.svg";
+    set icon_z17;
+}
 node[power=insulator] {
     icon-image: "presets/power/insulator.svg";
@@ -1226 +1230 @@
     set icon_z17;
 }
-
+node[power=terminal] {
+    icon-image: "presets/power/terminal.svg";
+    set icon_z17;
+}
 node[power=switchgear] {
     icon-image: "presets/power/switchgear.svg";