Changeset 1733 in josm for trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

Timestamp:

2009-07-05T10:48:09+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #2821, #2775 - agpifojpicture position wrong, preferences callable twice

File:

• trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (1 diff)

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

@@ -148 +148 @@
 
     public LatLon interpolate(LatLon ll2, double proportion) {
-        return new LatLon(this.x + proportion * (ll2.x - this.x),
-            this.y + proportion * (ll2.y - this.y));
+        return new LatLon(this.lat() + proportion * (ll2.lat() - this.lat()),
+            this.lon() + proportion * (ll2.lon() - this.lon()));
     }
 
     public LatLon getCenter(LatLon ll2) {
-        return new LatLon((this.x + ll2.x)/2.0, (this.y + ll2.y)/2.0);
+        return new LatLon((this.lat() + ll2.lat())/2.0, (this.lon() + ll2.lon())/2.0);
     }