Ticket #6592: 6592.patch

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

@@ -4 +4 @@
 import java.util.Date;
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 
 /**
@@ -18 +19 @@
 
     public HistoryNode(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp, LatLon coords) {
         super(id, version, visible, user, uid, changesetId, timestamp);
-        setCoords(coords);
+        this.coords = coords;
+    }
+
+    public HistoryNode(Node p) {
+        super(p);
+        this.coords = p.getCoor();
     }
 
     @Override

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

@@ -10 +10 @@
 import java.util.Locale;
 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;
 
 /**
@@ -69 +73 @@
         tags = new HashMap<String, String>();
     }
 
+    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;
     }

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

@@ -8 +8 @@
 import java.util.List;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -17 +18 @@
  */
 public class HistoryRelation extends HistoryOsmPrimitive{
 
-    private ArrayList<RelationMember> members;
+    private ArrayList<RelationMember> members = new ArrayList<RelationMember>();
 
     /**
      * constructor
@@ -35 +36 @@
     public HistoryRelation(long id, long version, boolean visible, String user, long uid, long changesetId,
             Date timestamp) throws IllegalArgumentException {
         super(id, version, visible, user, uid, changesetId, timestamp);
-        members = new ArrayList<RelationMember>();
     }
     /**
      * constructor
@@ -59 +59 @@
         }
     }
 
+    public HistoryRelation(Relation p) {
+        super(p);
+    }
+
     /**
      * replies an immutable list of members of this relation
      *

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

@@ -9 +9 @@
 import java.util.List;
 
 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
  * OSM data.
@@ -16 +17 @@
  */
 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>();
     }
 
     public HistoryWay(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp, ArrayList<Long> nodeIdList) {
@@ -28 +28 @@
         this.nodeIds.addAll(nodeIdList);
     }
 
+    public HistoryWay(Way p) {
+        super(p);
+    }
+
     /**
      * replies the number of nodes in this way
      * @return the number of nodes

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

@@ -144 +144 @@
     }
     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();