Changeset 5554 in josm

Timestamp:

2012-11-03T09:58:37+01:00 (11 years ago)

Author:

bastiK

Message:

join ProjectionInfo and Projections

the first is not referenced in core code (therefore removed by server build) but needed in plugins (see #8172)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/projection/ProjectionInfo.java (deleted)
• src/org/openstreetmap/josm/data/projection/Projections.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) (1 diff)

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

@@ -6 +6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -24 +25 @@
 import org.openstreetmap.josm.data.projection.proj.SwissObliqueMercator;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.Pair;
@@ -140 +143 @@
         }
     }
+
+    private final static Map<String, ProjectionChoice> allCodesPC = new HashMap<String, ProjectionChoice>();
+    private final static Map<String, Projection> allCodes = 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);
+            }
+        }
+    }
+
+    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;
+    }
+
 }

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -65 +65 @@
             double east = Double.parseDouble(f[3]);
             double north = Double.parseDouble(f[4]);
-            Projection p = ProjectionInfo.getProjectionByCode(code);
+            Projection p = Projections.getProjectionByCode(code);
             {
                 EastNorth en = p.latlon2eastNorth(new LatLon(lat, lon));

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -171 +171 @@
 
         for (TestData data : allData) {
-            Projection proj = ProjectionInfo.getProjectionByCode(data.code);
+            Projection proj = Projections.getProjectionByCode(data.code);
             if (proj == null) {
                 fail.append("Projection "+data.code+" from test data was not found!\n");