Changeset 11247 in josm for trunk/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java

Timestamp:

2016-11-13T00:29:31+01:00 (7 years ago)

Author:

Don-vip

Message:

see #9400 - see #10387 - see #12914 - initial implementation of boundaries file, replacing left-right-hand-traffic.osm, discourage contributors to use operator=RFF and operator=ERDF in France (territories rules must be manually eabled on existing installations)

File:

• trunk/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java

@@ -37 +37 @@
      */
     public static Collection<OsmPrimitive> getSurroundingObjects(EastNorth internalPoint) {
-        return getSurroundingObjects(Main.getLayerManager().getEditDataSet(), internalPoint);
+        return getSurroundingObjects(Main.getLayerManager().getEditDataSet(), internalPoint, false);
     }
 
@@ -46 +46 @@
      * @param ds the data set
      * @param internalPoint the internal point.
+     * @param includeMultipolygonWays whether to include multipolygon ways in the result (false by default)
      * @return the surrounding polygons/multipolygons
-     * @since 11240
+     * @since 11247
      */
-    public static Collection<OsmPrimitive> getSurroundingObjects(DataSet ds, EastNorth internalPoint) {
+    public static Collection<OsmPrimitive> getSurroundingObjects(DataSet ds, EastNorth internalPoint, boolean includeMultipolygonWays) {
         if (ds == null) {
             return Collections.emptySet();
@@ -62 +63 @@
         for (Relation r : ds.getRelations()) {
             if (r.isUsable() && r.isMultipolygon() && r.isSelectable() && Geometry.isNodeInsideMultiPolygon(n, r, null)) {
-                for (RelationMember m : r.getMembers()) {
-                    if (m.isWay() && m.getWay().isClosed()) {
-                        found.values().remove(m.getWay());
+                if (!includeMultipolygonWays) {
+                    for (RelationMember m : r.getMembers()) {
+                        if (m.isWay() && m.getWay().isClosed()) {
+                            found.values().remove(m.getWay());
+                        }
                     }
                 }