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

Timestamp:

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

Author:

zverik

Message:

Fixed deprecated method calls

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java (modified) (13 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
-import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
@@ -24 +25 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
 import org.openstreetmap.josm.tools.Destroyable;
 
@@ -113 +115 @@
             return;
         }
-        ImageryLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
         if (layer == null) {
             setOffsetGood(true);
             return;
         }
+        TileSourceDisplaySettings displaySettings = layer.getDisplaySettings();
         LatLon center = ImageryOffsetTools.getMapCenter();
         Integer hash = layer.hashCode();
@@ -124 +127 @@
             // create entry for this layer and mark as needing alignment
             data = new ImageryLayerData();
-            data.lastDx = layer.getDx();
-            data.lastDy = layer.getDy();
+            data.lastDx = displaySettings.getDx();
+            data.lastDy = displaySettings.getDy();
             boolean r = false;
             if (Math.abs(data.lastDx) + Math.abs(data.lastDy) > THRESHOLD) {
@@ -135 +138 @@
         } else {
             // now, we have a returning layer.
-            if (Math.abs(data.lastDx - layer.getDx()) + Math.abs(data.lastDy - layer.getDy()) > THRESHOLD) {
+            if (Math.abs(data.lastDx - displaySettings.getDx()) + Math.abs(data.lastDy - displaySettings.getDy()) > THRESHOLD) {
                 // offset has changed, record the current position
-                data.lastDx = layer.getDx();
-                data.lastDy = layer.getDy();
+                data.lastDx = displaySettings.getDx();
+                data.lastDy = displaySettings.getDy();
                 data.lastChecked = center;
                 storeLayerOffset(layer);
@@ -154 +157 @@
      */
     public void markGood() {
-        ImageryLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
         if (layer != null) {
+            TileSourceDisplaySettings displaySettings = layer.getDisplaySettings();
             LatLon center = ImageryOffsetTools.getMapCenter();
             Integer hash = layer.hashCode();
@@ -162 +166 @@
                 // create entry for this layer and mark as good
                 data = new ImageryLayerData();
-                data.lastDx = layer.getDx();
-                data.lastDy = layer.getDy();
+                data.lastDx = displaySettings.getDx();
+                data.lastDy = displaySettings.getDy();
                 data.lastChecked = center;
                 layers.put(hash, data);
             } else {
-                data.lastDx = layer.getDx();
-                data.lastDy = layer.getDy();
+                data.lastDx = displaySettings.getDx();
+                data.lastDy = displaySettings.getDy();
                 data.lastChecked = center;
             }
@@ -199 +203 @@
     public void layerAdded(LayerAddEvent e) {
         Layer newLayer = e.getAddedLayer();
-        if (newLayer instanceof ImageryLayer)
-            loadLayerOffset((ImageryLayer) newLayer);
+        if (newLayer instanceof AbstractTileSourceLayer)
+            loadLayerOffset((AbstractTileSourceLayer) newLayer);
         checkOffset();
     }
@@ -218 +222 @@
      * projections: nobody uses them anyway.
      */
-    private void storeLayerOffset(ImageryLayer layer) {
+    private void storeLayerOffset(AbstractTileSourceLayer layer) {
         String id = ImageryOffsetTools.getImageryID(layer);
         if (!Main.pref.getBoolean("iodb.remember.offsets", true) || id == null)
@@ -229 +233 @@
         }
         LatLon center = ImageryOffsetTools.getMapCenter();
-        offsets.add(id + ":" + center.lat() + ":" + center.lon() + ":" + layer.getDx() + ":" + layer.getDy());
+        offsets.add(id + ":" + center.lat() + ":" + center.lon() + ":" +
+                layer.getDisplaySettings().getDx() + ":" + layer.getDisplaySettings().getDy());
         Main.pref.putCollection("iodb.stored.offsets", offsets);
     }
@@ -236 +241 @@
      * Loads the current imagery layer offset from preferences.
      */
-    private void loadLayerOffset(ImageryLayer layer) {
+    private void loadLayerOffset(AbstractTileSourceLayer layer) {
         String id = ImageryOffsetTools.getImageryID(layer);
         if (!Main.pref.getBoolean("iodb.remember.offsets", true) || id == null)
@@ -249 +254 @@
                         dparts[i] = Double.parseDouble(parts[i+1]);
                     }
-                } catch (Exception e) {
+                } catch (NumberFormatException e) {
                     continue;
                 }
@@ -255 +260 @@
                 if (lastPos.greatCircleDistance(ImageryOffsetTools.getMapCenter()) < Math.max(maxDistance, 3.0) * 1000) {
                     // apply offset
-                    layer.setOffset(dparts[2], dparts[3]);
+                    OffsetBookmark bookmark = new OffsetBookmark(Main.getProjection().toCode(),
+                            layer.getName(), "Restored", dparts[2], dparts[3]);
+                    layer.getDisplaySettings().setOffsetBookmark(bookmark);
                     return;
                 }