sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1688659 - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/internal/metadata/ sis-metadata/src/main/java/org/apache/sis/io/wkt/ sis-referencing/src/main/java/org/apache/sis/referencing/cs/ sis-referencing/src/test/java...
Date Wed, 01 Jul 2015 14:32:38 GMT
Author: desruisseaux
Date: Wed Jul  1 14:32:38 2015
New Revision: 1688659

URL: http://svn.apache.org/r1688659
Log:
WKT 2: CS types are not quoted text.
Also fix the detection of "Mean Sea Level" datum as VerticalDatumType.GEOIDAL.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -25,6 +25,8 @@ import org.opengis.referencing.cs.Coordi
 import org.opengis.referencing.cs.AxisDirection;
 import org.apache.sis.util.StringBuilders;
 import org.apache.sis.measure.Units;
+import org.apache.sis.util.CharSequences;
+import org.apache.sis.util.Characters;
 
 
 /**
@@ -174,6 +176,9 @@ public final class VerticalDatumTypes im
      */
     private static VerticalDatumType guess(final String name) {
         if (name != null) {
+            if (CharSequences.equalsFiltered("Mean Sea Level", name, Characters.Filter.LETTERS_AND_DIGITS,
true)) {
+                return VerticalDatumType.GEOIDAL;
+            }
             for (int i=0; i<name.length();) {
                 final int c = name.codePointAt(i);
                 if (Character.isLetter(c)) {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -956,7 +956,18 @@ public class Formatter implements Locali
     public void append(final String text, final ElementKind type) {
         if (text != null) {
             appendSeparator();
-            quote(text, type);
+            if (type != ElementKind.CODE_LIST) {
+                quote(text, type);
+            } else {
+                /*
+                 * Code lists have no quotes. They are normally formatted by the append(Enumerated)
method,
+                 * but an important exception is the CS[type] element in which the type is
defined by the
+                 * interface implemented by the CoordinateSystem rather than a CodeList instance.
+                 */
+                setColor(type);
+                buffer.append(text);
+                resetColor();
+            }
         }
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -36,6 +36,7 @@ import org.apache.sis.referencing.Abstra
 import org.apache.sis.internal.referencing.ReferencingUtilities;
 import org.apache.sis.internal.metadata.AxisDirections;
 import org.apache.sis.internal.metadata.WKTKeywords;
+import org.apache.sis.io.wkt.ElementKind;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.resources.Errors;
@@ -464,7 +465,7 @@ public class AbstractCS extends Abstract
         if (type == null) {
             formatter.setInvalidWKT(this, null);
         }
-        formatter.append(type, null);
+        formatter.append(type, ElementKind.CODE_LIST);
         formatter.append(getDimension());
         return WKTKeywords.CS;
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -81,6 +81,7 @@ public final strictfp class WKTFormatTes
         format.setConvention(Convention.WKT1);
         parser = format;
         testConsistency();
+        testConsistencyWithDenormalizedBaseCRS();
     }
 
     /**
@@ -97,6 +98,22 @@ public final strictfp class WKTFormatTes
         parser = new WKTFormat(null, null);
         parser.setConvention(Convention.WKT1);
         testConsistency();
+        testConsistencyWithDenormalizedBaseCRS();
+    }
+
+    /**
+     * Tests consistency between the parser and the formatter when using the WKT 2 format.
+     * This test parses a WKT, formats it then parses again. We should obtain the same result.
+     *
+     * @throws ParseException if a parsing failed.
+     */
+    @Test
+    @DependsOnMethod("testConsistencyOfWKT1")
+    public void testConsistencyOfWKT2() throws ParseException {
+        format = new WKTFormat(null, null);
+        format.setConvention(Convention.WKT2);
+        parser = format;
+        testConsistency();
     }
 
     /**
@@ -108,7 +125,7 @@ public final strictfp class WKTFormatTes
         testConsistency(
                 "GEOGCS[“Tokyo”,"
                 + "DATUM[“Tokyo”,"
-                +   "SPHEROID[“Bessel 1841”,6377397.155,299.1528128,AUTHORITY[“EPSG”,“7004”]],"
+                +   "SPHEROID[“Bessel 1841”, 6377397.155, 299.1528128, AUTHORITY[“EPSG”,“7004”]],"
                 +   "TOWGS84[-148,507,685,0,0,0,0],AUTHORITY[“EPSG”,“6301”]],"
                 + "PRIMEM[“Greenwich”,0,AUTHORITY[“EPSG”,“8901”]],"
                 + "UNIT[“DMSH”,0.0174532925199433,AUTHORITY[“EPSG”,“9108”]],"
@@ -119,7 +136,7 @@ public final strictfp class WKTFormatTes
         testConsistency(
                 "GEOGCS[“NTF (Paris)”,"
                 + "DATUM[“Nouvelle_Triangulation_Francaise”,"
-                +   "SPHEROID[“Clarke 1880 (IGN)”,6378249.2,293.466021293627,AUTHORITY[“EPSG”,“7011”]],"
+                +   "SPHEROID[“Clarke 1880 (IGN)”, 6378249.2, 293.466021293627, AUTHORITY[“EPSG”,“7011”]],"
                 +   "TOWGS84[-168,-60,320,0,0,0,0],AUTHORITY[“EPSG”,“6275”]],"
                 + "PRIMEM[“Paris”,2.5969213,AUTHORITY[“EPSG”,“8903”]],"
                 + "UNIT[“grad”,0.015707963267949,AUTHORITY[“EPSG”,“9105”]],"
@@ -128,10 +145,44 @@ public final strictfp class WKTFormatTes
                 + "AUTHORITY[“EPSG”,“4807”]]");
 
         testConsistency(
+                "PROJCS[“NAD27 / Texas South Central”,"
+                + "GEOGCS[“NAD27”,"
+                +   "DATUM[“North American Datum 1927”,"
+                +     "SPHEROID[“Clarke 1866”, 6378206.4, 294.97869821]],"
+                +   "UNIT[“degree”,0.0174532925199433]],"
+                + "PROJECTION[“Lambert_Conformal_Conic_2SP”],"
+                + "PARAMETER[“latitude_of_origin”,27.83333333333333],"
+                + "PARAMETER[“central_meridian”,-99.0],"
+                + "PARAMETER[“standard_parallel_1”,28.383333333333],"
+                + "PARAMETER[“standard_parallel_2”,30.283333333333],"
+                + "PARAMETER[“false_easting”,2000000],"
+                + "PARAMETER[“false_northing”,0],"
+                + "UNIT[“US survey foot”,0.304800609601219],"
+                + "AXIS[“Y”,NORTH],"
+                + "AXIS[“X”,EAST]]");
+
+        testConsistency(
+                "VERT_CS[“mean sea level depth”,"
+                + "VERT_DATUM[“Mean Sea Level”,2005,AUTHORITY[“EPSG”,“5100”]],"
+                + "UNIT[“kilometre”,1000],AXIS[“Z”,DOWN]]");
+    }
+
+    /**
+     * Similar to {@link #testConsistency()}, but using a base CRS that do not have normalized
axes.
+     * Since base CRS axes are formatted in WKT 1 but not in WKT 2, we have an information
lost in WKT 2.
+     * This information lost was considered unimportant in WKT 2 because the ISO 19111 ProjectedCRS
model
+     * does not have a MathTransform. But in the Apache SIS case, this causes the 'conversionFromBase'
+     * property to have a different MathTransform, and consequently cause a test failure.
+     * In brief, the tests in this class can not be run on those WKT using the WKT 2 format.
+     *
+     * @throws ParseException if a parsing failed.
+     */
+    private void testConsistencyWithDenormalizedBaseCRS() throws ParseException {
+        testConsistency(
                 "PROJCS[“NTF (Paris) / France I”,"
                 + "GEOGCS[“NTF (Paris)”,"
                 +   "DATUM[“Nouvelle_Triangulation_Francaise”,"
-                +     "SPHEROID[“Clarke 1880 (IGN)”,6378249.2,293.466021293627,AUTHORITY[“EPSG”,“7011”]],"
+                +     "SPHEROID[“Clarke 1880 (IGN)”, 6378249.2, 293.466021293627, AUTHORITY[“EPSG”,“7011”]],"
                 +     "TOWGS84[-168,-60,320,0,0,0,0],"
                 +     "AUTHORITY[“EPSG”,“6275”]],"
                 +   "PRIMEM[“Paris”,2.5969213,AUTHORITY[“EPSG”,“8903”]],"
@@ -148,11 +199,6 @@ public final strictfp class WKTFormatTes
                 + "UNIT[“km”,1000],"
                 + "AXIS[“X”,EAST],"
                 + "AXIS[“Y”,NORTH]]");
-
-        testConsistency(
-                "VERT_CS[“mean sea level depth”,"
-                + "VERT_DATUM[“Mean Sea Level”,2005,AUTHORITY[“EPSG”,“5100”]],"
-                + "UNIT[“kilometre”,1000],AXIS[“Z”,DOWN]]");
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -175,18 +175,18 @@ public final strictfp class DefaultCompo
                 "    Datum[“World Geodetic System 1984”,\n" +
                 "      Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”,
1]]],\n" +
                 "      PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n"
+
-                "    CS[“ellipsoidal”, 2],\n" +
+                "    CS[ellipsoidal, 2],\n" +
                 "      Axis[“Longitude (L)”, east, Order[1]],\n" +
                 "      Axis[“Latitude (B)”, north, Order[2]],\n" +
                 "      AngleUnit[“degree”, 0.017453292519943295]],\n" +
                 "  VerticalCRS[“Gravity-related height”,\n" +
                 "    VerticalDatum[“Mean Sea Level”],\n" +
-                "    CS[“vertical”, 1],\n" +
+                "    CS[vertical, 1],\n" +
                 "      Axis[“Gravity-related height (H)”, up, Order[1]],\n" +
                 "      LengthUnit[“metre”, 1]],\n" +
                 "  TimeCRS[“Time”,\n" +
                 "    TimeDatum[“Modified Julian”, TimeOrigin[1858-11-17T00:00:00.0Z]],\n"
+
-                "    CS[“temporal”, 1],\n" +
+                "    CS[temporal, 1],\n" +
                 "      Axis[“Time (t)”, future, Order[1]],\n" +
                 "      TimeUnit[“day”, 86400]],\n" +
                 "  Area[“World”],\n" +

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -175,7 +175,7 @@ public final strictfp class DefaultDeriv
                 "  DerivingConversion[“Paris to Greenwich”,\n" +
                 "    Method[“Longitude rotation”, Id[“EPSG”, 9601]],\n" +
                 "    Parameter[“Longitude offset”, 2.33722917, Id[“EPSG”, 8602]]],\n"
+
-                "  CS[“ellipsoidal”, 2],\n" +
+                "  CS[ellipsoidal, 2],\n" +
                 "    Axis[“Latitude (B)”, north, Order[1]],\n" +
                 "    Axis[“Longitude (L)”, east, Order[2]],\n" +
                 "    AngleUnit[“degree”, 0.017453292519943295]]",

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -100,7 +100,7 @@ public final strictfp class DefaultGeoce
                 "  Datum[“World Geodetic System 1984”,\n" +
                 "    Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”,
1]]],\n" +
                 "    PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n"
+
-                "  CS[“Cartesian”, 3],\n" +
+                "  CS[Cartesian, 3],\n" +
                 "    Axis[“(X)”, geocentricX, Order[1]],\n" +
                 "    Axis[“(Y)”, geocentricY, Order[2]],\n" +
                 "    Axis[“(Z)”, geocentricZ, Order[3]],\n" +
@@ -118,7 +118,7 @@ public final strictfp class DefaultGeoce
                 "GeodeticCRS[“Geocentric”,\n" +
                 "  Datum[“World Geodetic System 1984”,\n" +
                 "    Ellipsoid[“WGS84”, 6378137.0, 298.257223563]],\n" +
-                "  CS[“Cartesian”, 3],\n" +
+                "  CS[Cartesian, 3],\n" +
                 "    Axis[“(X)”, geocentricX],\n" +
                 "    Axis[“(Y)”, geocentricY],\n" +
                 "    Axis[“(Z)”, geocentricZ],\n" +
@@ -139,7 +139,7 @@ public final strictfp class DefaultGeoce
                 "    Scope[“Satellite navigation.”],\n" +
                 "    Id[“EPSG”, 6326]],\n" +
                 "    PrimeMeridian[“Greenwich”, 0.0, Id[“EPSG”, 8901]],\n" +
-                "  CS[“Cartesian”, 3],\n" +
+                "  CS[Cartesian, 3],\n" +
                 "    Axis[“Geocentric X (X)”, geocentricX],\n" +
                 "    Axis[“Geocentric Y (Y)”, geocentricY],\n" +
                 "    Axis[“Geocentric Z (Z)”, geocentricZ],\n" +

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -156,7 +156,7 @@ public final strictfp class DefaultGeogr
                 "  Datum[“World Geodetic System 1984”,\n" +
                 "    Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”,
1]]],\n" +
                 "    PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n"
+
-                "  CS[“ellipsoidal”, 2],\n" +
+                "  CS[ellipsoidal, 2],\n" +
                 "    Axis[“Longitude (L)”, east, Order[1]],\n" +
                 "    Axis[“Latitude (B)”, north, Order[2]],\n" +
                 "    AngleUnit[“degree”, 0.017453292519943295],\n" +
@@ -175,7 +175,7 @@ public final strictfp class DefaultGeogr
                 "GeodeticCRS[“WGS 84”,\n" +
                 "  Datum[“World Geodetic System 1984”,\n" +
                 "    Ellipsoid[“WGS84”, 6378137.0, 298.257223563]],\n" +
-                "  CS[“ellipsoidal”, 2],\n" +
+                "  CS[ellipsoidal, 2],\n" +
                 "    Axis[“Longitude (L)”, east],\n" +
                 "    Axis[“Latitude (B)”, north],\n" +
                 "    Unit[“degree”, 0.017453292519943295],\n" +
@@ -197,7 +197,7 @@ public final strictfp class DefaultGeogr
                 "    Scope[“Satellite navigation.”],\n" +
                 "    Id[“EPSG”, 6326]],\n" +
                 "    PrimeMeridian[“Greenwich”, 0.0, Id[“EPSG”, 8901]],\n" +
-                "  CS[“ellipsoidal”, 2],\n" +
+                "  CS[ellipsoidal, 2],\n" +
                 "    Axis[“Geodetic longitude (λ)”, east],\n" +
                 "    Axis[“Geodetic latitude (φ)”, north],\n" +
                 "    Unit[“degree”, 0.017453292519943295, Id[“EPSG”, 9102]],\n" +
@@ -220,7 +220,7 @@ public final strictfp class DefaultGeogr
                 "  Datum[“Nouvelle Triangulation Francaise”,\n" +           // Formatter
should replace "ç" by "c".
                 "    Ellipsoid[“NTF”, 6378249.2, 293.4660212936269]],\n" +
                 "    PrimeMeridian[“Paris”, 2.5969213, Unit[“grade”, 0.015707963267948967]],\n"
+
-                "  CS[“ellipsoidal”, 2],\n" +
+                "  CS[ellipsoidal, 2],\n" +
                 "    Axis[“Longitude (L)”, east],\n" +                      // See method
javadoc.
                 "    Axis[“Latitude (B)”, north],\n" +
                 "    Unit[“grade”, 0.015707963267948967]]",

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -194,7 +194,7 @@ public final strictfp class DefaultProje
                 "    Parameter[“Scale factor at natural origin”, 0.99987742],\n" +
                 "    Parameter[“False easting”, 600000.0],\n" +
                 "    Parameter[“False northing”, 2200000.0]],\n" +
-                "  CS[“Cartesian”, 2],\n" +
+                "  CS[Cartesian, 2],\n" +
                 "    Axis[“Easting (E)”, east],\n" +
                 "    Axis[“Northing (N)”, north],\n" +
                 "    Unit[“metre”, 1],\n" +
@@ -219,7 +219,7 @@ public final strictfp class DefaultProje
                 "    Parameter[“Scale factor at natural origin”, 0.99987742],\n" +
                 "    Parameter[“False easting”, 600000.0],\n" +
                 "    Parameter[“False northing”, 2200000.0]],\n" +
-                "  CS[“Cartesian”, 2],\n" +
+                "  CS[Cartesian, 2],\n" +
                 "    Axis[“Easting (E)”, east],\n" +
                 "    Axis[“Northing (N)”, north],\n" +
                 "    Unit[“metre”, 1],\n" +
@@ -250,7 +250,7 @@ public final strictfp class DefaultProje
                 "    Parameter[“Scale factor at natural origin”, 0.99987742, ScaleUnit[“unity”,
1], Id[“EPSG”, 8805]],\n" +
                 "    Parameter[“False easting”, 600000.0, LengthUnit[“metre”, 1],
Id[“EPSG”, 8806]],\n" +
                 "    Parameter[“False northing”, 2200000.0, LengthUnit[“metre”, 1],
Id[“EPSG”, 8807]]],\n" +
-                "  CS[“Cartesian”, 2],\n" +
+                "  CS[Cartesian, 2],\n" +
                 "    Axis[“Easting (E)”, east, Order[1]],\n" +
                 "    Axis[“Northing (N)”, north, Order[2]],\n" +
                 "    LengthUnit[“metre”, 1],\n" +
@@ -330,7 +330,7 @@ public final strictfp class DefaultProje
                 "    Parameter[“Longitude of natural origin”, 0.0],\n" +
                 "    Parameter[“False easting”, 1000.0],\n" +
                 "    Parameter[“False northing”, 2000.0]],\n" +
-                "  CS[“Cartesian”, 2],\n" +
+                "  CS[Cartesian, 2],\n" +
                 "    Axis[“Easting (E)”, east],\n" +
                 "    Axis[“Northing (N)”, north],\n" +
                 "    Unit[“metre”, 1]]",

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -54,7 +54,7 @@ public final strictfp class DefaultTempo
         assertWktEquals(Convention.WKT2,
                 "TimeCRS[“Time”,\n" +
                 "  TimeDatum[“Modified Julian”, TimeOrigin[1858-11-17T00:00:00.0Z]],\n"
+
-                "  CS[“temporal”, 1],\n" +
+                "  CS[temporal, 1],\n" +
                 "    Axis[“Time (t)”, future, Order[1]],\n" +
                 "    TimeUnit[“day”, 86400]]",
                 HardCodedCRS.TIME);

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -55,7 +55,7 @@ public final strictfp class DefaultVerti
         assertWktEquals(Convention.WKT2,
                 "VerticalCRS[“Depth”,\n" +
                 "  VerticalDatum[“Mean Sea Level”],\n" +
-                "  CS[“vertical”, 1],\n" +
+                "  CS[vertical, 1],\n" +
                 "    Axis[“Depth (D)”, down, Order[1]],\n" +
                 "    LengthUnit[“metre”, 1]]",
                 HardCodedCRS.DEPTH);

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -107,10 +107,9 @@ public final strictfp class DefaultVerti
         assertIsMeanSeaLevel(datum, true);
         /*
          * Following attribute does not exist in GML 3.2, so it has been inferred.
-         * Our datum name is "Mean Sea Level", which for now is not yet mapped to
-         * the geoidal type (this could change in any future SIS version).
+         * Our datum name is "Mean Sea Level", which is mapped to the geoidal type.
          */
-        assertEquals("vertDatumType", VerticalDatumType.OTHER_SURFACE, datum.getVerticalDatumType());
+        assertEquals("vertDatumType", VerticalDatumType.GEOIDAL, datum.getVerticalDatumType());
         /*
          * Values in the following tests are specific to our XML file.
          * The actual texts in the EPSG database are more descriptive.

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java?rev=1688659&r1=1688658&r2=1688659&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
[UTF-8] Wed Jul  1 14:32:38 2015
@@ -162,7 +162,7 @@ public final strictfp class DefaultTrans
                 "    Datum[“Tokyo 1918”,\n" +
                 "      Ellipsoid[“Bessel 1841”, 6377397.155, 299.1528128, LengthUnit[“metre”,
1]]],\n" +
                 "      PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n"
+
-                "    CS[“Cartesian”, 3],\n" +
+                "    CS[Cartesian, 3],\n" +
                 "      Axis[“(X)”, geocentricX, Order[1]],\n" +
                 "      Axis[“(Y)”, geocentricY, Order[2]],\n" +
                 "      Axis[“(Z)”, geocentricZ, Order[3]],\n" +
@@ -171,7 +171,7 @@ public final strictfp class DefaultTrans
                 "    Datum[“Japanese Geodetic Datum 2000”,\n" +
                 "      Ellipsoid[“GRS 1980”, 6378137.0, 298.257222101, LengthUnit[“metre”,
1]]],\n" +
                 "      PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n"
+
-                "    CS[“Cartesian”, 3],\n" +
+                "    CS[Cartesian, 3],\n" +
                 "      Axis[“(X)”, geocentricX, Order[1]],\n" +
                 "      Axis[“(Y)”, geocentricY, Order[2]],\n" +
                 "      Axis[“(Z)”, geocentricZ, Order[3]],\n" +
@@ -186,7 +186,7 @@ public final strictfp class DefaultTrans
                 "  SourceCRS[GeodeticCRS[“Tokyo 1918”,\n" +
                 "    Datum[“Tokyo 1918”,\n" +
                 "      Ellipsoid[“Bessel 1841”, 6377397.155, 299.1528128]],\n" +
-                "    CS[“Cartesian”, 3],\n" +
+                "    CS[Cartesian, 3],\n" +
                 "      Axis[“(X)”, geocentricX],\n" +
                 "      Axis[“(Y)”, geocentricY],\n" +
                 "      Axis[“(Z)”, geocentricZ],\n" +
@@ -194,7 +194,7 @@ public final strictfp class DefaultTrans
                 "  TargetCRS[GeodeticCRS[“JGD2000”,\n" +
                 "    Datum[“Japanese Geodetic Datum 2000”,\n" +
                 "      Ellipsoid[“GRS 1980”, 6378137.0, 298.257222101]],\n" +
-                "    CS[“Cartesian”, 3],\n" +
+                "    CS[Cartesian, 3],\n" +
                 "      Axis[“(X)”, geocentricX],\n" +
                 "      Axis[“(Y)”, geocentricY],\n" +
                 "      Axis[“(Z)”, geocentricZ],\n" +



Mime
View raw message