Changeset 9381 in josm for trunk/src

Timestamp:

2016-01-10T03:23:50+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12325 - Don't warn "highway link is not linked to adequate highway/link" for highways outside the download area

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (3 diffs)
• tests/Highways.java (modified) (1 diff)
• tests/PowerLines.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.search.SearchCompiler.InDataSourceArea;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -24 +25 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -37 +39 @@
 public class Test extends AbstractVisitor {
 
+    protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA = new InDataSourceArea(false);
+
     /** Name of the test */
     protected final String name;

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

@@ -154 +154 @@
     public static boolean isHighwayLinkOkay(final Way way) {
         final String highway = way.get("highway");
-        if (highway == null || !highway.endsWith("_link")) {
+        if (highway == null || !highway.endsWith("_link")
+                || !IN_DOWNLOADED_AREA.evaluate(way.getNode(0)) || !IN_DOWNLOADED_AREA.evaluate(way.getNode(way.getNodesCount()-1))) {
             return true;
         }

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;
@@ -28 +27 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.Geometry;
-import org.openstreetmap.josm.tools.Predicate;
 
 /**
@@ -46 +44 @@
     /** Values for {@code power} key interpreted as allowed power items */
     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<>();