Changeset 14120 in josm for trunk/src/org

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (9 diffs)
• actions/CreateCircleAction.java (modified) (4 diffs)
• actions/ImageryAdjustAction.java (modified) (4 diffs)
• actions/JoinNodeWayAction.java (modified) (3 diffs)
• actions/OrthogonalizeAction.java (modified) (3 diffs)
• actions/SessionLoadAction.java (modified) (2 diffs)
• actions/mapmode/ExtrudeAction.java (modified) (7 diffs)
• command/MoveCommand.java (modified) (3 diffs)
• data/coor/CachedLatLon.java (modified) (2 diffs)
• data/coor/LatLon.java (modified) (2 diffs)
• data/coor/conversion/ProjectedCoordinateFormat.java (modified) (2 diffs)
• data/gpx/GpxData.java (modified) (5 diffs)
• data/imagery/OffsetBookmark.java (modified) (4 diffs)
• data/imagery/TemplatedWMSTileSource.java (modified) (2 diffs)
• data/imagery/WMTSTileSource.java (modified) (3 diffs)
• data/osm/DataSet.java (modified) (4 diffs)
• data/osm/INode.java (modified) (2 diffs)
• data/osm/Node.java (modified) (3 diffs)
• data/osm/NodeData.java (modified) (2 diffs)
• data/osm/search/SearchCompiler.java (modified) (3 diffs)
• data/osm/visitor/BoundingXYVisitor.java (modified) (5 diffs)
• data/osm/visitor/paint/relations/MultipolygonCache.java (modified) (3 diffs)
• data/projection/ProjectionBoundsProvider.java (added)
• data/projection/ProjectionRegistry.java (added)
• data/validation/OsmValidator.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (4 diffs)
• gui/MapView.java (modified) (4 diffs)
• gui/MapViewState.java (modified) (4 diffs)
• gui/NavigatableComponent.java (modified) (6 diffs)
• gui/datatransfer/importers/PrimitiveDataPaster.java (modified) (2 diffs)
• gui/dialogs/InspectPrimitiveDataText.java (modified) (4 diffs)
• gui/dialogs/LatLonDialog.java (modified) (3 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (6 diffs)
• gui/layer/ImageryLayer.java (modified) (2 diffs)
• gui/layer/WMSLayer.java (modified) (5 diffs)
• gui/layer/WMTSLayer.java (modified) (3 diffs)
• gui/layer/gpx/ImportAudioAction.java (modified) (2 diffs)
• gui/layer/imagery/ReprojectionTile.java (modified) (2 diffs)
• gui/layer/imagery/TileCoordinateConverter.java (modified) (2 diffs)
• gui/layer/imagery/TileSourceDisplaySettings.java (modified) (2 diffs)
• gui/layer/markerlayer/PlayHeadMarker.java (modified) (3 diffs)
• gui/mappaint/RenderingCLI.java (modified) (4 diffs)
• gui/mappaint/RenderingHelper.java (modified) (3 diffs)
• gui/preferences/imagery/ImageryPreference.java (modified) (2 diffs)
• gui/preferences/projection/ProjectionPreference.java (modified) (2 diffs)
• io/session/SessionWriter.java (modified) (3 diffs)
• tools/Geometry.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -7 +7 @@
 import java.awt.GraphicsEnvironment;
 import java.io.IOException;
-import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.nio.file.InvalidPathException;
@@ -16 +15 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -25 +22 @@
 import java.util.concurrent.Future;
 
-import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.UndoRedoHandler;
@@ -38 +34 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.io.FileWatcher;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -364 +361 @@
     }
 
-    /* ----------------------------------------------------------------------------------------- */
-    /* projection handling  - Main is a registry for a single, global projection instance        */
-    /*                                                                                           */
-    /* TODO: For historical reasons the registry is implemented by Main. An alternative approach */
-    /* would be a singleton org.openstreetmap.josm.data.projection.ProjectionRegistry class.     */
-    /* ----------------------------------------------------------------------------------------- */
-    /**
-     * The projection method used.
-     * Use {@link #getProjection()} and {@link #setProjection(Projection)} for access.
-     * Use {@link #setProjection(Projection)} in order to trigger a projection change event.
-     */
-    private static volatile Projection proj;
-
     /**
      * Replies the current projection.
      *
      * @return the currently active projection
-     */
+     * @deprecated Use {@link ProjectionRegistry#getProjection}
+     */
+    @Deprecated
     public static Projection getProjection() {
-        return proj;
+        return ProjectionRegistry.getProjection();
     }
 
@@ -390 +376 @@
      *
      * @param p the projection
-     */
+     * @deprecated Use {@link ProjectionRegistry#setProjection}
+     */
+    @Deprecated
     public static void setProjection(Projection p) {
-        CheckParameterUtil.ensureParameterNotNull(p);
-        Projection oldValue = proj;
-        Bounds b = main != null ? main.getRealBounds() : null;
-        proj = p;
-        fireProjectionChanged(oldValue, proj, b);
-    }
-
-    /**
-     * Returns the bounds for the current projection. Used for projection events.
-     * @return the bounds for the current projection
-     * @see #restoreOldBounds
-     */
-    protected Bounds getRealBounds() {
-        // To be overriden
-        return null;
-    }
-
-    /**
-     * Restore clean state corresponding to old bounds after a projection change event.
-     * @param oldBounds bounds previously returned by {@link #getRealBounds}, before the change of projection
-     * @see #getRealBounds
-     */
-    protected void restoreOldBounds(Bounds oldBounds) {
-        // To be overriden
-    }
-
-    /*
-     * Keep WeakReferences to the listeners. This relieves clients from the burden of
-     * explicitly removing the listeners and allows us to transparently register every
-     * created dataset as projection change listener.
-     */
-    private static final List<WeakReference<ProjectionChangeListener>> listeners = new CopyOnWriteArrayList<>();
-
-    private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
-        if ((newValue == null ^ oldValue == null)
-                || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
-            listeners.removeIf(x -> x.get() == null);
-            listeners.stream().map(WeakReference::get).filter(Objects::nonNull).forEach(x -> x.projectionChanged(oldValue, newValue));
-            if (newValue != null && oldBounds != null && main != null) {
-                main.restoreOldBounds(oldBounds);
-            }
-            /* TODO - remove layers with fixed projection */
-        }
+        ProjectionRegistry.setProjection(p);
     }
 
@@ -442 +388 @@
      *
      * @param listener the listener. Ignored if <code>null</code>.
-     */
+     * @deprecated Use {@link ProjectionRegistry#addProjectionChangeListener}
+     */
+    @Deprecated
     public static void addProjectionChangeListener(ProjectionChangeListener listener) {
-        if (listener == null) return;
-        for (WeakReference<ProjectionChangeListener> wr : listeners) {
-            // already registered ? => abort
-            if (wr.get() == listener) return;
-        }
-        listeners.add(new WeakReference<>(listener));
+        ProjectionRegistry.addProjectionChangeListener(listener);
     }
 
@@ -456 +399 @@
      *
      * @param listener the listener. Ignored if <code>null</code>.
-     */
+     * @deprecated Use {@link ProjectionRegistry#removeProjectionChangeListener}
+     */
+    @Deprecated
     public static void removeProjectionChangeListener(ProjectionChangeListener listener) {
-        if (listener == null) return;
-        // remove the listener - and any other listener which got garbage collected in the meantime
-        listeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
+        ProjectionRegistry.removeProjectionChangeListener(listener);
     }
 
@@ -466 +409 @@
      * Remove all projection change listeners. For testing purposes only.
      * @since 13322
-     */
+     * @deprecated Use {@link ProjectionRegistry#clearProjectionChangeListeners}
+     */
+    @Deprecated
     public static void clearProjectionChangeListeners() {
-        listeners.clear();
+        ProjectionRegistry.clearProjectionChangeListeners();
     }
 

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

@@ -18 +18 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -30 +29 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
@@ -180 +180 @@
 
         // see #10777
-        LatLon ll1 = Main.getProjection().eastNorth2latlon(n1);
-        LatLon ll2 = Main.getProjection().eastNorth2latlon(center);
+        LatLon ll1 = ProjectionRegistry.getProjection().eastNorth2latlon(n1);
+        LatLon ll2 = ProjectionRegistry.getProjection().eastNorth2latlon(center);
 
         double radiusInMeters = ll1.greatCircleDistance(ll2);
@@ -218 +218 @@
                 double x = center.east() + r*Math.cos(alpha);
                 double y = center.north() + r*Math.sin(alpha);
-                LatLon ll = Main.getProjection().eastNorth2latlon(new EastNorth(x, y));
+                LatLon ll = ProjectionRegistry.getProjection().eastNorth2latlon(new EastNorth(x, y));
                 if (ll.isOutSideWorld()) {
                     notifyNodesNotOnCircle();

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)) {

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

@@ -19 +19 @@
 import java.util.TreeSet;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
@@ -30 +29 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -143 +143 @@
                                 node.getEastNorth());
                         MoveCommand c = new MoveCommand(
-                                node, Main.getProjection().eastNorth2latlon(newPosition));
+                                node, ProjectionRegistry.getProjection().eastNorth2latlon(newPosition));
                         // Avoid moving a given node several times at the same position in case of overlapping ways
                         if (!cmds.contains(c)) {

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

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -148 +149 @@
         if (!isEnabled())
             return;
-        if ("EPSG:4326".equals(Main.getProjection().toString())) {
+        if ("EPSG:4326".equals(ProjectionRegistry.getProjection().toString())) {
             String msg = tr("<html>You are using the EPSG:4326 projection which might lead<br>" +
                     "to undesirable results when doing rectangular alignments.<br>" +
@@ -307 +308 @@
             throw new InvalidUserInputException("Unable to orthogonalize " + singleNode);
         }
-        return new MoveCommand(singleNode, Main.getProjection().eastNorth2latlon(Geometry.getCentroidEN(rightAnglePositions)));
+        return new MoveCommand(singleNode, ProjectionRegistry.getProjection().eastNorth2latlon(Geometry.getCentroidEN(rightAnglePositions)));
     }
 

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

@@ -20 +20 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -147 +148 @@
                 }
                 if (noMap && viewport != null) {
-                    MainApplication.getMap().mapView.scheduleZoomTo(viewport.getEastNorthViewport(Main.getProjection()));
+                    MainApplication.getMap().mapView.scheduleZoomTo(viewport.getEastNorthViewport(ProjectionRegistry.getProjection()));
                 }
             }

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -29 +29 @@
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.MergeNodesAction;
@@ -46 +45 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
@@ -655 +655 @@
             //move existing node
             Node n1Old = selectedSegment.getFirstNode();
-            cmds.add(new MoveCommand(n1Old, Main.getProjection().eastNorth2latlon(newN1en)));
+            cmds.add(new MoveCommand(n1Old, ProjectionRegistry.getProjection().eastNorth2latlon(newN1en)));
             changedNodes.add(n1Old);
         } else if (ignoreSharedNodes && segmentAngleZero && !alwaysCreateNodes && hasOtherWays) {
             // replace shared node with new one
             Node n1Old = selectedSegment.getFirstNode();
-            Node n1New = new Node(Main.getProjection().eastNorth2latlon(newN1en));
+            Node n1New = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(newN1en));
             wnew.addNode(insertionPoint, n1New);
             wnew.removeNode(n1Old);
@@ -668 +668 @@
         } else {
             //introduce new node
-            Node n1New = new Node(Main.getProjection().eastNorth2latlon(newN1en));
+            Node n1New = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(newN1en));
             wnew.addNode(insertionPoint, n1New);
             wayWasModified = true;
@@ -685 +685 @@
             //move existing node
             Node n2Old = selectedSegment.getSecondNode();
-            cmds.add(new MoveCommand(n2Old, Main.getProjection().eastNorth2latlon(newN2en)));
+            cmds.add(new MoveCommand(n2Old, ProjectionRegistry.getProjection().eastNorth2latlon(newN2en)));
             changedNodes.add(n2Old);
         } else if (ignoreSharedNodes && segmentAngleZero && !alwaysCreateNodes && hasOtherWays) {
             // replace shared node with new one
             Node n2Old = selectedSegment.getSecondNode();
-            Node n2New = new Node(Main.getProjection().eastNorth2latlon(newN2en));
+            Node n2New = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(newN2en));
             wnew.addNode(insertionPoint, n2New);
             wnew.removeNode(n2Old);
@@ -698 +698 @@
         } else {
             //introduce new node
-            Node n2New = new Node(Main.getProjection().eastNorth2latlon(newN2en));
+            Node n2New = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(newN2en));
             wnew.addNode(insertionPoint, n2New);
             wayWasModified = true;
@@ -937 +937 @@
 
         // find out the movement distance, in metres
-        double distance = Main.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance(
-                Main.getProjection().eastNorth2latlon(n1movedEn));
+        double distance = ProjectionRegistry.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance(
+                ProjectionRegistry.getProjection().eastNorth2latlon(n1movedEn));
         MainApplication.getMap().statusLine.setDist(distance);
         updateStatusLine();

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -14 +14 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -21 +20 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -73 +73 @@
     public MoveCommand(Node node, LatLon position) {
         this(Collections.singleton((OsmPrimitive) node),
-                Main.getProjection().latlon2eastNorth(position).subtract(node.getEastNorth()));
+                ProjectionRegistry.getProjection().latlon2eastNorth(position).subtract(node.getEastNorth()));
     }
 

trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java

@@ -4 +4 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 
 /**
@@ -46 +46 @@
      */
     public CachedLatLon(EastNorth eastNorth) {
-        this(eastNorth, Main.getProjection());
+        this(eastNorth, ProjectionRegistry.getProjection());
     }
 

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -17 +17 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -195 +195 @@
      */
     public boolean isOutSideWorld() {
-        Bounds b = Main.getProjection().getWorldBoundsLatLon();
+        Bounds b = ProjectionRegistry.getProjection().getWorldBoundsLatLon();
         return lat() < b.getMinLat() || lat() > b.getMaxLat() ||
                 lon() < b.getMinLon() || lon() > b.getMaxLon();

trunk/src/org/openstreetmap/josm/data/coor/conversion/ProjectedCoordinateFormat.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.ILatLon;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 
 /**
@@ -25 +25 @@
     @Override
     public String latToString(ILatLon ll) {
-        return cDdFormatter.format(ll.getEastNorth(Main.getProjection()).north());
+        return cDdFormatter.format(ll.getEastNorth(ProjectionRegistry.getProjection()).north());
     }
 
     @Override
     public String lonToString(ILatLon ll) {
-        return cDdFormatter.format(ll.getEastNorth(Main.getProjection()).east());
+        return cDdFormatter.format(ll.getEastNorth(ProjectionRegistry.getProjection()).east());
     }
 }

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -20 +20 @@
 import java.util.stream.Stream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Data;
@@ -26 +25 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.gpx.GpxTrack.GpxTrackChangeListener;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -539 +539 @@
                 WayPoint r = null;
                 for (WayPoint wpSeg : seg.getWayPoints()) {
-                    EastNorth en = wpSeg.getEastNorth(Main.getProjection());
+                    EastNorth en = wpSeg.getEastNorth(ProjectionRegistry.getProjection());
                     if (r == null) {
                         r = wpSeg;
@@ -586 +586 @@
                 }
                 if (r != null) {
-                    EastNorth c = r.getEastNorth(Main.getProjection());
+                    EastNorth c = r.getEastNorth(ProjectionRegistry.getProjection());
                     /* if there is only one point in the seg, it will do this twice, but no matter */
                     rx = c.east();
@@ -603 +603 @@
         if (bestEN == null)
             return null;
-        WayPoint best = new WayPoint(Main.getProjection().eastNorth2latlon(bestEN));
+        WayPoint best = new WayPoint(ProjectionRegistry.getProjection().eastNorth2latlon(bestEN));
         best.time = bestTime;
         return best;

trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

@@ -10 +10 @@
 import java.util.stream.Collectors;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.StructUtils.StructEntry;
@@ -18 +17 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 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.MainApplication;
@@ -49 +49 @@
     public boolean isUsable(ImageryLayer layer) {
         if (projection_code == null) return false;
-        if (!Main.getProjection().toCode().equals(projection_code) && !hasCenter()) return false;
+        if (!ProjectionRegistry.getProjection().toCode().equals(projection_code) && !hasCenter()) return false;
         ImageryInfo info = layer.getInfo();
         return imagery_id != null ? Objects.equals(info.getId(), imagery_id) : Objects.equals(info.getName(), imagery_name);
@@ -363 +363 @@
         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;
         }
         OffsetBookmark nb = new OffsetBookmark(
-                Main.getProjection().toCode(), layer.getInfo().getId(), layer.getInfo().getName(),
+                ProjectionRegistry.getProjection().toCode(), layer.getInfo().getId(), layer.getInfo().getName(),
                 name, layer.getDisplaySettings().getDisplacement(), center);
         for (ListIterator<OffsetBookmark> it = allBookmarks.listIterator(); it.hasNext();) {

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -16 +16 @@
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -108 +108 @@
         } else if (baseUrl.toLowerCase(Locale.US).contains("crs=")) {
             // assume WMS 1.3.0
-            switchLatLon = Main.getProjection().switchXY();
+            switchLatLon = ProjectionRegistry.getProjection().switchXY();
         }
         String bbox = getBbox(zoom, tilex, tiley, switchLatLon);

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -50 +50 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 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.ExtendedDialog;
@@ -346 +347 @@
             List<Layer> ls = layerById.entrySet().iterator().next().getValue()
                     .stream().filter(
-                            u -> u.tileMatrixSet.crs.equals(Main.getProjection().toCode()))
+                            u -> u.tileMatrixSet.crs.equals(ProjectionRegistry.getProjection().toCode()))
                     .collect(Collectors.toList());
             if (ls.size() == 1) {
@@ -631 +632 @@
     private static TileMatrix parseTileMatrix(XMLStreamReader reader, String matrixCrs) throws XMLStreamException {
         Projection matrixProj = Optional.ofNullable(Projections.getProjectionByCode(matrixCrs))
-                .orElseGet(Main::getProjection); // use current projection if none found. Maybe user is using custom string
+                .orElseGet(ProjectionRegistry::getProjection); // use current projection if none found. Maybe user is using custom string
         TileMatrix ret = new TileMatrix();
         for (int event = reader.getEventType();

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -25 +25 @@
 import java.util.stream.Stream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.APIDataSet.APIOperation;
 import org.openstreetmap.josm.data.Bounds;
@@ -54 +53 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -175 +175 @@
         // Transparently register as projection change listener. No need to explicitly remove
         // the listener, projection change listeners are managed as WeakReferences.
-        Main.addProjectionChangeListener(this);
+        ProjectionRegistry.addProjectionChangeListener(this);
         addSelectionListener((DataSelectionListener) e -> fireSelectionChange(e.getSelection()));
     }
@@ -1045 +1045 @@
      */
     public void invalidateEastNorthCache() {
-        if (Main.getProjection() == null)
+        if (ProjectionRegistry.getProjection() == null)
             return; // sanity check
         beginUpdate();

trunk/src/org/openstreetmap/josm/data/osm/INode.java

@@ -6 +6 @@
 import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 
 /**
@@ -34 +35 @@
      */
     default EastNorth getEastNorth() {
-        return getEastNorth(Main.getProjection());
+        return getEastNorth(ProjectionRegistry.getProjection());
     }
 

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -10 +10 @@
 import java.util.function.Predicate;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -16 +15 @@
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.projection.Projecting;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -114 +114 @@
             invalidateEastNorthCache();
         } else if (eastNorth != null) {
-            LatLon ll = Main.getProjection().eastNorth2latlon(eastNorth);
+            LatLon ll = ProjectionRegistry.getProjection().eastNorth2latlon(eastNorth);
             this.lat = ll.lat();
             this.lon = ll.lon();
             this.east = eastNorth.east();
             this.north = eastNorth.north();
-            this.eastNorthCacheKey = Main.getProjection().getCacheKey();
+            this.eastNorthCacheKey = ProjectionRegistry.getProjection().getCacheKey();
         } else {
             this.lat = Double.NaN;

trunk/src/org/openstreetmap/josm/data/osm/NodeData.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 
 /**
@@ -77 +77 @@
     @Override
     public void setEastNorth(EastNorth eastNorth) {
-        setCoor(Main.getProjection().eastNorth2latlon(eastNorth));
+        setCoor(ProjectionRegistry.getProjection().eastNorth2latlon(eastNorth));
     }
 

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -23 +23 @@
 import java.util.stream.Collectors;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -36 +35 @@
 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer.Range;
 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer.Token;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
@@ -1895 +1895 @@
         protected Collection<Bounds> getBounds(OsmPrimitive primitive) {
             final Collection<Bounds> bounds = super.getBounds(primitive);
-            return bounds == null || bounds.isEmpty() ? Collections.singleton(Main.getProjection().getWorldBoundsLatLon()) : bounds;
+            return bounds == null || bounds.isEmpty() ?
+                    Collections.singleton(ProjectionRegistry.getProjection().getWorldBoundsLatLon()) : bounds;
         }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -4 +4 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
@@ -19 +18 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -76 +76 @@
     public void visit(Bounds b) {
         if (b != null) {
-            Main.getProjection().visitOutline(b, this::visit);
+            ProjectionRegistry.getProjection().visitOutline(b, this::visit);
         }
     }
@@ -98 +98 @@
     public void visit(ILatLon latlon) {
         if (latlon != null) {
-            visit(latlon.getEastNorth(Main.getProjection()));
+            visit(latlon.getEastNorth(ProjectionRegistry.getProjection()));
         }
     }
@@ -159 +159 @@
         if (bounds == null)
             return;
-        LatLon minLatlon = Main.getProjection().eastNorth2latlon(bounds.getMin());
-        LatLon maxLatlon = Main.getProjection().eastNorth2latlon(bounds.getMax());
+        LatLon minLatlon = ProjectionRegistry.getProjection().eastNorth2latlon(bounds.getMin());
+        LatLon maxLatlon = ProjectionRegistry.getProjection().eastNorth2latlon(bounds.getMax());
         bounds = new ProjectionBounds(new LatLon(
                         Math.max(-90, minLatlon.lat() - enlargeDegree),
-                        Math.max(-180, minLatlon.lon() - enlargeDegree)).getEastNorth(Main.getProjection()),
+                        Math.max(-180, minLatlon.lon() - enlargeDegree)).getEastNorth(ProjectionRegistry.getProjection()),
                 new LatLon(
                         Math.min(90, maxLatlon.lat() + enlargeDegree),
-                        Math.min(180, maxLatlon.lon() + enlargeDegree)).getEastNorth(Main.getProjection()));
+                        Math.min(180, maxLatlon.lon() + enlargeDegree)).getEastNorth(ProjectionRegistry.getProjection()));
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java

@@ -9 +9 @@
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -29 +28 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
@@ -49 +49 @@
 
     private MultipolygonCache() {
-        Main.addProjectionChangeListener(this);
+        ProjectionRegistry.addProjectionChangeListener(this);
         SelectionEventManager.getInstance().addSelectionListener(this);
         MainApplication.getLayerManager().addLayerChangeListener(this);

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -31 +31 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.validation.tests.Addresses;
 import org.openstreetmap.josm.data.validation.tests.ApiCapabilitiesTest;
@@ -352 +353 @@
      */
     public static void initializeGridDetail() {
-        String code = Main.getProjection().toCode();
+        String code = ProjectionRegistry.getProjection().toCode();
         if (Arrays.asList(ProjectionPreference.wgs84.allCodes()).contains(code)) {
             OsmValidator.griddetail = 10_000;

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -102 +102 @@
 import org.openstreetmap.josm.data.preferences.JosmUrls;
 import org.openstreetmap.josm.data.preferences.sources.SourceType;
+import org.openstreetmap.josm.data.projection.ProjectionBoundsProvider;
 import org.openstreetmap.josm.data.projection.ProjectionCLI;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileSource;
 import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper;
@@ -258 +260 @@
     };
 
+    private static final ProjectionBoundsProvider mainBoundsProvider = new ProjectionBoundsProvider() {
+        @Override
+        public Bounds getRealBounds() {
+            return isDisplayingMapView() ? map.mapView.getRealBounds() : null;
+        }
+
+        @Override
+        public void restoreOldBounds(Bounds oldBounds) {
+            if (isDisplayingMapView()) {
+                map.mapView.zoomTo(oldBounds);
+            }
+        }
+    };
+
     private static final List<CLIModule> cliModules = new ArrayList<>();
 
@@ -341 +357 @@
         undoRedo = super.undoRedo;
         getLayerManager().addLayerChangeListener(undoRedoCleaner);
+        ProjectionRegistry.setboundsProvider(mainBoundsProvider);
     }
 
@@ -511 +528 @@
         } catch (SecurityException e) {
             Logging.log(Logging.LEVEL_ERROR, "Unable to shutdown worker", e);
-        }
-    }
-
-    @Override
-    protected Bounds getRealBounds() {
-        return isDisplayingMapView() ? map.mapView.getRealBounds() : null;
-    }
-
-    @Override
-    protected void restoreOldBounds(Bounds oldBounds) {
-        if (isDisplayingMapView()) {
-            map.mapView.zoomTo(oldBounds);
         }
     }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -37 +37 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.Bounds;
@@ -48 +47 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MapViewState.MapViewRectangle;
 import org.openstreetmap.josm.gui.autofilter.AutoFilterManager;
@@ -358 +358 @@
 
                 layer.addPropertyChangeListener(this);
-                Main.addProjectionChangeListener(layer);
+                ProjectionRegistry.addProjectionChangeListener(layer);
                 invalidatedListener.addTo(layer);
                 AudioPlayer.reset();
@@ -398 +398 @@
         }
         painter.detachFromMapView(new MapViewEvent(this, false));
-        Main.removeProjectionChangeListener(layer);
+        ProjectionRegistry.removeProjectionChangeListener(layer);
         layer.removePropertyChangeListener(this);
         invalidatedListener.removeFrom(layer);

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -16 +16 @@
 import javax.swing.JComponent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
@@ -25 +24 @@
 import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -394 +394 @@
      */
     public static MapViewState createDefaultState(int width, int height) {
-        Projection projection = Main.getProjection();
+        Projection projection = ProjectionRegistry.getProjection();
         double scale = projection.getDefaultZoomInPPD();
         MapViewState state = new MapViewState(projection, width, height, scale, new EastNorth(0, 0));
@@ -403 +403 @@
     private static EastNorth calculateDefaultCenter() {
         Bounds b = Optional.ofNullable(DownloadDialog.getSavedDownloadBounds()).orElseGet(
-                () -> Main.getProjection().getWorldBoundsLatLon());
-        return b.getCenter().getEastNorth(Main.getProjection());
+                () -> ProjectionRegistry.getProjection().getWorldBoundsLatLon());
+        return b.getCenter().getEastNorth(ProjectionRegistry.getProjection());
     }
 

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -32 +32 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
@@ -53 +52 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
@@ -188 +188 @@
         setLayout(null);
         state = MapViewState.createDefaultState(getWidth(), getHeight());
-        Main.addProjectionChangeListener(projectionChangeListener);
+        ProjectionRegistry.addProjectionChangeListener(projectionChangeListener);
     }
 
@@ -334 +334 @@
      */
     public void fixProjection() {
-        state = state.usingProjection(Main.getProjection());
+        state = state.usingProjection(ProjectionRegistry.getProjection());
         repaint();
     }
@@ -492 +492 @@
      */
     public Bounds getLatLonBounds(Rectangle r) {
-        return Main.getProjection().getLatLonBoundsBox(getProjectionBounds(r));
+        return ProjectionRegistry.getProjection().getLatLonBoundsBox(getProjectionBounds(r));
     }
 
@@ -525 +525 @@
             return new Point();
         } else {
-            return getPoint2D(latlon.getEastNorth(Main.getProjection()));
+            return getPoint2D(latlon.getEastNorth(ProjectionRegistry.getProjection()));
         }
     }

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveDataPaster.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.WayData;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -73 +74 @@
                 if (data instanceof NodeData) {
                     NodeData nodeData = (NodeData) data;
-                    nodeData.setEastNorth(nodeData.getEastNorth(Main.getProjection()).add(offset));
+                    nodeData.setEastNorth(nodeData.getEastNorth(ProjectionRegistry.getProjection()).add(offset));
                 } else if (data instanceof WayData) {
                     updateNodes(newIds.get(OsmPrimitiveType.NODE), data);

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

@@ -8 +8 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -22 +21 @@
 import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator.Hemisphere;
@@ -171 +171 @@
             addBbox(o);
             add(tr("Centroid: "),
-                    toStringCSV(", ", Main.getProjection().eastNorth2latlon(
+                    toStringCSV(", ", ProjectionRegistry.getProjection().eastNorth2latlon(
                             Geometry.getCentroid(((IWay<?>) o).getNodes()))));
             addWayNodes((IWay<?>) o);
@@ -203 +203 @@
         if (bbox != null) {
             add(tr("Bounding box: "), bbox.toStringCSV(", "));
-            EastNorth bottomRigth = bbox.getBottomRight().getEastNorth(Main.getProjection());
-            EastNorth topLeft = bbox.getTopLeft().getEastNorth(Main.getProjection());
+            EastNorth bottomRigth = bbox.getBottomRight().getEastNorth(ProjectionRegistry.getProjection());
+            EastNorth topLeft = bbox.getTopLeft().getEastNorth(ProjectionRegistry.getProjection());
             add(tr("Bounding box (projected): "),
                     Double.toString(topLeft.east()), ", ",

trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

@@ -23 +23 @@
 import javax.swing.event.DocumentListener;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
 import org.openstreetmap.josm.data.coor.conversion.LatLonParser;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
@@ -196 +196 @@
         tfLatLon.setText(CoordinateFormatManager.getDefaultFormat().latToString(llc) + ' ' +
                          CoordinateFormatManager.getDefaultFormat().lonToString(llc));
-        EastNorth en = Main.getProjection().latlon2eastNorth(llc);
+        EastNorth en = ProjectionRegistry.getProjection().latlon2eastNorth(llc);
         tfEastNorth.setText(Double.toString(en.east()) + ' ' + Double.toString(en.north()));
         // Both latLonCoordinates and eastNorthCoordinates may have been reset to null if ll is out of the world
@@ -213 +213 @@
         } else {
             if (eastNorthCoordinates == null) return null;
-            return Main.getProjection().eastNorth2latlon(eastNorthCoordinates);
+            return ProjectionRegistry.getProjection().eastNorth2latlon(eastNorthCoordinates);
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -91 +91 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 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.ExtendedDialog;
@@ -328 +329 @@
         if (coordinateConverter.requiresReprojection()) {
             content.add(Arrays.asList(tr("Tile download projection"), tileSource.getServerCRS()));
-            content.add(Arrays.asList(tr("Tile display projection"), Main.getProjection().toCode()));
+            content.add(Arrays.asList(tr("Tile display projection"), ProjectionRegistry.getProjection().toCode()));
         }
         content.add(Arrays.asList(tr("Current zoom"), Integer.toString(currentZoomLevel)));
@@ -449 +450 @@
                     content.add(Arrays.asList(tr("Reprojection"),
                             tile.getTileSource().getServerCRS() +
-                            " -> " + Main.getProjection().toCode()));
+                            " -> " + ProjectionRegistry.getProjection().toCode()));
                     BufferedImage img = tile.getImage();
                     if (img != null) {
@@ -566 +567 @@
             }
             // check if projection is supported
-            projectionChanged(null, Main.getProjection());
+            projectionChanged(null, ProjectionRegistry.getProjection());
             initTileSource(this.tileSource);
         }
@@ -1412 +1413 @@
                     CoordinateConversion.projToEn(topLeftUnshifted),
                     CoordinateConversion.projToEn(botRightUnshifted));
-            ProjectionBounds bbox = projServer.getEastNorthBoundsBox(projBounds, Main.getProjection());
+            ProjectionBounds bbox = projServer.getEastNorthBoundsBox(projBounds, ProjectionRegistry.getProjection());
             t1 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(bbox.getMin()), zoom);
             t2 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(bbox.getMax()), zoom);
@@ -1962 +1963 @@
         @Override
         public boolean isActive() {
-            EastNorth offset = bookmark.getDisplacement(Main.getProjection());
+            EastNorth offset = bookmark.getDisplacement(ProjectionRegistry.getProjection());
             EastNorth active = getDisplaySettings().getDisplacement();
             return Utils.equalsEpsilon(offset.east(), active.east()) && Utils.equalsEpsilon(offset.north(), active.north());

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -29 +29 @@
 import javax.swing.JTextField;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -85 +85 @@
     public double getPPD() {
         if (!MainApplication.isDisplayingMapView())
-            return Main.getProjection().getDefaultZoomInPPD();
+            return ProjectionRegistry.getProjection().getDefaultZoomInPPD();
         MapView mapView = MainApplication.getMap().mapView;
         ProjectionBounds bounds = mapView.getProjectionBounds();

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -16 +16 @@
 import org.apache.commons.jcs.access.CacheAccess;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -29 +28 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 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.MainApplication;
@@ -96 +96 @@
         AbstractWMSTileSource tileSource;
         if (info.getImageryType() == ImageryType.WMS) {
-            tileSource = new TemplatedWMSTileSource(info, chooseProjection(Main.getProjection()));
+            tileSource = new TemplatedWMSTileSource(info, chooseProjection(ProjectionRegistry.getProjection()));
         } else {
             /*
@@ -107 +107 @@
              *  * we always use current definitions returned by server
              */
-            WMSEndpointTileSource endpointTileSource = new WMSEndpointTileSource(info, Main.getProjection());
+            WMSEndpointTileSource endpointTileSource = new WMSEndpointTileSource(info, ProjectionRegistry.getProjection());
             this.serverProjections = endpointTileSource.getServerProjections();
-            endpointTileSource.setTileProjection(chooseProjection(Main.getProjection()));
+            endpointTileSource.setTileProjection(chooseProjection(ProjectionRegistry.getProjection()));
             tileSource = endpointTileSource;
         }
@@ -182 +182 @@
         Logging.info(tr("Reprojecting layer {0} from {1} to {2}. For best image quality and performance,"
                 + " switch to one of the supported projections: {3}",
-                getName(), proj.toCode(), Main.getProjection().toCode(), Utils.join(", ", getNativeProjections())));
+                getName(), proj.toCode(), ProjectionRegistry.getProjection().toCode(), Utils.join(", ", getNativeProjections())));
         return proj;
     }

trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

@@ -7 +7 @@
 import org.apache.commons.jcs.access.CacheAccess;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -15 +14 @@
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
@@ -81 +81 @@
         double displayScale = MainApplication.getMap().mapView.getScale();
         if (coordinateConverter.requiresReprojection()) {
-            displayScale *= Main.getProjection().getMetersPerUnit();
+            displayScale *= ProjectionRegistry.getProjection().getMetersPerUnit();
         }
         Scale snap = scaleList.getSnapScale(displayScale, false);

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -189 +190 @@
                     continue;
                 }
-                WayPoint wNear = layer.data.nearestPointOnTrack(w.getEastNorth(Main.getProjection()), snapDistance);
+                WayPoint wNear = layer.data.nearestPointOnTrack(w.getEastNorth(ProjectionRegistry.getProjection()), snapDistance);
                 if (wNear != null) {
                     WayPoint wc = new WayPoint(w.getCoor());

trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java

@@ -8 +8 @@
 import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.CoordinateConversion;
 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.MainApplication;
@@ -122 +122 @@
         }
 
-        Projection projCurrent = Main.getProjection();
+        Projection projCurrent = ProjectionRegistry.getProjection();
         Projection projServer = Projections.getProjectionByCode(source.getServerCRS());
         EastNorth en00Server = tileToEastNorth(xtile, ytile, zoom);

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java

@@ -14 +14 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.CoordinateConversion;
 import org.openstreetmap.josm.data.projection.Projecting;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.ShiftedProjecting;
 import org.openstreetmap.josm.gui.MapView;
@@ -202 +202 @@
      */
     public boolean requiresReprojection() {
-        return !Objects.equals(tileSource.getServerCRS(), Main.getProjection().toCode());
+        return !Objects.equals(tileSource.getServerCRS(), ProjectionRegistry.getProjection().toCode());
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -7 +7 @@
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.io.session.SessionAwareReadApply;
@@ -206 +206 @@
             setDisplacement(EastNorth.ZERO);
         } else {
-            setDisplacement(offsetBookmark.getDisplacement(Main.getProjection()));
+            setDisplacement(offsetBookmark.getDisplacement(ProjectionRegistry.getProjection()));
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -215 +216 @@
             for (Marker m : recent.parentLayer.data) {
                 if (m instanceof AudioMarker) {
-                    double distanceSquared = m.getEastNorth(Main.getProjection()).distanceSq(en);
+                    double distanceSquared = m.getEastNorth(ProjectionRegistry.getProjection()).distanceSq(en);
                     if (distanceSquared < closestAudioMarkerDistanceSquared) {
                         ca = (AudioMarker) m;
@@ -348 +349 @@
             return;
         setEastNorth(w2 == null ?
-                w1.getEastNorth(Main.getProjection()) :
-                    w1.getEastNorth(Main.getProjection()).interpolate(w2.getEastNorth(Main.getProjection()),
+                w1.getEastNorth(ProjectionRegistry.getProjection()) :
+                    w1.getEastNorth(ProjectionRegistry.getProjection()).interpolate(w2.getEastNorth(ProjectionRegistry.getProjection()),
                             (audioTime - w1.time)/(w2.time - w1.time)));
         time = audioTime;

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) {

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

@@ -16 +16 @@
 import java.util.Optional;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
@@ -22 +21 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
@@ -65 +65 @@
         this.scale = scale;
         this.styles = styles;
-        Projection proj = Main.getProjection();
+        Projection proj = ProjectionRegistry.getProjection();
         projBounds = new ProjectionBounds();
         projBounds.extend(proj.latlon2eastNorth(bounds.getMin()));

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -62 +62 @@
 import org.openstreetmap.josm.data.imagery.Shape;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
@@ -856 +857 @@
             JButton add = new JButton(tr("Add"));
             buttonPanel.add(add, GBC.std().insets(0, 5, 0, 0));
-            add.addActionListener(e -> model.addRow(new OffsetBookmark(Main.getProjection().toCode(), "", "", "", 0, 0)));
+            add.addActionListener(e -> model.addRow(new OffsetBookmark(ProjectionRegistry.getProjection().toCode(), "", "", "", 0, 0)));
 
             JButton delete = new JButton(tr("Delete"));

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.projection.CustomProjection;
 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.ExtendedDialog;
@@ -493 +494 @@
         pc.setPreferences(pref);
         Projection proj = pc.getProjection();
-        Main.setProjection(proj);
+        ProjectionRegistry.setProjection(proj);
     }
 

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

@@ -26 +26 @@
 import javax.xml.transform.stream.StreamResult;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -264 +264 @@
         MapView mapView = MainApplication.getMap().mapView;
         EastNorth center = mapView.getCenter();
-        LatLon centerLL = Main.getProjection().eastNorth2latlon(center);
+        LatLon centerLL = ProjectionRegistry.getProjection().eastNorth2latlon(center);
         centerEl.setAttribute("lat", Double.toString(centerLL.lat()));
         centerEl.setAttribute("lon", Double.toString(centerLL.lon()));
@@ -293 +293 @@
             }
         }
-        String code = Main.getProjection().toCode();
+        String code = ProjectionRegistry.getProjection().toCode();
         if (code != null) {
             Element codeEl = doc.createElement("code");

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.Projections;
 
@@ -164 +165 @@
                                 }
 
-                                Node newNode = new Node(Main.getProjection().eastNorth2latlon(intersection));
+                                Node newNode = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(intersection));
                                 Node intNode = newNode;
                                 boolean insertInSeg1 = false;
@@ -1053 +1054 @@
         double area = 0;
         double perimeter = 0;
-        Projection useProjection = projection == null ? Main.getProjection() : projection;
+        Projection useProjection = projection == null ? ProjectionRegistry.getProjection() : projection;
 
         if (!nodes.isEmpty()) {