Changeset 4135 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-06-11T01:17:42+02:00 (13 years ago)

Author:

bastiK

Message:

revert un-caching of Marker

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -16 +16 @@
 import javax.swing.Icon;
 
+import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -22 +23 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -70 +70 @@
                              may be adjusted later to sync with other data, so not final */
 
-    private LatLon coor;
+    private CachedLatLon coor;
 
     public final void setCoor(LatLon coor) {
-        this.coor = new LatLon(coor);
+        if(this.coor == null) {
+            this.coor = new CachedLatLon(coor);
+        } else {
+            this.coor.setCoor(coor);
+        }
     }
 
@@ -81 +85 @@
 
     public final void setEastNorth(EastNorth eastNorth) {
-        this.coor = Projections.inverseProject(eastNorth);
+        coor.setEastNorth(eastNorth);
     }
 
     public final EastNorth getEastNorth() {
-        return Projections.project(this.coor);
+        return coor.getEastNorth();
     }