Changeset 5548 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2012-11-01T16:52:19+01:00 (11 years ago)

Author:

bastiK

Message:

remove Projection classes (replaced by data/epsg file)

concludes the projection rework from ealier this year

Location:

trunk/src/org/openstreetmap/josm/data/projection

Files:

• BelgianLambert1972.java (deleted)
• BelgianLambert2008.java (deleted)
• CustomProjection.java (modified) (7 diffs)
• Epsg3008.java (deleted)
• Epsg4326.java (deleted)
• GaussKrueger.java (deleted)
• Lambert.java (deleted)
• Lambert93.java (deleted)
• LambertCC9Zones.java (deleted)
• LambertEST.java (deleted)
• Mercator.java (deleted)
• Projection.java (modified) (2 diffs)
• Projections.java (modified) (4 diffs)
• Puwg.java (deleted)
• SwissGrid.java (deleted)
• TransverseMercatorLV.java (deleted)
• UTM.java (deleted)
• UTM_France_DOM.java (deleted)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.projection.datum.ThreeParameterDatum;
 import org.openstreetmap.josm.data.projection.datum.WGS84Datum;
+import org.openstreetmap.josm.data.projection.proj.Mercator;
 import org.openstreetmap.josm.data.projection.proj.Proj;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
@@ -38 +39 @@
      */
     protected String pref;
+    protected String name;
+    protected String code;
+    protected String cacheDir;
     protected Bounds bounds;
 
@@ -83 +87 @@
 
     public CustomProjection() {
-        this.pref = null;
     }
 
     public CustomProjection(String pref) {
+        this(null, null, pref, null);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param name describe projection in one or two words
+     * @param code unique code for this projection - may be null
+     * @param pref the string that defines the custom projection
+     * @param cacheDir cache directory name
+     */
+    public CustomProjection(String name, String code, String pref, String cacheDir) {
+        this.name = name;
+        this.code = code;
+        this.pref = pref;
+        this.cacheDir = cacheDir;
         try {
-            this.pref = pref;
             update(pref);
         } catch (ProjectionConfigurationException ex) {
@@ -104 +122 @@
             ellps = Ellipsoid.WGS84;
             datum = WGS84Datum.INSTANCE;
-            proj = new org.openstreetmap.josm.data.projection.proj.Mercator();
+            proj = new Mercator();
             bounds = new Bounds(
                     new LatLon(-85.05112877980659, -180.0),
@@ -429 +447 @@
     @Override
     public Integer getEpsgCode() {
+        if (code != null && code.startsWith("EPSG:")) {
+            try {
+                return Integer.parseInt(code.substring(5));
+            } catch (NumberFormatException e) {}
+        }
         return null;
     }
@@ -434 +457 @@
     @Override
     public String toCode() {
-        return "proj:" + (pref == null ? "ERROR" : pref);
+        return code != null ? code : "proj:" + (pref == null ? "ERROR" : pref);
     }
 
     @Override
     public String getCacheDirectoryName() {
-        return "proj-"+Utils.md5Hex(pref == null ? "" : pref).substring(0, 4);
+        return cacheDir != null ? cacheDir : "proj-"+Utils.md5Hex(pref == null ? "" : pref).substring(0, 4);
     }
 
@@ -452 +475 @@
     @Override
     public String toString() {
-        return tr("Custom Projection");
+        return name != null ? name : tr("Custom Projection");
     }
 }

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

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.projection;
 
@@ -7 +7 @@
 
 /**
- * Classes implementing this are able to convert lat/lon values to
- * planar screen coordinates.
+ * A projection, i.e. a class that supports conversion from lat/lon
+ * to east/north and back.
  *
- * @author imi
+ * The conversion from east/north to the screen coordinates is simply a scale
+ * factor and x/y offset.
  */
 public interface Projection {
     /**
-     * The default scale factor in east/north units per pixel ({@link #NavigatableComponent#scale}))
+     * The default scale factor in east/north units per pixel ({@link #NavigatableComponent#scale})).
      * FIXME: misnomer
+     * @return the scale factor
      */
     double getDefaultZoomInPPD();
 
     /**
-     * Convert from lat/lon to northing/easting.
+     * Convert from lat/lon to easting/northing.
      *
-     * @param p     The geo point to convert. x/y members of the point are filled.
+     * @param ll the geographical point to convert (in WGS84 lat/lon)
+     * @return the corresponding east/north coordinates
      */
-    EastNorth latlon2eastNorth(LatLon p);
+    EastNorth latlon2eastNorth(LatLon ll);
 
     /**
-     * Convert from norting/easting to lat/lon.
+     * Convert from easting/norting to lat/lon.
      *
-     * @param p     The geo point to convert. lat/lon members of the point are filled.
+     * @param en the geographical point to convert (in projected coordinates)
+     * @return the corresponding lat/lon (WGS84)
      */
-    LatLon eastNorth2latlon(EastNorth p);
+    LatLon eastNorth2latlon(EastNorth en);
 
     /**
-     * Describe the projection converter in one or two words.
+     * Describe the projection in one or two words.
+     * @return the name / description
      */
     String toString();
 
     /**
-     * Return projection code. This should be a unique identifier.
+     * Return projection code.
+     *
+     * This should be a unique identifier.
      * If projection supports parameters, return a different code
      * for each set of parameters.
      * 
      * The EPSG code can be used (if defined for the projection).
+     *
+     * @return the projection identifier
      */
     String toCode();
 
     /**
-     * Get a filename compatible string (for the cache directory)
+     * Get a filename compatible string (for the cache directory).
+     * @return the cache directory name (base name)
      */
     String getCacheDirectoryName();
 
     /**
-     * Get the bounds of the world
+     * Get the bounds of the world.
+     * @return the supported lat/lon rectangle for this projection
      */
     Bounds getWorldBoundsLatLon();

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
 import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -47 +48 @@
      * should be compatible to PROJ.4
      */
-    public static Map<String, ProjFactory> projs = new HashMap<String, ProjFactory>();
-    public static Map<String, Ellipsoid> ellipsoids = new HashMap<String, Ellipsoid>();
-    public static Map<String, Datum> datums = new HashMap<String, Datum>();
-    public static Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<String, NTV2GridShiftFileWrapper>();
-    public static Map<String, String> inits = new HashMap<String, String>();
+    final public static Map<String, ProjFactory> projs = new HashMap<String, ProjFactory>();
+    final public static Map<String, Ellipsoid> ellipsoids = new HashMap<String, Ellipsoid>();
+    final public static Map<String, Datum> datums = new HashMap<String, Datum>();
+    final public static Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<String, NTV2GridShiftFileWrapper>();
+    final public static Map<String, Pair<String, String>> inits = new HashMap<String, Pair<String, String>>();
 
     static {
@@ -109 +110 @@
 
     public static String getInit(String id) {
-        return inits.get(id);
+        return inits.get(id.toLowerCase()).b;
     }
 
@@ -116 +117 @@
      */
     private static void loadInits() {
-        Pattern epsgPattern = Pattern.compile("\\A<(\\d+)>(.*)<>\\Z");
+        Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
         try {
             InputStream in = new MirroredInputStream("resource://data/epsg");
             BufferedReader r = new BufferedReader(new InputStreamReader(in));
-            String line;
+            String line, lastline = "";
             while ((line = r.readLine()) != null) {
                 line = line.trim();
                 if (!line.startsWith("#") && !line.isEmpty()) {
+                    if (!lastline.startsWith("#")) throw new AssertionError();
+                    String name = lastline.substring(1).trim();
                     Matcher m = epsgPattern.matcher(line);
                     if (m.matches()) {
-                        inits.put("epsg:" + m.group(1), 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);
                     }
                 }
+                lastline = line;
             }
         } catch (IOException ex) {