Changeset 9532 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-01-18T22:48:40+01:00 (8 years ago)

Author:

bastiK

Message:

see #12186 - add Oblique Mercator projection
(imports pieces of code from the Geotools project)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/CustomProjection.java (modified) (4 diffs)
• data/projection/Projections.java (modified) (2 diffs)
• data/projection/proj/AbstractProj.java (modified) (2 diffs)
• data/projection/proj/ICentralMeridianProvider.java (added)
• data/projection/proj/ObliqueMercator.java (added)
• data/projection/proj/ProjParameters.java (modified) (1 diff)
• gui/MapView.java (modified) (1 diff)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.projection.datum.ThreeParameterDatum;
 import org.openstreetmap.josm.data.projection.datum.WGS84Datum;
+import org.openstreetmap.josm.data.projection.proj.ICentralMeridianProvider;
 import org.openstreetmap.josm.data.projection.proj.IPolar;
 import org.openstreetmap.josm.data.projection.proj.Mercator;
@@ -98 +99 @@
         /** Latitude of second standard parallel */
         lat_2("lat_2", true),
-        /** Latitude of true scale */
+        /** Latitude of true scale (Polar Stereographic) */
         lat_ts("lat_ts", true),
+        /** longitude of the center of the projection (Oblique Mercator) */
+        lonc("lonc", true),
+        /** azimuth (true) of the center line passing through the center of the
+         * projection (Oblique Mercator) */
+        alpha("alpha", true),
+        /** rectified bearing of the center line (Oblique Mercator) */
+        gamma("gamma", true),
+        /** select "Hotine" variant of Oblique Mercator */
+        no_off("no_off", false),
+        /** legacy alias for no_off */
+        no_uoff("no_uoff", false),
+        /** longitude of first point (Oblique Mercator) */
+        lon_1("lon_1", true),
+        /** longitude of second point (Oblique Mercator) */
+        lon_2("lon_2", true),
         /** the exact proj.4 string will be preserved in the WKT representation */
         wktext("wktext", false),  // ignored
@@ -232 +248 @@
             if (s != null) {
                 this.lon0 = parseAngle(s, Param.lon_0.key);
+            }
+            if (proj instanceof ICentralMeridianProvider) {
+                this.lon0 = ((ICentralMeridianProvider) proj).getCentralMeridian();
             }
             s = parameters.get(Param.pm.key);
@@ -501 +520 @@
         if (s != null) {
             projParams.lat_ts = parseAngle(s, Param.lat_ts.key);
+        }
+        s = parameters.get(Param.lonc.key);
+        if (s != null) {
+            projParams.lonc = parseAngle(s, Param.lonc.key);
+        }
+        s = parameters.get(Param.alpha.key);
+        if (s != null) {
+            projParams.alpha = parseAngle(s, Param.alpha.key);
+        }
+        s = parameters.get(Param.gamma.key);
+        if (s != null) {
+            projParams.gamma = parseAngle(s, Param.gamma.key);
+        }
+        s = parameters.get(Param.lon_1.key);
+        if (s != null) {
+            projParams.lon1 = parseAngle(s, Param.lon_1.key);
+        }
+        s = parameters.get(Param.lon_2.key);
+        if (s != null) {
+            projParams.lon2 = parseAngle(s, Param.lon_2.key);
+        }
+        if (parameters.containsKey(Param.no_off.key) || parameters.containsKey(Param.no_uoff.key)) {
+            projParams.no_off = true;
         }
         proj.initialize(projParams);

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

@@ -35 +35 @@
 import org.openstreetmap.josm.data.projection.proj.LonLat;
 import org.openstreetmap.josm.data.projection.proj.Mercator;
+import org.openstreetmap.josm.data.projection.proj.ObliqueMercator;
 import org.openstreetmap.josm.data.projection.proj.PolarStereographic;
 import org.openstreetmap.josm.data.projection.proj.Proj;
@@ -88 +89 @@
         registerBaseProjection("lcc", LambertConformalConic.class, "core");
         registerBaseProjection("lonlat", LonLat.class, "core");
+        registerBaseProjection("omerc", ObliqueMercator.class, "core");
         registerBaseProjection("somerc", SwissObliqueMercator.class, "core");
         registerBaseProjection("stere", PolarStereographic.class, "core");

trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java

@@ -25 +25 @@
 
     /**
+     * Difference allowed in iterative computations.
+     */
+    private static final double ITERATION_TOLERANCE = 1E-10;
+
+    /**
      * Relative iteration precision used in the <code>mlfn</code> method
      */
@@ -153 +158 @@
 
     /**
+     * Iteratively solve equation (7-9) from Snyder.
+     */
+    final double cphi2(final double ts) {
+        final double eccnth = 0.5 * e;
+        double phi = (Math.PI/2) - 2.0 * Math.atan(ts);
+        for (int i=0; i<MAXIMUM_ITERATIONS; i++) {
+            final double con  = e * Math.sin(phi);
+            final double dphi = (Math.PI/2) - 2.0*Math.atan(ts * Math.pow((1-con)/(1+con), eccnth)) - phi;
+            phi += dphi;
+            if (Math.abs(dphi) <= ITERATION_TOLERANCE) {
+                return phi;
+            }
+        }
+        throw new RuntimeException("no convergence");
+    }
+
+    /**
      * Computes function <code>f(s,c,e²) = c/sqrt(1 - s²&times;e²)</code> needed for the true scale
      * latitude (Snyder 14-15), where <var>s</var> and <var>c</var> are the sine and cosine of

trunk/src/org/openstreetmap/josm/data/projection/proj/ProjParameters.java

@@ -14 +14 @@
     public Double lat1;
     public Double lat2;
+
+    // Polar Stereographic
     public Double lat_ts;
+
+    // Oblique Mercator
+    public Double lonc;
+    public Double alpha;
+    public Double gamma;
+    public Boolean no_off;
+    public Double lon1;
+    public Double lon2;
 }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -739 +739 @@
         GeneralPath path = new GeneralPath();
 
+        double d = 1.0;
         path.moveTo(p.x, p.y);
         double max = b.getMax().lat();
-        for (; lat <= max; lat += 1.0) {
+        for (; lat <= max; lat += d) {
             p = getPoint(new LatLon(lat >= max ? max : lat, lon));
             path.lineTo(p.x, p.y);
         }
         lat = max; max = b.getMax().lon();
-        for (; lon <= max; lon += 1.0) {
+        for (; lon <= max; lon += d) {
             p = getPoint(new LatLon(lat, lon >= max ? max : lon));
             path.lineTo(p.x, p.y);
         }
         lon = max; max = b.getMinLat();
-        for (; lat >= max; lat -= 1.0) {
+        for (; lat >= max; lat -= d) {
             p = getPoint(new LatLon(lat <= max ? max : lat, lon));
             path.lineTo(p.x, p.y);
         }
         lat = max; max = b.getMinLon();
-        for (; lon >= max; lon -= 1.0) {
+        for (; lon >= max; lon -= d) {
             p = getPoint(new LatLon(lat, lon <= max ? max : lon));
             path.lineTo(p.x, p.y);