Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

Timestamp:

2017-08-24T00:15:51+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

File:

• trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -262 +264 @@
         Element centerEl = doc.createElement("center");
         viewportEl.appendChild(centerEl);
-        EastNorth center = Main.map.mapView.getCenter();
+        MapView mapView = MainApplication.getMap().mapView;
+        EastNorth center = mapView.getCenter();
         LatLon centerLL = Projections.inverseProject(center);
         centerEl.setAttribute("lat", Double.toString(centerLL.lat()));
@@ -268 +271 @@
         Element scale = doc.createElement("scale");
         viewportEl.appendChild(scale);
-        double dist100px = Main.map.mapView.getDist100Pixel();
+        double dist100px = mapView.getDist100Pixel();
         scale.setAttribute("meter-per-pixel", Double.toString(dist100px / 100));
     }