Changeset 8415 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
- Timestamp:
- 2015-05-22T21:15:05+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
r8345 r8415 256 256 @Override 257 257 public void visit(Way w) { 258 if (e.child == null && left.matches(new Environment( ).withPrimitive(w))) {258 if (e.child == null && left.matches(new Environment(w))) { 259 259 if (e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))) { 260 260 e.child = w; … … 272 272 @Override 273 273 public void visit(Node n) { 274 if (e.child == null && left.matches(new Environment( ).withPrimitive(n))) {274 if (e.child == null && left.matches(new Environment(n))) { 275 275 if (e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes()) 276 276 || e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null)) { … … 282 282 @Override 283 283 public void visit(Way w) { 284 if (e.child == null && left.matches(new Environment( ).withPrimitive(w))) {284 if (e.child == null && left.matches(new Environment(w))) { 285 285 if (e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes())) 286 286 || e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() && Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null)) { … … 317 317 final Relation multipolygon = multipolygons.iterator().next(); 318 318 if (multipolygon == null) throw new NoSuchElementException(); 319 containsFinder = new ContainsFinder(new Environment( ).withPrimitive(multipolygon)) {319 containsFinder = new ContainsFinder(new Environment(multipolygon)) { 320 320 @Override 321 321 public boolean isPrimitiveUsable(OsmPrimitive p) {
Note:
See TracChangeset
for help on using the changeset viewer.