Changeset 1722 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-07-03T12:33:32+02:00 (15 years ago)

Author:

stoecker

Message:

Large rework in projection handling - now allows only switching and more specific projections
TODO:

• allow subprojections (i.e. settings for projections)
• setup preferences for subprojections
• better support of the new projection depending world bounds (how to handle valid data outside of world)
• do not allow to zoom out of the world - zoom should stop when whole world is displayed
• fix Lambert and SwissGrid to handle new OutOfWorld style and subprojections
• fix new UTM projection
• handle layers with fixed projection on projection change
• allow easier projection switching (e.g. in menu)

NOTE:
This checkin very likely will cause problems. Please report or fix them. Older plugins may have trouble. The SVN plugins
have been fixed but may have problems nevertheless. This is a BIG change, but will make JOSMs internal structure much cleaner
and reduce lots of projection related problems.

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/MirrorAction.java (modified) (2 diffs)
• actions/UnGlueAction.java (modified) (1 diff)
• actions/ZoomInAction.java (modified) (1 diff)
• actions/ZoomOutAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/ZoomAction.java (modified) (1 diff)
• command/MoveCommand.java (modified) (3 diffs)
• command/RotateCommand.java (modified) (6 diffs)
• data/Bounds.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• data/ProjectionBounds.java (added)
• data/coor/LatLon.java (modified) (2 diffs)
• data/gpx/GpxData.java (modified) (3 diffs)
• data/osm/Node.java (modified) (6 diffs)
• data/osm/visitor/BoundingXYVisitor.java (modified) (5 diffs)
• data/osm/visitor/MapPaintVisitor.java (modified) (1 diff)
• data/projection/Epsg4326.java (modified) (2 diffs)
• data/projection/Lambert.java (modified) (4 diffs)
• data/projection/LambertEST.java (modified) (3 diffs)
• data/projection/Mercator.java (modified) (2 diffs)
• data/projection/Projection.java (modified) (4 diffs)
• data/projection/SwissGrid.java (modified) (5 diffs)
• data/projection/UTM.java (added)
• gui/MapMover.java (modified) (3 diffs)
• gui/MapScaler.java (modified) (2 diffs)
• gui/MapSlider.java (modified) (2 diffs)
• gui/MapStatus.java (modified) (4 diffs)
• gui/MapView.java (modified) (7 diffs)
• gui/NavigatableComponent.java (modified) (10 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• gui/download/BoundingBoxSelection.java (modified) (2 diffs)
• gui/layer/GeoImageLayer.java (modified) (1 diff)
• gui/preferences/ProjectionPreference.java (modified) (3 diffs)
• io/GpxWriter.java (modified) (1 diff)
• tools/OsmUrlToBounds.java (modified) (1 diff)

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

@@ -250 +250 @@
         }
     };
+
+    static public void setProjection(String name)
+    {
+        Bounds b = (map != null && map.mapView != null) ? map.mapView.getRealBounds() : null;
+        Projection oldProj = Main.proj;
+        try {
+            Main.proj = (Projection)Class.forName(name).newInstance();
+        } catch (final Exception e) {
+            JOptionPane.showMessageDialog(null, tr("The projection {0} could not be activated. Using Mercator", name));
+            Main.proj = new Mercator();
+        }
+        if(!Main.proj.equals(oldProj))
+        {
+            if(b != null)
+                map.mapView.zoomTo(b);
+            /* TODO - remove layers with fixed projection */
+        }
+    }
+
     /**
      * Should be called before the main constructor to setup some parameter stuff
@@ -255 +274 @@
      */
     public static void preConstructorInit(Map<String, Collection<String>> args) {
-        try {
-            Main.proj = (Projection)Class.forName(Main.pref.get("projection")).newInstance();
-        } catch (final Exception e) {
-            e.printStackTrace();
-            JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using Mercator"));
-            Main.proj = new Mercator();
-        }
+        setProjection(Main.pref.get("projection", Mercator.class.getName()));
 
         try {

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

@@ -55 +55 @@
         }
 
-        double minEast = 200.0;
-        double maxEast = -200.0;
+        double minEast = 20000000000.0;
+        double maxEast = -20000000000.0;
         for (Node n : nodes) {
-            minEast = Math.min(minEast, n.eastNorth.east());
-            maxEast = Math.max(maxEast, n.eastNorth.east());
+            double east = n.getEastNorth().east();
+            minEast = Math.min(minEast, east);
+            maxEast = Math.max(maxEast, east);
         }
         double middle = (minEast + maxEast) / 2;
@@ -66 +67 @@
 
         for (Node n : nodes)
-            cmds.add(new MoveCommand(n, 2 * (middle - n.eastNorth.east()), 0.0));
+            cmds.add(new MoveCommand(n, 2 * (middle - n.getEastNorth().east()), 0.0));
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Mirror"), cmds));

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

@@ -148 +148 @@
         if(e.getSource() instanceof JPanel) {
             MapView mv = Main.map.mapView;
-            n.setEastNorth(mv.getEastNorth(mv.lastMEvent.getX(), mv.lastMEvent.getY()));
+            n.setCoor(mv.getLatLon(mv.lastMEvent.getX(), mv.lastMEvent.getY()));
         }
 

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

@@ -20 +20 @@
     public void actionPerformed(ActionEvent e) {
         if (Main.map == null) return;
-        double zoom = Main.map.mapView.getScale();
-        Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), zoom * .9);
+        Main.map.mapView.zoomToFactor(0.9);
     }
 }

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

@@ -20 +20 @@
     public void actionPerformed(ActionEvent e) {
         if (Main.map == null) return;
-        double zoom = Main.map.mapView.getScale();
-        Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), zoom /.9);
+        Main.map.mapView.zoomToFactor(1/0.9);
     }
 }

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

@@ -812 +812 @@
             double c = A.distanceSq(B);
             q = (a - b + c) / (2*c);
-            n.setEastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north()));
+            n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
         }
     }

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

@@ -57 +57 @@
      */
     public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) {
-        if (r.width >= 3 && r.height >= 3) {
-            double scale = mv.getScale() * r.getWidth()/mv.getWidth();
-            EastNorth newCenter = mv.getEastNorth(r.x+r.width/2, r.y+r.height/2);
-            mv.zoomTo(newCenter, scale);
-        }
+        if (r.width >= 3 && r.height >= 3)
+            mv.zoomToFactor(mv.getEastNorth(r.x+r.width/2, r.y+r.height/2), r.getWidth()/mv.getWidth());
     }
 

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

@@ -48 +48 @@
     public static class OldState {
         LatLon latlon;
-        EastNorth eastNorth;
         boolean modified;
     }
@@ -70 +69 @@
         for (Node n : this.objects) {
             OldState os = new OldState();
-            os.eastNorth = n.getEastNorth();
             os.latlon = n.getCoor();
             os.modified = n.modified;
@@ -105 +103 @@
         for (Node n : objects) {
             OldState os = it.next();
-            n.setEastNorth(os.eastNorth);
+            n.setCoor(os.latlon);
             n.modified = os.modified;
         }

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

@@ -14 +14 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -37 +38 @@
 
     /**
+     * Small helper for holding the interesting part of the old data state of the
+     * objects.
+     */
+    public static class OldState {
+        LatLon latlon;
+        EastNorth eastNorth;
+        boolean modified;
+    }
+
+    /**
      * angle of rotation starting click to pivot
      */
@@ -49 +60 @@
      * List of all old states of the objects.
      */
-    private Map<Node, MoveCommand.OldState> oldState = new HashMap<Node, MoveCommand.OldState>();
+    private Map<Node, OldState> oldState = new HashMap<Node, OldState>();
 
     /**
@@ -63 +74 @@
 
         for (Node n : this.objects) {
-            MoveCommand.OldState os = new MoveCommand.OldState();
+            OldState os = new OldState();
+            os.latlon = n.getCoor();
             os.eastNorth = n.getEastNorth();
-            os.latlon = n.getCoor();
             os.modified = n.modified;
             oldState.put(n, os);
@@ -102 +113 @@
             double nx =  sinPhi * x + cosPhi * y + pivot.east();
             double ny = -cosPhi * x + sinPhi * y + pivot.north();
-            n.setEastNorth(nx, ny);
+            n.setEastNorth(new EastNorth(nx, ny));
             if (setModified)
                 n.modified = true;
@@ -115 +126 @@
     @Override public void undoCommand() {
         for (Node n : objects) {
-            MoveCommand.OldState os = oldState.get(n);
-            n.setEastNorth(os.eastNorth);
+            OldState os = oldState.get(n);
+            n.setCoor(os.latlon);
             n.modified = os.modified;
         }

trunk/src/org/openstreetmap/josm/data/Bounds.java

@@ -25 +25 @@
         this.min = min;
         this.max = max;
-    }
-
-    /**
-     * Construct bounds that span the whole world.
-     */
-    public Bounds() {
-        min = new LatLon(-Projection.MAX_LAT, -Projection.MAX_LON);
-        max = new LatLon(Projection.MAX_LAT, Projection.MAX_LON);
     }
 

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -352 +352 @@
         put("selectionlist.visible", true);
         put("commandstack.visible", true);
-        put("projection", Mercator.class.getName());
         if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
             put("laf", "javax.swing.plaf.metal.MetalLookAndFeel");

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

@@ -7 +7 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.Main;
 
 import java.text.DecimalFormat;
@@ -87 +88 @@
      */
     public boolean isOutSideWorld() {
-        return lat() < -Projection.MAX_LAT || lat() > Projection.MAX_LAT ||
-            lon() < -Projection.MAX_LON || lon() > Projection.MAX_LON;
+        Bounds b = Main.proj.getWorldBoundsLatLon();
+        return lat() < b.min.lat() || lat() > b.max.lat() ||
+            lon() < b.min.lon() || lon() > b.max.lon();
     }
 

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

@@ -40 +40 @@
     public Collection<WayPoint> waypoints = new LinkedList<WayPoint>();
 
-    public Bounds bounds;
-
     public void mergeFrom(GpxData other) {
         if (storageFile == null && other.storageFile != null) {
@@ -82 +80 @@
 
     // FIXME might perhaps use visitor pattern?
-    public void recalculateBounds() {
-        bounds = null;
+    public Bounds recalculateBounds() {
+        Bounds bounds = null;
         for (WayPoint wpt : waypoints) {
             if (bounds == null) {
@@ -111 +109 @@
             }
         }
-        if (bounds == null) {
-            bounds = new Bounds();
-        }
+        return bounds;
     }
 

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

@@ -8 +8 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.LatLon.CoordinateFormat;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.Node;
 
 
@@ -18 +20 @@
 public final class Node extends OsmPrimitive {
 
-    public LatLon coor;
-    public volatile EastNorth eastNorth;
+    private LatLon coor;
+
+    private EastNorth eastNorth;
+    private Projection proj;
+
 
     public final void setCoor(LatLon coor) {
         this.coor = coor;
-        this.eastNorth = Main.proj.latlon2eastNorth(coor);
+        proj = null;
     }
 
@@ -31 +36 @@
 
     public final void setEastNorth(EastNorth eastNorth) {
-        this.eastNorth = eastNorth;
-        this.coor = Main.proj.eastNorth2latlon(eastNorth);
-    }
-
-    public final void setEastNorth(double east, double north) {
-        this.setEastNorth(new EastNorth(east, north));
+        proj = Main.proj;
+        eastNorth = eastNorth;
+        this.coor = proj.eastNorth2latlon(eastNorth);
     }
 
     public final EastNorth getEastNorth() {
+        if(proj != Main.proj)
+        {
+            proj = Main.proj;
+            eastNorth = proj.latlon2eastNorth(coor);
+        }
         return eastNorth;
     }
@@ -45 +52 @@
     private static CoordinateFormat mCord;
 
-    static {
+    static public CoordinateFormat getCoordinateFormat()
+    {
+        return mCord;
+    }
+
+    static public void setCoordinateFormat()
+    {
         try {
             mCord = LatLon.CoordinateFormat.valueOf(Main.pref.get("coordinates"));
         } catch (IllegalArgumentException iae) {
-            mCord =LatLon.CoordinateFormat.DECIMAL_DEGREES;
+            mCord = LatLon.CoordinateFormat.DECIMAL_DEGREES;
         }
+    }
+
+    static {
+        setCoordinateFormat();
     }
 
@@ -72 +89 @@
     }
 
+    public Node(EastNorth eastNorth) {
+        setEastNorth(eastNorth);
+    }
+
     @Override public void visit(Visitor visitor) {
         visitor.visit(this);
@@ -78 +99 @@
     @Override public void cloneFrom(OsmPrimitive osm) {
         super.cloneFrom(osm);
-        coor = ((Node)osm).coor;
-        eastNorth = ((Node)osm).eastNorth;
+        setCoor(((Node)osm).coor);
     }
 

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

@@ -4 +4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -19 +20 @@
 public class BoundingXYVisitor extends AbstractVisitor {
 
-    public EastNorth min, max;
+    private ProjectionBounds bounds = null;
 
     public void visit(Node n) {
@@ -38 +39 @@
     }
 
+    public void visit(Bounds b) {
+        if(b != null)
+        {
+            visit(Main.proj.latlon2eastNorth(b.min));
+            visit(Main.proj.latlon2eastNorth(b.max));
+        }
+    }
+
+    public void visit(ProjectionBounds b) {
+        if(b != null)
+            bounds = new ProjectionBounds(b.min, b.max);
+    }
+
     public void visit(EastNorth eastNorth) {
         if (eastNorth != null) {
-            if (min == null)
-                min = eastNorth;
-            else if (eastNorth.east() < min.east() || eastNorth.north() < min.north())
-                min = new EastNorth(Math.min(min.east(), eastNorth.east()), Math.min(min.north(), eastNorth.north()));
+            if (bounds == null)
+                bounds = new ProjectionBounds(eastNorth, eastNorth);
+            else
+                bounds.extend(eastNorth);
+        }
+    }
 
-            if (max == null)
-                max = eastNorth;
-            else if (eastNorth.east() > max.east() || eastNorth.north() > max.north())
-                max = new EastNorth(Math.max(max.east(), eastNorth.east()), Math.max(max.north(), eastNorth.north()));
-        }
+    public boolean hasExtend()
+    {
+        return bounds != null && !bounds.min.equals(bounds.max);
     }
 
@@ -55 +69 @@
      * @return The bounding box or <code>null</code> if no coordinates have passed
      */
-    public Bounds getBounds() {
-        if (min == null || max == null)
-            return null;
-        return new Bounds(Main.proj.eastNorth2latlon(min), Main.proj.eastNorth2latlon(max));
+    public ProjectionBounds getBounds() {
+        return bounds;
     }
 
@@ -78 +90 @@
      */
     public void enlargeBoundingBox(double enlargeDegree) {
-        if (min == null || max == null)
+        if (bounds == null)
             return;
-        LatLon minLatlon = Main.proj.eastNorth2latlon(min);
-        min = Main.proj.latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree));
-        LatLon maxLatlon = Main.proj.eastNorth2latlon(max);
-        max = Main.proj.latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree));
+        LatLon minLatlon = Main.proj.eastNorth2latlon(bounds.min);
+        LatLon maxLatlon = Main.proj.eastNorth2latlon(bounds.max);
+        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)));
     }
 }

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

@@ -1274 +1274 @@
         useRealWidth = Main.pref.getBoolean("mappaint.useRealWidth",false);
         zoomLevelDisplay = Main.pref.getBoolean("mappaint.zoomLevelDisplay",false);
-        circum = Main.map.mapView.getScale()*100*Main.proj.scaleFactor()*40041455; /* circumference of the earth in meter */
+        circum = Main.map.mapView.getMapScale();
         styles = MapPaintStyles.getStyles().getStyleSet();
         drawMultipolygon = Main.pref.getBoolean("mappaint.multipolygon",true);

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.projection;
+
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 
 /**
@@ -32 +36 @@
     }
 
-    public double scaleFactor() {
-        return 1.0/360;
-    }
-
     @Override public boolean equals(Object o) {
         return o instanceof Epsg4326;
     }
 
-    @Override public int hashCode() {
-        return Epsg4326.class.hashCode();
+    public ProjectionBounds getWorldBounds()
+    {
+        Bounds b = getWorldBoundsLatLon();
+        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
+    }
+
+    public Bounds getWorldBoundsLatLon()
+    {
+        return new Bounds(
+        new LatLon(-90.0, -180.0),
+        new LatLon(90.0, 180.0));
     }
 }

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 
 public class Lambert implements Projection {
@@ -104 +106 @@
         } else {
             outOfLambertZones = true; // possible when MAX_LAT is used
-            if (p.lat() != 0 && Math.abs(p.lat()) != Projection.MAX_LAT
-                    && p.lon() != 0 && Math.abs(p.lon()) != Projection.MAX_LON
-                    && dontDisplayErrors == false) {
-                JOptionPane.showMessageDialog(Main.parent,
-                        tr("The projection \"{0}\" is designed for\n"
-                        + "latitudes between 46.1\u00b0 and 57\u00b0 only.\n"
-                        + "Use another projection system if you are not using\n"
-                        + "a French WMS server.\n"
-                        + "Do not upload any data after this message.", this.toString()));
-                dontDisplayErrors = true;
-            }
         }
         if (!outOfLambertZones) {
@@ -167 +158 @@
     }
 
-    public double scaleFactor() {
-        return 1.0 / 360;
-    }
-
     @Override
     public boolean equals(Object o) {
         return o instanceof Lambert;
-    }
-
-    @Override
-    public int hashCode() {
-        return Lambert.class.hashCode();
     }
 
@@ -300 +282 @@
     }
 
+    public ProjectionBounds getWorldBounds()
+    {
+        Bounds b = getWorldBoundsLatLon();
+        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
+    }
+
+    public Bounds getWorldBoundsLatLon()
+    {
+        return new Bounds(
+        new LatLon(-90.0, -180.0),
+        new LatLon(90.0, 180.0));
+    }
 }

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

@@ -9 +9 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 
 public class LambertEST implements Projection {
@@ -105 +107 @@
     }
 
-    public double scaleFactor() {
-        return 1.0 / 360;
-    }
-
     @Override
     public boolean equals(Object o) {
@@ -114 +112 @@
     }
 
-    @Override
-    public int hashCode() {
-        return LambertEST.class.hashCode();
+    public ProjectionBounds getWorldBounds()
+    {
+        Bounds b = getWorldBoundsLatLon();
+        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
+    }
+
+    public Bounds getWorldBoundsLatLon()
+    {
+        return new Bounds(
+        new LatLon(-90.0, -180.0),
+        new LatLon(90.0, 180.0));
     }
 }

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

@@ -6 +6 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 
 /**
@@ -45 +47 @@
     }
 
-    public double scaleFactor() {
-        return 1/Math.PI/2;
-    }
-
     @Override public boolean equals(Object o) {
         return o instanceof Mercator;
     }
 
-    @Override public int hashCode() {
-        return Mercator.class.hashCode();
+    public ProjectionBounds getWorldBounds()
+    {
+        Bounds b = getWorldBoundsLatLon();
+        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
+    }
+
+    public Bounds getWorldBoundsLatLon()
+    {
+        return new Bounds(
+        new LatLon(-85.05112877980659, -180.0),
+        new LatLon(85.05112877980659, 180.0));
     }
 }

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

@@ -4 +4 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 
 /**
@@ -12 +14 @@
  */
 public interface Projection {
-
-    /**
-     * Maximum latitude representable.
-     */
-    public static final double MAX_LAT = 85.05112877980659; // Mercator squares the world
-
-    /**
-     * Maximum longditude representable.
-     */
-    public static final double MAX_LON = 180;
-
     /**
      * Minimum difference in location to not be represented as the same position.
@@ -36 +27 @@
         new Lambert(),
         new LambertEST(),
-        new SwissGrid()
+        new SwissGrid(),
+        new UTM()
     };
 
@@ -69 +61 @@
 
     /**
-     * The factor to multiply with an easting coordinate to get from "easting
-     * units per pixel" to "meters per pixel"
+     * Get the bounds of the world
      */
-    double scaleFactor();
+    ProjectionBounds getWorldBounds();
+    Bounds getWorldBoundsLatLon();
 }

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.JOptionPane;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 
 /**
@@ -19 +19 @@
  */
 public class SwissGrid implements Projection {
-    private boolean doAlertOnCoordinatesOufOfRange = true;
-
-    /**
-     * replies true if if wgs is in or reasonably close to Switzerland. False otherwise.
-     *
-     * @param wgs  lat/lon in WGS89
-     * @return
-     */
-    protected boolean latlonInAcceptableRange(LatLon wgs) {
-        // coordinate transformation is invoked for boundary values regardless
-        // of current data set.
-        //
-        if (Math.abs(wgs.lon()) == Projection.MAX_LON && Math.abs(wgs.lat()) == Projection.MAX_LAT) {
-            return true;
-        }
-        return   wgs.lon() >= 5.7 && wgs.lon() <= 10.6
-               && wgs.lat() >= 45.7 && wgs.lat() <= 47.9;
-    }
-
-    /**
-     * displays an alert if lat/lon are not reasonably close to Switzerland.
-     */
-    protected void alertCoordinatesOutOfRange() {
-        JOptionPane.showMessageDialog(Main.parent,
-                tr("The projection \"{0}\" is designed for\n"
-                + "latitudes between 45.7\u00b0 and 47.9\u00b0\n"
-                + "and longitutes between 5.7\u00b0 and 10.6\u00b0 only.\n"
-                + "Use another projection system if you are not working\n"
-                + "on a data set of Switzerland or Liechtenstein.\n"
-                + "Do not upload any data after this message.", this.toString()),
-                "Current projection not suitable",
-                JOptionPane.WARNING_MESSAGE
-        );
-        doAlertOnCoordinatesOufOfRange = false;
-    }
-
     /**
      * @param wgs  WGS84 lat/lon (ellipsoid GRS80) (in degree)
@@ -60 +24 @@
      */
     public EastNorth latlon2eastNorth(LatLon wgs) {
-            if (!latlonInAcceptableRange(wgs)) {
-                if (doAlertOnCoordinatesOufOfRange) {
-                    alertCoordinatesOutOfRange();
-                }
-            }
-
             double phi = 3600d * wgs.lat();
             double lambda = 3600d * wgs.lon();
@@ -131 +89 @@
     }
 
-    public double scaleFactor() {
-        return 1.0;
-    }
-
     @Override public String toString() {
         return tr("Swiss Grid (Switzerland)");
@@ -152 +106 @@
     }
 
-    @Override
-    public int hashCode() {
-        return SwissGrid.class.hashCode();
+    public ProjectionBounds getWorldBounds()
+    {
+        Bounds b = getWorldBoundsLatLon();
+        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
+    }
+
+    public Bounds getWorldBoundsLatLon()
+    {
+        return new Bounds(
+        new LatLon(45.7, 5.7),
+        new LatLon(47.9, 10.6));
     }
 }

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

@@ -44 +44 @@
                 EastNorth newcenter = nc.getEastNorth(nc.getWidth()/2+nc.getWidth()/5, nc.getHeight()/2+nc.getHeight()/5);
                 if (action.equals("left"))
-                    nc.zoomTo(new EastNorth(2*center.east()-newcenter.east(), center.north()), nc.getScale());
+                    nc.zoomTo(new EastNorth(2*center.east()-newcenter.east(), center.north()));
                 else if (action.equals("right"))
-                    nc.zoomTo(new EastNorth(newcenter.east(), center.north()), nc.getScale());
+                    nc.zoomTo(new EastNorth(newcenter.east(), center.north()));
                 else if (action.equals("up"))
-                    nc.zoomTo(new EastNorth(center.east(), 2*center.north()-newcenter.north()), nc.getScale());
+                    nc.zoomTo(new EastNorth(center.east(), 2*center.north()-newcenter.north()));
                 else if (action.equals("down"))
-                    nc.zoomTo(new EastNorth(center.east(), newcenter.north()), nc.getScale());
+                    nc.zoomTo(new EastNorth(center.east(), newcenter.north()));
             }
         }
@@ -123 +123 @@
             EastNorth center = nc.getCenter();
             EastNorth mouseCenter = nc.getEastNorth(e.getX(), e.getY());
-            EastNorth p = new EastNorth(
+            nc.zoomTo(new EastNorth(
                     mousePosMove.east() + center.east() - mouseCenter.east(),
-                    mousePosMove.north() + center.north() - mouseCenter.north());
-            nc.zoomTo(p, nc.getScale());
+                    mousePosMove.north() + center.north() - mouseCenter.north()));
         } else
             endMovement();
@@ -182 +181 @@
      */
     public void mouseWheelMoved(MouseWheelEvent e) {
-        double newScale = nc.getScale() * Math.pow(0.8, - e.getWheelRotation());
-
-        // New center position so that point under the mouse pointer stays the same place as it was before zooming
-        // You will get the formula by simplifying this expression: newCenter = oldCenter + mouseCoordinatesInNewZoom - mouseCoordinatesInOldZoom
-        double newX = nc.center.east() - (e.getX() - nc.getWidth()/2.0) * (newScale - nc.scale);
-        double newY = nc.center.north() + (e.getY() - nc.getHeight()/2.0) * (newScale - nc.scale);
-
-        nc.zoomTo(new EastNorth(newX, newY), newScale);
+        nc.zoomToFactor(e.getX(), e.getY(), Math.pow(0.8, - e.getWheelRotation()));
     }
 

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

@@ -14 +14 @@
 import org.openstreetmap.josm.actions.HelpAction.Helpful;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.projection.Projection;
 
 public class MapScaler extends JComponent implements Helpful {
 
     private final NavigatableComponent mv;
-    public MapScaler(NavigatableComponent mv, Projection proj) {
+    public MapScaler(NavigatableComponent mv) {
         this.mv = mv;
         setSize(100,30);
@@ -26 +25 @@
 
     @Override public void paint(Graphics g) {
-        LatLon ll1 = mv.getLatLon(0,0);
-        LatLon ll2 = mv.getLatLon(100,0);
-        double dist = ll1.greatCircleDistance(ll2);
+        double dist = mv.getDist100Pixel();
         String text = dist >= 2000 ? Math.round(dist/100)/10 +" km" : (dist >= 1
         ? Math.round(dist*10)/10 +" m" : "< 1 m");

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

@@ -11 +11 @@
 import org.openstreetmap.josm.actions.HelpAction.Helpful;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.Main;
 
 class MapSlider extends JSlider implements PropertyChangeListener, ChangeListener, Helpful {
@@ -28 +30 @@
         if (getModel().getValueIsAdjusting()) return;
 
-        double sizex = this.mv.scale * this.mv.getWidth();
-        double sizey = this.mv.scale * this.mv.getHeight();
-        for (int zoom = 0; zoom <= 150; zoom++, sizex *= 1.1, sizey *= 1.1) {
-            if (sizex > MapView.world.east() || sizey > MapView.world.north()) {
-                preventChange=true;
-                setValue(zoom);
-                preventChange=false;
+        ProjectionBounds world = Main.proj.getWorldBounds();
+        ProjectionBounds current = this.mv.getProjectionBounds();
+
+        double cur_e = current.max.east()-current.min.east();
+        double cur_n = current.max.north()-current.min.north();
+        double e = world.max.east()-world.min.east();
+        double n = world.max.north()-world.min.north();
+        int zoom = 0;
+
+        while(zoom <= 150) {
+            e /= 1.1;
+            n /= 1.1;
+            if(e < cur_e && n < cur_n)
                 break;
-            }
+            ++zoom;
         }
+        preventChange=true;
+        setValue(zoom);
+        preventChange=false;
     }
 
     public void stateChanged(ChangeEvent e) {
         if (preventChange) return;
-        EastNorth pos = MapView.world;
-        for (int zoom = 0; zoom < getValue(); zoom++)
-            pos = new EastNorth(pos.east()/1.1, pos.north()/1.1);
-        if (this.mv.getWidth() < this.mv.getHeight())
-            this.mv.zoomTo(this.mv.center, pos.east()/(this.mv.getWidth()-20));
-        else
-            this.mv.zoomTo(this.mv.center, pos.north()/(this.mv.getHeight()-20));
+
+        ProjectionBounds world = Main.proj.getWorldBounds();
+        double fact = Math.pow(1.1, getValue());
+        double es = world.max.east()-world.min.east();
+        double n = world.max.north()-world.min.north();
+
+        this.mv.zoomTo(new ProjectionBounds(this.mv.getCenter(), es/fact, n/fact));
     }
 

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

@@ -38 +38 @@
 import org.openstreetmap.josm.actions.HelpAction.Helpful;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.LatLon.CoordinateFormat;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -89 +91 @@
         }
     }
-
-    LatLon.CoordinateFormat mCord;
 
     ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 11);
@@ -263 +263 @@
         this.mv = mapFrame.mapView;
 
-        try {
-            mCord = LatLon.CoordinateFormat.valueOf(Main.pref.get("coordinates"));
-        } catch (IllegalArgumentException iae) {
-            mCord =LatLon.CoordinateFormat.DECIMAL_DEGREES;
-        }
         // Listen for mouse movements and set the position text field
         mv.addMouseMotionListener(new MouseMotionListener(){
@@ -278 +273 @@
                 // Do not update the view if ctrl is pressed.
                 if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == 0) {
+                    CoordinateFormat mCord = Node.getCoordinateFormat();
                     LatLon p = mv.getLatLon(e.getX(),e.getY());
                     latText.setText(p.latToString(mCord));

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

@@ -30 +30 @@
 import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -95 +96 @@
                 zoomSlider.setBounds(3, 0, 114, 30);
 
-                MapScaler scaler = new MapScaler(MapView.this, Main.proj);
+                MapScaler scaler = new MapScaler(MapView.this);
                 add(scaler);
                 scaler.setLocation(10,30);
@@ -197 +198 @@
     }
 
-
     /**
      * Remove the layer from the mapview. If the layer was in the list before,
@@ -289 +289 @@
         // draw world borders
         tempG.setColor(Color.WHITE);
-        Bounds b = new Bounds();
-        Point min = getPoint(getProjection().latlon2eastNorth(b.min));
-        Point max = getPoint(getProjection().latlon2eastNorth(b.max));
+        ProjectionBounds b = getProjection().getWorldBounds();
+        Point min = getPoint(b.min);
+        Point max = getPoint(b.max);
         int x1 = Math.min(min.x, max.x);
         int y1 = Math.min(min.y, max.y);
@@ -307 +307 @@
 
     /**
-     * Set the new dimension to the projection class. Also adjust the components
-     * scale, if in autoScale mode.
+     * Set the new dimension to the view.
      */
     public void recalculateCenterScale(BoundingXYVisitor box) {
-        // -20 to leave some border
-        int w = getWidth()-20;
-        if (w < 20)
-            w = 20;
-        int h = getHeight()-20;
-        if (h < 20)
-            h = 20;
-
-        EastNorth oldCenter = center;
-        double oldScale = this.scale;
-
-        if (box == null || box.min == null || box.max == null) {
-            // no bounds means whole world
-            center = getProjection().latlon2eastNorth(new LatLon(0,0));
-            EastNorth world = getProjection().latlon2eastNorth(new LatLon(Projection.MAX_LAT,Projection.MAX_LON));
-            double scaleX = world.east()*2/w;
-            double scaleY = world.north()*2/h;
-            scale = Math.max(scaleX, scaleY); // minimum scale to see all of the screen
-        } else {
-            if(box.min.equals(box.max))
-                box.enlargeBoundingBox();
-            center = new EastNorth(box.min.east()/2+box.max.east()/2, box.min.north()/2+box.max.north()/2);
-            double scaleX = (box.max.east()-box.min.east())/w;
-            double scaleY = (box.max.north()-box.min.north())/h;
-            scale = Math.max(scaleX, scaleY); // minimum scale to see all of the screen
-        }
-
-        if (!center.equals(oldCenter))
-            firePropertyChange("center", oldCenter, center);
-        if (oldScale != scale)
-            firePropertyChange("scale", oldScale, scale);
-        repaint();
+        if(box == null)
+            box = new BoundingXYVisitor();
+        if(box.getBounds() == null)
+            box.visit(getProjection().getWorldBounds());
+        if(!box.hasExtend())
+             box.enlargeBoundingBox();
+
+        zoomTo(box.getBounds());
     }
 
@@ -392 +367 @@
 
     /**
-     * In addition to the base class funcitonality, this keep trak of the autoscale
-     * feature.
-     */
-    @Override public void zoomTo(EastNorth newCenter, double scale) {
-        EastNorth oldCenter = center;
-        double oldScale = this.scale;
-        super.zoomTo(newCenter, scale);
-        if ((oldCenter == null && center != null) || !oldCenter.equals(center))
-            firePropertyChange("center", oldCenter, center);
-        if (oldScale != scale)
-            firePropertyChange("scale", oldScale, scale);
-    }
-
-    /**
      * Tries to zoom to the download boundingbox[es] of the current edit layer
      * (aka {@link OsmDataLayer}). If the edit layer has multiple download bounding
@@ -420 +381 @@
         BoundingXYVisitor bbox = new BoundingXYVisitor();
         for (DataSource ds : dataSources) {
-            if (ds.bounds != null) {
-                bbox.visit(Main.proj.latlon2eastNorth(ds.bounds.max));
-                bbox.visit(Main.proj.latlon2eastNorth(ds.bounds.min));
-            }
-            if (bbox.max != null && bbox.min != null && !bbox.max.equals(bbox.min)) {
+            bbox.visit(ds.bounds);
+            if (bbox.hasExtend()) {
                 // ... we zoom to it's bounding box
                 recalculateCenterScale(bbox);

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

@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.HelpAction.Helpful;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -24 +26 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Mercator;
 
 /**
@@ -33 +36 @@
 public class NavigatableComponent extends JComponent implements Helpful {
 
-    public static final EastNorth world = Main.proj.latlon2eastNorth(new LatLon(Projection.MAX_LAT, Projection.MAX_LON));
     public static final int snapDistance = sqr(Main.pref.getInteger("node.snap-distance", 10));
 
@@ -42 +44 @@
      * northing/easting space of the projection.
      */
-    protected double scale;
+    private double scale;
     /**
      * Center n/e coordinate of the desired screen center.
@@ -58 +60 @@
 
     /**
-     * Return the OSM-conform zoom factor (0 for whole world, 1 for half, 2 for quarter...)
-     */
-    public int zoom() {
-        double sizex = scale * getWidth();
-        double sizey = scale * getHeight();
-        for (int zoom = 0; zoom <= 32; zoom++, sizex *= 2, sizey *= 2)
-            if (sizex > world.east() || sizey > world.north())
-                return zoom;
-        return 32;
-    }
-
-    /**
      * Return a ID which is unique as long as viewport dimensions are the same
      */
@@ -75 +65 @@
     {
         String x = center.east() + "_" + center.north() + "_" + scale + "_" +
-        getWidth() + "_" + getHeight();
+        getWidth() + "_" + getHeight() + "_" + getProjection().toString();
         java.util.zip.CRC32 id = new java.util.zip.CRC32();
         id.update(x.getBytes());
@@ -81 +71 @@
     }
 
-    /**
-     * Return the current scale value.
-     * @return The scale value currently used in display
-     */
-    public double getScale() {
-        return scale;
+    public double getMapScale() {
+        /* TODO: we assume a pixel is 0.025mm */
+        return getDist100Pixel()/(0.00025*100);
+    }
+
+    public double getDist100Pixel()
+    {
+        LatLon ll1 = getLatLon(0,0);
+        LatLon ll2 = getLatLon(100,0);
+        return ll1.greatCircleDistance(ll2);
     }
 
@@ -110 +104 @@
     }
 
+    public ProjectionBounds getProjectionBounds() {
+        return new ProjectionBounds(
+        new EastNorth(
+                center.east() - getWidth()/2.0*scale,
+                center.north() - getHeight()/2.0*scale),
+        new EastNorth(
+                center.east() + getWidth()/2.0*scale,
+                center.north() + getHeight()/2.0*scale));
+    };
+
+    public Bounds getRealBounds() {
+        return new Bounds(
+        getProjection().eastNorth2latlon(new EastNorth(
+                center.east() - getWidth()/2.0*scale,
+                center.north() - getHeight()/2.0*scale)),
+        getProjection().eastNorth2latlon(new EastNorth(
+                center.east() + getWidth()/2.0*scale,
+                center.north() + getHeight()/2.0*scale)));
+    };
+
     /**
      * @param x X-Pixelposition to get coordinate from
@@ -118 +132 @@
      */
     public LatLon getLatLon(int x, int y) {
-
         return getProjection().eastNorth2latlon(getEastNorth(x, y));
     }
@@ -141 +154 @@
      * @param scale The scale to use.
      */
-    public void zoomTo(EastNorth newCenter, double scale) {
-        center = newCenter;
-        getProjection().eastNorth2latlon(center);
-        this.scale = scale;
-        repaint();
+    private void zoomTo(EastNorth newCenter, double newScale) {
+/* TODO: check that newCenter is really inside visible world and that scale is correct, don't allow zooming out to much */
+        boolean rep = false;
+        if(!newCenter.equals(center))
+        {
+            EastNorth oldCenter = center;
+            center = newCenter;
+            rep = true;
+            firePropertyChange("center", oldCenter, newCenter);
+        }
+        if(scale != newScale)
+        {
+            double oldScale = scale;
+            scale = newScale;
+            rep = true;
+            firePropertyChange("scale", oldScale, newScale);
+        }
+        if(rep)
+            repaint();
+    }
+
+    public void zoomTo(EastNorth newCenter) {
+        zoomTo(newCenter, scale);
+    }
+
+    public void zoomToFactor(double x, double y, double factor) {
+        double newScale = scale*factor;
+        // New center position so that point under the mouse pointer stays the same place as it was before zooming
+        // You will get the formula by simplifying this expression: newCenter = oldCenter + mouseCoordinatesInNewZoom - mouseCoordinatesInOldZoom
+        zoomTo(new EastNorth(
+        center.east() - (x - getWidth()/2.0) * (newScale - scale),
+        center.north() + (y - getHeight()/2.0) * (newScale - scale)),
+        newScale);
+    }
+
+    public void zoomToFactor(EastNorth newCenter, double factor) {
+        zoomTo(newCenter, scale*factor);
+    }
+
+    public void zoomToFactor(double factor) {
+        zoomTo(center, scale*factor);
+    }
+
+    public void zoomTo(ProjectionBounds box) {
+        // -20 to leave some border
+        int w = getWidth()-20;
+        if (w < 20)
+            w = 20;
+        int h = getHeight()-20;
+        if (h < 20)
+            h = 20;
+
+        double scaleX = (box.max.east()-box.min.east())/w;
+        double scaleY = (box.max.north()-box.min.north())/h;
+        double newScale = Math.max(scaleX, scaleY);
+
+        zoomTo(box.getCenter(), newScale);
+    }
+
+    public void zoomTo(Bounds box) {
+        zoomTo(new ProjectionBounds(getProjection().latlon2eastNorth(box.min),
+        getProjection().latlon2eastNorth(box.max)));
     }
 

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

@@ -207 +207 @@
                 ((OsmPrimitive) o).visit(box);
         }
-        if (box.max == null || box.min == null)
+        if (box.getBounds() == null)
             return;
         box.enlargeBoundingBox();

trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

@@ -21 +21 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -162 +163 @@
 
     private void updateUrl(DownloadDialog gui) {
-        double lat = (gui.minlat + gui.maxlat)/2;
-        double lon = (gui.minlon + gui.maxlon)/2;
-        // convert to mercator (for calculation of zoom only)
-        double latMin = Math.log(Math.tan(Math.PI/4.0+gui.minlat/180.0*Math.PI/2.0))*180.0/Math.PI;
-        double latMax = Math.log(Math.tan(Math.PI/4.0+gui.maxlat/180.0*Math.PI/2.0))*180.0/Math.PI;
-        double size = Math.max(Math.abs(latMax-latMin), Math.abs(gui.maxlon-gui.minlon));
-        int zoom = 0;
-        while (zoom <= 20) {
-            if (size >= 180)
-                break;
-            size *= 2;
-            zoom++;
-        }
-        // Truncate lat and lon to something more sensible
-        int decimals = (int) Math.pow(10, (zoom / 3));
-        lat = Math.round(lat * decimals);
-        lat /= decimals;
-        lon = Math.round(lon * decimals);
-        lon /= decimals;
-        showUrl.setText("http://www.openstreetmap.org/?lat="+lat+"&lon="+lon+"&zoom="+zoom);
+        showUrl.setText(OsmUrlToBounds.getURL(new Bounds(
+        new LatLon(gui.minlat, gui.minlon), new LatLon(gui.maxlat, gui.maxlon))));
     }
 }

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

@@ -536 +536 @@
 
             if (centerToggle.getModel().isSelected())
-                Main.map.mapView.zoomTo(currentImageEntry.pos, Main.map.mapView.getScale());
+                Main.map.mapView.zoomTo(currentImageEntry.pos);
 
             dlg.setTitle(currentImageEntry.image +

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.coor.LatLon.CoordinateFormat;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -28 +30 @@
 
         for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
-            if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection"))) {
+            if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection", Mercator.class.getName()))) {
                 projectionCombo.setSelectedIndex(i);
                 break;
@@ -54 +56 @@
 
     public boolean ok() {
-        boolean restart = Main.pref.put("projection",
-        projectionCombo.getSelectedItem().getClass().getName());
+        String projname = projectionCombo.getSelectedItem().getClass().getName();
+        if(Main.pref.put("projection", projname))
+            Main.setProjection(projname);
         if(Main.pref.put("coordinates",
         ((CoordinateFormat)coordinatesCombo.getSelectedItem()).name()))
-            restart = true;
-        return restart;
+            Node.setCoordinateFormat();
+        return false;
     }
 }

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -121 +121 @@
         if (attr.containsKey(GpxData.META_KEYWORDS)) simpleTag("keywords", (String)attr.get(GpxData.META_KEYWORDS));
 
-        data.recalculateBounds();
-        Bounds bounds = data.bounds;
-        String b = "minlat=\"" + bounds.min.lat() + "\" minlon=\"" + bounds.min.lon() +
-            "\" maxlat=\"" + bounds.max.lat() + "\" maxlon=\"" + bounds.max.lon() + "\"" ;
-        inline("bounds", b);
+        Bounds bounds = data.recalculateBounds();
+        if(bounds != null)
+        {
+            String b = "minlat=\"" + bounds.min.lat() + "\" minlon=\"" + bounds.min.lon() +
+                "\" maxlat=\"" + bounds.max.lat() + "\" maxlon=\"" + bounds.max.lon() + "\"" ;
+            inline("bounds", b);
+        }
 
         closeln("metadata");

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

@@ -55 +55 @@
         return Double.parseDouble(map.get("m"+key));
     }
+
+    static public int getZoom(Bounds b)
+    {
+        // convert to mercator (for calculation of zoom only)
+        double latMin = Math.log(Math.tan(Math.PI/4.0+b.min.lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
+        double latMax = Math.log(Math.tan(Math.PI/4.0+b.max.lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
+        double size = Math.max(Math.abs(latMax-latMin), Math.abs(b.max.lon()-b.min.lon()));
+        int zoom = 0;
+        while (zoom <= 20) {
+            if (size >= 180)
+                break;
+            size *= 2;
+            zoom++;
+        }
+        return zoom;
+    }
+
+    static public String getURL(Bounds b)
+    {
+        return getURL(b.center(), getZoom(b));
+    }
+
+    static public String getURL(LatLon pos, int zoom)
+    {
+        // Truncate lat and lon to something more sensible
+        int decimals = (int) Math.pow(10, (zoom / 3));
+        double lat = (Math.round(pos.lat() * decimals))/decimals;
+        double lon = (Math.round(pos.lon() * decimals))/decimals;
+        return new String("http://www.openstreetmap.org/?lat="+lat+"&lon="+lon+"&zoom="+zoom);
+    }
 }