Changeset 8495 in josm

Timestamp:

2015-06-19T19:20:50+02:00 (9 years ago)

Author:

simon04

Message:

fix #11150 - False validator warning on ford if node is outside the downloaded area and highway or waterway is not loaded

Location:

trunk

Files:

• data/validator/combinations.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) (2 diffs)

trunk/data/validator/combinations.mapcss

@@ -264 +264 @@
 way[waterway] > node[ford?] { set ford_on_waterway; }
 way[highway] > node[ford?] { set ford_on_highway; }
-node[ford?]!.ford_on_waterway, node[ford?]!.ford_on_highway {
+node[ford?]:in-downloaded-area!.ford_on_waterway, node[ford?]:in-downloaded-area!.ford_on_highway {
     throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway");
 }

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -1302 +1302 @@
      * Matches objects within source area ("downloaded area").
      */
-    private static class InDataSourceArea extends InArea {
+    public static class InDataSourceArea extends InArea {
 
         public InDataSourceArea(boolean all) {
@@ -1310 +1310 @@
         @Override
         protected Bounds getBounds() {
-            return new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D());
+            return Main.main.getCurrentDataSet() == null || Main.main.getCurrentDataSet().getDataSourceArea() == null
+                    ? null : new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D());
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.search.SearchCompiler;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -467 +468 @@
                     !MultipolygonCache.getInstance().get(Main.map.mapView, (Relation) e.osm).getOpenEnds().isEmpty();
         }
+
+        private static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA = new SearchCompiler.InDataSourceArea(false);
+
+        /**
+         * {@code in-downloaded-area} tests whether the object is within source area ("downloaded area").
+         * @see SearchCompiler.InDataSourceArea
+         */
+        static boolean inDownloadedArea(Environment e) {
+            return IN_DOWNLOADED_AREA.evaluate(e.osm);
+        }
+
     }