Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

23.06.2009 22:03:37 (3 years ago)

Author:

Gubaer

Message:

new: MultiFetchServerObjectReader using APIs Multi Fetch method
update: now uses Multi Fetch to check for deleted primitives on the server
update: now uses Multi Fetch to update the selected primitives with the state from the server
fixed: cleaned up merging in MergeVisitor
new: conflict resolution dialog; now resolves conflicts due to different visibilities
new: replacement for realEqual() on OsmPrimitive and derived classes; realEqual now @deprecated
fixed: cleaning up OsmReader
fixed: progress indication in OsmApi

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (5 diffs)

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

@@ -8 +8 @@
 import java.util.HashSet;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -80 +81 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted) {
+            if (osm.visible && !osm.deleted) {
                 o.add(osm);
             }
@@ -89 +90 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted && !osm.incomplete) {
+            if (osm.visible && !osm.deleted && !osm.incomplete) {
                 o.add(osm);
             }
@@ -98 +99 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted && !osm.incomplete && !(osm instanceof Relation)) {
+            if (osm.visible && !osm.deleted && !osm.incomplete && !(osm instanceof Relation)) {
                 o.add(osm);
             }
@@ -311 +312 @@
         return ret;
     }
+
+    protected void deleteWay(Way way) {
+        way.nodes.clear();
+        way.delete(true);
+    }
+
+    /**
+     * removes all references from ways in this dataset to a particular node
+     * 
+     * @param node the node
+     */
+    public void unlinkNodeFromWays(Node node) {
+        for (Way way: ways) {
+            if (way.nodes.contains(node)) {
+                way.nodes.remove(node);
+                if (way.nodes.size() < 2) {
+                    deleteWay(way);
+                }
+            }
+        }
+    }
+
+    /**
+     * removes all references from relations in this dataset  to this primitive
+     * 
+     * @param primitive the primitive
+     */
+    public void unlinkPrimitiveFromRelations(OsmPrimitive primitive) {
+        for (Relation relation : relations) {
+            Iterator<RelationMember> it = relation.members.iterator();
+            while(it.hasNext()) {
+                RelationMember member = it.next();
+                if (member.member.equals(primitive)) {
+                    it.remove();
+                }
+            }
+        }
+    }
+
+    /**
+     * removes all references from from other primitives  to the
+     * referenced primitive
+     * 
+     * @param referencedPrimitive the referenced primitive
+     */
+    public void unlinkReferencesToPrimitive(OsmPrimitive referencedPrimitive) {
+        if (referencedPrimitive instanceof Node) {
+            unlinkNodeFromWays((Node)referencedPrimitive);
+            unlinkPrimitiveFromRelations(referencedPrimitive);
+        } else {
+            unlinkPrimitiveFromRelations(referencedPrimitive);
+        }
+    }
 }