Changeset 24905 in osm for applications/editors/josm/plugins/undelete/src/org

Timestamp:

2010-12-29T22:03:57+01:00 (14 years ago)

Author:

bastik

Message:

'add rudimentary support for undeleting relations'

File:

• applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java (modified) (6 diffs)

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.User;
@@ -33 +35 @@
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
+import org.openstreetmap.josm.data.osm.history.HistoryRelation;
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -44 +47 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-
+/**
+ *  // TODO: undelete relation members if necessary
+ */
 
 public class Undelete extends Plugin {
@@ -79 +84 @@
         OsmPrimitiveTypesComboBox cbType = new OsmPrimitiveTypesComboBox();
         cbType.setToolTipText("Choose the OSM object type");
+        cbType.setSelectedIndex(Main.pref.getInteger("undelete.lasttype", 0));
         gc.weightx = 1;
         all.add(cbType, gc);
@@ -111 +117 @@
         dialog.showDialog();
         if (dialog.getValue() != 1) return;
+        Main.pref.putInteger("undelete.lasttype", cbType.getSelectedIndex());
         Main.pref.put("undelete.newlayer", layer.isSelected());
         Main.pref.putInteger("undelete.osmid", tfId.getOsmId());
@@ -210 +217 @@
                   else
                   {
-                      primitive=new Node();
+                      primitive=new Relation();
                       hPrimitive1=h.getLatest();
-                      hPrimitive2=h.getLatest();
+                      hPrimitive2=h.getByVersion(h.getNumVersions()-1);
+                      
+                      Relation rel = new Relation(id, (int) hPrimitive1.getVersion());
+                      
+                      HistoryRelation hRel = (HistoryRelation) hPrimitive2;
+                      
+                      List<RelationMember> members = new ArrayList<RelationMember>(hRel.getNumMembers());
+                      for (org.openstreetmap.josm.data.osm.history.RelationMember m : hRel.getMembers()) {
+                        OsmPrimitive p = datas.getPrimitiveById(m.getPrimitiveId(), m.getPrimitiveType());
+                        if (p == null) {
+                            switch (m.getPrimitiveType()) {
+                            case NODE: p = new Node(m.getPrimitiveId()); break;
+                            case WAY: p = new Way(m.getPrimitiveId()); break;
+                            case RELATION: p = new Relation(m.getPrimitiveId()); break;
+                            }
+                            datas.addPrimitive(p);
+                        }
+                        members.add(new RelationMember(m.getRole(), p));
+                      }
+                      
+                      rel.setMembers(members);
+                      
+                      primitive=rel;
                   }