Changeset 4126 in josm

Timestamp:

Jun 7, 2011 7:05:14 PM (2 years ago)

Author:

bastiK

Message:

memory optimizations for Node & WayPoint (Patch by Gubaer, modified)

The field 'proj' in CachedLatLon is a waste of memory. For the 2 classes where this has the greatest impact, the cache for the projected coordinates is replaced by 2 simple double fields (east & north). On projection change, they have to be invalidated explicitly. This is handled by the DataSet & the GpxLayer.

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (modified) (7 diffs)
• src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/command/MoveCommand.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/coor/CachedLatLon.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (6 diffs)
• src/org/openstreetmap/josm/data/osm/INode.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Node.java (modified) (11 diffs)
• src/org/openstreetmap/josm/data/osm/NodeData.java (modified) (5 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/projection/ProjectionChangeListener.java (added)
• src/org/openstreetmap/josm/data/projection/Projections.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/MapView.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (11 diffs)
• src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/Layer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) (7 diffs)
• src/org/openstreetmap/josm/io/imagery/Grabber.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/imagery/WMSGrabber.java (modified) (5 diffs)
• src/org/openstreetmap/josm/tools/Geometry.java (modified) (4 diffs)
• test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (modified) (16 diffs)
• test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) (1 diff)

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

@@ -16 +16 @@
 import java.awt.event.WindowEvent;
 import java.io.File;
+import java.lang.ref.WeakReference;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -56 +58 @@
 import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.gui.GettingStarted;
@@ -73 +76 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -119 +123 @@
     public static PrimitiveDeepCopy pasteBuffer = new PrimitiveDeepCopy();
     public static Layer pasteSource;
-    /**
-     * The projection method used.
-     */
-    public static Projection proj;
+
     /**
      * The MapFrame. Use setMapFrame to set or clear it.
@@ -154 +155 @@
      */
     static public int debug_level = 1;
-    static public final void debug(String msg) {
+    static public void debug(String msg) {
         if (debug_level <= 0)
             return;
@@ -213 +214 @@
         platform.startupHook();
 
-        // We try to establish an API connection early, so that any API 
+        // We try to establish an API connection early, so that any API
         // capabilities are already known to the editor instance. However
         // if it goes wrong that's not critical at this stage.
@@ -768 +769 @@
         System.err.println("Error: Could not recognize Java Version: "+version);
     }
+
+    /* ----------------------------------------------------------------------------------------- */
+    /* 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.
+     * @deprecated use {@link #getProjection()} and {@link #setProjection(Projection)} instead.
+     * For the time being still publicly available, but avoid/migrate write access to it. Use
+     * {@link #setProjection(Projection)} in order to trigger a projection change event.
+     */
+    @Deprecated
+    public static Projection proj;
+
+    /**
+     * Replies the current projection.
+     * 
+     * @return
+     */
+    public static Projection getProjection() {
+        return proj;
+    }
+
+    /**
+     * Sets the current projection
+     * 
+     * @param p the projection
+     */
+    public static void setProjection(Projection p) {
+        CheckParameterUtil.ensureParameterNotNull(p);
+        Projection oldValue = proj;
+        proj = p;
+        fireProjectionChanged(oldValue, proj);
+    }
+
+    /*
+     * 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 ArrayList<WeakReference<ProjectionChangeListener>> listeners = new ArrayList<WeakReference<ProjectionChangeListener>>();
+
+    private static void fireProjectionChanged(Projection oldValue, Projection newValue) {
+        if (newValue == null ^ oldValue == null
+                || (newValue != null && oldValue != null && !newValue.getClass().getName().equals(oldValue.getClass().getName()))) {
+
+            synchronized(Main.class) {
+                Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
+                while(it.hasNext()){
+                    WeakReference<ProjectionChangeListener> wr = it.next();
+                    if (wr.get() == null) {
+                        it.remove();
+                        continue;
+                    }
+                    wr.get().projectionChanged(oldValue, newValue);
+                }
+            }
+            if (newValue != null) {
+                Bounds b = (Main.map != null && Main.map.mapView != null) ? Main.map.mapView.getRealBounds() : null;
+                if (b != null){
+                    Main.map.mapView.zoomTo(b);
+                }
+            }
+            /* TODO - remove layers with fixed projection */
+        }
+    }
+
+    /**
+     * Register a projection change listener
+     * 
+     * @param listener the listener. Ignored if null.
+     */
+    public static void addProjectionChangeListener(ProjectionChangeListener listener) {
+        if (listener == null) return;
+        synchronized (Main.class) {
+            for (WeakReference<ProjectionChangeListener> wr : listeners) {
+                // already registered ? => abort
+                if (wr.get() == listener) return;
+            }
+        }
+        listeners.add(new WeakReference<ProjectionChangeListener>(listener));
+    }
+
+    /**
+     * Removes a projection change listener
+     * 
+     * @param listener the listener. Ignored if null.
+     */
+    public static void removeProjectionChangeListener(ProjectionChangeListener listener) {
+        if (listener == null) return;
+        synchronized(Main.class){
+            Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
+            while(it.hasNext()){
+                WeakReference<ProjectionChangeListener> wr = it.next();
+                // remove the listener - and any other listener which god garbage
+                // collected in the meantime
+                if (wr.get() == null || wr.get() == listener) {
+                    it.remove();
+                }
+            }
+        }
+    }
 }

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

@@ -153 +153 @@
                     double x = xc + r*Math.cos(a);
                     double y = yc + r*Math.sin(a);
-                    Node n = new Node(Main.proj.eastNorth2latlon(new EastNorth(x,y)));
+                    Node n = new Node(Main.getProjection().eastNorth2latlon(new EastNorth(x,y)));
                     wayToAdd.add(n);
                     cmds.add(new AddCommand(n));
@@ -245 +245 @@
                 double x = xc + r*Math.cos(a);
                 double y = yc + r*Math.sin(a);
-                Node n = new Node(Main.proj.eastNorth2latlon(new EastNorth(x,y)));
+                Node n = new Node(Main.getProjection().eastNorth2latlon(new EastNorth(x,y)));
                 wayToAdd.add(n);
                 cmds.add(new AddCommand(n));

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

@@ -162 +162 @@
             pnl.add(new JMultilineLabel(tr("Use arrow keys or drag the imagery layer with mouse to adjust the imagery offset.\n" +
                     "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.proj.toString())), GBC.eop());
+                    "If you want to save the offset as bookmark, enter the bookmark name below",Main.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));
@@ -211 +211 @@
         public void updateOffsetIntl() {
             // Support projections with very small numbers (e.g. 4326)
-            int precision = Main.proj.getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
+            int precision = Main.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
             // US locale to force decimal separator to be '.'
             tOffset.setText(new java.util.Formatter(java.util.Locale.US).format(

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

@@ -117 +117 @@
         if (!isEnabled())
             return;
-        if ("EPSG:4326".equals(Main.proj.toString())) {
+        if ("EPSG:4326".equals(Main.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>" +

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

@@ -255 +255 @@
 
             // find out the movement distance, in metres
-            double distance = Main.proj.eastNorth2latlon(initialN1en).greatCircleDistance(Main.proj.eastNorth2latlon(newN1en));
+            double distance = Main.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance(Main.getProjection().eastNorth2latlon(newN1en));
             Main.map.statusLine.setDist(distance);
             updateStatusLine();
@@ -309 +309 @@
                         //move existing node
                         Node n1Old = selectedSegment.getFirstNode();
-                        cmds.add(new MoveCommand(n1Old, Main.proj.eastNorth2latlon(newN1en)));
+                        cmds.add(new MoveCommand(n1Old, Main.getProjection().eastNorth2latlon(newN1en)));
                     } else {
                         //introduce new node
-                        Node n1New = new Node(Main.proj.eastNorth2latlon(newN1en));
+                        Node n1New = new Node(Main.getProjection().eastNorth2latlon(newN1en));
                         wnew.addNode(insertionPoint, n1New);
                         insertionPoint ++;
@@ -326 +326 @@
                         //move existing node
                         Node n2Old = selectedSegment.getSecondNode();
-                        cmds.add(new MoveCommand(n2Old, Main.proj.eastNorth2latlon(newN2en)));
+                        cmds.add(new MoveCommand(n2Old, Main.getProjection().eastNorth2latlon(newN2en)));
                     } else {
                         //introduce new node
-                        Node n2New = new Node(Main.proj.eastNorth2latlon(newN2en));
+                        Node n2New = new Node(Main.getProjection().eastNorth2latlon(newN2en));
                         wnew.addNode(insertionPoint, n2New);
                         insertionPoint ++;

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

@@ -12 +12 @@
 import javax.swing.JLabel;
 
-import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -18 +17 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -59 +59 @@
 
     public MoveCommand(Node node, LatLon position) {
-        this(Collections.singleton((OsmPrimitive) node), node.getEastNorth().sub(new CachedLatLon(position).getEastNorth()));
+        this(Collections.singleton((OsmPrimitive) node), node.getEastNorth().sub(Projections.project(position)));
     }
 

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

@@ -5 +5 @@
 import org.openstreetmap.josm.data.projection.Projection;
 
+/**
+ * LatLon class that maintains a cache of projected EastNorth coordinates.
+ * 
+ * This class is convenient to use, but has relatively high memory costs.
+ * It keeps a pointer to the last known projection in order to detect projection 
+ * changes.
+ * 
+ * Node and WayPoint have another, optimized, cache for projected coordinates.
+ */
 public class CachedLatLon extends LatLon {
     private EastNorth eastNorth;
@@ -19 +28 @@
 
     public CachedLatLon(EastNorth eastNorth) {
-        super(Main.proj.eastNorth2latlon(eastNorth));
-        proj = Main.proj;
+        super(Main.getProjection().eastNorth2latlon(eastNorth));
+        proj = Main.getProjection();
         this.eastNorth = eastNorth;
     }
@@ -30 +39 @@
 
     public final void setEastNorth(EastNorth eastNorth) {
-        proj = Main.proj;
+        proj = Main.getProjection();
         this.eastNorth = eastNorth;
         LatLon l = proj.eastNorth2latlon(eastNorth);
@@ -36 +45 @@
     }
 
+    /**
+     * Replies the projected east/north coordinates.
+     * 
+     * @return the internally cached east/north coordinates. null, if the globally defined projection is null
+     */
     public final EastNorth getEastNorth() {
-        if(proj != Main.proj)
+        if(proj != Main.getProjection())
         {
-            proj = Main.proj;
+            proj = Main.getProjection();
             eastNorth = proj.latlon2eastNorth(this);
         }

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

@@ -106 +106 @@
         case DEGREES_MINUTES_SECONDS: return dms(y) + ((y < 0) ? SOUTH : NORTH);
         case NAUTICAL: return dm(y) + ((y < 0) ? SOUTH : NORTH);
-        case EAST_NORTH: return cDdFormatter.format(Main.proj.latlon2eastNorth(this).north());
+        case EAST_NORTH: return cDdFormatter.format(Main.getProjection().latlon2eastNorth(this).north());
         default: return "ERR";
         }
@@ -122 +122 @@
         case DEGREES_MINUTES_SECONDS: return dms(x) + ((x < 0) ? WEST : EAST);
         case NAUTICAL: return dm(x) + ((x < 0) ? WEST : EAST);
-        case EAST_NORTH: return cDdFormatter.format(Main.proj.latlon2eastNorth(this).east());
+        case EAST_NORTH: return cDdFormatter.format(Main.getProjection().latlon2eastNorth(this).east());
         default: return "ERR";
         }
@@ -142 +142 @@
      */
     public boolean isOutSideWorld() {
-        Bounds b = Main.proj.getWorldBoundsLatLon();
+        Bounds b = Main.getProjection().getWorldBoundsLatLon();
         return lat() < b.getMin().lat() || lat() > b.getMax().lat() ||
         lon() < b.getMin().lon() || lon() > b.getMax().lon();

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

@@ -7 +7 @@
 import java.util.Date;
 
-import org.openstreetmap.josm.data.coor.CachedLatLon;
+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.Projections;
 import org.openstreetmap.josm.tools.PrimaryDateParser;
 
@@ -26 +27 @@
 
     public WayPoint(LatLon ll) {
-        coor = new CachedLatLon(ll);
+        lat = ll.lat();
+        lon = ll.lon();
     }
 
-    private final CachedLatLon coor;
+    /*
+     * We "inline" lat/lon, rather than usinga LatLon internally => reduces memory overhead. Relevant
+     * because a lot of GPX waypoints are created when GPS tracks are downloaded from the OSM server.
+     */
+    private double lat = 0;
+    private double lon = 0;
+
+    /*
+     * internal cache of projected coordinates
+     */
+    private double east = Double.NaN;
+    private double north = Double.NaN;
+
+    /**
+     * Invalidate the internal cache of east/north coordinates.
+     */
+    public void invalidateEastNorthCache() {
+        this.east = Double.NaN;
+        this.north = Double.NaN;
+    }
 
     public final LatLon getCoor() {
-        return coor;
+        return new LatLon(lat,lon);
     }
 
+    /**
+     * <p>Replies the projected east/north coordinates.</p>
+     * 
+     * <p>Uses the {@link Main#getProjection() global projection} to project the lan/lon-coordinates.
+     * Internally caches the projected coordinates.</p>
+     *
+     * <p><strong>Caveat:</strong> doesn't listen to projection changes. Clients must
+     * {@link #reproject() trigger a reprojection} or {@link #invalidateEastNorthCache() invalidate the internal cache}.</p>
+     * 
+     * @return the east north coordinates or {@code null}
+     * @see #invalidateEastNorthCache()
+     * 
+     */
     public final EastNorth getEastNorth() {
-        return coor.getEastNorth();
+        if (Double.isNaN(east) || Double.isNaN(north)) {
+            // projected coordinates haven't been calculated yet,
+            // so fill the cache of the projected waypoint coordinates
+            EastNorth en = Projections.project(new LatLon(lat, lon));
+            this.east = en.east();
+            this.north = en.north();
+        }
+        return new EastNorth(east, north);
     }
 
     @Override
     public String toString() {
-        return "WayPoint (" + (attr.containsKey("name") ? attr.get("name") + ", " :"") + coor.toString() + ", " + attr + ")";
+        return "WayPoint (" + (attr.containsKey("name") ? attr.get("name") + ", " :"") + getCoor().toString() + ", " + attr + ")";
     }
 
@@ -57 +98 @@
     }
 
-    public int compareTo(WayPoint w)
-    {
+    public int compareTo(WayPoint w) {
         return Double.compare(time, w.time);
     }

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

@@ -30 +30 @@
     public boolean isUsable(ImageryLayer layer) {
         if (proj == null) return false;
-        if (!Main.proj.toCode().equals(proj.toCode())) return false;
+        if (!Main.getProjection().toCode().equals(proj.toCode())) return false;
         return layer.getInfo().getName().equals(layerName);
     }
@@ -122 +122 @@
         LatLon center;
         if (Main.map != null && Main.map.mapView != null) {
-            center = Main.proj.eastNorth2latlon(Main.map.mapView.getCenter());
+            center = Main.getProjection().eastNorth2latlon(Main.map.mapView.getCenter());
         } else {
             center = new LatLon(0,0);
         }
         OffsetBookmark nb = new OffsetBookmark(
-                Main.proj, layer.getInfo().getName(),
+                Main.getProjection(), layer.getInfo().getName(),
                 name, layer.getDx(), layer.getDy(), center.lon(), center.lat());
         for (ListIterator<OffsetBookmark> it = allBookmarks.listIterator();it.hasNext();) {

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

@@ -20 +20 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -34 +35 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -83 +87 @@
  * @author imi
  */
-public class DataSet implements Cloneable {
+public class DataSet implements Cloneable, ProjectionChangeListener {
 
     /**
@@ -120 +124 @@
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
     private final Object selectionLock = new Object();
+
+    public DataSet() {
+        /*
+         * Transparently register as projection change lister. No need to explicitly remove the
+         * the listener, projection change listeners are managed as WeakReferences.
+         */
+        Main.addProjectionChangeListener(this);
+    }
 
     public Lock getReadLock() {
@@ -975 +987 @@
     }
 
+    /**
+     * Invalidates the internal cache of projected east/north coordinates.
+     * 
+     * This method can be invoked after the globally configured projection method
+     * changed. In contrast to {@link DataSet#reproject()} it only invalidates the
+     * cache and doesn't reproject the coordinates.
+     */
+    public void invalidateEastNorthCache() {
+        if (Main.getProjection() == null) return; // sanity check
+        try {
+            beginUpdate();
+            for (Node n: Utils.filteredCollection(allPrimitives, Node.class)) {
+                n.invalidateEastNorthCache();
+            }
+        } finally {
+            endUpdate();
+        }
+    }
+
     public void cleanupDeletedPrimitives() {
         beginUpdate();
@@ -1064 +1095 @@
         return ret;
     }
+
+    /* --------------------------------------------------------------------------------- */
+    /* interface ProjectionChangeListner                                                 */
+    /* --------------------------------------------------------------------------------- */
+    @Override
+    public void projectionChanged(Projection oldValue, Projection newValue) {
+        invalidateEastNorthCache();
+    }
 }

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

@@ -6 +6 @@
 
 public interface INode extends IPrimitive {
-    
+
     LatLon getCoor();
     void setCoor(LatLon coor);
     EastNorth getEastNorth();
     void setEastNorth(EastNorth eastNorth);
-
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import org.openstreetmap.josm.data.coor.CachedLatLon;
+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.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.projection.Projections;
 
 /**
@@ -15 +16 @@
 public final class Node extends OsmPrimitive implements INode {
 
-    private CachedLatLon coor;
+    /*
+     * We "inline" lat/lon rather than using a LatLon-object => reduces memory footprint
+     */
+    static private final double COORDINATE_NOT_DEFINED = Double.NaN;
+    private double lat = COORDINATE_NOT_DEFINED;
+    private double lon = COORDINATE_NOT_DEFINED;
+
+    /*
+     * the cached projected coordinates
+     */
+    private double east = Double.NaN;
+    private double north = Double.NaN;
+
+    private boolean isLatLonKnown() {
+        return lat != COORDINATE_NOT_DEFINED && lon != COORDINATE_NOT_DEFINED;
+    }
 
     @Override
@@ -46 +62 @@
     @Override
     public final LatLon getCoor() {
-        return coor;
-    }
-
+        if (!isLatLonKnown()) return null;
+        return new LatLon(lat,lon);
+    }
+
+    /**
+     * <p>Replies the projected east/north coordinates.</p>
+     * 
+     * <p>Uses the {@link Main#getProjection() global projection} to project the lan/lon-coordinates.
+     * Internally caches the projected coordinates.</p>
+     *
+     * <p><strong>Caveat:</strong> doesn't listen to projection changes. Clients must
+     * {@link #invalidateEastNorthCache() invalidate the internal cache}.</p>
+     * 
+     * <p>Replies {@code null} if this node doesn't know lat/lon-coordinates, i.e. because it is an incomplete node.
+     * 
+     * @return the east north coordinates or {@code null}
+     * @see #invalidateEastNorthCache()
+     * 
+     */
     @Override
     public final EastNorth getEastNorth() {
-        return coor != null ? coor.getEastNorth() : null;
+        if (!isLatLonKnown()) return null;
+        
+        if (getDataSet() == null)
+            // there is no dataset that listens for projection changes
+            // and invalidates the cache, so we don't use the cache at all
+            return Projections.project(new LatLon(lat, lon));
+        
+        if (Double.isNaN(east) || Double.isNaN(north)) {
+            // projected coordinates haven't been calculated yet,
+            // so fill the cache of the projected node coordinates
+            EastNorth en = Projections.project(new LatLon(lat, lon));
+            this.east = en.east();
+            this.north = en.north();
+        }
+        return new EastNorth(east, north);
     }
 
@@ -58 +104 @@
      */
     protected void setCoorInternal(LatLon coor, EastNorth eastNorth) {
-        if(this.coor == null) {
-            if (eastNorth == null) {
-                this.coor = new CachedLatLon(coor);
-            } else {
-                this.coor = new CachedLatLon(eastNorth);
-            }
-        } else {
-            if (eastNorth == null) {
-                this.coor.setCoor(coor);
-            } else {
-                this.coor.setEastNorth(eastNorth);
-            }
-        }
+        if (coor != null) {
+            this.lat = coor.lat();
+            this.lon = coor.lon();
+            invalidateEastNorthCache();
+        } else if (eastNorth != null) {
+            LatLon ll = Projections.inverseProject(eastNorth);
+            this.lat = ll.lat();
+            this.lon = ll.lon();
+            this.east = eastNorth.east();
+            this.north = eastNorth.north();
+        } else
+            throw new IllegalArgumentException();
     }
 
@@ -150 +195 @@
         try {
             super.cloneFrom(osm);
-            setCoor(((Node)osm).coor);
+            setCoor(((Node)osm).getCoor());
         } finally {
             writeUnlock(locked);
@@ -173 +218 @@
             super.mergeFrom(other);
             if (!other.isIncomplete()) {
-                setCoor(new LatLon(((Node)other).coor));
+                setCoor(((Node)other).getCoor());
             }
         } finally {
@@ -200 +245 @@
 
     @Override public String toString() {
-        String coorDesc = coor == null?"":"lat="+coor.lat()+",lon="+coor.lon();
+        String coorDesc = isLatLonKnown() ? "lat="+lat+",lon="+lon : "";
         return "{Node id=" + getUniqueId() + " version=" + getVersion() + " " + getFlagsAsString() + " "  + coorDesc+"}";
     }
@@ -211 +256 @@
             return false;
         Node n = (Node)other;
-        if (coor == null && n.coor == null)
+        LatLon coor = getCoor();
+        LatLon otherCoor = n.getCoor();
+        if (coor == null && otherCoor == null)
             return true;
-        else if (coor != null && n.coor != null)
-            return coor.equalsEpsilon(n.coor);
+        else if (coor != null && otherCoor != null)
+            return coor.equalsEpsilon(otherCoor);
         else
             return false;
@@ -241 +288 @@
     @Override
     public void updatePosition() {
-        // TODO: replace CachedLatLon with simple doubles and update precalculated EastNorth value here
     }
 
@@ -253 +299 @@
         builder.append(toString());
         builder.append("\n");
-        if (coor == null) {
+        if (isLatLonKnown()) {
             builder.append("Coor is null\n");
         } else {
-            builder.append(String.format("EastNorth: %s\n", coor.getEastNorth()));
-            builder.append(coor.getProjection());
+            builder.append(String.format("EastNorth: %s\n", getEastNorth()));
+            builder.append(Main.getProjection());
             builder.append("\n");
         }
@@ -263 +309 @@
         return builder.toString();
     }
+
+    /**
+     * Invoke to invalidate the internal cache of projected east/north coordinates.
+     * Coordinates are reprojected on demand when the {@link #getEastNorth()} is invoked
+     * next time.
+     */
+    public void invalidateEastNorthCache() {
+        this.east = Double.NaN;
+        this.north = Double.NaN;
+    }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import org.openstreetmap.josm.data.coor.CachedLatLon;
 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.Projections;
 
 public class NodeData extends PrimitiveData implements INode {
 
-    private final CachedLatLon coor = new CachedLatLon(0, 0);
+    /*
+     * we "inline" lat/lon coordinates instead of using a LatLon => reduces memory footprint
+     */
+    private double lat = Double.NaN;
+    private double lon = Double.NaN;
 
-    public NodeData() {
-
-    }
+    public NodeData() {}
 
     public NodeData(NodeData data) {
@@ -20 +22 @@
     }
 
+    private boolean isLatLonKnown() {
+        return lat != Double.NaN && lon != Double.NaN;
+    }
+    
     @Override
     public LatLon getCoor() {
-        return coor;
+        return isLatLonKnown() ? new LatLon(lat,lon) : null;
     }
 
     @Override
     public void setCoor(LatLon coor) {
-        this.coor.setCoor(coor);
+        if (coor == null) {
+            this.lat = Double.NaN;
+            this.lon = Double.NaN;
+        } else {
+            this.lat = coor.lat();
+            this.lon = coor.lon();
+        }
     }
 
     @Override
     public EastNorth getEastNorth() {
-        return this.coor.getEastNorth();
+        /*
+         * No internal caching of projected coordinates needed. In contrast to getEastNorth()
+         * on Node, this method is rarely used. Caching would be overkill.
+         */
+        return Projections.project(getCoor());
     }
 
     @Override
     public void setEastNorth(EastNorth eastNorth) {
-        this.coor.setEastNorth(eastNorth);
+        LatLon ll = Projections.inverseProject(eastNorth);
+        setCoor(ll);
     }
 
@@ -47 +64 @@
     @Override
     public String toString() {
-        return super.toString() + " NODE " + coor;
+        return super.toString() + " NODE " + getCoor();
     }
 
@@ -54 +71 @@
         return OsmPrimitiveType.NODE;
     }
-    
-    @Override 
+
+    @Override
     public void visit(PrimitiveVisitor visitor) {
         visitor.visit(this);
@@ -64 +81 @@
         return formatter.format(this);
     }
-
 }

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

@@ -113 +113 @@
         if (bounds == null)
             return;
-        LatLon minLatlon = Main.proj.eastNorth2latlon(bounds.getMin());
-        LatLon maxLatlon = Main.proj.eastNorth2latlon(bounds.getMax());
+        LatLon minLatlon = Main.getProjection().eastNorth2latlon(bounds.getMin());
+        LatLon maxLatlon = Main.getProjection().eastNorth2latlon(bounds.getMax());
         bounds = new ProjectionBounds(
-                Main.proj.latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree)),
-                Main.proj.latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree)));
+                Main.getProjection().latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree)),
+                Main.getProjection().latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree)));
     }
 

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.projection;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.ArrayList;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -14 +18 @@
      */
     private static ArrayList<Projection> allProjections =
-    new ArrayList<Projection>(Arrays.asList(new Projection[] {
-        // global projections
-        new Epsg4326(),
-        new Mercator(),
-        new UTM(),
-        // regional - alphabetical order by country name
-        new LambertEST(), // Still needs proper default zoom
-        new Lambert(),    // Still needs proper default zoom
-        new LambertCC9Zones(),    // Still needs proper default zoom
-        new UTM_France_DOM(),
-        new TransverseMercatorLV(),
-        new Puwg(),
-        new Epsg3008(), // SWEREF99 13 30
-        new SwissGrid(),
-    }));
+        new ArrayList<Projection>(Arrays.asList(new Projection[] {
+                // global projections
+                new Epsg4326(),
+                new Mercator(),
+                new UTM(),
+                // regional - alphabetical order by country name
+                new LambertEST(), // Still needs proper default zoom
+                new Lambert(),    // Still needs proper default zoom
+                new LambertCC9Zones(),    // Still needs proper default zoom
+                new UTM_France_DOM(),
+                new TransverseMercatorLV(),
+                new Puwg(),
+                new Epsg3008(), // SWEREF99 13 30
+                new SwissGrid(),
+        }));
 
     public static ArrayList<Projection> getProjections() {
@@ -43 +47 @@
         allProjections.add(proj);
     }
+
+    static public EastNorth project(LatLon ll) {
+        if (ll == null) return null;
+        return Main.getProjection().latlon2eastNorth(ll);
+    }
+
+    static public LatLon inverseProject(EastNorth en) {
+        if (en == null) return null;
+        return Main.getProjection().eastNorth2latlon(en);
+    }
 }

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

@@ -23 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ValidateAction;
-import org.openstreetmap.josm.actions.upload.ValidateUploadHook;
 import org.openstreetmap.josm.data.projection.Epsg4326;
 import org.openstreetmap.josm.data.projection.Lambert;
@@ -30 +29 @@
 import org.openstreetmap.josm.data.validation.tests.CrossingWays;
 import org.openstreetmap.josm.data.validation.tests.DuplicateNode;
+import org.openstreetmap.josm.data.validation.tests.DuplicateRelation;
 import org.openstreetmap.josm.data.validation.tests.DuplicateWay;
-import org.openstreetmap.josm.data.validation.tests.DuplicateRelation;
 import org.openstreetmap.josm.data.validation.tests.DuplicatedWayNodes;
 import org.openstreetmap.josm.data.validation.tests.MultipolygonTest;
@@ -48 +47 @@
 import org.openstreetmap.josm.data.validation.tests.WronglyOrderedWays;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
 
@@ -77 +76 @@
     @SuppressWarnings("unchecked")
     public static Class<Test>[] allAvailableTests = new Class[] {
-            DuplicateNode.class, // ID    1 ..   99
-            OverlappingWays.class, // ID  101 ..  199
-            UntaggedNode.class, // ID  201 ..  299
-            UntaggedWay.class, // ID  301 ..  399
-            SelfIntersectingWay.class, // ID  401 ..  499
-            DuplicatedWayNodes.class, // ID  501 ..  599
-            CrossingWays.class, // ID  601 ..  699
-            SimilarNamedWays.class, // ID  701 ..  799
-            NodesWithSameName.class, // ID  801 ..  899
-            Coastlines.class, // ID  901 ..  999
-            WronglyOrderedWays.class, // ID 1001 .. 1099
-            UnclosedWays.class, // ID 1101 .. 1199
-            TagChecker.class, // ID 1201 .. 1299
-            UnconnectedWays.class, // ID 1301 .. 1399
-            DuplicateWay.class, // ID 1401 .. 1499
-            NameMismatch.class, // ID  1501 ..  1599
-            MultipolygonTest.class, // ID  1601 ..  1699
-            RelationChecker.class, // ID  1701 ..  1799
-            TurnrestrictionTest.class, // ID  1801 ..  1899
-            DuplicateRelation.class, // ID 1901 .. 1999
+        DuplicateNode.class, // ID    1 ..   99
+        OverlappingWays.class, // ID  101 ..  199
+        UntaggedNode.class, // ID  201 ..  299
+        UntaggedWay.class, // ID  301 ..  399
+        SelfIntersectingWay.class, // ID  401 ..  499
+        DuplicatedWayNodes.class, // ID  501 ..  599
+        CrossingWays.class, // ID  601 ..  699
+        SimilarNamedWays.class, // ID  701 ..  799
+        NodesWithSameName.class, // ID  801 ..  899
+        Coastlines.class, // ID  901 ..  999
+        WronglyOrderedWays.class, // ID 1001 .. 1099
+        UnclosedWays.class, // ID 1101 .. 1199
+        TagChecker.class, // ID 1201 .. 1299
+        UnconnectedWays.class, // ID 1301 .. 1399
+        DuplicateWay.class, // ID 1401 .. 1499
+        NameMismatch.class, // ID  1501 ..  1599
+        MultipolygonTest.class, // ID  1601 ..  1699
+        RelationChecker.class, // ID  1701 ..  1799
+        TurnrestrictionTest.class, // ID  1801 ..  1899
+        DuplicateRelation.class, // ID 1901 .. 1999
     };
 
@@ -242 +241 @@
      */
     public void initializeGridDetail() {
-        if (Main.proj.toString().equals(new Epsg4326().toString())) {
+        if (Main.getProjection().toString().equals(new Epsg4326().toString())) {
             OsmValidator.griddetail = 10000;
-        } else if (Main.proj.toString().equals(new Mercator().toString())) {
+        } else if (Main.getProjection().toString().equals(new Mercator().toString())) {
             OsmValidator.griddetail = 0.01;
-        } else if (Main.proj.toString().equals(new Lambert().toString())) {
+        } else if (Main.getProjection().toString().equals(new Lambert().toString())) {
             OsmValidator.griddetail = 0.1;
         }
@@ -265 +264 @@
                 JOptionPane.showMessageDialog(Main.parent,
                         tr("Error initializing test {0}:\n {1}", test.getClass()
-                        .getSimpleName(), e),
-                        tr("Error"),
-                        JOptionPane.ERROR_MESSAGE);
+                                .getSimpleName(), e),
+                                tr("Error"),
+                                JOptionPane.ERROR_MESSAGE);
             }
         }

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

@@ -118 +118 @@
      *
      * @param listener the listener. Ignored if null or already registered.
-     * @param initialFire Fire an edit-layer-changed-event right after adding 
+     * @param initialFire Fire an edit-layer-changed-event right after adding
      * the listener in case there is an edit layer present
      */
@@ -285 +285 @@
         }
         layer.addPropertyChangeListener(this);
+        Main.addProjectionChangeListener(layer);
         AudioPlayer.reset();
         repaint();
@@ -359 +360 @@
 
         layers.remove(layer);
+        Main.removeProjectionChangeListener(layer);
         fireLayerRemoved(layer);
         layer.removePropertyChangeListener(this);

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

@@ -39 +39 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.gui.preferences.ProjectionPreference;
@@ -96 +97 @@
      * northing/easting space of the projection.
      */
-    private double scale = Main.proj.getDefaultZoomInPPD();
+    private double scale = Main.getProjection().getDefaultZoomInPPD();
     /**
      * Center n/e coordinate of the desired screen center.
@@ -111 +112 @@
 
     private EastNorth calculateDefaultCenter() {
-        Bounds b = Main.proj.getWorldBoundsLatLon();
+        Bounds b = Main.getProjection().getWorldBoundsLatLon();
         double lat = (b.getMax().lat() + b.getMin().lat())/2;
         double lon = (b.getMax().lon() + b.getMin().lon())/2;
 
-        return Main.proj.latlon2eastNorth(new LatLon(lat, lon));
+        return Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
     }
 
@@ -209 +210 @@
         EastNorth p2 = getEastNorth(r.x + r.width, r.y + r.height);
 
-        Bounds result = new Bounds(Main.proj.eastNorth2latlon(p1));
+        Bounds result = new Bounds(Main.getProjection().eastNorth2latlon(p1));
 
         double eastMin = Math.min(p1.east(), p2.east());
@@ -219 +220 @@
 
         for (int i=0; i < 10; i++) {
-            result.extend(Main.proj.eastNorth2latlon(new EastNorth(eastMin + i * deltaEast, northMin)));
-            result.extend(Main.proj.eastNorth2latlon(new EastNorth(eastMin + i * deltaEast, northMax)));
-            result.extend(Main.proj.eastNorth2latlon(new EastNorth(eastMin, northMin  + i * deltaNorth)));
-            result.extend(Main.proj.eastNorth2latlon(new EastNorth(eastMax, northMin  + i * deltaNorth)));
+            result.extend(Main.getProjection().eastNorth2latlon(new EastNorth(eastMin + i * deltaEast, northMin)));
+            result.extend(Main.getProjection().eastNorth2latlon(new EastNorth(eastMin + i * deltaEast, northMax)));
+            result.extend(Main.getProjection().eastNorth2latlon(new EastNorth(eastMin, northMin  + i * deltaNorth)));
+            result.extend(Main.getProjection().eastNorth2latlon(new EastNorth(eastMax, northMin  + i * deltaNorth)));
         }
 
@@ -250 +251 @@
             return getPoint2D(getProjection().latlon2eastNorth(latlon));
     }
+
     public Point2D getPoint2D(Node n) {
         return getPoint2D(n.getEastNorth());
@@ -282 +284 @@
     public void zoomTo(EastNorth newCenter, double newScale) {
         Bounds b = getProjection().getWorldBoundsLatLon();
-        CachedLatLon cl = new CachedLatLon(newCenter);
+        LatLon cl = Projections.inverseProject(newCenter);
         boolean changed = false;
         double lat = cl.lat();
@@ -291 +293 @@
         else if(lon > b.getMax().lon()) {changed = true; lon = b.getMax().lon(); }
         if(changed) {
-            newCenter = new CachedLatLon(lat, lon).getEastNorth();
+            newCenter = Projections.project(new LatLon(lat,lon));
         }
         int width = getWidth()/2;
@@ -350 +352 @@
 
     public void zoomTo(LatLon newCenter) {
-        if(newCenter instanceof CachedLatLon) {
-            zoomTo(((CachedLatLon)newCenter).getEastNorth(), scale);
-        } else {
-            zoomTo(getProjection().latlon2eastNorth(newCenter), scale);
-        }
+        zoomTo(Projections.project(newCenter));
     }
 
     public void smoothScrollTo(LatLon newCenter) {
-        if (newCenter instanceof CachedLatLon) {
-            smoothScrollTo(((CachedLatLon)newCenter).getEastNorth());
-        } else {
-            smoothScrollTo(getProjection().latlon2eastNorth(newCenter));
-        }
+        smoothScrollTo(Projections.project(newCenter));
     }
 
@@ -441 +435 @@
 
         public ZoomData(EastNorth center, double scale) {
-            this.center = new CachedLatLon(center);
+            this.center = Projections.inverseProject(center);
             this.scale = scale;
         }
@@ -1145 +1139 @@
      */
     public Projection getProjection() {
-        return Main.proj;
+        return Main.getProjection();
     }
 

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

@@ -52 +52 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
@@ -59 +60 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -330 +332 @@
 
         g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-        Main.pref.getBoolean("mappaint.gpx.use-antialiasing", false) ?
-                RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
+                Main.pref.getBoolean("mappaint.gpx.use-antialiasing", false) ?
+                        RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
 
         /****************************************************************
@@ -1231 +1233 @@
         if (bestEN == null)
             return null;
-        WayPoint best = new WayPoint(Main.proj.eastNorth2latlon(bestEN));
+        WayPoint best = new WayPoint(Main.getProjection().eastNorth2latlon(bestEN));
         best.time = bestTime;
         return best;
@@ -1490 +1492 @@
             importer.importDataHandleExceptions(files, NullProgressMonitor.INSTANCE);
         }
-
+    }
+
+    @Override
+    public void projectionChanged(Projection oldValue, Projection newValue) {
+        if (newValue == null) return;
+        if (data.waypoints != null) {
+            for (WayPoint wp : data.waypoints){
+                wp.invalidateEastNorthCache();
+            }
+        }
+        if (data.tracks != null){
+            for (GpxTrack track: data.tracks) {
+                for (GpxTrackSegment segment: track.getSegments()) {
+                    for (WayPoint wp: segment.getWayPoints()) {
+                        wp.invalidateEastNorthCache();
+                    }
+                }
+            }
+        }
+        if (data.routes != null) {
+            for (GpxRoute route: data.routes) {
+                if (route.routePoints == null) {
+                    continue;
+                }
+                for (WayPoint wp: route.routePoints) {
+                    wp.invalidateEastNorthCache();
+                }
+            }
+        }
     }
 }

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

@@ -83 +83 @@
 
     public double getPPD(){
-        if (Main.map == null || Main.map.mapView == null) return Main.proj.getDefaultZoomInPPD();
+        if (Main.map == null || Main.map.mapView == null) return Main.getProjection().getDefaultZoomInPPD();
         ProjectionBounds bounds = Main.map.mapView.getProjectionBounds();
         return Main.map.mapView.getWidth() / (bounds.maxEast - bounds.minEast);

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

@@ -23 +23 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.Destroyable;
@@ -42 +44 @@
  * @author imi
  */
-abstract public class Layer implements Destroyable, MapViewPaintable {
+abstract public class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener {
 
     public interface LayerAction {
@@ -362 +364 @@
         }
     }
+
+    /* --------------------------------------------------------------------------------- */
+    /* interface ProjectionChangeListener                                                */
+    /* --------------------------------------------------------------------------------- */
+    @Override
+    public void projectionChanged(Projection oldValue, Projection newValue) {
+        // default implementation does nothing - override in subclasses
+    }
 }

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

@@ -62 +62 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory;
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -80 +81 @@
  */
 public class OsmDataLayer extends Layer implements Listener, SelectionChangedListener {
+    // static private final Logger logger = Logger.getLogger(OsmDataLayer.class.getName());
+
     static public final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk";
     static public final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer";
@@ -658 +661 @@
             }
         }
-
     }
 
@@ -675 +677 @@
         isChanged = true;
     }
+
+    @Override
+    public void projectionChanged(Projection oldValue, Projection newValue) {
+        /*
+         * No reprojection required. The dataset itself is registered as projection
+         * change listener and already got notified.
+         */
+    }
 }

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

@@ -95 +95 @@
         public GpsPoint(LatLon ll, String t) {
             latlon = ll;
-            eastNorth = Main.proj.latlon2eastNorth(ll);
+            eastNorth = Main.getProjection().latlon2eastNorth(ll);
             time = t;
         }

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

@@ -871 +871 @@
 
     private Point pixelPos(LatLon ll) {
-        return Main.map.mapView.getPoint(Main.proj.latlon2eastNorth(ll).add(getDx(), getDy()));
+        return Main.map.mapView.getPoint(Main.getProjection().latlon2eastNorth(ll).add(getDx(), getDy()));
     }
     private Point pixelPos(Tile t) {
@@ -879 +879 @@
     }
     private LatLon getShiftedLatLon(EastNorth en) {
-        return Main.proj.eastNorth2latlon(en.add(-getDx(), -getDy()));
+        return Main.getProjection().eastNorth2latlon(en.add(-getDx(), -getDy()));
     }
     private Coordinate getShiftedCoord(EastNorth en) {

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

@@ -16 +16 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -23 +22 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -70 +70 @@
                              may be adjusted later to sync with other data, so not final */
 
-    private CachedLatLon coor;
+    private LatLon coor;
 
     public final void setCoor(LatLon coor) {
-        if(this.coor == null) {
-            this.coor = new CachedLatLon(coor);
-        } else {
-            this.coor.setCoor(coor);
-        }
+        this.coor = new LatLon(coor);
     }
 
@@ -85 +81 @@
 
     public final void setEastNorth(EastNorth eastNorth) {
-        coor.setEastNorth(eastNorth);
+        this.coor = Projections.inverseProject(eastNorth);
     }
 
     public final EastNorth getEastNorth() {
-        return coor.getEastNorth();
+        return Projections.project(this.coor);
     }
 
@@ -264 +260 @@
      */
     public String getText() {
-        if (this.text != null ) {
+        if (this.text != null )
             return this.text;
-        }
-        else {
+        else
             return getText(this.textMap);
-        }
     }
 

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

@@ -734 +734 @@
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    OffsetBookmark b = new OffsetBookmark(Main.proj,"","",0,0);
+                    OffsetBookmark b = new OffsetBookmark(Main.getProjection(),"","",0,0);
                     model.addRow(b);
                 }

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

@@ -9 +9 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.BorderFactory;
@@ -27 +26 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -39 +38 @@
             return new ProjectionPreference();
         }
-    }
-
-    public interface ProjectionChangedListener {
-        void projectionChanged();
     }
 
@@ -65 +60 @@
     }
 
-    //TODO This is not nice place for a listener code but probably only Dataset will want to listen for projection changes so it's acceptable
-    private static CopyOnWriteArrayList<ProjectionChangedListener> listeners = new CopyOnWriteArrayList<ProjectionChangedListener>();
-
-    public static void addProjectionChangedListener(ProjectionChangedListener listener) {
-        listeners.addIfAbsent(listener);
-    }
-
-    public static void removeProjectionChangedListener(ProjectionChangedListener listener) {
-        listeners.remove(listener);
-    }
-
-    private static void fireProjectionChanged() {
-        for (ProjectionChangedListener listener: listeners) {
-            listener.projectionChanged();
-        }
-    }
-
-
     /**
      * Combobox with all projections available
@@ -161 +138 @@
         gui.mapcontent.addTab(tr("Map Projection"), scrollpane);
 
-        updateMeta(Main.proj);
+        updateMeta(Main.getProjection());
     }
 
@@ -202 +179 @@
     {
         Bounds b = (Main.map != null && Main.map.mapView != null) ? Main.map.mapView.getRealBounds() : null;
-        Projection oldProj = Main.proj;
-
-        Projection p = null;
+
+        Projection proj = null;
         for (ClassLoader cl : PluginHandler.getResourceClassLoaders()) {
             try {
-                p = (Projection) Class.forName(name, true, cl).newInstance();
+                proj = (Projection) Class.forName(name, true, cl).newInstance();
             } catch (final Exception e) {
             }
-            if (p != null) {
-                Main.proj = p;
-                break;
-            }
-        }
-        if (p == null) {
+            if (proj != null) {
+                break;
+            }
+        }
+        if (proj == null) {
             JOptionPane.showMessageDialog(
                     Main.parent,
@@ -223 +198 @@
             );
             coll = null;
-            Main.proj = new Mercator();
-            name = Main.proj.getClass().getName();
+            proj = new Mercator();
+            name = Main.getProjection().getClass().getName();
         }
         PROP_SUB_PROJECTION.put(coll);
         PROP_PROJECTION_SUBPROJECTION.put(coll, name);
-        if(Main.proj instanceof ProjectionSubPrefs) {
-            ((ProjectionSubPrefs) Main.proj).setPreferences(coll);
-        }
-        fireProjectionChanged(); // This should be probably called from the if bellow, but hashCode condition doesn't look sure enough
-        if(b != null && (!Main.proj.getClass().getName().equals(oldProj.getClass().getName()) || Main.proj.hashCode() != oldProj.hashCode()))
+        if(proj instanceof ProjectionSubPrefs) {
+            ((ProjectionSubPrefs) proj).setPreferences(coll);
+        }
+        Projection oldProj = Main.getProjection();
+        Main.setProjection(proj);
+        if(b != null && (!proj.getClass().getName().equals(oldProj.getClass().getName()) || proj.hashCode() != oldProj.hashCode()))
         {
             Main.map.mapView.zoomTo(b);

trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java

@@ -41 +41 @@
         }
 
-        this.proj = Main.proj;
+        this.proj = Main.getProjection();
         this.pixelPerDegree = request.getPixelPerDegree();
         this.request = request;

trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java

@@ -52 +52 @@
         BufferedImage img = layer.normalizeImage(ImageIO.read(bais));
         bais.reset();
-        layer.cache.saveToCache(layer.isOverlapEnabled()?img:null, bais, Main.proj, pixelPerDegree, b.minEast, b.minNorth);
+        layer.cache.saveToCache(layer.isOverlapEnabled()?img:null, bais, Main.getProjection(), pixelPerDegree, b.minEast, b.minNorth);
 
         return img;

trunk/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java

@@ -40 +40 @@
     @Override
     public EastNorth getOffset(ImageryInfo info, EastNorth en) {
-        LatLon ll = Main.proj.eastNorth2latlon(en);
+        LatLon ll = Main.getProjection().eastNorth2latlon(en);
         try {
             URL url = new URL(this.url + "action=GetOffsetForPoint&lat=" + ll.lat() + "&lon=" + ll.lon() + "&id=" + URLEncoder.encode(info.getFullUrl(), "UTF-8"));
@@ -50 +50 @@
             String sLon = s.substring(1,i);
             String sLat = s.substring(i+1,s.length()-1);
-            return Main.proj.latlon2eastNorth(new LatLon(Double.valueOf(sLat),Double.valueOf(sLon))).sub(en);
+            return Main.getProjection().latlon2eastNorth(new LatLon(Double.valueOf(sLat),Double.valueOf(sLon))).sub(en);
         } catch (Exception e) {
             e.printStackTrace();

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -72 +72 @@
     protected URL getURL(double w, double s,double e,double n,
             int wi, int ht) throws MalformedURLException {
-        String myProj = Main.proj.toCode();
-        if(Main.proj instanceof Mercator) // don't use mercator code directly
+        String myProj = Main.getProjection().toCode();
+        if(Main.getProjection() instanceof Mercator) // don't use mercator code directly
         {
-            LatLon sw = Main.proj.eastNorth2latlon(new EastNorth(w, s));
-            LatLon ne = Main.proj.eastNorth2latlon(new EastNorth(e, n));
+            LatLon sw = Main.getProjection().eastNorth2latlon(new EastNorth(w, s));
+            LatLon ne = Main.getProjection().eastNorth2latlon(new EastNorth(e, n));
             myProj = "EPSG:4326";
             s = sw.lat();
@@ -114 +114 @@
     static public String getProjection(String baseURL, Boolean warn)
     {
-        String projname = Main.proj.toCode();
-        if(Main.proj instanceof Mercator) {
+        String projname = Main.getProjection().toCode();
+        if(Main.getProjection() instanceof Mercator) {
             projname = "EPSG:4326";
         }
@@ -146 +146 @@
     @Override
     public boolean loadFromCache(WMSRequest request) {
-        BufferedImage cached = layer.cache.getExactMatch(Main.proj, pixelPerDegree, b.minEast, b.minNorth);
+        BufferedImage cached = layer.cache.getExactMatch(Main.getProjection(), pixelPerDegree, b.minEast, b.minNorth);
 
         if (cached != null) {
@@ -152 +152 @@
             return true;
         } else if (request.isAllowPartialCacheMatch()) {
-            BufferedImage partialMatch = layer.cache.getPartialMatch(Main.proj, pixelPerDegree, b.minEast, b.minNorth);
+            BufferedImage partialMatch = layer.cache.getPartialMatch(Main.getProjection(), pixelPerDegree, b.minEast, b.minNorth);
             if (partialMatch != null) {
                 request.finish(State.PARTLY_IN_CACHE, partialMatch);
@@ -194 +194 @@
         BufferedImage img = layer.normalizeImage(ImageIO.read(bais));
         bais.reset();
-        layer.cache.saveToCache(layer.isOverlapEnabled()?img:null, bais, Main.proj, pixelPerDegree, b.minEast, b.minNorth);
+        layer.cache.saveToCache(layer.isOverlapEnabled()?img:null, bais, Main.getProjection(), pixelPerDegree, b.minEast, b.minNorth);
         return img;
     }

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

@@ -112 +112 @@
                                 }
 
-                                Node newNode = new Node(Main.proj.eastNorth2latlon(intersection));
+                                Node newNode = new Node(Main.getProjection().eastNorth2latlon(intersection));
                                 Node intNode = newNode;
                                 boolean insertInSeg1 = false;
@@ -458 +458 @@
         return inside;
     }
-    
+
     /**
      * returns area of a closed way in square meters
@@ -478 +478 @@
         return Math.abs(area/2);
     }
-    
+
     protected static double calcX(Node p1){
         double lat1, lon1, lat2, lon2;
@@ -495 +495 @@
         return 6367000 * c;
     }
-    
+
     protected static double calcY(Node p1){
         double lat1, lon1, lat2, lon2;

trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java

@@ -68 +68 @@
 
         // init projection
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
 
         // make sure we don't upload to or test against production

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

@@ -18 +18 @@
 
     protected void build() {
-        Main.proj = new Epsg4326();
+        Main.setProjection(new Epsg4326());
 
         setLayout(new BorderLayout());

trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java

@@ -58 +58 @@
 
         // init projection
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
     }
 

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -176 +176 @@
         //
         Main.pref.put("osm-server.atomic-upload", false);
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
 
         File dataSetCacheOutputFile = new File(tempOutputDir, MultiFetchServerObjectReaderTest.class.getName() + ".dataset");

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -183 +183 @@
         //
         Main.pref.put("osm-server.atomic-upload", false);
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
 
         File dataSetCacheOutputFile = new File(tempOutputDir, MultiFetchServerObjectReaderTest.class.getName() + ".dataset");

trunk/test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java

@@ -32 +32 @@
     @BeforeClass
     public static void load() throws Exception {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         img = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, BufferedImage.TYPE_3BYTE_BGR);
         g = (Graphics2D)img.getGraphics();

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -76 +76 @@
         their = new DataSet();
         their.setVersion("0.6");
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

@@ -29 +29 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         Main.pref = new Preferences();
     }

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

@@ -29 +29 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java

@@ -66 +66 @@
     @Test
     public void testRemove() throws Exception {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/restriction.osm"), NullProgressMonitor.INSTANCE);
         removeAllTest(ds);
@@ -73 +73 @@
     @Test
     public void testMove() throws Exception {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/restriction.osm"), NullProgressMonitor.INSTANCE);
 

trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

@@ -16 +16 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         Main.pref = new Preferences();
     }

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

@@ -37 +37 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         Main.pref = new Preferences();
     }

trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java

@@ -15 +15 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new SwissGrid();
+        Main.setProjection(new SwissGrid());
     }
 
@@ -62 +62 @@
         {
             LatLon ll = new LatLon(46.518, 6.567);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Lausanne", Math.abs(en.east() - 533111.69) < 0.1);
             assertTrue("Lausanne", Math.abs(en.north() - 152227.85) < 0.1);
@@ -70 +72 @@
         {
             LatLon ll = new LatLon(47.78, 8.58);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Schafouse", Math.abs(en.east() - 685544.16) < 0.1);
             assertTrue("Schafouse", Math.abs(en.north() - 292782.91) < 0.1);
@@ -78 +82 @@
         {
             LatLon ll = new LatLon(46.58, 10.48);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Grinson", Math.abs(en.east() - 833068.04) < 0.1);
             assertTrue("Grinson", Math.abs(en.north() - 163265.39) < 0.1);
@@ -86 +92 @@
         {
             LatLon ll = new LatLon(46.0 + 57.0 / 60 + 3.89813884505 / 3600, 7.0 + 26.0 / 60 + 19.076595154147 / 3600);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Berne", Math.abs(en.east() - 600000.0) < 0.1);
             assertTrue("Berne", Math.abs(en.north() - 200000.0) < 0.1);
@@ -93 +101 @@
         {
             LatLon ll = new LatLon(46.0 + 2.0 / 60 + 38.87 / 3600, 8.0 + 43.0 / 60 + 49.79 / 3600);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Ref", Math.abs(en.east() - 700000.0) < 0.1);
             assertTrue("Ref", Math.abs(en.north() - 100000.0) < 0.1);
@@ -105 +115 @@
         {
             EastNorth en = new EastNorth(533111.69, 152227.85);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Lausanne", Math.abs(ll.lat() - 46.518) < 0.00001);
             assertTrue("Lausanne", Math.abs(ll.lon() - 6.567) < 0.00001);
@@ -113 +125 @@
         {
             EastNorth en = new EastNorth(685544.16, 292782.91);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Schafouse", Math.abs(ll.lat() - 47.78) < 0.00001);
             assertTrue("Schafouse", Math.abs(ll.lon() - 8.58) < 0.00001);
@@ -121 +135 @@
         {
             EastNorth en = new EastNorth(833068.04, 163265.39);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Grinson", Math.abs(ll.lat() - 46.58) < 0.00001);
             assertTrue("Grinson", Math.abs(ll.lon() - 10.48) < 0.00001);
@@ -129 +145 @@
         {
             EastNorth en = new EastNorth(600000.0, 200000.0);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Berne", Math.abs(ll.lat() - (46.0 + 57.0 / 60 + 3.89813884505 / 3600)) < 0.00001);
             assertTrue("Berne", Math.abs(ll.lon() - (7.0 + 26.0 / 60 + 19.076595154147 / 3600)) < 0.00001);
@@ -137 +155 @@
         {
             EastNorth en = new EastNorth(700000.0, 100000.0);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Ref", Math.abs(ll.lat() - (46.0 + 2.0 / 60 + 38.87 / 3600)) < 0.00001);
             assertTrue("Ref", Math.abs(ll.lon() - (8.0 + 43.0 / 60 + 49.79 / 3600)) < 0.00001);
@@ -152 +172 @@
         {
             EastNorth en = new EastNorth(533111.69, 152227.85);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Lausanne", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Lausanne", Math.abs(en.north() - en2.north()) < 0.002);
@@ -162 +186 @@
         {
             EastNorth en = new EastNorth(685544.16, 292782.91);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Schafouse", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Schafouse", Math.abs(en.north() - en2.north()) < 0.002);
@@ -172 +200 @@
         {
             EastNorth en = new EastNorth(833068.04, 163265.39);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Grinson", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Grinson", Math.abs(en.north() - en2.north()) < 0.002);
@@ -182 +214 @@
         {
             EastNorth en = new EastNorth(600000.0, 200000.0);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Berne", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Berne", Math.abs(en.north() - en2.north()) < 0.002);
@@ -192 +228 @@
         {
             EastNorth en = new EastNorth(700000.0, 100000.0);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Ref", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Ref", Math.abs(en.north() - en2.north()) < 0.002);

trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java

@@ -47 +47 @@
     @BeforeClass
     public static void init() {
-        Main.proj = new Epsg4326();
+        Main.setProjection(new Epsg4326());
         Main.pref = new Preferences();
     }