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

Timestamp:

2012-12-26T15:47:43+01:00 (11 years ago)

Author:

bastiK

Message:

add option to select projection by code

this means it is no longer necessary to write a GUI for each new projection, because they are accessible in this list

File:

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

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

@@ -7 +7 @@
 import java.io.InputStreamReader;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -113 +116 @@
 
     public static String getInit(String id) {
-        return inits.get(id.toLowerCase()).b;
+        return inits.get(id.toUpperCase()).b;
     }
 
@@ -132 +135 @@
                     Matcher m = epsgPattern.matcher(line);
                     if (m.matches()) {
-                        inits.put("epsg:" + m.group(1), Pair.create(name, m.group(2).trim()));
+                        inits.put("EPSG:" + m.group(1), Pair.create(name, m.group(2).trim()));
                     } else {
                         System.err.println("Warning: failed to parse line from the epsg projection definition: "+line);
@@ -144 +147 @@
     }
 
-    private final static Map<String, ProjectionChoice> allCodesPC = new HashMap<String, ProjectionChoice>();
-    private final static Map<String, Projection> allCodes = new HashMap<String, Projection>();
+    private final static Set<String> allCodes = new HashSet<String>();
+    private final static Map<String, ProjectionChoice> allProjectionChoicesByCode = new HashMap<String, ProjectionChoice>();
+    private final static Map<String, Projection> projectionsByCode_cache = new HashMap<String, Projection>();
 
     static {
-        // FIXME: use {@link #inits}, because it may contain more codes in future
-        // than exposed by the ProjectionChoices
         for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
             for (String code : pc.allCodes()) {
-                allCodesPC.put(code, pc);
+                allProjectionChoicesByCode.put(code, pc);
             }
         }
+        allCodes.addAll(inits.keySet());
+        allCodes.addAll(allProjectionChoicesByCode.keySet());
     }
 
     public static Projection getProjectionByCode(String code) {
-        Projection p = allCodes.get(code);
-        if (p != null) return p;
-        ProjectionChoice pc = allCodesPC.get(code);
-        if (pc == null) return null;
-        Collection<String> pref = pc.getPreferencesFromCode(code);
-        pc.setPreferences(pref);
-        p = pc.getProjection();
-        allCodes.put(code, p);
-        return p;
+        Projection proj = projectionsByCode_cache.get(code);
+        if (proj != null) return proj;
+        ProjectionChoice pc = allProjectionChoicesByCode.get(code);
+        if (pc != null) {
+            Pair<String, String> pair = inits.get(code);
+            if (pair == null) return null;
+            String name = pair.a;
+            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);
+        return proj;
+    }
+
+    public static Collection<String> getAllProjectionCodes() {
+        return Collections.unmodifiableCollection(allCodes);
     }