Changeset 3232 in josm for trunk/src/org/openstreetmap/josm/data/projection/Puwg.java

Timestamp:

11.05.2010 09:25:21 (2 years ago)

Author:

jttt

Message:

Fix #2297 JOSM Webstart fails at loading plugins, cleanup puwg projection

File:

• trunk/src/org/openstreetmap/josm/data/projection/Puwg.java (modified) (11 diffs)

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

@@ -123 +123 @@
     public Collection<String> getPreferencesFromCode(String code)
     {
-        for (Projection p : Puwg.Zones)
+        for (PuwgData p : Puwg.Zones)
         {
             if(code.equals(p.toCode()))
@@ -151 +151 @@
 }
 
-interface PuwgData extends Projection {
-    public double getPuwgCentralMeridianDeg();
-    public double getPuwgCentralMeridian();
-    public double getPuwgFalseEasting();
-    public double getPuwgFalseNorthing();
-    public double getPuwgScaleFactor();
+interface PuwgData {
+    double getPuwgCentralMeridianDeg();
+    double getPuwgCentralMeridian();
+    double getPuwgFalseEasting();
+    double getPuwgFalseNorthing();
+    double getPuwgScaleFactor();
+
+    // Projection methods
+    String toCode();
+    String getCacheDirectoryName();
+    Bounds getWorldBoundsLatLon();
 }
 
@@ -165 +170 @@
     private static final double Epsg2180ScaleFactor = 0.9993;
     private static final double Epsg2180CentralMeridian = 19.0;
-    private static DecimalFormat decFormatter = new DecimalFormat("###0");
 
     @Override public String toString() {
@@ -185 +189 @@
                 new LatLon(54.84, 24.15));
     }
-
-    /* These two MUST NOT be used. Use Puwg implementation instead. */
-    public EastNorth latlon2eastNorth(LatLon p) { return null; }
-    public LatLon eastNorth2latlon(EastNorth p) { return null; }
 
     public double getPuwgCentralMeridianDeg() { return Epsg2180CentralMeridian; }
@@ -195 +195 @@
     public double getPuwgFalseNorthing() { return Epsg2180FalseNorthing; }
     public double getPuwgScaleFactor() { return Epsg2180ScaleFactor; }
-
-    public double getDefaultZoomInPPD() {
-        // This will set the scale bar to about 100 km
-        return 0.009;
-    }
-
-    public String eastToString(EastNorth p) {
-        return decFormatter.format(p.east());
-    }
-
-    public String northToString(EastNorth p) {
-        return decFormatter.format(p.north());
-    }
 }
 
@@ -218 +205 @@
     final private String[] Puwg2000Code = { "EPSG:2176",  "EPSG:2177", "EPSG:2178", "EPSG:2179"};
     final private String[] Puwg2000CDName = { "epsg2176",  "epsg2177", "epsg2178", "epsg2179"};
-    private static DecimalFormat decFormatter = new DecimalFormat("###0.00");
 
     @Override public String toString() {
@@ -238 +224 @@
                 new LatLon(54.84, (3 * getZone()) + 1.5));
     }
-
-    /* These two MUST NOT be used. Use Puwg implementation instead. */
-    public EastNorth latlon2eastNorth(LatLon p) { return null; }
-    public LatLon eastNorth2latlon(EastNorth p) { return null; }
 
     public double getPuwgCentralMeridianDeg() { return getZone() * 3.0; }
@@ -252 +234 @@
     public int getZoneIndex() { return getZone() - 5; }
 
-    public double getDefaultZoomInPPD() {
-        // This will set the scale bar to about 100 km
-        return 0.009;
-    }
-
-    public String eastToString(EastNorth p) {
-        return Integer.toString(getZone()) + decFormatter.format(p.east());
-    }
-
-    public String northToString(EastNorth p) {
-        return decFormatter.format(p.north());
-    }
-
-}
-
-class Epsg2176 extends Puwg2000 implements Projection {
+}
+
+class Epsg2176 extends Puwg2000 {
     private static final int PuwgZone = 5;
 
@@ -274 +243 @@
 }
 
-class Epsg2177 extends Puwg2000 implements Projection {
+class Epsg2177 extends Puwg2000 {
     private static final int PuwgZone = 6;
 
@@ -281 +250 @@
 }
 
-class Epsg2178 extends Puwg2000 implements Projection {
+class Epsg2178 extends Puwg2000 {
     private static final int PuwgZone = 7;
 
@@ -288 +257 @@
 }
 
-class Epsg2179 extends Puwg2000 implements Projection {
+class Epsg2179 extends Puwg2000 {
     private static final int PuwgZone = 8;