sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1753247 - in /sis/branches/JDK8/core/sis-referencing/src: main/java/org/apache/sis/internal/referencing/provider/ main/java/org/apache/sis/referencing/operation/projection/ test/java/org/apache/sis/referencing/operation/transform/ test/jav...
Date Mon, 18 Jul 2016 15:35:16 GMT
Author: desruisseaux
Date: Mon Jul 18 15:35:16 2016
New Revision: 1753247

URL: http://svn.apache.org/viewvc?rev=1753247&view=rev
Log:
Add missing EPSG identifiers in Molodensky parameters.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java?rev=1753247&r1=1753246&r2=1753247&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
[UTF-8] Mon Jul 18 15:35:16 2016
@@ -128,13 +128,13 @@ public abstract class GeocentricAffine e
     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);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java?rev=1753247&r1=1753246&r2=1753247&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
[UTF-8] Mon Jul 18 15:35:16 2016
@@ -92,8 +92,8 @@ public final class Molodensky extends Ge
     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")

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java?rev=1753247&r1=1753246&r2=1753247&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
[UTF-8] Mon Jul 18 15:35:16 2016
@@ -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>

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java?rev=1753247&r1=1753246&r2=1753247&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
[UTF-8] Mon Jul 18 15:35:16 2016
@@ -115,8 +115,8 @@ public final strictfp class Interpolated
                 "  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" +

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java?rev=1753247&r1=1753246&r2=1753247&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
[UTF-8] Mon Jul 18 15:35:16 2016
@@ -461,11 +461,11 @@ public final strictfp class MolodenskyTr
                 "  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" +

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java?rev=1753247&r1=1753246&r2=1753247&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
[UTF-8] Mon Jul 18 15:35:16 2016
@@ -65,7 +65,7 @@ import org.opengis.metadata.Identifier;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.7
+ * @version 0.8
  * @module
  */
 public strictfp class CoordinateOperationMethods extends HTMLGenerator {

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java?rev=1753247&r1=1753246&r2=1753247&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
[UTF-8] Mon Jul 18 15:35:16 2016
@@ -23,7 +23,7 @@
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 package org.apache.sis.referencing.report;



Mime
View raw message