Changeset 3382 in josm

Timestamp:

Jul 23, 2010 9:27:18 PM (3 years ago)

Author:

jttt

Message:

Fix #4928 Moving of objects adds offset to down and right

Location:

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

Files:

• DataSet.java (modified) (3 diffs)
• Node.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -21 +21 @@
 
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -804 +805 @@
     }
 
-    private void reindexNode(Node node, LatLon newCoor) {
+    private void reindexNode(Node node, LatLon newCoor, EastNorth eastNorth) {
         nodes.remove(node);
-        node.setCoorInternal(newCoor);
+        node.setCoorInternal(newCoor, eastNorth);
         nodes.add(node);
         for (OsmPrimitive primitive: node.getReferrers()) {
@@ -932 +933 @@
     }
 
-    void fireNodeMoved(Node node, LatLon newCoor) {
-        reindexNode(node, newCoor);
+    void fireNodeMoved(Node node, LatLon newCoor, EastNorth eastNorth) {
+        reindexNode(node, newCoor, eastNorth);
         fireEvent(new NodeMovedEvent(this, node));
     }

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -19 +18 @@
     public final void setCoor(LatLon coor) {
         if(coor != null){
-            if (getDataSet() != null) {
-                boolean locked = writeLock();
-                try {
-                    getDataSet().fireNodeMoved(this, coor);
-                } finally {
-                    writeUnlock(locked);
-                }
-            } else {
-                setCoorInternal(coor);
-            }
+            updateCoor(coor, null);
+        }
+    }
+
+    public final void setEastNorth(EastNorth eastNorth) {
+        if(eastNorth != null) {
+            updateCoor(null, eastNorth);
+        }
+    }
+
+    private void updateCoor(LatLon coor, EastNorth eastNorth) {
+        if (getDataSet() != null) {
+            boolean locked = writeLock();
+            try {
+                getDataSet().fireNodeMoved(this, coor, eastNorth);
+            } finally {
+                writeUnlock(locked);
+            }
+        } else {
+            setCoorInternal(coor, eastNorth);
         }
     }
@@ -36 +45 @@
     }
 
-    public final void setEastNorth(EastNorth eastNorth) {
-        if(eastNorth != null) {
-            setCoor(Main.proj.eastNorth2latlon(eastNorth));
-        }
-    }
-
     public final EastNorth getEastNorth() {
         return coor != null ? coor.getEastNorth() : null;
@@ -49 +52 @@
      * To be used only by Dataset.reindexNode
      */
-    protected void setCoorInternal(LatLon coor) {
+    protected void setCoorInternal(LatLon coor, EastNorth eastNorth) {
         if(this.coor == null) {
-            this.coor = new CachedLatLon(coor);
+            if (eastNorth == null) {
+                this.coor = new CachedLatLon(coor);
+            } else {
+                this.coor = new CachedLatLon(eastNorth);
+            }
         } else {
-            this.coor.setCoor(coor);
+            if (eastNorth == null) {
+                this.coor.setCoor(coor);
+            } else {
+                this.coor.setEastNorth(eastNorth);
+            }
         }
     }