Changeset 29376 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationObject.java

Timestamp:

2013-03-19T20:46:10+01:00 (11 years ago)

Author:

zverik

Message:

another iteration

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationObject.java (modified) (2 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationObject.java

@@ -2 +2 @@
 
 import java.util.Map;
-import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
 
 /**
@@ -9 +12 @@
  */
 public class CalibrationObject extends ImageryOffsetBase {
-    private OsmPrimitive object;
-    private long lastUserId;
+    private LatLon[] geometry;
 
-    public CalibrationObject(OsmPrimitive object, long lastUserId) {
-        this.object = object;
-        this.lastUserId = lastUserId;
+    public CalibrationObject(LatLon[] geometry) {
+        this.geometry = geometry;
     }
 
-    public CalibrationObject(OsmPrimitive object) {
-        this(object, 0);
+    public CalibrationObject( OsmPrimitive p ) {
+        if( p instanceof Node )
+            geometry = new LatLon[] { ((Node)p).getCoor() };
+        else if( p instanceof Way ) {
+            geometry = new LatLon[((Way)p).getNodesCount()];
+            for( int i = 0; i < geometry.length; i++ )
+                geometry[i] = ((Way)p).getNode(i).getCoor();
+        } else
+            throw new IllegalArgumentException("Calibration Object can be created either from node or a way");
     }
 
-    public long getLastUserId() {
-        return lastUserId;
+    public LatLon[] getGeometry() {
+        return geometry;
     }
 
-    public OsmPrimitive getObject() {
-        return object;
-    }
-    
     @Override
     public void putServerParams( Map<String, String> map ) {
         super.putServerParams(map);
-        map.put("object", object instanceof Node ? "node" : "way");
-        map.put("id", String.valueOf(object.getId()));
+        StringBuilder sb = new StringBuilder();
+        for( int i = 0; i < geometry.length; i++ ) {
+            if( i > 0 )
+                sb.append(',');
+            sb.append(geometry[i].lon()).append(' ').append(geometry[i].lat());
+        }
+        map.put("geometry", sb.toString());
     }
 
     @Override
     public String toString() {
-        return "CalibrationObject{" + "object=" + object + ", lastUserId=" + lastUserId + "position=" + position + ", date=" + date + ", author=" + author + ", description=" + description + ", abandonDate=" + abandonDate + '}';
+        return "CalibrationObject{" + geometry.length + "nodes; position=" + position + ", date=" + date + ", author=" + author + ", description=" + description + ", abandonDate=" + abandonDate + '}';
     }
 }