Changeset 7062 in josm for trunk

Timestamp:

2014-05-04T16:03:06+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9976 - false positive: missing power=tower/pole

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java (modified) (2 diffs)

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

@@ -43 +43 @@
     public static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
     /** Values for {@code power} key interpreted as allowed power items */
-    public static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator");
+    public static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear");
 
     private final Map<Way, String> towerPoleTagMap = new HashMap<>();
@@ -68 +68 @@
                     if (!isPowerTower(n)) {
                         if (!isPowerAllowed(n)) {
-                            potentialErrors.add(new PowerLineError(n, w));
-                            erroneous = true;
+                            if (!w.isFirstLastNode(n) || !isPowerStation(n)) {
+                                potentialErrors.add(new PowerLineError(n, w));
+                                erroneous = true;
+                            }
                         }
                     } else if (fixValue == null) {