Changeset 15886 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-02-19T09:08:57+01:00 (5 years ago)

Author:

GerdP

Message:

fix #9599: Join Overlapping Areas" creates a new way when joining 2 buildings

• now also takes care when inner ways of multipolygons are selected together with outer ways

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (4 diffs)

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

@@ -686 +686 @@
 
         for (Way way : outerStartingWays) {
-            List<Way> splitWays = splitWayOnNodes(way, nodes);
-
-            // see #9599
-            if (!way.isNew() && splitWays.size() > 1) {
-                for (Way part : splitWays) {
-                    Node n = part.firstNode();
-                    Way old = oldestWayMap.get(n);
-                    if (old == null || old.getUniqueId() > way.getUniqueId()) {
-                        oldestWayMap.put(n, way);
-                    }
-                }
-            }
-
+            List<Way> splitWays = splitWayOnNodes(way, nodes, oldestWayMap);
             preparedWays.addAll(markWayInsideSide(splitWays, false));
         }
 
         for (Way way : innerStartingWays) {
-            List<Way> splitWays = splitWayOnNodes(way, nodes);
+            List<Way> splitWays = splitWayOnNodes(way, nodes, oldestWayMap);
             preparedWays.addAll(markWayInsideSide(splitWays, true));
         }
@@ -1126 +1114 @@
      * @param way way to split
      * @param nodes split points
+     * @param oldestWayMap  nodes from old ways (modified here)
      * @return list of split ways (or original way if no splitting is done).
      */
-    private List<Way> splitWayOnNodes(Way way, Set<Node> nodes) {
+    private List<Way> splitWayOnNodes(Way way, Set<Node> nodes, Map<Node, Way> oldestWayMap) {
 
         List<Way> result = new ArrayList<>();
@@ -1144 +1133 @@
                 result.add(split.getOriginalWay());
                 result.addAll(split.getNewWays());
+
+                // see #9599
+                if (!way.isNew() && result.size() > 1) {
+                    for (Way part : result) {
+                        Node n = part.firstNode();
+                        Way old = oldestWayMap.get(n);
+                        if (old == null || old.getUniqueId() > way.getUniqueId()) {
+                            oldestWayMap.put(n, way);
+                        }
+                    }
+                }
             }
         }
@@ -1150 +1150 @@
             result.add(way);
         }
-
         return result;
     }