Changeset 1887 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2009-08-02T22:03:01+02:00 (16 years ago)

Author:

stoecker

Message:

temporary fix for Lambert projection

File:

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

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

@@ -107 +107 @@
                 layoutZone = currentZone;
             } else if (layoutZone != currentZone) {
-                if ((currentZone < layoutZone && Math.abs(zoneLimits[currentZone] - lt) > cMaxOverlappingZones)
-                        || (currentZone > layoutZone && Math.abs(zoneLimits[layoutZone] - lt) > cMaxOverlappingZones)) {
+                if (farawayFromLambertZoneFrance(lt,lg)) {
                     OptionPaneUtil.showMessageDialog(Main.parent,
                             tr("IMPORTANT : data positioned far away from\n"
@@ -273 +272 @@
     }
 
+    private boolean farawayFromLambertZoneFrance(double lat, double lon) {
+        if (lat < (zoneLimits[3] - cMaxOverlappingZones) || (lat > (cMaxLatZone1 + cMaxOverlappingZones))
+                || (lon < (cMinLonZones - cMaxOverlappingZones)) || (lon > (cMaxLonZones + cMaxOverlappingZones)))
+            return true;
+        return false;
+    }
+
     public Bounds getWorldBoundsLatLon()
     {
+        // These are not the Lambert Zone boundaries but we keep these values until coordinates outside the
+        // projection boundaries are handled correctly.
         return new Bounds(
+                new LatLon(-85.05112877980659, -180.0),
+                new LatLon(85.05112877980659, 180.0));
+        /*return new Bounds(
                 new LatLon(45.0, -4.9074074074074059),
-                new LatLon(57.0, 10.2));
+                new LatLon(57.0, 10.2));*/
     }
 }