Changeset 29377 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetTools.java

Timestamp:

2013-03-20T08:05:48+01:00 (12 years ago)

Author:

zverik

Message:

some updates to iodb plugin

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetTools.java (modified) (3 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetTools.java

@@ -19 +19 @@
 public class ImageryOffsetTools {
     public static final String DIALOG_TITLE = tr("Imagery Offset");
-    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
     
     public static ImageryLayer getTopImageryLayer() {
@@ -42 +41 @@
         Projection proj = Main.getProjection();
         EastNorth offsetCenter = proj.latlon2eastNorth(center);
-        EastNorth centerOffset = offsetCenter.add(-layer.getDx(), -layer.getDy()); // todo: add or substract?
+        EastNorth centerOffset = offsetCenter.add(-layer.getDx(), -layer.getDy());
         LatLon offsetLL = proj.eastNorth2latlon(centerOffset);
         return offsetLL;
@@ -48 +47 @@
     
     public static void applyLayerOffset( ImageryLayer layer, ImageryOffset offset ) {
+        double[] dxy = calculateOffset(offset);
+        layer.setOffset(dxy[0], dxy[1]);
+    }
+
+    /**
+     * Calculate dx and dy for imagery offset.
+     * @return [dx, dy]
+     */
+    public static double[] calculateOffset( ImageryOffset offset ) {
         Projection proj = Main.getProjection();
         EastNorth center = proj.latlon2eastNorth(offset.getPosition());
         EastNorth offsetPos = proj.latlon2eastNorth(offset.getImageryPos());
-        layer.setOffset(center.getX() - offsetPos.getX(), center.getY() - offsetPos.getY());
+        return new double[] { center.getX() - offsetPos.getX(), center.getY() - offsetPos.getY() };
     }