Changeset 12161 in josm for trunk/src/org/openstreetmap/josm/data/coor

Timestamp:

2017-05-15T15:43:30+02:00 (7 years ago)

Author:

michael2402

Message:

See #13415: Add the ILatLon interface, unify handling of Nodes and CachedLatLon

Location:

trunk/src/org/openstreetmap/josm/data/coor

Files:

• CachedLatLon.java (modified) (5 diffs)
• LatLon.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.data.projection.Projection;
 
@@ -20 +21 @@
 
     private EastNorth eastNorth;
-    private transient Projection proj;
+    private transient Object cacheKey;
 
     /**
@@ -37 +38 @@
     public CachedLatLon(LatLon coor) {
         super(coor.lat(), coor.lon());
-        proj = null;
+        cacheKey = null;
     }
 
@@ -45 +46 @@
      */
     public CachedLatLon(EastNorth eastNorth) {
-        super(Main.getProjection().eastNorth2latlon(eastNorth));
-        proj = Main.getProjection();
+        this(eastNorth, Main.getProjection());
+    }
+
+    private CachedLatLon(EastNorth eastNorth, Projection projection) {
+        super(projection.eastNorth2latlon(eastNorth));
+        cacheKey = projection.getCacheKey();
         this.eastNorth = eastNorth;
     }
@@ -55 +60 @@
      * @return the internally cached east/north coordinates. null, if the globally defined projection is null
      */
-    public final EastNorth getEastNorth() {
-        if (!Objects.equals(proj, Main.getProjection())) {
-            proj = Main.getProjection();
-            eastNorth = proj.latlon2eastNorth(this);
+    @Override
+    public final EastNorth getEastNorth(Projecting projecting) {
+        if (!Objects.equals(cacheKey, projecting.getCacheKey())) {
+            cacheKey = projecting.getCacheKey();
+            eastNorth = projecting.latlon2eastNorth(this);
         }
         return eastNorth;

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -43 +43 @@
  * @author Imi
  */
-public class LatLon extends Coordinate {
+public class LatLon extends Coordinate implements ILatLon {
 
     private static final long serialVersionUID = 1L;
@@ -251 +251 @@
     }
 
-    protected LatLon(LatLon coor) {
+    /**
+     * Creates a new LatLon object for the given coordinate
+     * @param coor The coordinates to copy from.
+     */
+    public LatLon(ILatLon coor) {
         super(coor.lon(), coor.lat());
     }
@@ -263 +267 @@
     }
 
-    /**
-     * Returns the latitude, i.e., the north-south position in degrees.
-     * @return the latitude
-     */
+    @Override
     public double lat() {
         return y;
@@ -286 +287 @@
     }
 
-    /**
-     * Returns the longitude, i.e., the east-west position in degrees.
-     * @return the longitude
-     */
+    @Override
     public double lon() {
         return x;