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

Timestamp:

2015-07-21T22:39:57+02:00 (10 years ago)

Author:

bastiK

Message:

add proj.4 syntax "+proj=utm +zone=... [+south]" for CustomProjection (see #11701)

This is just a shortcut for a set of already supported parameters.

File:

• trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (modified) (4 diffs)

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

@@ -103 +103 @@
         /** definition of axis for projection */
         axis("axis", true),
+        /** UTM zone */
+        zone("zone", true),
+        /** indicate southern hemisphere for UTM */
+        south("south", false),
         // JOSM extensions, not present in PROJ.4
         wmssrs("wmssrs", true),
@@ -185 +189 @@
             datum = parseDatum(parameters, ellps);
             proj = parseProjection(parameters, ellps);
+            // "utm" is a shortcut for a set of parameters
+            if ("utm".equals(parameters.get(Param.proj.key))) {
+                String zoneStr = parameters.get(Param.zone.key);
+                Integer zone;
+                if (zoneStr == null) 
+                    throw new ProjectionConfigurationException(tr("UTM projection (''+proj=utm'') requires ''+zone=...'' parameter."));
+                try {
+                    zone = Integer.parseInt(zoneStr);
+                } catch (NumberFormatException e) {
+                    zone = null;
+                }
+                if (zone == null || zone < 1 || zone > 60)
+                    throw new ProjectionConfigurationException(tr("Expected integer value in range 1-60 for ''+zone=...'' paramter."));
+                this.lon0 = 6 * zone - 183;
+                this.k0 = 0.9996;
+                this.x0 = 500000;
+                this.y0 = parameters.containsKey(Param.south.key) ? 10000000 : 0;
+            }
             String s = parameters.get(Param.x_0.key);
             if (s != null) {
@@ -400 +422 @@
         if (id == null) throw new ProjectionConfigurationException(tr("Projection required (+proj=*)"));
 
+        // "utm" is not a real projection, but a shortcut for a set of parameters
+        if ("utm".equals(id)) {
+            id = "tmerc";
+        }
         Proj proj =  Projections.getBaseProjection(id);
         if (proj == null) throw new ProjectionConfigurationException(tr("Unknown projection identifier: ''{0}''", id));
@@ -436 +462 @@
     public static double parseDouble(Map<String, String> parameters, String parameterName) throws ProjectionConfigurationException {
         if (!parameters.containsKey(parameterName))
-            throw new IllegalArgumentException(tr("Unknown parameter ''{0}''", parameterName));
+            throw new ProjectionConfigurationException(tr("Unknown parameter ''{0}''", parameterName));
         String doubleStr = parameters.get(parameterName);
         if (doubleStr == null)