sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1828796 - /sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java
Date Tue, 10 Apr 2018 08:18:15 GMT
Author: desruisseaux
Date: Tue Apr 10 08:18:15 2018
New Revision: 1828796

URL: http://svn.apache.org/viewvc?rev=1828796&view=rev
Log:
The γc=0 case do not happen in practice. If it still happen, the generic case is sufficient.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java?rev=1828796&r1=1828795&r2=1828796&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueMercator.java
[UTF-8] Tue Apr 10 08:18:15 2018
@@ -243,12 +243,10 @@ public class ObliqueMercator extends Con
          */
         getContextualParameters().getMatrix(MatrixRole.NORMALIZATION).convertAfter(0, null,
-λ0);
         final MatrixSIS denormalize = getContextualParameters().getMatrix(MatrixRole.DENORMALIZATION);
-        if (γc != 0) {
-            final Matrix3 rotation = new Matrix3();
-            rotation.m00 =   rotation.m11 = cos(γc);
-            rotation.m10 = -(rotation.m01 = sin(γc));
-            denormalize.setMatrix(denormalize.multiply(rotation));
-        }
+        final Matrix3 rotation = new Matrix3();
+        rotation.m00 =   rotation.m11 = cos(γc);
+        rotation.m10 = -(rotation.m01 = sin(γc));
+        denormalize.setMatrix(denormalize.multiply(rotation));
         /*
          * For variant B only, an additional (uc, vc) translation is applied here.
          * Note that the general form of uc works even in  αc = 90°  special case,



Mime
View raw message