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

Timestamp:

2009-07-03T12:33:32+02:00 (16 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/data/osm

Files:

• Node.java (modified) (6 diffs)
• visitor/BoundingXYVisitor.java (modified) (5 diffs)
• visitor/MapPaintVisitor.java (modified) (1 diff)

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