You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/02/15 09:52:35 UTC
svn commit: r1783083 -
/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
Author: desruisseaux
Date: Wed Feb 15 09:52:34 2017
New Revision: 1783083
URL: http://svn.apache.org/viewvc?rev=1783083&view=rev
Log:
Fix the parameter values for Universal Polar Stereographic (UPS) projection.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java?rev=1783083&r1=1783082&r2=1783083&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java [UTF-8] Wed Feb 15 09:52:34 2017
@@ -120,10 +120,10 @@ public final class PolarStereographicA e
* @since 0.8
*/
public static int isUPS(final ParameterValueGroup group) {
- if (Numerics.epsilonEqual(group.parameter(Constants.SCALE_FACTOR) .doubleValue(Units.UNITY), 1, Numerics.COMPARISON_THRESHOLD) &&
- Numerics.epsilonEqual(group.parameter(Constants.FALSE_EASTING) .doubleValue(Units.METRE), 0, Formulas.LINEAR_TOLERANCE) &&
- Numerics.epsilonEqual(group.parameter(Constants.FALSE_NORTHING) .doubleValue(Units.METRE), 0, Formulas.LINEAR_TOLERANCE) &&
- Numerics.epsilonEqual(group.parameter(Constants.CENTRAL_MERIDIAN).doubleValue(Units.DEGREE), 0, Formulas.ANGULAR_TOLERANCE))
+ if (Numerics.epsilonEqual(group.parameter(Constants.SCALE_FACTOR) .doubleValue(Units.UNITY), 0.994, Numerics.COMPARISON_THRESHOLD) &&
+ Numerics.epsilonEqual(group.parameter(Constants.FALSE_EASTING) .doubleValue(Units.METRE), 2000000, Formulas.LINEAR_TOLERANCE) &&
+ Numerics.epsilonEqual(group.parameter(Constants.FALSE_NORTHING) .doubleValue(Units.METRE), 2000000, Formulas.LINEAR_TOLERANCE) &&
+ Numerics.epsilonEqual(group.parameter(Constants.CENTRAL_MERIDIAN).doubleValue(Units.DEGREE), 0, Formulas.ANGULAR_TOLERANCE))
{
final double \u03c6 = group.parameter(Constants.LATITUDE_OF_ORIGIN).doubleValue(Units.DEGREE);
if (Numerics.epsilonEqual(\u03c6, Latitude.MAX_VALUE, Formulas.ANGULAR_TOLERANCE)) return +1;