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

Timestamp:

2009-10-04T00:37:05+02:00 (16 years ago)

Author:

stoecker

Message:

fixed #3649 - show node coordinates in history dialog

Location:

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

Files:

• History.java (modified) (2 diffs)
• HistoryNode.java (modified) (3 diffs)
• HistoryOsmPrimitive.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import java.util.List;
 import java.util.NoSuchElementException;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 
 public class History{
@@ -195 +197 @@
         return versions.isEmpty();
     }
+
+    public OsmPrimitiveType getType() {
+        if (isEmpty())
+            throw new NoSuchElementException(tr("No type found. History is empty."));
+        return versions.get(0).getType();
+    }
 }

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

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.coor.LatLon;
 
 
@@ -13 +14 @@
  */
 public class HistoryNode extends HistoryOsmPrimitive {
-    public HistoryNode(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp) {
+    private LatLon coor;
+    public HistoryNode(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp,
+    double lat, double lon) {
         super(id, version, visible, user, uid, changesetId, timestamp);
+        coor = new LatLon(lat, lon);
     }
 
@@ -21 +25 @@
         return OsmPrimitiveType.NODE;
     }
+
+    public LatLon getCoordinate() {
+        return coor;
+    }
 }

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

@@ -39 +39 @@
     /**
      * constructor
-     * 
+     *
      * @param id the id (>0 required)
      * @param version the version (> 0 required)
@@ -47 +47 @@
      * @param changesetId the changeset id (> 0 required)
      * @param timestamp the timestamp (! null required)
-     * 
+     *
      * @throws IllegalArgumentException thrown if preconditions are violated
      */
@@ -53 +53 @@
         ensurePositiveLong(id, "id");
         ensurePositiveLong(version, "version");
-        ensurePositiveLong(uid, "uid");
+        if(uid != -1) /* allow -1 for anonymous users */
+            ensurePositiveLong(uid, "uid");
         ensurePositiveLong(changesetId, "changesetId");
         ensureNotNull(user, "user");