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

Timestamp:

2009-07-03T12:33:32+02:00 (14 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.

File:

• trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (2 diffs)

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