Changeset 17111 in josm for trunk

Timestamp:

2020-10-08T10:52:49+02:00 (4 years ago)

Author:

GerdP

Message:

fix #16247: Validator issues on power related items

• replace mapcss tests by java code, use new code 2502 for warning Node connects a power line or cable with an object which is not related to the power infrastructure.

Location:

trunk

Files:

• resources/data/validator/geometry.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/PowerLines.java (modified) (7 diffs)

trunk/resources/data/validator/geometry.mapcss

@@ -345 +345 @@
 }
 
-/* #12577 */
-way[power=line] > node,
-way[power=minor_line] > node,
-way[power=cable] > node {
-  set node_in_power_way;
-}
-way[!power][!building] > node.node_in_power_way {
-  throwWarning: tr("Node connects a power line or cable with an object which is not related to the power infrastructure.");
-}
-
 /* #12646, #12992, #16334 */
 way[waterway=~/^(stream|river|drain)$/]!:closed >[index=-1] node[natural!=sinkhole][natural!=cave_entrance]!:connection:in-downloaded-area { 

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

@@ -7 +7 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
@@ -30 +33 @@
     /** Test identifier */
     protected static final int POWER_LINES = 2501;
+    protected static final int POWER_CONNECTION = 2502;
 
     /** Values for {@code power} key interpreted as power lines */
@@ -43 +47 @@
             "portal", "terminal", "insulator");
 
-    private final List<TestError> potentialErrors = new ArrayList<>();
+    private final Set<Node> badConnections = new LinkedHashSet<>();
+    private final Set<Node> missingTowerOrPole = new LinkedHashSet<>();
 
     private final List<OsmPrimitive> powerStations = new ArrayList<>();
@@ -61 +66 @@
                     if (!isPowerTower(n) && !isPowerAllowed(n) && IN_DOWNLOADED_AREA.test(n)
                         && (!w.isFirstLastNode(n) || !isPowerStation(n))) {
-                        potentialErrors.add(TestError.builder(this, Severity.WARNING, POWER_LINES)
-                                .message(tr("Missing power tower/pole within power line"))
-                                .primitives(n)
-                                .build());
+                        missingTowerOrPole.add(n);
                     }
                 }
@@ -71 +73 @@
             }
         }
+    }
+
+    @Override
+    public void visit(Node n) {
+        boolean nodeInLineOrCable = false;
+        boolean connectedToUnrelated = false;
+        for (Way parent : n.getParentWays()) {
+            if (parent.hasTag("power", "line", "minor_line", "cable"))
+                nodeInLineOrCable = true;
+            else if (!isRelatedToPower(parent)) {
+                connectedToUnrelated = true;
+            }
+        }
+        if (nodeInLineOrCable && connectedToUnrelated)
+            badConnections.add(n);
+    }
+
+    private static boolean isRelatedToPower(Way way) {
+        if (way.hasTag("power") || way.hasTag("building"))
+            return true;
+        for (OsmPrimitive ref : way.getReferrers()) {
+            if (ref instanceof Relation && ref.isMultipolygon() && (ref.hasTag("power") || ref.hasTag("building"))) {
+                for (RelationMember rm : ((Relation) ref).getMembers()) {
+                    if (way == rm.getMember())
+                        return true;
+                }
+            }
+        }
+        return false;
     }
 
@@ -83 +114 @@
     public void startTest(ProgressMonitor progressMonitor) {
         super.startTest(progressMonitor);
-        powerStations.clear();
-        potentialErrors.clear();
+        clearCollections();
     }
 
     @Override
     public void endTest() {
-        for (TestError e : potentialErrors) {
-            e.primitives(Node.class)
-                    .filter(n -> !isInPowerStation(n))
-                    .findAny()
-                    .ifPresent(ignore -> errors.add(e));
-        }
-        potentialErrors.clear();
-        powerStations.clear();
+        for (Node n : missingTowerOrPole) {
+            if (!isInPowerStation(n)) {
+                errors.add(TestError.builder(this, Severity.WARNING, POWER_LINES)
+                        .message(tr("Missing power tower/pole within power line"))
+                        .primitives(n)
+                        .build());
+            }
+        }
+
+        for (Node n : badConnections) {
+            errors.add(TestError.builder(this, Severity.WARNING, POWER_CONNECTION)
+                    .message(tr("Node connects a power line or cable with an object "
+                            + "which is not related to the power infrastructure."))
+                    .primitives(n).build());
+        }
+        clearCollections();
         super.endTest();
     }
@@ -177 +215 @@
         return p.hasTag("building", values);
     }
+
+    private void clearCollections() {
+        powerStations.clear();
+        badConnections.clear();
+        missingTowerOrPole.clear();
+    }
 }