Changeset 4339 in josm for trunk

Timestamp:

2011-08-26T21:34:44+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6592 - patch by simon04 - Exception showing history of incomplete objects

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/history/HistoryNode.java (modified) (2 diffs)
• data/osm/history/HistoryOsmPrimitive.java (modified) (2 diffs)
• data/osm/history/HistoryRelation.java (modified) (4 diffs)
• data/osm/history/HistoryWay.java (modified) (3 diffs)
• gui/history/HistoryBrowserModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 
@@ -20 +21 @@
         super(id, version, visible, user, uid, changesetId, timestamp);
         setCoords(coords);
+    }
+
+    public HistoryNode(Node p) {
+        super(p);
+        setCoords(p.getCoor());
     }
 

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -11 +11 @@
 import java.util.Map;
 
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -70 +74 @@
     }
 
+    public HistoryOsmPrimitive(OsmPrimitive p) {
+        this(p.getId(), p.getVersion(), p.isVisible(),
+                p.getUser() == null ? null : p.getUser().getName(),
+                p.getUser() == null ? 0 : p.getUser().getId(),
+                p.getChangesetId(), p.getTimestamp());
+    }
+
+    public static HistoryOsmPrimitive forOsmPrimitive(OsmPrimitive p) {
+        if (p instanceof Node) {
+            return new HistoryNode((Node) p);
+        } else if (p instanceof Way) {
+            return new HistoryWay((Way) p);
+        } else if (p instanceof Relation) {
+            return new HistoryRelation((Relation) p);
+        } else {
+            return null;
+        }
+    }
+
     public long getId() {
         return id;

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -18 +19 @@
 public class HistoryRelation extends HistoryOsmPrimitive{
 
-    private ArrayList<RelationMember> members;
+    private ArrayList<RelationMember> members = new ArrayList<RelationMember>();
 
     /**
@@ -36 +37 @@
             Date timestamp) throws IllegalArgumentException {
         super(id, version, visible, user, uid, changesetId, timestamp);
-        members = new ArrayList<RelationMember>();
     }
     /**
@@ -58 +58 @@
             this.members.addAll(members);
         }
+    }
+
+    public HistoryRelation(Relation p) {
+        super(p);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Way;
 /**
  * Represents an immutable OSM way in the context of a historical view on
@@ -17 +18 @@
 public class HistoryWay extends HistoryOsmPrimitive {
 
-    private ArrayList<Long> nodeIds;
+    private ArrayList<Long> nodeIds = new ArrayList<Long>();
 
     public HistoryWay(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp) {
         super(id, version, visible, user, uid, changesetId, timestamp);
-        nodeIds = new ArrayList<Long>();
     }
 
@@ -27 +27 @@
         this(id, version, visible, user, uid, changesetId, timestamp);
         this.nodeIds.addAll(nodeIdList);
+    }
+
+    public HistoryWay(Way p) {
+        super(p);
     }
 

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -145 +145 @@
     protected boolean canShowAsLatest(OsmPrimitive primitive) {
         if (primitive == null) return false;
-        if (primitive.isNew()) return false;
+        if (primitive.isNew() || !primitive.isUsable()) return false;
+        
+        //try creating a history primitive. if that fails, the primitive cannot be used.
+        try {
+            HistoryOsmPrimitive.forOsmPrimitive(primitive);
+        } catch (Exception ign) {
+            return false;
+        }
+
         if (history == null) return false;
-        // only show latest of the same version if it is
-        // modified
+        // only show latest of the same version if it is modified
         if (history.getByVersion(primitive.getVersion()) != null)
             return primitive.isModified();