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

Timestamp:

2017-02-10T15:44:42+01:00 (7 years ago)

Author:

bastiK

Message:

applied #14346 Rotation angle for Transverse Mercator projection (based on patch by anonymous)

File:

• trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (modified) (6 diffs)

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

@@ -47 +47 @@
  * at the time of migration.
  * <p>
- *
+ * The non-standard parameter <code>gamma</code> has been added as a method
+ * to rotate the projected coordinates by a certain angle (clockwise, see
+ * {@link ObliqueMercator}).
+ * <p>
  * <b>References:</b>
  * <ul>
@@ -107 +110 @@
     private double ml0;
 
+    /**
+     * The rectified bearing of the central line, in radians.
+     */
+    protected double rectifiedGridAngle;
+
+    /**
+     * Sine and Cosine values for the coordinate system rotation angle
+     */
+    private double sinrot, cosrot;
+
     @Override
     public String getName() {
@@ -125 +138 @@
         latitudeOfOrigin = params.lat0 == null ? 0 : Math.toRadians(params.lat0);
         ml0 = mlfn(latitudeOfOrigin, Math.sin(latitudeOfOrigin), Math.cos(latitudeOfOrigin));
+
+        if (params.gamma != null) {
+                rectifiedGridAngle = Math.toRadians(params.gamma);
+        } else {
+                rectifiedGridAngle = 0.0;
+        }
+        sinrot = Math.sin(rectifiedGridAngle);
+        cosrot = Math.cos(rectifiedGridAngle);
+
     }
 
@@ -131 +153 @@
         double sinphi = Math.sin(y);
         double cosphi = Math.cos(y);
+        double u, v;
 
         double t = (Math.abs(cosphi) > EPSILON) ? sinphi/cosphi : 0;
@@ -151 +174 @@
             FC7 * als * (61.0+ t*(t*(179.0 - t) - 479.0)))));
 
+        u=y; v=x;
+        x = v * cosrot + u * sinrot;
+        y = u * cosrot - v * sinrot;
+
         return new double[] {x, y};
     }
@@ -156 +183 @@
     @Override
     public double[] invproject(double x, double y) {
+        double v = x * cosrot - y * sinrot;
+        double u = y * cosrot + x * sinrot;
+        x=v; y=u;
+
         double phi = invMlfn(ml0 + y);