Changeset 1722 in josm for trunk/src/org/openstreetmap/josm/data/projection/Lambert.java

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.

File:

• trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) (4 diffs)

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