Changeset 11432 in josm for trunk/src

Timestamp:

2017-01-06T20:47:12+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14093 - don't autofix "Missing power tower/pole within power line" (patch by Klumbumbus, modified)

File:

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

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -59 +58 @@
         if (w.isUsable()) {
             if (isPowerLine(w) && !w.hasTag("location", "underground")) {
-                String fixValue = null;
-                TestError.Builder error = null;
-                Node errorNode = null;
-                boolean canFix = false;
                 for (Node n : w.getNodes()) {
-                    if (!isPowerTower(n)) {
-                        if (!isPowerAllowed(n) && IN_DOWNLOADED_AREA.test(n) && (!w.isFirstLastNode(n) || !isPowerStation(n))) {
-                            error = TestError.builder(this, Severity.WARNING, POWER_LINES)
-                                    .message(tr("Missing power tower/pole within power line"))
-                                    .primitives(n);
-                            errorNode = n;
-                        }
-                    } else if (fixValue == null) {
-                        // First tower/pole tag found, remember it
-                        fixValue = n.get("power");
-                        canFix = true;
-                    } else if (!fixValue.equals(n.get("power"))) {
-                        // The power line contains both "tower" and "pole" -> cannot fix this error
-                        canFix = false;
+                    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());
                     }
-                }
-                if (error != null && canFix) {
-                    final ChangePropertyCommand fix = new ChangePropertyCommand(errorNode, "power", fixValue);
-                    potentialErrors.add(error.fix(() -> fix).build());
-                } else if (error != null) {
-                    potentialErrors.add(error.build());
                 }
             } else if (w.isClosed() && isPowerStation(w)) {