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

Timestamp:

2009-07-08T22:58:37+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #2245: Merge layers doesn't update the "action" tags

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -168 +168 @@
     }
 
+
     private void fixWay(Way w) {
         boolean replacedSomething = false;
         LinkedList<Node> newNodes = new LinkedList<Node>();
-        for (Node n : w.nodes) {
-            Node otherN = (Node) merged.get(n);
-            newNodes.add(otherN == null ? n : otherN);
-            if (otherN != null) {
-                replacedSomething = true;
+        for (Node myNode : w.nodes) {
+            Node mergedNode = (Node) merged.get(myNode);
+            if (mergedNode != null) {
+                if (!mergedNode.deleted) {
+                    newNodes.add(mergedNode);
+                }
+                replacedSomething =  true;
+            } else {
+                newNodes.add(myNode);
             }
         }
@@ -187 +192 @@
         boolean replacedSomething = false;
         LinkedList<RelationMember> newMembers = new LinkedList<RelationMember>();
-        for (RelationMember m : r.members) {
-            OsmPrimitive otherP = merged.get(m.member);
-            if (otherP == null) {
-                newMembers.add(m);
+        for (RelationMember myMember : r.members) {
+            OsmPrimitive mergedMember = merged.get(myMember.member);
+            if (mergedMember == null) {
+                newMembers.add(myMember);
             } else {
-                RelationMember mnew = new RelationMember(m);
-                mnew.member = otherP;
-                newMembers.add(mnew);
+                if (! mergedMember.deleted) {
+                    RelationMember newMember = new RelationMember(myMember);
+                    newMember.member = mergedMember;
+                    newMembers.add(newMember);
+                }
                 replacedSomething = true;
             }