Changeset 14120 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.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/gui/mappaint/RenderingCLI.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -21 +21 @@
 
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.cli.CLIModule;
 import org.openstreetmap.josm.data.Bounds;
@@ -32 +31 @@
 import org.openstreetmap.josm.data.preferences.JosmUrls;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.mappaint.RenderingHelper.StyleData;
@@ -427 +427 @@
         Config.getPref().putBoolean("mappaint.auto_reload_local_styles", false); // unnecessary to listen for external changes
         String projCode = Optional.ofNullable(argProjection).orElse("epsg:3857");
-        Main.setProjection(Projections.getProjectionByCode(projCode.toUpperCase(Locale.US)));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode(projCode.toUpperCase(Locale.US)));
 
         RightAndLefthandTraffic.initialize();
@@ -449 +449 @@
     RenderingArea determineRenderingArea(DataSet ds) {
 
-        Projection proj = Main.getProjection();
+        Projection proj = ProjectionRegistry.getProjection();
         Double scale = null; // scale in east-north units per pixel
         if (argZoom != null) {