commit 8682b7700f7dcf1ac89792b434c09c5ca461898c
author Martin Desruisseaux <desruisseaux@apache.org> Fri Jul 15 17:00:10 2016 +0000
committer Martin Desruisseaux <desruisseaux@apache.org> Fri Jul 15 17:00:10 2016 +0000
tree 268691031e9ace8c8b294811440a5bb4e20ef8bc
parent 020e817cd4d4c66245c1708d3baa4fa54b754b27

Additional info in the MathFunctions.atanh(double) method.
One less level of indirection in PolarStereographicSouth (may reduce class loading).
Use a separated property in the Ant script for SIS version of the branch from which to create a release.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK8@1752853 13f79535-47bb-0310-9956-ffa450edef68

core/sis-build-helper/src/main/ant/prepare-release.xml

diff --git a/core/sis-build-helper/src/main/ant/prepare-release.xml b/core/sis-build-helper/src/main/ant/prepare-release.xml
index 08e3028..221cb78 100644
--- a/core/sis-build-helper/src/main/ant/prepare-release.xml
+++ b/core/sis-build-helper/src/main/ant/prepare-release.xml
@@ -32,7 +32,7 @@
     <!-- Ensure that the "sis-build-helper" plugin used by the build is the released version. -->
     <replaceregexp file = "${user.dir}/pom.xml"
                   match = "&lt;sis\.plugin\.version&gt;.+&lt;/sis\.plugin\.version&gt;"
-                replace = "&lt;sis.plugin.version&gt;${sis.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"/>
+                replace = "&lt;sis.plugin.version&gt;${branch.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"/>
                 <!-- The -SNAPSHOT part will be removed later, at tag creation. -->
 
     <!-- Replace the version number in Java code. -->
@@ -44,9 +44,9 @@
     <replace dir="${user.dir}" failOnNoReplacements="true">
       <include name="**/pom.xml"/>
       <replacefilter token="svn.apache.org/repos/asf/sis/trunk"
-                     value="svn.apache.org/repos/asf/sis/branches/${sis.version}"/>
+                     value="svn.apache.org/repos/asf/sis/branches/${branch.version}"/>
       <replacefilter token="svn.apache.org/viewvc/sis/trunk"
-                     value="svn.apache.org/viewvc/sis/branches/${sis.version}"/>
+                     value="svn.apache.org/viewvc/sis/branches/${branch.version}"/>
     </replace>
   </target>
 
@@ -58,18 +58,18 @@
     <!-- Replace URL to branch by URL to the branch on Subversion. -->
     <replace dir="${user.dir}" failOnNoReplacements="true">
       <include name="**/pom.xml"/>
-      <replacefilter token="svn.apache.org/repos/asf/sis/branches/${sis.version}"
+      <replacefilter token="svn.apache.org/repos/asf/sis/branches/${branch.version}"
                      value="svn.apache.org/repos/asf/sis/tags/${sis.version}"/>
-      <replacefilter token="svn.apache.org/viewvc/sis/branches/${sis.version}"
+      <replacefilter token="svn.apache.org/viewvc/sis/branches/${branch.version}"
                      value="svn.apache.org/viewvc/sis/tags/${sis.version}"/>
     </replace>
 
     <!-- Replace version numbers. Note that no snapshot other than SIS can exist at this point. -->
     <replace dir="${user.dir}" failOnNoReplacements="true">
       <include name="**/pom.xml"/>
-      <replacefilter token="&lt;version&gt;${sis.version}-SNAPSHOT&lt;/version&gt;"
+      <replacefilter token="&lt;version&gt;${branch.version}-SNAPSHOT&lt;/version&gt;"
                      value="&lt;version&gt;${sis.version}&lt;/version&gt;"/>
-      <replacefilter token="&lt;sis.plugin.version&gt;${sis.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"
+      <replacefilter token="&lt;sis.plugin.version&gt;${branch.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"
                      value="&lt;sis.plugin.version&gt;${sis.version}&lt;/sis.plugin.version&gt;"/>
     </replace>
   </target>

core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java

diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
index 7a13b5c..f3ae95f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
@@ -70,8 +70,8 @@
 
             forESRI(PolarStereographicB.LONGITUDE_OF_ORIGIN, builder),
                     PolarStereographicB.SCALE_FACTOR,                   // Not formally a parameter of this projection.
-            forESRI(PolarStereographicB.FALSE_EASTING, builder),
-            forESRI(PolarStereographicB.FALSE_NORTHING, builder)
+            forESRI(CylindricalEqualArea.FALSE_EASTING, builder),
+            forESRI(CylindricalEqualArea.FALSE_NORTHING, builder)
         };
 
         PARAMETERS = builder

core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java

diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java b/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
index c3e791d..ec1e6ee 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
@@ -364,6 +364,8 @@
         /*
          * The classical formulas is log((1+x)/(1-x))/2, but the following is more
          * accurate if the (1+x)/(1-x) ratio is close to 1, i.e. if x is close to 0.
+         * This is often the case in Apache SIS since x is often a value close to the
+         * Earth excentricity, which is a small value (0 would be a perfect sphere).
          */
         return 0.5 * Math.log1p(2*x / (1-x));
     }