Changeset 18324 in josm

Timestamp:

2021-11-20T00:34:04+01:00 (3 years ago)

Author:

Klumbumbus

Message:

fix #17034 - Add power=connection (partly patch by gaben, icon self created PD and CC0 licensed)

Location:

trunk

Files:

• resources/data/defaultpresets.xml (modified) (2 diffs)
• resources/data/validator/geometry.mapcss (modified) (1 diff)
• resources/images/presets/power/connection.svg (moved) (moved from trunk/nodist/images/presets/power_connection3.svg )
• resources/styles/standard/elemstyles.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/PowerLines.java (modified) (3 diffs)

trunk/resources/data/defaultpresets.xml

@@ -6795 +6795 @@
             </optional>
         </item> <!-- Catenary mast -->
+        <item name="Connection" icon="presets/power/connection.svg" name_context="power" type="node" preset_name_label="true">
+            <link wiki="Tag:power=connection" />
+            <space />
+            <key key="power" value="connection" />
+            <optional>
+                <reference ref="cables" />
+                <reference ref="ref_operator" />
+            </optional>
+        </item> <!-- Connection -->
         <item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:power=insulator" />
@@ -6803 +6812 @@
             <reference ref="ref_operator" />
         </item> <!-- Insulator -->
+        <separator/>
         <item name="Power Line" icon="presets/power/line.svg" type="way" preset_name_label="true">
             <link wiki="Tag:power=line" />

trunk/resources/data/validator/geometry.mapcss

@@ -108 +108 @@
 way[power=pole],
 way[power=catenary_mast],
+way[power=connection],
 way[power=terminal],
 way[power=tower]!:closed,

trunk/resources/styles/standard/elemstyles.mapcss

@@ -1264 +1264 @@
 node[power=catenary_mast] {
     icon-image: "presets/power/catenary_mast.svg";
+    set icon_z17;
+}
+node[power=connection] {
+    icon-image: "presets/power/connection.svg";
     set icon_z17;
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

@@ -45 +45 @@
     /** Values for {@code power} key interpreted as allowed power items */
     static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
-            "portal", "terminal", "insulator");
+            "portal", "terminal", "insulator", "connection");
 
     private final Set<Node> badConnections = new LinkedHashSet<>();
@@ -56 +56 @@
      */
     public PowerLines() {
-        super(tr("Power lines"), tr("Checks for nodes in power lines that do not have a power=tower/pole tag."));
+        super(tr("Power lines"), tr("Checks for nodes in power lines that do not have a power=tower/pole/connection tag."));
     }
 
@@ -122 +122 @@
             if (!isInPowerStation(n)) {
                 errors.add(TestError.builder(this, Severity.WARNING, POWER_LINES)
-                        .message(tr("Missing power tower/pole within power line"))
+                        .message(tr("Missing power tower/pole/connection within power line"))
                         .primitives(n)
                         .build());