Changeset 5634 in josm for trunk/src

Timestamp:

2012-12-26T15:47:43+01:00 (12 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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/Projections.java (modified) (4 diffs)
• gui/preferences/projection/CodeProjectionChoice.java (added)
• gui/preferences/projection/CustomProjectionChoice.java (modified) (1 diff)
• gui/preferences/projection/ProjectionPreference.java (modified) (4 diffs)
• gui/preferences/projection/SubPrefsOptions.java (modified) (1 diff)

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);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

@@ -245 +245 @@
         return false;
     }
+
+    @Override
+    public boolean showProjectionName() {
+        return false;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -204 +204 @@
 
         /************************
+         * Projection by Code.
+         */
+        registerProjectionChoice(new CodeProjectionChoice());
+
+        /************************
          * Custom projection.
          */
@@ -265 +270 @@
     private Component projectionCodeGlue;
     private JLabel projectionCode = new JLabel();
+    private JLabel projectionNameLabel;
+    private Component projectionNameGlue;
+    private JLabel projectionName = new JLabel();
     private JLabel bounds = new JLabel();
 
@@ -304 +312 @@
         projPanel.add(projectionCodeGlue = GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
         projPanel.add(projectionCode, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
+        projPanel.add(projectionNameLabel = new JLabel(tr("Projection name")), GBC.std().insets(25,5,0,5));
+        projPanel.add(projectionNameGlue = GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
+        projPanel.add(projectionName, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
         projPanel.add(new JLabel(tr("Bounds")), GBC.std().insets(25,5,0,5));
         projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
@@ -328 +339 @@
         Projection proj = pc.getProjection();
         projectionCode.setText(proj.toCode());
+        projectionName.setText(proj.toString());
         Bounds b = proj.getWorldBoundsLatLon();
         CoordinateFormat cf = CoordinateFormat.getDefaultFormat();
         bounds.setText(b.getMin().lonToString(cf)+", "+b.getMin().latToString(cf)+" : "+b.getMax().lonToString(cf)+", "+b.getMax().latToString(cf));
         boolean showCode = true;
+        boolean showName = false;
         if (pc instanceof SubPrefsOptions) {
             showCode = ((SubPrefsOptions) pc).showProjectionCode();
+            showName = ((SubPrefsOptions) pc).showProjectionName();
         }
         projectionCodeLabel.setVisible(showCode);
         projectionCodeGlue.setVisible(showCode);
         projectionCode.setVisible(showCode);
+        projectionNameLabel.setVisible(showName);
+        projectionNameGlue.setVisible(showName);
+        projectionName.setVisible(showName);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/SubPrefsOptions.java

@@ -11 +11 @@
      */
     boolean showProjectionCode();
+
+    /**
+     * @return true, if the projection name should be displayed in the top panel
+     */
+    boolean showProjectionName();
 }