Changeset 1743 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-07-07T19:54:54+02:00 (16 years ago)

Author:

stoecker

Message:

added much improved preferences for external styles and presets

File:

• trunk/src/org/openstreetmap/josm/data/projection/UTM.java (modified) (3 diffs)

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

@@ -91 +91 @@
     {
         return Math.toRadians(-183.0 + (zone * 6.0));
+    }
+    private double UTMCentralMeridianDeg(int zone)
+    {
+        return -183.0 + (zone * 6.0);
     }
 
@@ -324 +328 @@
 
     public EastNorth latlon2eastNorth(LatLon p) {
-        EastNorth a = MapLatLonToXY(Math.toRadians(p.lat()), Math.toRadians(p.lon()), UTMCentralMeridian(33));
+        EastNorth a = MapLatLonToXY(Math.toRadians(p.lat()), Math.toRadians(p.lon()), UTMCentralMeridian(getzone()));
         return new EastNorth(a.east() * UTMScaleFactor + 3500000.0, a.north() * UTMScaleFactor);
     }
 
     public LatLon eastNorth2latlon(EastNorth p) {
-        return MapXYToLatLon((p.east()-3500000.0)/UTMScaleFactor, p.north()/UTMScaleFactor, UTMCentralMeridian(33));
+        return MapXYToLatLon((p.east()-3500000.0)/UTMScaleFactor, p.north()/UTMScaleFactor, UTMCentralMeridian(getzone()));
+    }
+
+    @Override public String toString() {
+        return tr("UTM Zone {0}", getzone());
     }
 
     /* TODO - support all UTM's not only zone 33 */
-    @Override public String toString() {
-        return tr("UTM Zone {0}", 33);
+    public int getzone()
+    {
+      return 33;
     }
 
@@ -354 +363 @@
     {
         return new Bounds(
-        new LatLon(-90.0, 14.0),
-        new LatLon(90.0, 22.0));
+        new LatLon(-85.0, UTMCentralMeridianDeg(getzone())-5.0),
+        new LatLon(85.0, UTMCentralMeridianDeg(getzone())+5.0));
     }
 }