Changeset 1724 in josm for trunk/src/org/openstreetmap/josm/data/osm/Node.java

Timestamp:

2009-07-03T22:19:22+02:00 (15 years ago)

Author:

stoecker

Message:

some more changes and bug fixes related to new projection stuff - GPX should now work also

File:

• trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) (4 diffs)

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

@@ -6 +6 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.LatLon.CoordinateFormat;
@@ -11 +12 @@
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.data.osm.Node;
-
 
 /**
@@ -20 +20 @@
 public final class Node extends OsmPrimitive {
 
-    private LatLon coor;
-
-    private EastNorth eastNorth;
-    private Projection proj;
-
+    private CachedLatLon coor;
 
     public final void setCoor(LatLon coor) {
-        this.coor = coor;
-        proj = null;
+        if(this.coor == null)
+            this.coor = new CachedLatLon(coor);
+        else
+            this.coor.setCoor(coor);
     }
 
@@ -36 +34 @@
 
     public final void setEastNorth(EastNorth eastNorth) {
-        proj = Main.proj;
-        eastNorth = eastNorth;
-        this.coor = proj.eastNorth2latlon(eastNorth);
+        coor.setEastNorth(eastNorth);
     }
 
     public final EastNorth getEastNorth() {
-        if(proj != Main.proj)
-        {
-            proj = Main.proj;
-            eastNorth = proj.latlon2eastNorth(coor);
-        }
-        return eastNorth;
+        return coor.getEastNorth();
     }