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

Timestamp:

2009-11-21T15:48:35+01:00 (15 years ago)

Author:

stoecker

Message:

fix for subprojections

Location:

trunk/src/org/openstreetmap/josm/data/projection

Files:

• ProjectionSubPrefs.java (modified) (1 diff)
• UTM.java (modified) (2 diffs)

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

@@ -37 +37 @@
     /**
      * Will be called if the preference dialog is dismissed.
+     * argument may be null to reset everything
      */
     public void setPreferences(Collection<String> args);

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

@@ -26 +26 @@
 public class UTM implements Projection, ProjectionSubPrefs {
 
-    private int zone = 33;
+    public static final int DEFAULT_ZONE = 30;
+    private int zone = DEFAULT_ZONE;
 
     final private double UTMScaleFactor = 0.9996;
@@ -410 +411 @@
     public void setPreferences(Collection<String> args)
     {
-        /* TODO: parse args instead of fixed value */
-        zone = 33;
+        zone = DEFAULT_ZONE;
+        try {
+            for(String s : args)
+            {
+                zone = Integer.parseInt(s);
+                if(zone <= 0 || zone > 60)
+                    zone = DEFAULT_ZONE;
+                break;
+            }
+        } catch(NumberFormatException e) {}
     }
 
     public Collection<String> getPreferencesFromCode(String code)
     {
-        /* TODO: implement */
+        if(code.startsWith("EPSG:3258"))
+        {
+            try {
+                String zonestring = code.substring(9);
+                int zoneval = Integer.parseInt(zonestring);
+                if(zoneval > 0 && zone <= 60)
+                {
+                    return Collections.singleton(zonestring);
+                }
+            } catch(NumberFormatException e) {}
+        }
         return null;
     }