Ticket #11150: 11150.patch

data/validator/combinations.mapcss

@@ -258 +258 @@
 /* see #10471 */
 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?]:indownloadedarea!.ford_on_waterway, node[ford?]:indownloadedarea!.ford_on_highway {
     throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway");
 }
 

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

@@ -1219 +1219 @@
     /**
      * Matches objects within source area ("downloaded area").
      */
-    private static class InDataSourceArea extends InArea {
+    public static class InDataSourceArea extends InArea {
 
         public InDataSourceArea(boolean all) {
             super(all);
@@ -1227 +1227 @@
 
         @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());
         }
     }
 

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

@@ -9 +9 @@
 import java.util.regex.Pattern;
 
 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;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -418 +419 @@
             case "open_end":
                 // handling at org.openstreetmap.josm.gui.mappaint.mapcss.Selector.ChildOrParentSelector.MultipolygonOpenEndFinder
                 return true;
+            case "indownloadedarea":
+                return new SearchCompiler.InDataSourceArea(false).evaluate(e.osm);
             }
             return false;
         }