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

Timestamp:

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

Author:

stoecker

Message:

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

Location:

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

Files:

• CachedLatLon.java (added)
• EastNorth.java (modified) (1 diff)
• LatLon.java (modified) (1 diff)

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

@@ -30 +30 @@
         return new EastNorth(this.x + proportion * (en2.x - this.x),
             this.y + proportion * (en2.y - this.y));
+    }
+
+    public EastNorth getCenter(EastNorth en2) {
+        return new EastNorth((this.x + en2.x)/2.0, (this.y + en2.y)/2.0);
     }
 

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

@@ -143 +143 @@
     }
 
+    public LatLon interpolate(LatLon ll2, double proportion) {
+        return new LatLon(this.x + proportion * (ll2.x - this.x),
+            this.y + proportion * (ll2.y - this.y));
+    }
+
+    public LatLon getCenter(LatLon ll2) {
+        return new LatLon((this.x + ll2.x)/2.0, (this.y + ll2.y)/2.0);
+    }
+
     @Override public String toString() {
         return "LatLon[lat="+lat()+",lon="+lon()+"]";