This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 1cb9a4913e9c2f760afb6200ef190ec5697f892e
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Sep 28 11:28:03 2023 +0200
After removing the export of projection packages, the `getClass() ==
Foo.class` verifications are no longer necessary.
---
.../apache/sis/referencing/operation/projection/AlbersEqualArea.java | 2 +-
.../org/apache/sis/referencing/operation/projection/CassiniSoldner.java | 2 +-
.../sis/referencing/operation/projection/CylindricalEqualArea.java | 2 +-
.../sis/referencing/operation/projection/LambertConicConformal.java | 2 +-
.../main/org/apache/sis/referencing/operation/projection/Mercator.java | 2 +-
.../referencing/operation/projection/ModifiedAzimuthalEquidistant.java | 2 +-
.../sis/referencing/operation/projection/ObliqueStereographic.java | 2 +-
.../apache/sis/referencing/operation/projection/PolarStereographic.java | 2 +-
.../main/org/apache/sis/referencing/operation/projection/Polyconic.java | 2 +-
.../org/apache/sis/referencing/operation/projection/Sinusoidal.java | 2 +-
.../apache/sis/referencing/operation/projection/TransverseMercator.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
index c8d94cb481..93a4fd502c 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
@@ -203,7 +203,7 @@ public class AlbersEqualArea extends AuthalicConversion {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
AlbersEqualArea kernel = this;
- if (eccentricity == 0 && getClass() == AlbersEqualArea.class) {
+ if (eccentricity == 0) {
kernel = new Spherical(this);
}
return kernel.completeWithWraparound(factory);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java
index 6dbeaadb2a..1f176e8123 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java
@@ -225,7 +225,7 @@ public class CassiniSoldner extends MeridianArcBased {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
CassiniSoldner kernel = this;
- if ((eccentricity == 0 && variant == null) && getClass() ==
CassiniSoldner.class) {
+ if (eccentricity == 0 && variant == null) {
kernel = new Spherical(this);
}
return context.completeTransform(factory, kernel);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
index 129252b61b..a547b5b675 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
@@ -211,7 +211,7 @@ public class CylindricalEqualArea extends
AuthalicConversion {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
CylindricalEqualArea kernel = this;
- if ((variant == Variant.SPHERICAL || eccentricity == 0) && getClass()
== CylindricalEqualArea.class) {
+ if (variant == Variant.SPHERICAL || eccentricity == 0) {
kernel = new Spherical(this);
}
return context.completeTransform(factory, kernel);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
index 66c558df56..261f28dd9c 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
@@ -401,7 +401,7 @@ public class LambertConicConformal extends
ConformalProjection {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
LambertConicConformal kernel = this;
- if (eccentricity == 0 && getClass() == LambertConicConformal.class) {
+ if (eccentricity == 0) {
kernel = new Spherical(this);
}
return kernel.completeWithWraparound(factory);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
index 1690c4f49b..39eb958878 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
@@ -352,7 +352,7 @@ public class Mercator extends ConformalProjection {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
NormalizedProjection kernel = this;
-subst: if (variant.spherical || (eccentricity == 0 && getClass() ==
Mercator.class)) {
+subst: if (variant.spherical || eccentricity == 0) {
if (variant == Variant.AUXILIARY && eccentricity != 0) {
final int type =
context.getValue(MercatorAuxiliarySphere.AUXILIARY_SPHERE_TYPE);
if (type == AuthalicMercator.TYPE) {
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java
index 6f77e581d2..60b6122d6a 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java
@@ -145,7 +145,7 @@ public class ModifiedAzimuthalEquidistant extends
AzimuthalEquidistant {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
AzimuthalEquidistant kernel = this;
- if (eccentricity == 0 && getClass() ==
ModifiedAzimuthalEquidistant.class) {
+ if (eccentricity == 0) {
kernel = new AzimuthalEquidistant(this);
}
return context.completeTransform(factory, kernel);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
index 9ced299105..f499fd0000 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
@@ -237,7 +237,7 @@ public class ObliqueStereographic extends
NormalizedProjection {
return delegate(factory, PolarStereographicA.NAME);
}
}
- if (eccentricity == 0 && getClass() == ObliqueStereographic.class) {
+ if (eccentricity == 0) {
return context.completeTransform(factory, new Spherical(this));
}
return completeWithWraparound(factory);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
index b32cb5afb6..e378a3901d 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
@@ -296,7 +296,7 @@ public class PolarStereographic extends ConformalProjection
{
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
PolarStereographic kernel = this;
- if (eccentricity == 0 && getClass() == PolarStereographic.class) {
+ if (eccentricity == 0) {
kernel = new Spherical(this);
}
return context.completeTransform(factory, kernel);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java
index 941167d8e7..f0372cdb00 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java
@@ -158,7 +158,7 @@ public class Polyconic extends MeridianArcBased {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
Polyconic kernel = this;
- if (eccentricity == 0 && getClass() == Polyconic.class) {
+ if (eccentricity == 0) {
kernel = new Spherical(this);
}
return context.completeTransform(factory, kernel);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java
index 377290a7a6..b74b066d90 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java
@@ -156,7 +156,7 @@ public class Sinusoidal extends MeridianArcBased {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
Sinusoidal kernel = this;
- if ((eccentricity == 0 && getClass() == Sinusoidal.class) || variant
== Variant.PSEUDO) {
+ if (eccentricity == 0 || variant == Variant.PSEUDO) {
kernel = new Spherical(this);
}
return context.completeTransform(factory, kernel);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
index 7d48c19c14..f7b7d78380 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
@@ -360,7 +360,7 @@ public class TransverseMercator extends
NormalizedProjection {
@Override
public MathTransform createMapProjection(final MathTransformFactory
factory) throws FactoryException {
TransverseMercator kernel = this;
- if (eccentricity == 0 && getClass() == TransverseMercator.class) {
+ if (eccentricity == 0) {
kernel = new Spherical(this);
}
return context.completeTransform(factory, kernel);
