Changeset 864 in josm for trunk/src/org

Timestamp:

2008-08-24T21:14:42+02:00 (16 years ago)

Author:

framm

Message:

• fix for Lambert projection by Pieren <pieren3@…>

File:

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

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

@@ -66 +66 @@
         public static int layoutZone = -1;
 
+        private static int currentZone = 0;
+
+        private static boolean dontDisplayErrors = false;
+
         /**
          * @param p  WGS84 lat/lon (ellipsoid GRS80) (in degree)
@@ -77 +81 @@
 
                 // check if longitude and latitude are inside the french Lambert zones
-                int currentZone = 0;
+                currentZone = 0;
                 boolean outOfLambertZones = false;
                 if (lt >= zoneLimits[3] && lt <= cMaxLatZone1 && lg >= cMinLonZones && lg <= cMaxLonZones) {
@@ -100 +104 @@
                 } 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 \"" + this.toString() + "\" is designed for\n" 
+                                        + "latitudes between 46.1 and 57 degrees 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."));
+                                dontDisplayErrors = true;
+                        }
                 }
                 if (!outOfLambertZones) {
-                        if (layoutZone == -1)
+                        if (layoutZone == -1) {
                                 layoutZone = currentZone;
-                        else if (layoutZone != currentZone) {
+                                dontDisplayErrors = false;
+                        } else if (layoutZone != currentZone) {
                                 if ((currentZone < layoutZone && Math.abs(zoneLimits[currentZone] - lt) > cMaxOverlappingZones)
                                                 || (currentZone > layoutZone && Math.abs(zoneLimits[layoutZone] - lt) > cMaxOverlappingZones)) {
@@ -110 +126 @@
                                                                         tr("IMPORTANT : data positionned far away from\n"
                                                                                         + "the current Lambert zone limits.\n"
+                                                                                + "Do not upload any data after this message.\n"
                                                                                         + "Undo your last action, Save your work \n"
                                                                                         + "and Start a new layer on the new zone."));
                                         layoutZone = -1;
+                                        dontDisplayErrors = true;
                                 } else {
-                                        System.out.println("temporarily extends Lambert zone "
-                                                        + layoutZone + " projection at lat,lon:" + lt + ","
-                                                        + lg);
+                                        System.out.println("temporarily extends Lambert zone " + layoutZone + " projection at lat,lon:"
+                                                + lt + "," + lg);
                                 }
                         }
@@ -127 +144 @@
 
         public LatLon eastNorth2latlon(EastNorth p) {
-                LatLon geo = Geographic(p, Xs[layoutZone], Ys[layoutZone], c[layoutZone], n[layoutZone]);
+                LatLon geo;
+                if (layoutZone == -1)
+                        // possible until the Lambert zone is determined by latlon2eastNorth() with a valid LatLon
+                        geo = Geographic(p, Xs[currentZone], Ys[currentZone], c[currentZone], n[currentZone]);
+                else
+                        geo = Geographic(p, Xs[layoutZone], Ys[layoutZone], c[layoutZone], n[layoutZone]);
                 // translate ellipsoid Clark => GRS80 (WGS83)
                 LatLon wgs = Clark2GRS80(geo);
@@ -133 +155 @@
         }
 
-        @Override
-        public String toString() {
-                return "Lambert";
+        @Override public String toString() {
+                return "Lambert Zone (France)";
         }