Changeset 3440 in josm for trunk/src/org

Timestamp:

2010-08-15T17:31:20+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5333 "Merge selection" tool is broken

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/AddPrimitivesCommand.java (modified) (4 diffs)
• data/osm/DataSet.java (modified) (3 diffs)
• data/osm/OsmPrimitiveType.java (modified) (1 diff)
• data/osm/visitor/MergeSourceBuildingVisitor.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
@@ -23 +24 @@
     }
 
+    @SuppressWarnings("null")
     @Override public boolean executeCommand() {
 
@@ -28 +30 @@
 
         for (PrimitiveData pd:data) {
-            createdPrimitives.add(getLayer().data.getPrimitiveById(pd, true));
+            OsmPrimitive primitive = getLayer().data.getPrimitiveById(pd);
+            boolean created = primitive == null;
+            if (created) {
+                primitive = pd.getType().newInstance(pd.getUniqueId(), true);
+            }
+            if (pd instanceof NodeData) { // Load nodes immediately because they can't be added to dataset without coordinates
+                primitive.load(pd);
+            }
+            if (created) {
+                getLayer().data.addPrimitive(primitive);
+            }
+            createdPrimitives.add(primitive);
         }
 
-        // Load nodes first to prevent ways with null coordinates
-        for (int i=0; i<createdPrimitives.size(); i++) {
-            if (createdPrimitives.get(i) instanceof Node) {
-                createdPrimitives.get(i).load(data.get(i));
-            }
-        }
-
-        // Now load ways and relations
+        //Then load ways and relations
         for (int i=0; i<createdPrimitives.size(); i++) {
             if (!(createdPrimitives.get(i) instanceof Node)) {
@@ -57 +63 @@
     @Override public JLabel getDescription() {
         return new JLabel(trn("Added {0} object", "Added {0} objects", data.size(), data.size()), null,
-                            JLabel.HORIZONTAL
+                JLabel.HORIZONTAL
         );
     }

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -283 +283 @@
                 success = ways.remove((Way) primitive);
             } else if (primitive instanceof Relation) {
-                success = relations.remove((Relation) primitive);
+                success = relations.remove(primitive);
             }
             if (!success)
@@ -609 +609 @@
      */
     public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type) {
-        return getPrimitiveById(new SimplePrimitiveId(id, type), false);
+        return getPrimitiveById(new SimplePrimitiveId(id, type));
     }
 
     public OsmPrimitive getPrimitiveById(PrimitiveId primitiveId) {
-        return getPrimitiveById(primitiveId, false);
-    }
-
+        return primitivesMap.get(primitiveId);
+    }
+
+    /**
+     *
+     * @param primitiveId
+     * @param createNew
+     * @return
+     * @deprecated This method can created inconsistent dataset when called for node with id < 0 and createNew=true. That will add
+     * complete node without coordinates to dataset which is not allowed.
+     */
+    @Deprecated
     public OsmPrimitive getPrimitiveById(PrimitiveId primitiveId, boolean createNew) {
         OsmPrimitive result = primitivesMap.get(primitiveId);
@@ -734 +743 @@
      */
     public boolean isModified() {
-        for (Node n: nodes) {
-            if (n.isModified()) return true;
-        }
-        for (Way w: ways) {
-            if (w.isModified()) return true;
-        }
-        for (Relation r: relations) {
-            if (r.isModified()) return true;
+        for (OsmPrimitive p: allPrimitives) {
+            if (p.isModified())
+                return true;
         }
         return false;

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

@@ -72 +72 @@
     }
 
+    public OsmPrimitive newInstance(long uniqueId, boolean allowNegative) {
+        switch (this) {
+        case NODE:
+            return new Node(uniqueId, allowNegative);
+        case WAY:
+            return new Way(uniqueId, allowNegative);
+        case RELATION:
+            return new Relation(uniqueId, allowNegative);
+        default:
+            throw new AssertionError();
+        }
+    }
+
     @Override
     public String toString() {

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

@@ -163 +163 @@
         // Create all primitives first
         for (PrimitiveData primitive: mappedPrimitives.values()) {
-            hull.getPrimitiveById(primitive, true);
-        }
-        // Then fill nodes with data
-        for (PrimitiveData primitive : mappedPrimitives.values()) {
-            if (primitive instanceof NodeData) {
-                if (!primitive.isIncomplete()) {
-                    hull.getPrimitiveById(primitive).load(primitive);
-                }
+            OsmPrimitive newPrimitive = hull.getPrimitiveById(primitive);
+            boolean created = newPrimitive == null;
+            if (created) {
+                newPrimitive = primitive.getType().newInstance(primitive.getUniqueId(), true);
+            }
+            if (newPrimitive instanceof Node && !primitive.isIncomplete()) {
+                newPrimitive.load(primitive);
+            }
+            if (created) {
+                hull.addPrimitive(newPrimitive);
             }
         }
         // Then ways and relations
         for (PrimitiveData primitive : mappedPrimitives.values()) {
-            if (!(primitive instanceof NodeData)) {
-                if (!primitive.isIncomplete()) {
-                    hull.getPrimitiveById(primitive).load(primitive);
-                }
+            if (!(primitive instanceof NodeData) && !primitive.isIncomplete()) {
+                hull.getPrimitiveById(primitive).load(primitive);
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -1481 +1481 @@
                         toAdd.add(primitiveInDs);
                     } else if (!primitive.isNew()) {
-                        toAdd.add(ds.getPrimitiveById(primitive, true));
+                        OsmPrimitive p = primitive.getType().newInstance(primitive.getUniqueId(), true);
+                        ds.addPrimitive(p);
+                        toAdd.add(p);
                     } else {
                         hasNewInOtherLayer = true;