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

Timestamp:

2017-05-13T14:21:55+02:00 (9 years ago)

Author:

zverik

Message:

Fixed deprecated method calls

File:

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

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 
 /**
@@ -34 +35 @@
      * @return the layer, or null if it hasn't been found.
      */
-    public static ImageryLayer getTopImageryLayer() {
+    public static AbstractTileSourceLayer getTopImageryLayer() {
         if (Main.map == null || Main.map.mapView == null)
             return null;
-        List<ImageryLayer> layers = Main.getLayerManager().getLayersOfType(ImageryLayer.class);
-        for (ImageryLayer layer : layers) {
+        List<AbstractTileSourceLayer> layers = Main.getLayerManager().getLayersOfType(AbstractTileSourceLayer.class);
+        for (AbstractTileSourceLayer layer : layers) {
             String url = layer.getInfo().getUrl();
             if (layer.isVisible() && url != null && !url.contains("gps-")) {
@@ -64 +65 @@
      * @see #applyLayerOffset
      */
-    public static LatLon getLayerOffset(ImageryLayer layer, LatLon center) {
+    public static LatLon getLayerOffset(AbstractTileSourceLayer layer, LatLon center) {
         Projection proj = Main.getProjection();
         EastNorth offsetCenter = Main.map.mapView.getCenter();
-        EastNorth centerOffset = offsetCenter.add(-layer.getDx(), -layer.getDy());
+        EastNorth centerOffset = offsetCenter.add(-layer.getDisplaySettings().getDx(),
+                -layer.getDisplaySettings().getDy());
         LatLon offsetLL = proj.eastNorth2latlon(centerOffset);
         return offsetLL;
@@ -77 +79 @@
      * @see #getLayerOffset
      */
-    public static void applyLayerOffset(ImageryLayer layer, ImageryOffset offset) {
-        double[] dxy = calculateOffset(offset);
-        layer.setOffset(dxy[0], dxy[1]);
+    public static void applyLayerOffset(AbstractTileSourceLayer layer, ImageryOffset offset) {
+        OffsetBookmark bookmark = calculateOffset(offset);
+        layer.getDisplaySettings().setOffsetBookmark(bookmark);
     }
 
@@ -87 +89 @@
      * @see #applyLayerOffset
      */
-    public static double[] calculateOffset(ImageryOffset offset) {
+    public static OffsetBookmark calculateOffset(ImageryOffset offset) {
         Projection proj = Main.getProjection();
         EastNorth center = proj.latlon2eastNorth(offset.getPosition());
         EastNorth offsetPos = proj.latlon2eastNorth(offset.getImageryPos());
-        return new double[] {center.getX() - offsetPos.getX(), center.getY() - offsetPos.getY()};
+        EastNorth offsetXY = new EastNorth(center.getX() - offsetPos.getX(), center.getY() - offsetPos.getY());
+        OffsetBookmark b = new OffsetBookmark(proj.toCode(), offset.getImagery(), "Autogenerated",
+                offsetXY.getX(), offsetXY.getY(), offset.getPosition().lon(), offset.getPosition().lat());
+        return b;
     }
 
@@ -99 +104 @@
      * @return imagery id.
      */
-    public static String getImageryID(ImageryLayer layer) {
+    public static String getImageryID(AbstractTileSourceLayer layer) {
         return layer == null ? null :
             ImageryIdGenerator.getImageryID(layer.getInfo().getUrl(), layer.getInfo().getImageryType());