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

Timestamp:

2017-08-26T21:28:34+02:00 (9 years ago)

Author:

zverik

Message:

Upgrade API in imagery_offset_db

File:

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

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
@@ -36 +37 @@
      */
     public static AbstractTileSourceLayer getTopImageryLayer() {
-        if (Main.map == null || Main.map.mapView == null)
+        if (!MainApplication.isDisplayingMapView())
             return null;
-        List<AbstractTileSourceLayer> layers = Main.getLayerManager().getLayersOfType(AbstractTileSourceLayer.class);
+        List<AbstractTileSourceLayer> layers = MainApplication.getLayerManager().getLayersOfType(AbstractTileSourceLayer.class);
         for (AbstractTileSourceLayer layer : layers) {
             String url = layer.getInfo().getUrl();
@@ -54 +55 @@
     public static LatLon getMapCenter() {
         Projection proj = Main.getProjection();
-        return Main.map == null || Main.map.mapView == null
-                ? new LatLon(0, 0) : proj.eastNorth2latlon(Main.map.mapView.getCenter());
+        return !MainApplication.isDisplayingMapView()
+                ? new LatLon(0, 0) : proj.eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
     }
 
@@ -67 +68 @@
     public static LatLon getLayerOffset(AbstractTileSourceLayer layer, LatLon center) {
         Projection proj = Main.getProjection();
-        EastNorth offsetCenter = Main.map.mapView.getCenter();
+        EastNorth offsetCenter = MainApplication.getMap().mapView.getCenter();
         EastNorth centerOffset = offsetCenter.add(-layer.getDisplaySettings().getDx(),
                 -layer.getDisplaySettings().getDy());
@@ -121 +122 @@
 
     public static int getCurrentZoom() {
-        if (Main.map == null || Main.map.mapView == null) {
+        if (!MainApplication.isDisplayingMapView()) {
             return 1;
         }
-        MapView mv = Main.map.mapView;
+        MapView mv = MainApplication.getMap().mapView;
         LatLon topLeft = mv.getLatLon(0, 0);
         LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());