Add missing EPSG identifiers in Molodensky parameters.
git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK8@1753247 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
index ab78a5f..9be7867 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
@@ -128,13 +128,13 @@
static final ParameterDescriptor<Double> DS;
static {
final ParameterBuilder builder = builder();
- TX = createShift(builder.addName("X-axis translation").addName(Citations.OGC, "dx"));
- TY = createShift(builder.addName("Y-axis translation").addName(Citations.OGC, "dy"));
- TZ = createShift(builder.addName("Z-axis translation").addName(Citations.OGC, "dz"));
- RX = createRotation(builder, "X-axis rotation", "ex");
- RY = createRotation(builder, "Y-axis rotation", "ey");
- RZ = createRotation(builder, "Z-axis rotation", "ez");
- DS = builder.addName("Scale difference").addName(Citations.OGC, "ppm").create(1, Units.PPM);
+ TX = createShift(builder.addIdentifier("8605").addName("X-axis translation").addName(Citations.OGC, "dx"));
+ TY = createShift(builder.addIdentifier("8606").addName("Y-axis translation").addName(Citations.OGC, "dy"));
+ TZ = createShift(builder.addIdentifier("8607").addName("Z-axis translation").addName(Citations.OGC, "dz"));
+ RX = createRotation(builder.addIdentifier("8608"), "X-axis rotation", "ex");
+ RY = createRotation(builder.addIdentifier("8609"), "Y-axis rotation", "ey");
+ RZ = createRotation(builder.addIdentifier("8610"), "Z-axis rotation", "ez");
+ DS = builder.addIdentifier("8611").addName("Scale difference").addName(Citations.OGC, "ppm").create(1, Units.PPM);
}
/**
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
index 515554f..be48620 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
@@ -92,8 +92,8 @@
public static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
- AXIS_LENGTH_DIFFERENCE = builder.addName("Semi-major axis length difference").create(Double.NaN, SI.METRE);
- FLATTENING_DIFFERENCE = builder.addName("Flattening difference").createBounded(-1, +1, Double.NaN, Unit.ONE);
+ AXIS_LENGTH_DIFFERENCE = builder.addIdentifier("8654").addName("Semi-major axis length difference").create(Double.NaN, SI.METRE);
+ FLATTENING_DIFFERENCE = builder.addIdentifier("8655").addName("Flattening difference").createBounded(-1, +1, Double.NaN, Unit.ONE);
PARAMETERS = builder.setRequired(true)
.addIdentifier("9604")
.addName("Molodensky")
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
index 980fe2b..fd05f2a 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
@@ -160,7 +160,7 @@
* @author Rémi Maréchal (Geomatys)
* @author Adrian Custer (Geomatys)
* @since 0.6
- * @version 0.7
+ * @version 0.8
* @module
*
* @see <a href="http://www.remotesensing.org/geotiff/proj_list">Projections list on RemoteSensing.org</a>
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
index 34a295d..ec91d2b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
@@ -115,8 +115,8 @@
" Param_MT[“Molodensky inverse interpolation (radians domain)”,\n" +
" Parameter[“src_semi_major”, 6378249.2],\n" +
" Parameter[“src_semi_minor”, 6356515.0],\n" +
- " Parameter[“Semi-major axis length difference”, -112.2],\n" +
- " Parameter[“Flattening difference”, -5.4738838833299144E-5],\n" +
+ " Parameter[“Semi-major axis length difference”, -112.2, Id[“EPSG”, 8654]],\n" +
+ " Parameter[“Flattening difference”, -5.4738838833299144E-5, Id[“EPSG”, 8655]],\n" +
" ParameterFile[“Geocentric translation file”, “\\E.*\\W\\Q" +
FranceGeocentricInterpolationTest.TEST_FILE + "”, Id[“EPSG”, 8727]],\n" +
" Parameter[“dim”, 2]],\n" +
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index ae317cf..8b5e437 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@ -461,11 +461,11 @@
" Param_MT[“Molodensky (radians domain)”,\n" +
" Parameter[“src_semi_major”, 6378137.0],\n" +
" Parameter[“src_semi_minor”, 6356752.314245179],\n" +
- " Parameter[“Semi-major axis length difference”, 251.0],\n" +
- " Parameter[“Flattening difference”, 1.4192702255886284E-5],\n" +
- " Parameter[“X-axis translation”, 84.87],\n" +
- " Parameter[“Y-axis translation”, 96.49],\n" +
- " Parameter[“Z-axis translation”, 116.95],\n" +
+ " Parameter[“Semi-major axis length difference”, 251.0, Id[“EPSG”, 8654]],\n" +
+ " Parameter[“Flattening difference”, 1.4192702255886284E-5, Id[“EPSG”, 8655]],\n" +
+ " Parameter[“X-axis translation”, 84.87, Id[“EPSG”, 8605]],\n" +
+ " Parameter[“Y-axis translation”, 96.49, Id[“EPSG”, 8606]],\n" +
+ " Parameter[“Z-axis translation”, 116.95, Id[“EPSG”, 8607]],\n" +
" Parameter[“abridged”, TRUE],\n" +
" Parameter[“dim”, 3]],\n" +
" Param_MT[“Affine”,\n" +
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
index 0335a53..9926afc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
@@ -65,7 +65,7 @@
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.6
- * @version 0.7
+ * @version 0.8
* @module
*/
public strictfp class CoordinateOperationMethods extends HTMLGenerator {
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
index 56f7baa..7a3b7b2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
@@ -23,7 +23,7 @@
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.7
- * @version 0.7
+ * @version 0.8
* @module
*/
package org.apache.sis.referencing.report;
