Changeset 9133 in josm for trunk/src/org

Timestamp:

2015-12-15T15:45:37+01:00 (8 years ago)

Author:

bastiK

Message:

see #12186 - add more projections
The list of projections is now generated during the build process:
scripts/BuildEpsgList.java runs and creates data/projection/custom-epsg which is generated by combining data_nodist/projection/josm-epsg (a list maintained by the JOSM team) and data_nodist/projection/epsg (an upstream list from the proj.4 project, git: 3795cdf)
The ant task epsg cares for this.

File:

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

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

@@ -63 +63 @@
     }
 
-    private Projections() {
-        // Hide default constructor for utils classes
-    }
-
-    public static EastNorth project(LatLon ll) {
-        if (ll == null) return null;
-        return Main.getProjection().latlon2eastNorth(ll);
-    }
-
-    public static LatLon inverseProject(EastNorth en) {
-        if (en == null) return null;
-        return Main.getProjection().eastNorth2latlon(en);
-    }
+    private static final Set<String> allCodes = new HashSet<>();
+    private static final Map<String, ProjectionChoice> allProjectionChoicesByCode = new HashMap<>();
+    private static final Map<String, Projection> projectionsByCode_cache = new HashMap<>();
 
     /*********************************
@@ -144 +134 @@
         List<ProjectionDefinition> pds;
         try {
-            pds = loadProjectionDefinitions("resource://data/projection/epsg");
+            pds = loadProjectionDefinitions("resource://data/projection/custom-epsg");
         } catch (IOException ex) {
             throw new RuntimeException(ex);
@@ -152 +142 @@
             inits.put(pd.code, pd);
         }
+
+        for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
+            for (String code : pc.allCodes()) {
+                allProjectionChoicesByCode.put(code, pc);
+            }
+        }
+        allCodes.addAll(inits.keySet());
+        allCodes.addAll(allProjectionChoicesByCode.keySet());
+    }
+
+    private Projections() {
+        // Hide default constructor for utils classes
+    }
+
+    public static EastNorth project(LatLon ll) {
+        if (ll == null) return null;
+        return Main.getProjection().latlon2eastNorth(ll);
+    }
+
+    public static LatLon inverseProject(EastNorth en) {
+        if (en == null) return null;
+        return Main.getProjection().eastNorth2latlon(en);
     }
 
@@ -203 +215 @@
     /**
      * Load projection definitions from file.
-     * 
+     *
      * @param path the path
      * @return projection definitions
@@ -214 +226 @@
         ) {
             return loadProjectionDefinitions(r);
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
         }
     }
@@ -221 +231 @@
     /**
      * Load projection definitions from file.
-     * 
+     *
      * @param r the reader
      * @return projection definitions
@@ -249 +259 @@
     }
 
-    private static final Set<String> allCodes = new HashSet<>();
-    private static final Map<String, ProjectionChoice> allProjectionChoicesByCode = new HashMap<>();
-    private static final Map<String, Projection> projectionsByCode_cache = new HashMap<>();
-
-    static {
-        for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
-            for (String code : pc.allCodes()) {
-                allProjectionChoicesByCode.put(code, pc);
-            }
-        }
-        allCodes.addAll(inits.keySet());
-        allCodes.addAll(allProjectionChoicesByCode.keySet());
-    }
-
     public static Projection getProjectionByCode(String code) {
         Projection proj = projectionsByCode_cache.get(code);