Changeset 6003 in josm for trunk

Timestamp:

2013-06-12T00:50:23+02:00 (11 years ago)

Author:

Don-vip

Message:

Fallback to core projections when proj4j plugin fails to get one

File:

• trunk/src/org/openstreetmap/josm/data/projection/Projections.java (modified) (2 diffs)

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

@@ -165 +165 @@
         if (proj != null) return proj;
         ProjectionChoice pc = allProjectionChoicesByCode.get(code);
-        if (pc == null) {
+        if (pc != null) {
+            Collection<String> pref = pc.getPreferencesFromCode(code);
+            pc.setPreferences(pref);
+            try {
+                proj = pc.getProjection();
+            } catch (Throwable t) {
+                String cause = t.getMessage();
+                Main.warn("Unable to get projection "+code+" with "+pc + (cause != null ? ". "+cause : ""));
+            }
+        }
+        if (proj == null) {
             Pair<String, String> pair = inits.get(code);
             if (pair == null) return null;
@@ -171 +181 @@
             String init = pair.b;
             proj = new CustomProjection(name, code, init, null);
-        } else {
-            Collection<String> pref = pc.getPreferencesFromCode(code);
-            pc.setPreferences(pref);
-            proj = pc.getProjection();
         }
         projectionsByCode_cache.put(code, proj);