Author: desruisseaux
Date: Tue Jul 28 17:27:31 2015
New Revision: 1693136
URL: http://svn.apache.org/r1693136
Log:
Renamed LambertConformal as LambertConicConformal for compliance with common
usage.
Added:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
- copied, changed from r1693133,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConformal.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
- copied, changed from r1693133,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConformalTest.java
Removed:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConformal.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConformalTest.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java?rev=1693136&r1=1693135&r2=1693136&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java
[UTF-8] Tue Jul 28 17:27:31 2015
@@ -20,7 +20,7 @@ import org.opengis.parameter.ParameterDe
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.referencing.operation.ConicProjection;
import org.apache.sis.parameter.Parameters;
-import org.apache.sis.referencing.operation.projection.LambertConformal;
+import org.apache.sis.referencing.operation.projection.LambertConicConformal;
import org.apache.sis.referencing.operation.projection.NormalizedProjection;
@@ -74,6 +74,6 @@ class AbstractLambert extends MapProject
*/
@Override
protected final NormalizedProjection createProjection(final Parameters
parameters) {
- return new LambertConformal(this, parameters);
+ return new LambertConicConformal(this, parameters);
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java?rev=1693136&r1=1693135&r2=1693136&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
[UTF-8] Tue Jul 28 17:27:31 2015
@@ -28,7 +28,7 @@ import static java.lang.Math.*;
/**
- * Base class of {@link LambertConformal}, {@link Mercator} and {@link
PolarStereographic} projections.
+ * Base class of {@link LambertConicConformal}, {@link Mercator} and {@link
PolarStereographic} projections.
* All those projections have in common the property of being
<cite>conformal</cite>, i.e. they preserve
* angles locally. However we do not put this base class in public API because
we do not (yet) guarantee
* than all conformal projections will extend this base class.
Copied:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
(from r1693133,
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/LambertConicConformal.java?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java&p1=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConformal.java&r1=1693133&r2=1693136&rev=1693136&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/LambertConicConformal.java
[UTF-8] Tue Jul 28 17:27:31 2015
@@ -44,7 +44,7 @@ import static org.apache.sis.math.MathFu
/**
- * <cite>Lambert Conical Conformal</cite> projection (EPSG codes 9801, 9802,
9803, 9826, 1051).
+ * <cite>Lambert Conic Conformal</cite> projection (EPSG codes 9801, 9802,
9803, 9826, 1051).
* See the <a
href="http://mathworld.wolfram.com/LambertConformalConicProjection.html";>Lambert
conformal
* conic projection on MathWorld</a> for an overview.
*
@@ -61,7 +61,7 @@ import static org.apache.sis.math.MathFu
* @version 0.6
* @module
*/
-public class LambertConformal extends ConformalProjection {
+public class LambertConicConformal extends ConformalProjection {
/**
* For cross-version compatibility.
*/
@@ -184,7 +184,7 @@ public class LambertConformal extends Co
* @param method Description of the projection parameters.
* @param parameters The parameter values of the projection to create.
*/
- public LambertConformal(final OperationMethod method, final Parameters
parameters) {
+ public LambertConicConformal(final OperationMethod method, final
Parameters parameters) {
this(method, parameters, getVariant(method));
}
@@ -193,7 +193,7 @@ public class LambertConformal extends Co
* ("Relax constraint on placement of this()/super() call in
constructors").
*/
@Workaround(library="JDK", version="1.7")
- private LambertConformal(final OperationMethod method, final Parameters
parameters, final byte type) {
+ private LambertConicConformal(final OperationMethod method, final
Parameters parameters, final byte type) {
super(method, parameters, roles(type));
double φ0 = getAndStore(parameters, ((type & 1) != 0) ? // Odd 'type'
are SP1, even 'type' are SP2.
LambertConformal1SP.LATITUDE_OF_ORIGIN :
LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN);
@@ -268,7 +268,7 @@ public class LambertConformal extends Co
/*
* Computes F = m₁/(n⋅t₁ⁿ) from Geomatics Guidance Note number 7.
* Following constants will be stored in the denormalization matrix,
to be applied after
- * the non-linear formulas implemented by this LambertConformal class.
Opportunistically
+ * the non-linear formulas implemented by this LambertConicConformal
class. Opportunistically
* use double-double arithmetic since we the matrix coefficients will
be stored in this
* format anyway. This makes a change in the 2 or 3 last digits.
*/
@@ -323,14 +323,14 @@ public class LambertConformal extends Co
/**
* Creates a new projection initialized to the same parameters than the
given one.
*/
- LambertConformal(final LambertConformal other) {
+ LambertConicConformal(final LambertConicConformal other) {
super(other);
n = other.n;
}
/**
* Returns the names of additional internal parameters which need to be
taken in account when
- * comparing two {@code LambertConformal} projections or formatting them
in debug mode.
+ * comparing two {@code LambertConicConformal} projections or formatting
them in debug mode.
*/
@Override
String[] getInternalParameterNames() {
@@ -339,7 +339,7 @@ public class LambertConformal extends Co
/**
* Returns the values of additional internal parameters which need to be
taken in account when
- * comparing two {@code LambertConformal} projections or formatting them
in debug mode.
+ * comparing two {@code LambertConicConformal} projections or formatting
them in debug mode.
*/
@Override
double[] getInternalParameterValues() {
@@ -360,7 +360,7 @@ public class LambertConformal extends Co
*/
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
- LambertConformal kernel = this;
+ LambertConicConformal kernel = this;
if (excentricity == 0) {
kernel = new Spherical(this);
}
@@ -473,7 +473,7 @@ public class LambertConformal extends Co
* @version 0.6
* @module
*/
- static final class Spherical extends LambertConformal {
+ static final class Spherical extends LambertConicConformal {
/**
* For cross-version compatibility.
*/
@@ -484,7 +484,7 @@ public class LambertConformal extends Co
*
* @param other The other projection (usually ellipsoidal) from which
to copy the parameters.
*/
- protected Spherical(final LambertConformal other) {
+ protected Spherical(final LambertConicConformal other) {
super(other);
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java?rev=1693136&r1=1693135&r2=1693136&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
[UTF-8] Tue Jul 28 17:27:31 2015
@@ -54,7 +54,7 @@ import static java.lang.Math.*;
* @see EquatorialStereographic
* @see ObliqueStereographic
*/
-public class PolarStereographic extends ConformalProjection { // Seen as a
special case of LambertConformal.
+public class PolarStereographic extends ConformalProjection {
/**
* For cross-version compatibility.
*/
@@ -279,7 +279,7 @@ public class PolarStereographic extends
final boolean derivate) throws ProjectionException
{
/*
- * Note: formulas below are very similar to
LambertConformal.transform(…) with n = -1.
+ * Note: formulas below are very similar to
LambertConicConformal.transform(…) with n = -1.
*/
final double θ = srcPts[srcOff ]; // θ = λ - λ₀
final double φ = srcPts[srcOff+1]; // Sign may be reversed
Copied:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
(from r1693133,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConformalTest.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java?p2=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java&p1=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConformalTest.java&r1=1693133&r2=1693136&rev=1693136&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConformalTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
[UTF-8] Tue Jul 28 17:27:31 2015
@@ -39,9 +39,9 @@ import static org.junit.Assert.*;
/**
- * Tests the {@link LambertConformal} class. We test using various values of
the latitude of origin.
+ * Tests the {@link LambertConicConformal} class. We test using various values
of the latitude of origin.
* We do not test with various values of standard parallels, because it is
just an other way to set
- * the value of the <var>n</var> field in {@code LambertConformal}. As long as
we make this value varying,
+ * the value of the <var>n</var> field in {@code LambertConicConformal}. As
long as we make this value varying,
* the latitude of origin is the simplest approach.
*
* @author Martin Desruisseaux (Geomatys)
@@ -51,9 +51,9 @@ import static org.junit.Assert.*;
* @module
*/
@DependsOn(ConformalProjectionTest.class)
-public final strictfp class LambertConformalTest extends MapProjectionTestCase
{
+public final strictfp class LambertConicConformalTest extends
MapProjectionTestCase {
/**
- * Creates a new instance of {@link LambertConformal}. See the class
javadoc for an explanation
+ * Creates a new instance of {@link LambertConicConformal}. See the class
javadoc for an explanation
* about why we ask only for the latitude of origin and not the standard
parallels.
*
* @param ellipse {@code false} for a sphere, or {@code true} for WGS84
ellipsoid.
@@ -63,9 +63,9 @@ public final strictfp class LambertConfo
final LambertConformal1SP method = new LambertConformal1SP();
final Parameters parameters = parameters(method, ellipse);
parameters.getOrCreate(LambertConformal1SP.LATITUDE_OF_ORIGIN).setValue(latitudeOfOrigin);
- transform = new LambertConformal(method, parameters);
+ transform = new LambertConicConformal(method, parameters);
if (!ellipse) {
- transform = new LambertConformal.Spherical((LambertConformal)
transform);
+ transform = new
LambertConicConformal.Spherical((LambertConicConformal) transform);
}
tolerance = NORMALIZED_TOLERANCE;
validate();
@@ -86,7 +86,7 @@ public final strictfp class LambertConfo
public void testNormalizedWKT() {
createNormalizedProjection(true, 40);
assertWktEqualsRegex("\\Q" +
- "PARAM_MT[“Lambert conformal”,\n" +
+ "PARAM_MT[“Lambert conic conformal”,\n" +
" PARAMETER[“excentricity”, 0.08181919084262157],\n" +
" PARAMETER[“n”, 0.64278760968653\\E\\d*\\]\\]"); //
0.6427876096865393 in the original test.
}
@@ -120,7 +120,7 @@ public final strictfp class LambertConfo
assertEquals ("Inverse -∞", +PI/2, inverseTransform(-INF),
NORMALIZED_TOLERANCE);
// Like the north case, but with sign inversed.
- createNormalizedProjection(((LambertConformal) transform).excentricity
!= 0, -40);
+ createNormalizedProjection(((LambertConicConformal)
transform).excentricity != 0, -40);
validate();
assertEquals ("Not a number", NaN, transform(NaN),
NORMALIZED_TOLERANCE);
@@ -294,7 +294,7 @@ public final strictfp class LambertConfo
testDerivative();
// Make sure that the above methods did not overwrote the 'transform'
field.
- assertEquals("transform.class", LambertConformal.Spherical.class,
transform.getClass());
+ assertEquals("transform.class", LambertConicConformal.Spherical.class,
transform.getClass());
}
/**
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1693136&r1=1693135&r2=1693136&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] Tue Jul 28 17:27:31 2015
@@ -103,7 +103,7 @@ import org.junit.BeforeClass;
org.apache.sis.referencing.operation.projection.EquirectangularTest.class,
org.apache.sis.referencing.operation.projection.ConformalProjectionTest.class,
org.apache.sis.referencing.operation.projection.MercatorTest.class,
- org.apache.sis.referencing.operation.projection.LambertConformalTest.class,
+
org.apache.sis.referencing.operation.projection.LambertConicConformalTest.class,
org.apache.sis.referencing.operation.projection.TransverseMercatorTest.class,
org.apache.sis.referencing.operation.projection.PolarStereographicTest.class,
