Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-06-15T20:22:46+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (10 diffs)
• OsmPrimitiveType.java (added)
• Relation.java (modified) (4 diffs)
• history (added)
• history/History.java (added)
• history/HistoryDataSet.java (added)
• history/HistoryNode.java (added)
• history/HistoryOsmPrimitive.java (added)
• history/HistoryRelation.java (added)
• history/HistoryWay.java (added)
• history/RelationMember.java (added)

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

@@ -10 +10 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -78 +80 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted)
+            if (!osm.deleted) {
                 o.add(osm);
+            }
         return o;
     }
@@ -86 +89 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted && !osm.incomplete)
+            if (!osm.deleted && !osm.incomplete) {
                 o.add(osm);
+            }
         return o;
     }
@@ -94 +98 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted && !osm.incomplete && !(osm instanceof Relation))
+            if (!osm.deleted && !osm.incomplete && !(osm instanceof Relation)) {
                 o.add(osm);
+            }
         return o;
     }
@@ -150 +155 @@
         clearSelection(ways);
         clearSelection(relations);
-        for (OsmPrimitive osm : selection)
+        for (OsmPrimitive osm : selection) {
             osm.selected = true;
+        }
         fireSelectionChanged(selection);
     }
@@ -164 +170 @@
         clearSelection(relations);
         for (OsmPrimitive o : osm)
-            if (o != null)
+            if (o != null) {
                 o.selected = true;
+            }
         fireSelectionChanged(Arrays.asList(osm));
     }
@@ -176 +183 @@
         if (list == null)
             return;
-        for (OsmPrimitive osm : list)
+        for (OsmPrimitive osm : list) {
             osm.selected = false;
+        }
     }
 
@@ -189 +197 @@
             return sel;
         for (OsmPrimitive osm : list)
-            if (osm.selected && !osm.deleted)
+            if (osm.selected && !osm.deleted) {
                 sel.add(osm);
+            }
         return sel;
     }
@@ -200 +209 @@
      */
     public static void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
-        for (SelectionChangedListener l : selListeners)
+        for (SelectionChangedListener l : selListeners) {
             l.selectionChanged(sel);
+        }
     }
 
     @Override public DataSet clone() {
         DataSet ds = new DataSet();
-        for (Node n : nodes)
+        for (Node n : nodes) {
             ds.nodes.add(new Node(n));
-        for (Way w : ways)
+        }
+        for (Way w : ways) {
             ds.ways.add(new Way(w));
-        for (Relation e : relations)
+        }
+        for (Relation e : relations) {
             ds.relations.add(new Relation(e));
-        for (DataSource source : dataSources)
+        }
+        for (DataSource source : dataSources) {
             ds.dataSources.add(new DataSource(source.bounds, source.origin));
+        }
         ds.version = version;
         return ds;
@@ -260 +274 @@
         return selArr;
     }
+
+    /**
+     * returns a  primitive with a given id from the data set. null, if no such primitive
+     * exists
+     * 
+     * @param id  the id, > 0 required
+     * @return the primitive
+     * @exception IllegalArgumentException thrown, if id <= 0
+     */
+    public OsmPrimitive getPrimitiveById(long id) {
+        if (id <= 0)
+            throw new IllegalArgumentException(tr("parameter {0} > 0 required. Got {1}.", "id", id));
+        for (OsmPrimitive primitive : nodes) {
+            if (primitive.id == id) return primitive;
+        }
+        for (OsmPrimitive primitive : ways) {
+            if (primitive.id == id) return primitive;
+        }
+        for (OsmPrimitive primitive : relations) {
+            if (primitive.id == id) return primitive;
+        }
+        return null;
+    }
+
+    public Set<Long> getPrimitiveIds() {
+        HashSet<Long> ret = new HashSet<Long>();
+        for (OsmPrimitive primitive : nodes) {
+            ret.add(primitive.id);
+        }
+        for (OsmPrimitive primitive : ways) {
+            ret.add(primitive.id);
+        }
+        for (OsmPrimitive primitive : relations) {
+            ret.add(primitive.id);
+        }
+        return ret;
+    }
 }

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

@@ -78 +78 @@
     }
 
+    @Override
     public String getName() {
         String name;
@@ -84 +85 @@
         } else {
             name = get("type");
-            if (name == null)
+            if (name == null) {
                 name = tr("relation");
+            }
 
             name += " (";
-            if(names == null)
-              names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames));
+            if(names == null) {
+                names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames));
+            }
             String nameTag = null;
             for (String n : names) {
                 nameTag = get(n);
-                if (nameTag != null) break;
+                if (nameTag != null) {
+                    break;
+                }
             }
-            if (nameTag != null)
+            if (nameTag != null) {
                 name += "\"" + nameTag + "\", ";
+            }
 
             int mbno = members.size();
             name += trn("{0} member", "{0} members", mbno, mbno) + ")";
-            if(errors != null)
+            if(errors != null) {
                 name = "*"+name;
+            }
         }
         return name;
@@ -113 +120 @@
         return false;
     }
-    
+
     public RelationMember firstMember() {
         if (incomplete) return null;
@@ -122 +129 @@
         return (members.size() == 0) ? null : members.get(members.size() -1);
     }
+
+    /**
+     * removes all members with member.member == primitive
+     * 
+     * @param primitive the primitive to check for
+     */
+    public void removeMembersFor(OsmPrimitive primitive) {
+        if (primitive == null)
+            return;
+
+        ArrayList<RelationMember> todelete = new ArrayList<RelationMember>();
+        for (RelationMember member: members) {
+            if (member.member == primitive) {
+                todelete.add(member);
+            }
+        }
+        members.removeAll(todelete);
+    }
 }