Changeset 14120 in josm for trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

Timestamp:

2018-08-11T17:29:48+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods related to projections. New ProjectionRegistry class

File:

• trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -74 +75 @@
         }
         old = layer.getDisplaySettings().getOffsetBookmark();
-        EastNorth curOff = old == null ? EastNorth.ZERO : old.getDisplacement(Main.getProjection());
+        EastNorth curOff = old == null ? EastNorth.ZERO : old.getDisplacement(ProjectionRegistry.getProjection());
         LatLon center;
         if (MainApplication.isDisplayingMapView()) {
-            center = Main.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
+            center = ProjectionRegistry.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
         } else {
             center = LatLon.ZERO;
         }
         tempOffset = new OffsetBookmark(
-                Main.getProjection().toCode(),
+                ProjectionRegistry.getProjection().toCode(),
                 layer.getInfo().getId(),
                 layer.getInfo().getName(),
@@ -258 +259 @@
                     "You can also enter east and north offset in the {0} coordinates.\n" +
                     "If you want to save the offset as bookmark, enter the bookmark name below",
-                    Main.getProjection().toString())), GBC.eop());
+                    ProjectionRegistry.getProjection().toString())), GBC.eop());
             pnl.add(new JLabel(tr("Offset:")), GBC.std());
             pnl.add(tOffset, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5));
@@ -313 +314 @@
             if (layer != null) {
                 // Support projections with very small numbers (e.g. 4326)
-                int precision = Main.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
+                int precision = ProjectionRegistry.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
                 // US locale to force decimal separator to be '.'
                 try (Formatter us = new Formatter(Locale.US)) {