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

Timestamp:

2011-01-06T21:46:51+01:00 (14 years ago)

Author:

Upliner

Message:

Record mapview center coordinates for offeset bookmarks. Requested by usm78-gis

File:

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

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

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
@@ -22 +23 @@
     public String name;
     public double dx, dy;
+    public double centerX, centerY;
 
     public boolean isUsable(ImageryLayer layer) {
@@ -27 +29 @@
         layer.getInfo().getName().equals(layerName);
     }
+
     public OffsetBookmark(Projection proj, String layerName, String name, double dx, double dy) {
+        this(proj, layerName, name, dx, dy, 0, 0);
+    }
+
+    public OffsetBookmark(Projection proj, String layerName, String name, double dx, double dy, double centerX, double centerY) {
         this.proj = proj;
         this.layerName = layerName;
@@ -33 +40 @@
         this.dx = dx;
         this.dy = dy;
+        this.centerX = centerX;
+        this.centerY = centerY;
     }
 
@@ -50 +59 @@
         this.dx = Double.valueOf(array.get(3));
         this.dy = Double.valueOf(array.get(4));
+        if (array.size() >= 7) {
+            this.centerX = Double.valueOf(array.get(5));
+            this.centerY = Double.valueOf(array.get(6));
+        }
     }
 
@@ -59 +72 @@
         res.add(String.valueOf(dx));
         res.add(String.valueOf(dy));
+        if (this.centerX != 0 || this.centerY != 0) {
+            res.add(String.valueOf(centerX));
+            res.add(String.valueOf(centerY));
+        }
         return res;
     }
@@ -86 +103 @@
 
     public static void bookmarkOffset(String name, ImageryLayer layer) {
+        LatLon center;
+        if (Main.map != null && Main.map.mapView != null) {
+            center = Main.proj.eastNorth2latlon(Main.map.mapView.getCenter());
+        } else {
+            center = new LatLon(0,0);
+        }
         OffsetBookmark nb = new OffsetBookmark(
                 Main.proj, layer.getInfo().getName(),
-                name, layer.getDx(), layer.getDy());
+                name, layer.getDx(), layer.getDy(), center.lon(), center.lat());
         for (ListIterator<OffsetBookmark> it = allBookmarks.listIterator();it.hasNext();) {
             OffsetBookmark b = it.next();