Ignore:
Timestamp:
2016-11-13T00:29:31+01:00 (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java

    r11240 r11247  
    3737     */
    3838    public static Collection<OsmPrimitive> getSurroundingObjects(EastNorth internalPoint) {
    39         return getSurroundingObjects(Main.getLayerManager().getEditDataSet(), internalPoint);
     39        return getSurroundingObjects(Main.getLayerManager().getEditDataSet(), internalPoint, false);
    4040    }
    4141
     
    4646     * @param ds the data set
    4747     * @param internalPoint the internal point.
     48     * @param includeMultipolygonWays whether to include multipolygon ways in the result (false by default)
    4849     * @return the surrounding polygons/multipolygons
    49      * @since 11240
     50     * @since 11247
    5051     */
    51     public static Collection<OsmPrimitive> getSurroundingObjects(DataSet ds, EastNorth internalPoint) {
     52    public static Collection<OsmPrimitive> getSurroundingObjects(DataSet ds, EastNorth internalPoint, boolean includeMultipolygonWays) {
    5253        if (ds == null) {
    5354            return Collections.emptySet();
     
    6263        for (Relation r : ds.getRelations()) {
    6364            if (r.isUsable() && r.isMultipolygon() && r.isSelectable() && Geometry.isNodeInsideMultiPolygon(n, r, null)) {
    64                 for (RelationMember m : r.getMembers()) {
    65                     if (m.isWay() && m.getWay().isClosed()) {
    66                         found.values().remove(m.getWay());
     65                if (!includeMultipolygonWays) {
     66                    for (RelationMember m : r.getMembers()) {
     67                        if (m.isWay() && m.getWay().isClosed()) {
     68                            found.values().remove(m.getWay());
     69                        }
    6770                    }
    6871                }
Note: See TracChangeset for help on using the changeset viewer.