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 1e65345fcb82a7fb0198b75766a678b5824d47a3
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Apr 29 17:45:54 2020 +0200
Add SCALE_FACTOR parameter on CylindricalEqualArea and add some comments in other places.
---
.../referencing/provider/LambertConformalWest.java | 2 +-
.../provider/LambertCylindricalEqualArea.java | 22 ++++++++++++++++++++--
.../LambertCylindricalEqualAreaSpherical.java | 2 +-
.../provider/TransverseMercatorSouth.java | 2 +-
.../operation/projection/CylindricalEqualArea.java | 3 ++-
5 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
index 08636cc..3cfc5c5 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
@@ -88,7 +88,7 @@ public final class LambertConformalWest extends AbstractLambert {
LambertConformal1SP.LATITUDE_OF_ORIGIN,
LambertConformal1SP.LONGITUDE_OF_ORIGIN,
LambertConformal1SP.SCALE_FACTOR,
- FALSE_WESTING,
+ FALSE_WESTING, // Same as `FALSE_EASTING`
with only an additional comment.
LambertConformal1SP.FALSE_NORTHING);
}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java
index fd83e7e..2124c04 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java
@@ -30,7 +30,7 @@ import org.apache.sis.referencing.operation.projection.CylindricalEqualArea;
* The provider for <cite>"Lambert Cylindrical Equal Area"</cite> projection
(EPSG:9835).
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.1
*
* @see <a href="http://geotiff.maptools.org/proj_list/cylindrical_equal_area.html">GeoTIFF
parameters for Cylindrical Equal Area</a>
*
@@ -83,6 +83,24 @@ public final class LambertCylindricalEqualArea extends MapProjection {
public static final ParameterDescriptor<Double> LONGITUDE_OF_ORIGIN = Mercator1SP.LONGITUDE_OF_ORIGIN;
/**
+ * The operation parameter descriptor for the <cite>Scale factor at natural origin</cite>
(k₀) parameter value.
+ * Valid values range is (0 … ∞) and default value is 1. This is not formally a parameter
of this projection.
+ *
+ * <!-- Generated by ParameterNameTableGenerator -->
+ * <table class="sis">
+ * <caption>Parameter names</caption>
+ * <tr><td> OGC: </td><td> scale_factor </td></tr>
+ * <tr><td> ESRI: </td><td> Scale_Factor </td></tr>
+ * <tr><td> Proj4: </td><td> k </td></tr>
+ * </table>
+ * <b>Notes:</b>
+ * <ul>
+ * <li>Optional</li>
+ * </ul>
+ */
+ public static final ParameterDescriptor<Double> SCALE_FACTOR = Mercator2SP.SCALE_FACTOR;
+
+ /**
* The operation parameter descriptor for the <cite>False easting</cite>
(FE) parameter value.
* Valid values range is unrestricted and default value is 0 metre.
*
@@ -132,7 +150,7 @@ public final class LambertCylindricalEqualArea extends MapProjection {
.createGroupForMapProjection(
STANDARD_PARALLEL,
LONGITUDE_OF_ORIGIN,
- Mercator2SP.SCALE_FACTOR, // Not formally a Cylindrical
Equal Area parameter.
+ SCALE_FACTOR, // Not formally a Cylindrical Equal Area
parameter.
FALSE_EASTING,
FALSE_NORTHING);
}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualAreaSpherical.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualAreaSpherical.java
index c4ce09c..62d617f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualAreaSpherical.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualAreaSpherical.java
@@ -55,7 +55,7 @@ public final class LambertCylindricalEqualAreaSpherical extends MapProjection
{
.createGroupForMapProjection(
LambertCylindricalEqualArea.STANDARD_PARALLEL,
LambertCylindricalEqualArea.LONGITUDE_OF_ORIGIN,
- Mercator2SP.SCALE_FACTOR, // Not formally a Cylindrical
Equal Area parameter.
+ LambertCylindricalEqualArea.SCALE_FACTOR, // Not formally a Cylindrical
Equal Area parameter.
LambertCylindricalEqualArea.FALSE_EASTING,
LambertCylindricalEqualArea.FALSE_NORTHING);
}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
index 770eefa..c12f037 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
@@ -72,7 +72,7 @@ public final class TransverseMercatorSouth extends AbstractMercator {
TransverseMercator.LATITUDE_OF_ORIGIN,
TransverseMercator.LONGITUDE_OF_ORIGIN,
TransverseMercator.SCALE_FACTOR,
- LambertConformalWest.FALSE_WESTING,
+ LambertConformalWest.FALSE_WESTING, // Same as `FALSE_EASTING`
with only an additional comment.
falseSouthing);
}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
index bf57387..c92343c 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
@@ -58,7 +58,7 @@ import static org.apache.sis.internal.referencing.provider.LambertCylindricalEqu
* However this projection may be useful for computing areas.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.1
* @since 0.8
* @module
*/
@@ -117,6 +117,7 @@ public class CylindricalEqualArea extends EqualAreaProjection {
* "Longitude of origin" and "scale factor" are intentionally omitted from this map
because they will
* be handled in a special way. See comments in Mercator.initializer(…) method
for more details.
*/
+ roles.put(ParameterRole.SCALE_FACTOR, SCALE_FACTOR);
roles.put(ParameterRole.FALSE_EASTING, FALSE_EASTING);
roles.put(ParameterRole.FALSE_NORTHING, FALSE_NORTHING);
return new Initializer(method, parameters, roles, getVariant(method));
|