sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1674161 - in /sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation: matrix/MatrixSIS.java projection/LambertConformal.java projection/NormalizedProjection.java transform/ContextualParameters.java
Date Thu, 16 Apr 2015 22:00:10 GMT
Author: desruisseaux
Date: Thu Apr 16 22:00:09 2015
New Revision: 1674161

URL: http://svn.apache.org/r1674161
Log:
Minor documentation updates.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConformal.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java?rev=1674161&r1=1674160&r2=1674161&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
[UTF-8] Thu Apr 16 22:00:09 2015
@@ -336,8 +336,8 @@ public abstract class MatrixSIS implemen
      *     <td class="sep"><code>at.{@linkplain AffineTransform#translate(double,
double) translate}(offset, 0);
      *     at.{@linkplain AffineTransform#scale(double, double) scale}(scale, 1);</code></td>
      *   </tr><tr>
-     *     <td>{@code concatenate(1, scale, offset)}</td>
-     *     <td class="sep"><code>at.{@linkplain AffineTransform#translate(double,
double) translate}(0, offset);
+     *     <td class="hsep">{@code concatenate(1, scale, offset)}</td>
+     *     <td class="hsep sep"><code>at.{@linkplain AffineTransform#translate(double,
double) translate}(0, offset);
      *     at.{@linkplain AffineTransform#scale(double, double) scale}(1, scale);</code></td>
      *   </tr>
      * </table>

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConformal.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConformal.java?rev=1674161&r1=1674160&r2=1674161&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConformal.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConformal.java
[UTF-8] Thu Apr 16 22:00:09 2015
@@ -152,8 +152,8 @@ public class LambertConformal extends No
         final DoubleDouble F = new DoubleDouble(-pow(t1, -n), 0);
         F.multiply(m1, 0);
         F.divide(n, 0);
-        final DoubleDouble ρ0 = new DoubleDouble();         // Initialized to zero.
-        if (abs(abs(φ0) - PI/2) >= ANGULAR_TOLERANCE) {
+        final DoubleDouble ρ0 = new DoubleDouble();    // Initialized to zero.
+        if (φ0 != copySign(PI/2, -n)) {    // For avoiding the rounding error documented
in expOfNorthing(+π/2).
             ρ0.value = pow(expOfNorthing(φ0, excentricity*sin(φ0)), n);
             ρ0.multiply(F);
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java?rev=1674161&r1=1674160&r2=1674161&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] Thu Apr 16 22:00:09 2015
@@ -215,15 +215,15 @@ public abstract class NormalizedProjecti
      * </ul>
      *
      * In matrix form, this constructor creates the following matrices (subclasses are free
to modify):
-     * <table class="sis" style="td {vertical-align: middle}">
+     * <table class="sis">
      *   <caption>Initial matrix coefficients after construction</caption>
      *   <tr>
      *     <th>Normalization</th>
-     *     <th>Denormalization</th>
+     *     <th class="sep">Denormalization</th>
      *   </tr>
      *   <tr>
      *     <td>{@include ../transform/formulas.html#NormalizeGeographic}</td>
-     *     <td>{@include ../transform/formulas.html#DenormalizeCartesian}</td>
+     *     <td class="sep">{@include ../transform/formulas.html#DenormalizeCartesian}</td>
      *   </tr>
      * </table>
      *
@@ -233,7 +233,7 @@ public abstract class NormalizedProjecti
      * <ul>
      *   <li>{@code "semi_major"}       (mandatory)</li>
      *   <li>{@code "semi_minor"}       (mandatory)</li>
-     *   <li>{@code "central_meridian"} default to 0°)</li>
+     *   <li>{@code "central_meridian"} (default to 0°)</li>
      *   <li>{@code "scale_factor"}     (optional, default to 1)</li>
      *   <li>{@code "false_easting"}    (default to 0 metre)</li>
      *   <li>{@code "false_northing"}   (default to 0 metre)</li>
@@ -242,13 +242,13 @@ public abstract class NormalizedProjecti
      * <div class="note"><b>Note:</b>
      * Apache SIS uses EPSG names as much as possible, but this constructor is an exception
to this rule.
      * In this particular case we use OGC names because they are identical for a wide range
of projections.
-     * For example there is at least three different EPSG names for the <cite>scale
factor</cite> parameter,
+     * For example there is at least three different EPSG names for the <cite>"scale
factor"</cite> parameter,
      * depending on the projection:
      *
      * <ul>
-     *   <li><cite>Scale factor at natural origin</cite></li>
-     *   <li><cite>Scale factor on initial line</cite></li>
-     *   <li><cite>Scale factor on pseudo standard parallel</cite></li>
+     *   <li>Scale factor at natural origin</li>
+     *   <li>Scale factor on initial line</li>
+     *   <li>Scale factor on pseudo standard parallel</li>
      * </ul>
      *
      * OGC defines only {@code "scale_factor"} for all, which makes a convenient name to
look for in this

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java?rev=1674161&r1=1674160&r2=1674161&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
[UTF-8] Thu Apr 16 22:00:09 2015
@@ -255,24 +255,21 @@ public class ContextualParameters extend
      *
      *
      * <div class="section">Application to map projections</div>
-     * After {@link org.apache.sis.referencing.operation.projection.NormalizedProjection}
construction,
-     * those matrices are initialized to the following values:
+     * After {@link org.apache.sis.referencing.operation.projection.NormalizedProjection}
construction, the matrices
+     * returned by {@code projection.getContextualParameters().getMatrix(…)} are initialized
to the values shown below.
+     * Note that some {@code NormalizedProjection} subclasses apply further modifications
to those matrices.
      *
-     * <table class="sis" style="td {vertical-align: middle}">
+     * <table class="sis">
      *   <caption>Initial matrix coefficients after construction</caption>
      *   <tr>
      *     <th>{@code getMatrix(true)}</th>
-     *     <th>{@code getMatrix(false)}</th>
+     *     <th class="sep">{@code getMatrix(false)}</th>
      *   </tr><tr>
      *     <td>{@include formulas.html#NormalizeGeographic}</td>
-     *     <td>{@include formulas.html#DenormalizeCartesian}</td>
+     *     <td class="sep">{@include formulas.html#DenormalizeCartesian}</td>
      *   </tr>
      * </table>
      *
-     * <div class="note"><b>Note:</b>
-     * Some {@code NormalizedProjection} subclasses apply further modifications on those
matrices.
-     * </div>
-     *
      * @param  norm {@code true} for fetching the <cite>normalization</cite>
transform to apply before the kernel,
      *         or {@code false} for the <cite>denormalization</cite> transform
to apply after the kernel.
      * @return The matrix for the requested normalization ({@code true}) or denormalization
({@code false}) affine transform.



Mime
View raw message