Changeset 3962 in josm for trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

Timestamp:

2011-03-08T10:16:24+01:00 (13 years ago)

Author:

Upliner

Message:

fix #6049 auto-update scale factor of Mercator offset bookmarks

File:

• trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionInfo;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.data.projection.ProjectionInfo;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 
@@ -66 +67 @@
             this.centerX = Double.valueOf(array.get(5));
             this.centerY = Double.valueOf(array.get(6));
+        }
+        // Mercator scale factor migration
+        if (proj instanceof Mercator && this.dx < 1E-3 && this.dy < 1E-3) {
+            this.dx *= 6378137;
+            this.dy *= 6378137;
         }
         if (proj == null) {