Changeset 9321 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-01-05T15:43:10+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12234 - disable power validation test for nodes outside of downloaded area

File:

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

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.search.SearchCompiler.InDataSourceArea;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -27 +28 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.Predicate;
 
 /**
@@ -45 +47 @@
     protected static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear");
 
+    protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA = new InDataSourceArea(false);
+
     private final Map<Way, String> towerPoleTagMap = new HashMap<>();
 
@@ -67 +71 @@
                 for (Node n : w.getNodes()) {
                     if (!isPowerTower(n)) {
-                        if (!isPowerAllowed(n)) {
+                        if (!isPowerAllowed(n) && IN_DOWNLOADED_AREA.evaluate(n)) {
                             if (!w.isFirstLastNode(n) || !isPowerStation(n)) {
                                 potentialErrors.add(new PowerLineError(n, w));