Changeset 5072 in josm

Timestamp:

Mar 11, 2012 7:29:20 PM (15 months ago)

Author:

bastiK

Message:

basic support for custom projections (see #7495)

Location:

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

Files:

• BelgianLambert1972.java (modified) (1 diff)
• BelgianLambert2008.java (modified) (1 diff)
• CustomProjection.java (added)
• Ellipsoid.java (modified) (2 diffs)
• Projections.java (modified) (4 diffs)
• datum/CentricDatum.java (modified) (2 diffs)

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.projection;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.projection;
 

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import java.util.List;
-import java.util.ArrayList;
 
 /**
@@ -127 +125 @@
     public static Ellipsoid create_a_rf(double a, double rf) {
         return create_a_f(a, 1.0 / rf);
+    }
+
+    @Override
+    public String toString() {
+        return "Ellipsoid{a="+a+", b="+b+"}";
     }
 

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.datum.Datum;
+import org.openstreetmap.josm.data.projection.datum.WGS84Datum;
+import org.openstreetmap.josm.data.projection.proj.LambertConformalConic;
+import org.openstreetmap.josm.data.projection.proj.Proj;
+import org.openstreetmap.josm.data.projection.proj.SwissObliqueMercator;
+import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -23 +32 @@
                 new Mercator(),
                 new UTM(),
-                // regional - alphabetical order by country name
-                new GaussKrueger(),
-                new BelgianLambert1972(),
-                new BelgianLambert2008(),
-                new LambertEST(),
-                new Lambert(),
-                new Lambert93(),
-                new LambertCC9Zones(),
-                new UTM_France_DOM(),
-                new TransverseMercatorLV(),
-                new Puwg(),
-                new Epsg3008(), // SWEREF99 13 30
-                new SwissGrid(),
+                // regional - alphabetical order by country code
+                new BelgianLambert1972(),   // BE
+                new BelgianLambert2008(),   // BE
+                new SwissGrid(),            // CH
+                new GaussKrueger(),         // DE
+                new LambertEST(),           // EE
+                new Lambert(),              // FR
+                new Lambert93(),            // FR
+                new LambertCC9Zones(),      // FR
+                new UTM_France_DOM(),       // FR
+                new TransverseMercatorLV(), // LV
+                new Puwg(),                 // PL
+                new Epsg3008(),             // SE
         }));
+
+    static {
+        if (Main.pref.getBoolean("customprojection")) {
+            addProjection(new CustomProjection());
+        }
+    }
 
     public static ArrayList<Projection> getProjections() {
@@ -44 +59 @@
     /**
      * Adds a new projection to the list of known projections.
-     * 
+     *
      * For Plugins authors: make sure your plugin is an early plugin, i.e. put
      * Plugin-Early=true in your Manifest.
@@ -52 +67 @@
     }
 
-    static public EastNorth project(LatLon ll) {
+    public static EastNorth project(LatLon ll) {
         if (ll == null) return null;
         return Main.getProjection().latlon2eastNorth(ll);
     }
 
-    static public LatLon inverseProject(EastNorth en) {
+    public static LatLon inverseProject(EastNorth en) {
         if (en == null) return null;
         return Main.getProjection().eastNorth2latlon(en);
     }
+
+    /*********************************
+     * Registry for custom projection
+     *
+     * should be compatible to PROJ.4
+     */
+
+    private static Map<String, Ellipsoid> ellipsoids = new HashMap<String, Ellipsoid>();
+    private static Map<String, Class<? extends Proj>> projs = new HashMap<String, Class<? extends Proj>>();
+    private static Map<String, Datum> datums = new HashMap<String, Datum>();
+
+    static {
+        ellipsoids.put("intl", Ellipsoid.hayford);
+        ellipsoids.put("GRS80", Ellipsoid.GRS80);
+        ellipsoids.put("WGS84", Ellipsoid.WGS84);
+        ellipsoids.put("bessel", Ellipsoid.Bessel1841);
+
+        projs.put("merc", org.openstreetmap.josm.data.projection.proj.Mercator.class);
+        projs.put("lcc", LambertConformalConic.class);
+        projs.put("somerc", SwissObliqueMercator.class);
+        projs.put("tmerc", TransverseMercator.class);
+
+        datums.put("WGS84", WGS84Datum.INSTANCE);
+    }
+
+    public static Ellipsoid getEllipsoid(String id) {
+        return ellipsoids.get(id);
+    }
+
+    public static Proj getProjection(String id) {
+        Class<? extends Proj> projClass = projs.get(id);
+        if (projClass == null) return null;
+        Proj proj = null;
+        try {
+            proj = projClass.newInstance();
+        } catch (InstantiationException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return proj;
+    }
+
+    public static Datum getDatum(String id) {
+        return datums.get(id);
+    }
 }

trunk/src/org/openstreetmap/josm/data/projection/datum/CentricDatum.java

@@ -14 +14 @@
         super(name, proj4Id, ellps);
     }
-    
+
     @Override
     public LatLon toWGS84(LatLon ll) {
@@ -24 +24 @@
         return this.ellps.cart2LatLon(Ellipsoid.WGS84.latLon2Cart(ll));
     }
-    
+
+    @Override
+    public String toString() {
+        return "CentricDatum{ellipsoid="+ellps+"}";
+    }
 }