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 2015/07/18 10:01:57 UTC
svn commit: r1691698 - in /sis/branches/JDK8/core/sis-referencing/src:
main/java/org/apache/sis/referencing/operation/projection/
test/java/org/apache/sis/referencing/operation/projection/
test/java/org/apache/sis/test/suite/
Author: desruisseaux
Date: Sat Jul 18 08:01:56 2015
New Revision: 1691698
URL: http://svn.apache.org/r1691698
Log:
Renamed 'AbstractLambertConformal' as 'ConformalProjection'.
Added:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
- copied, changed from r1691621, sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformal.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
- copied, changed from r1691393, sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformalTest.java
Removed:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformal.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformalTest.java
Modified:
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/Mercator.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/projection/PolarStereographic.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConformalTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
Copied: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java (from r1691621, sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformal.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java&p1=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformal.java&r1=1691621&r2=1691698&rev=1691698&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformal.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java [UTF-8] Sat Jul 18 08:01:56 2015
@@ -43,7 +43,7 @@ import static java.lang.Math.*;
* @version 0.6
* @module
*/
-abstract class AbstractLambertConformal extends NormalizedProjection {
+abstract class ConformalProjection extends NormalizedProjection {
/**
* For cross-version compatibility.
*/
@@ -101,7 +101,7 @@ abstract class AbstractLambertConformal
* @param roles Parameters to look for <cite>central meridian</cite>, <cite>scale factor</cite>,
* <cite>false easting</cite>, <cite>false northing</cite> and other values.
*/
- protected AbstractLambertConformal(final OperationMethod method, final Parameters parameters,
+ protected ConformalProjection(final OperationMethod method, final Parameters parameters,
final Map<ParameterRole, ? extends ParameterDescriptor<Double>> roles)
{
super(method, parameters, roles);
@@ -138,7 +138,7 @@ abstract class AbstractLambertConformal
* formulas instead than the ellipsoidal ones. This constructor allows to transfer all parameters to the new
* instance without recomputing them.
*/
- AbstractLambertConformal(final AbstractLambertConformal other) {
+ ConformalProjection(final ConformalProjection other) {
super(other);
useIterations = other.useIterations;
c2χ = other.c2χ;
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=1691698&r1=1691697&r2=1691698&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] Sat Jul 18 08:01:56 2015
@@ -64,7 +64,7 @@ import static org.apache.sis.math.MathFu
* @version 0.6
* @module
*/
-public class LambertConformal extends AbstractLambertConformal {
+public class LambertConformal extends ConformalProjection {
/**
* For cross-version compatibility.
*/
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java?rev=1691698&r1=1691697&r2=1691698&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java [UTF-8] Sat Jul 18 08:01:56 2015
@@ -76,7 +76,7 @@ import static org.apache.sis.math.MathFu
* @see TransverseMercator
* @see ObliqueMercator
*/
-public class Mercator extends AbstractLambertConformal {
+public class Mercator extends ConformalProjection {
/**
* For cross-version compatibility.
*/
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=1691698&r1=1691697&r2=1691698&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] Sat Jul 18 08:01:56 2015
@@ -143,7 +143,7 @@ public abstract class NormalizedProjecti
/**
* Desired accuracy for the result of iterative computations, in radians.
- * This constant defines the desired accuracy of methods like {@link AbstractLambertConformal#φ(double)}.
+ * This constant defines the desired accuracy of methods like {@link ConformalProjection#φ(double)}.
*
* <p>The current value is 0.25 time the accuracy derived from {@link Formulas#LINEAR_TOLERANCE}.
* So if the linear tolerance is 1 cm, then the accuracy that we will seek for is 0.25 cm (about
@@ -866,7 +866,7 @@ public abstract class NormalizedProjecti
*
* <p>The Mercator projection is given by the {@linkplain Math#log(double) natural logarithm}
* of the value returned by this method. This function is <em>almost</em> the converse of
- * {@link AbstractLambertConformal#φ(double)}.
+ * {@link ConformalProjection#φ(double)}.
*
* <p>In IOGP Publication 373-7-2 – Geomatics Guidance Note number 7, part 2 – April 2015,
* a function closely related to this one has the letter <var>t</var>.</p>
@@ -914,7 +914,7 @@ public abstract class NormalizedProjecti
* @param ℯsinφ The sine of the φ argument multiplied by {@link #excentricity}.
* @return {@code Math.exp} of the Mercator projection of the given latitude.
*
- * @see AbstractLambertConformal#φ(double)
+ * @see ConformalProjection#φ(double)
* @see #dy_dφ(double, double)
*/
final double expOfNorthing(final double φ, final double ℯsinφ) {
@@ -940,7 +940,7 @@ public abstract class NormalizedProjecti
* @return The partial derivative of a Mercator projection at the given latitude.
*
* @see #expOfNorthing(double, double)
- * @see AbstractLambertConformal#φ(double)
+ * @see ConformalProjection#φ(double)
*/
final double dy_dφ(final double sinφ, final double cosφ) {
return (1 / cosφ) - excentricitySquared * cosφ / (1 - excentricitySquared * (sinφ*sinφ));
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=1691698&r1=1691697&r2=1691698&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] Sat Jul 18 08:01:56 2015
@@ -49,7 +49,7 @@ import static java.lang.Math.*;
* @see EquatorialStereographic
* @see ObliqueStereographic
*/
-public class PolarStereographic extends AbstractLambertConformal { // Seen as a special case of LambertConformal.
+public class PolarStereographic extends ConformalProjection { // Seen as a special case of LambertConformal.
/**
* For cross-version compatibility.
*/
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java?rev=1691698&r1=1691697&r2=1691698&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java [UTF-8] Sat Jul 18 08:01:56 2015
@@ -207,7 +207,7 @@ public class TransverseMercator extends
final double ξ0 = asin(sin(β) * cosh(η0));
// TODO: use trigonometric identities.
- // See AbstractLambertConformal for example.
+ // See ConformalProjection for example.
final double ξ = h4 * sin(8*ξ0) * cosh(8*η0)
+ h3 * sin(6*ξ0) * cosh(6*η0)
+ h2 * sin(4*ξ0) * cosh(4*η0)
@@ -246,7 +246,7 @@ public class TransverseMercator extends
final double ξ = srcPts[srcOff + 1];
// TODO: use trigonometric identities.
- // See AbstractLambertConformal for example.
+ // See ConformalProjection for example.
final double ξ0 = ξ - (ih4 * sin(8*ξ) * cosh(8*η)
+ ih3 * sin(6*ξ) * cosh(6*η)
+ ih2 * sin(4*ξ) * cosh(4*η)
Copied: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java (from r1691393, sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformalTest.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java?p2=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java&p1=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformalTest.java&r1=1691393&r2=1691698&rev=1691698&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AbstractLambertConformalTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] Sat Jul 18 08:01:56 2015
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
/**
- * Tests the {@link AbstractLambertConformal} class.
+ * Tests the {@link ConformalProjection} class.
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.6
@@ -37,30 +37,30 @@ import static org.junit.Assert.*;
* @module
*/
@DependsOn(NormalizedProjectionTest.class)
-public final strictfp class AbstractLambertConformalTest extends TransformTestCase {
+public final strictfp class ConformalProjectionTest extends TransformTestCase {
/**
- * Computes {@link AbstractLambertConformal#expOfNorthing(double, double)} for the given latitude.
+ * Computes {@link ConformalProjection#expOfNorthing(double, double)} for the given latitude.
*
* @param φ The latitude in radians.
* @return {@code Math.exp} of the Mercator projection of the given latitude.
*/
private double expOfNorthing(final double φ) {
- return NormalizedProjectionTest.expOfNorthing((AbstractLambertConformal) transform, φ);
+ return NormalizedProjectionTest.expOfNorthing((ConformalProjection) transform, φ);
}
/**
- * Computes {@link AbstractLambertConformal#φ(double)}.
+ * Computes {@link ConformalProjection#φ(double)}.
*
* @param expOfSouthing The reciprocal of the value returned by {@link #expOfNorthing(double)}.
* @return The latitude in radians.
* @throws ProjectionException if the iteration does not converge.
*/
private double φ(final double expOfSouthing) throws ProjectionException {
- return ((AbstractLambertConformal) transform).φ(expOfSouthing);
+ return ((ConformalProjection) transform).φ(expOfSouthing);
}
/**
- * Tests the {@link AbstractLambertConformal#φ(double)} function. We expect it to be
+ * Tests the {@link ConformalProjection#φ(double)} function. We expect it to be
* the converse of the {@link NormalizedProjection#expOfNorthing(double, double)} function.
* In theory only the [-90° … +90°] range needs to be tested. However the function is still
* consistent in the [-90° … +270°] range so we test that range for tracking this fact.
@@ -117,10 +117,10 @@ public final strictfp class AbstractLamb
* <li>φ values computed by an iterative method.</li>
* <li>φ values computed by the series expansion given by EPSG guide.</li>
* <li>φ values computed by modified form of series expansion, using trigonometric identities.</li>
- * <li>φ values computed by the actual {@link AbstractLambertConformal} implementation.</li>
+ * <li>φ values computed by the actual {@link ConformalProjection} implementation.</li>
* </ol>
*
- * {@link AbstractLambertConformal#φ(double)} which uses a mix of 1 and 3 in the above list.
+ * {@link ConformalProjection#φ(double)} which uses a mix of 1 and 3 in the above list.
* See {@link MercatorMethodComparison} for a discussion.
*
* @throws ProjectionException if an error occurred during computation of φ.
@@ -129,7 +129,7 @@ public final strictfp class AbstractLamb
*/
@Test
public void compareWithSeriesExpansion() throws ProjectionException {
- final AbstractLambertConformal projection = new NoOp(true);
+ final ConformalProjection projection = new NoOp(true);
final MercatorMethodComparison comparator = new MercatorMethodComparison(projection.excentricitySquared);
final Random random = TestUtilities.createRandomNumberGenerator();
final int numSamples = 2000;
Modified: 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/LambertConformalTest.java?rev=1691698&r1=1691697&r2=1691698&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/LambertConformalTest.java [UTF-8] Sat Jul 18 08:01:56 2015
@@ -50,7 +50,7 @@ import static org.junit.Assert.*;
* @version 0.6
* @module
*/
-@DependsOn(AbstractLambertConformalTest.class)
+@DependsOn(ConformalProjectionTest.class)
public final strictfp class LambertConformalTest extends MapProjectionTestCase {
/**
* Creates a new instance of {@link LambertConformal}. See the class javadoc for an explanation
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java?rev=1691698&r1=1691697&r2=1691698&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] Sat Jul 18 08:01:56 2015
@@ -112,7 +112,7 @@ public final class MercatorMethodCompari
/**
* Computes φ using the series expansion given by Geomatics Guidance Note number 7, part 2.
- * This is the first part of the {@link AbstractLambertConformal#φ(double)} method.
+ * This is the first part of the {@link ConformalProjection#φ(double)} method.
*
* @param t The {@code expOfSouthing} parameter value.
* @return The latitude (in radians) for the given parameter.
@@ -151,7 +151,7 @@ public final class MercatorMethodCompari
/**
* Computes φ using the iterative method used by USGS.
- * This is the second part of the {@link AbstractLambertConformal#φ(double)} method.
+ * This is the second part of the {@link ConformalProjection#φ(double)} method.
*
* @param t The {@code expOfSouthing} parameter value.
* @return The latitude (in radians) for the given parameter.
@@ -174,7 +174,7 @@ public final class MercatorMethodCompari
}
/**
- * Basically a copy of {@link AbstractLambertConformal#expOfNorthing(double, double)}.
+ * Basically a copy of {@link ConformalProjection#expOfNorthing(double, double)}.
*/
final double expOfNorthing(final double φ) {
final double ℯsinφ = excentricity * sin(φ);
@@ -195,15 +195,15 @@ public final class MercatorMethodCompari
/**
* Implementation of {@link #printAccuracyComparison(int)} and {@link #printErrorForExcentricities(double,double)},
- * optionally with a comparison with {@link AbstractLambertConformal}.
+ * optionally with a comparison with {@link ConformalProjection}.
*/
- private void compare(final AbstractLambertConformal projection, final int numSamples, final TableAppender summarize)
+ private void compare(final ConformalProjection projection, final int numSamples, final TableAppender summarize)
throws ProjectionException
{
final Statistics iterativeMethodErrors = new Statistics("Iterative method error");
final Statistics seriesExpansionErrors = new Statistics("Series expansion error");
final Statistics usingTrigoIdentErrors = new Statistics("Using trigonometric identities");
- final Statistics abstractLambertErrors = new Statistics("'AbstractLambertConformal' error");
+ final Statistics abstractLambertErrors = new Statistics("'ConformalProjection' error");
final Random random = new Random();
for (int i=0; i<numSamples; i++) {
final double φ = random.nextDouble() * PI - PI/2;
@@ -260,7 +260,7 @@ public final class MercatorMethodCompari
* Prints the error of the two methods for various excentricity values.
* The intend of this method is to find an excentricity threshold value where we consider the errors too high.
*
- * <p>This method is used for determining empirically a value for {@link AbstractLambertConformal#EXCENTRICITY_THRESHOLD}.
+ * <p>This method is used for determining empirically a value for {@link ConformalProjection#EXCENTRICITY_THRESHOLD}.
* The current threshold value is shown by inserting a horizontal line separator in the table when that threshold
* is crossed.</p>
*
@@ -281,7 +281,7 @@ public final class MercatorMethodCompari
final double step = 0.01;
double excentricity;
for (int i=0; (excentricity = min + step*i) < max; i++) {
- if (!crossThreshold && excentricity >= AbstractLambertConformal.EXCENTRICITY_THRESHOLD) {
+ if (!crossThreshold && excentricity >= ConformalProjection.EXCENTRICITY_THRESHOLD) {
crossThreshold = true;
table.appendHorizontalSeparator();
}
@@ -345,13 +345,13 @@ public final class MercatorMethodCompari
out.println("Comparison of the errors for a sphere.");
out.println("The errors should be almost zero:");
out.println();
- AbstractLambertConformal projection = new NoOp(false);
+ ConformalProjection projection = new NoOp(false);
MercatorMethodComparison c = new MercatorMethodComparison(projection);
c.compare(projection, 10000, null);
out.println();
out.println("Comparison of the errors for the WGS84 excentricity.");
- out.println("The 'AbstractLambertConformal' errors should be the same than the series expansion errors:");
+ out.println("The 'ConformalProjection' errors should be the same than the series expansion errors:");
out.println();
projection = new NoOp(true);
c = new MercatorMethodComparison(projection);
@@ -359,7 +359,7 @@ public final class MercatorMethodCompari
out.println();
out.println("Comparison of the errors for the excentricity of an imaginary ellipsoid.");
- out.println("The 'AbstractLambertConformal' errors should be the close to the iterative method errors:");
+ out.println("The 'ConformalProjection' errors should be the close to the iterative method errors:");
out.println();
projection = new NoOp(100, 95);
c = new MercatorMethodComparison(projection);
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java?rev=1691698&r1=1691697&r2=1691698&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] Sat Jul 18 08:01:56 2015
@@ -46,7 +46,7 @@ import static org.apache.sis.referencing
* @version 0.6
* @module
*/
-@DependsOn(AbstractLambertConformalTest.class)
+@DependsOn(ConformalProjectionTest.class)
public final strictfp class MercatorTest extends MapProjectionTestCase {
/**
* Creates a new instance of {@link Mercator} for a sphere or an ellipsoid.
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java?rev=1691698&r1=1691697&r2=1691698&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java [UTF-8] Sat Jul 18 08:01:56 2015
@@ -38,7 +38,7 @@ import org.apache.sis.util.Workaround;
* @module
*/
@SuppressWarnings("serial")
-final strictfp class NoOp extends AbstractLambertConformal {
+final strictfp class NoOp extends ConformalProjection {
/**
* Creates a new "no-operation".
*
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=1691698&r1=1691697&r2=1691698&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] Sat Jul 18 08:01:56 2015
@@ -101,7 +101,7 @@ import org.junit.BeforeClass;
// Test map projections. Those tests need the providers tested above.
org.apache.sis.referencing.operation.projection.NormalizedProjectionTest.class,
org.apache.sis.referencing.operation.projection.EquirectangularTest.class,
- org.apache.sis.referencing.operation.projection.AbstractLambertConformalTest.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.TransverseMercatorTest.class,