Changeset 8611 in josm

Timestamp:

2015-07-22T21:55:54+02:00 (9 years ago)

Author:

Don-vip

Message:

Add robustness to UNITS_TO_METERS parameters - this solves the opendata plugin failing unit test

File:

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

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

@@ -196 +196 @@
                 String zoneStr = parameters.get(Param.zone.key);
                 Integer zone;
-                if (zoneStr == null) 
+                if (zoneStr == null)
                     throw new ProjectionConfigurationException(tr("UTM projection (''+proj=utm'') requires ''+zone=...'' parameter."));
                 try {
@@ -236 +236 @@
             s = parameters.get(Param.units.key);
             if (s != null) {
-                this.metersPerUnit = UNITS_TO_METERS.get(s);
+                s = Utils.strip(s, "\"");
+                if (UNITS_TO_METERS.containsKey(s)) {
+                    this.metersPerUnit = UNITS_TO_METERS.get(s);
+                } else {
+                    Main.warn("No metersPerUnit found for: " + s);
+                }
             }
             s = parameters.get(Param.to_meter.key);
@@ -357 +362 @@
             ellps = Ellipsoid.WGS84;
         }
-        
+
         String nadgridsId = parameters.get(Param.nadgrids.key);
         if (nadgridsId != null) {