sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1684160 - 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-metadata/src/test/java/org/apache/sis/io/wkt/ sis-referencing/src/main/java/org/apache...
Date Mon, 08 Jun 2015 11:33:23 GMT
Author: desruisseaux
Date: Mon Jun  8 11:33:22 2015
New Revision: 1684160

URL: http://svn.apache.org/r1684160
Log:
WKT parsing: fix wrong axis names when axes were not explicitly specified.
Declare the ISO 19111 and ISO 19162 axis names as constants in AxisNames class.

Added:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java
  (with props)
Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/CharEncodingTest.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java

Added: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java?rev=1684160&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java
(added)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.internal.metadata;
+
+
+/**
+ * Constants for axis names specified by ISO 19111 and ISO 19162.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.6
+ * @version 0.6
+ * @module
+ */
+public final class AxisNames {
+    /**
+     * The ISO 19162 <cite>"Longitude"</cite> name.
+     */
+    public static final String LONGITUDE = "Longitude";
+
+    /**
+     * The ISO 19162 <cite>"Latitude"</cite> name.
+     */
+    public static final String LATITUDE = "Latitude";
+
+    /**
+     * The ISO 19111 <cite>"geodetic longitude"</cite> name. Abbreviation is
"λ" (lambda).
+     */
+    public static final String GEODETIC_LONGITUDE = "Geodetic longitude";
+
+    /**
+     * The ISO 19111 <cite>"geodetic latitude"</cite> name. Abbreviation is "φ"
(phi).
+     */
+    public static final String GEODETIC_LATITUDE = "Geodetic latitude";
+
+    /**
+     * The ISO 19111 <cite>"spherical longitude"</cite> name. Abbreviation is
"θ" (theta).
+     */
+    public static final String SPHERICAL_LONGITUDE = "Spherical longitude";
+
+    /**
+     * The ISO 19111 <cite>"spherical latitude"</cite> name. Abbreviation is
"φ′" (phi prime).
+     */
+    public static final String SPHERICAL_LATITUDE = "Spherical latitude";
+
+    /**
+     * The ISO 19111 <cite>"ellipsoidal height"</cite> name. Abbreviation is
lower case <cite>"h"</cite>.
+     */
+    public static final String ELLIPSOIDAL_HEIGHT = "Ellipsoidal height";
+
+    /**
+     * The ISO 19111 <cite>"gravity-related height"</cite> name. Abbreviation
is upper case <cite>"H"</cite>.
+     */
+    public static final String GRAVITY_RELATED_HEIGHT = "Gravity-related height";
+
+    /**
+     * The ISO 19111 <cite>"depth"</cite> name.
+     */
+    public static final String DEPTH = "Depth";
+
+    /**
+     * The ISO 19111 <cite>"Geocentric X"</cite> name. Abbreviation is upper
case <cite>"X"</cite>.
+     */
+    public static final String GEOCENTRIC_X = "Geocentric X";
+
+    /**
+     * The ISO 19111 <cite>"Geocentric Y"</cite> name. Abbreviation is upper
case <cite>"Y"</cite>.
+     */
+    public static final String GEOCENTRIC_Y = "Geocentric Y";
+
+    /**
+     * The ISO 19111 <cite>"Geocentric Z"</cite> name. Abbreviation is upper
case <cite>"Z"</cite>.
+     */
+    public static final String GEOCENTRIC_Z = "Geocentric Z";
+
+    /**
+     * The ISO 19111 <cite>"geocentric radius"</cite> name. Abbreviation is lower
case <cite>"r"</cite>.
+     */
+    public static final String GEOCENTRIC_RADIUS = "Geocentric radius";
+
+    /**
+     * The ISO 19111 <cite>"easting"</cite> name. Abbreviation is upper case
<cite>"E"</cite>.
+     */
+    public static final String EASTING = "Easting";
+
+    /**
+     * The ISO 19111 <cite>"westing"</cite> name. Abbreviation is upper case
<cite>"W"</cite>.
+     */
+    public static final String WESTING = "Westing";
+
+    /**
+     * The ISO 19111 <cite>"northing"</cite> name. Abbreviation is upper case
<cite>"N"</cite>.
+     */
+    public static final String NORTHING = "Northing";
+
+    /**
+     * The ISO 19111 <cite>"southing"</cite> name. Abbreviation is upper case
<cite>"S"</cite>.
+     */
+    public static final String SOUTHING = "Southing";
+
+    /**
+     * Do not allow instantiation of this class.
+     */
+    private AxisNames() {
+    }
+}

Propchange: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -50,6 +50,7 @@ import org.opengis.referencing.operation
 import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.iso.ImmutableIdentifier;
 import org.apache.sis.metadata.iso.citation.Citations;
+import org.apache.sis.internal.metadata.AxisNames;
 import org.apache.sis.internal.metadata.WKTKeywords;
 import org.apache.sis.internal.metadata.VerticalDatumTypes;
 import org.apache.sis.internal.metadata.ReferencingServices;
@@ -415,10 +416,10 @@ final class GeodeticObjectParser extends
              * shall be omitted at WKT formatting time. SIS's DefaultCoordinateSystemAxis.formatTo(Formatter)
              * method performs this removal, so we apply the reverse operation here.
              */
-            if (name.equalsIgnoreCase("Latitude") || name.equalsIgnoreCase("lat")) {
-                name = "Geodetic latitude";
-            } else if (name.equalsIgnoreCase("Longitude") || name.equalsIgnoreCase("long")
|| name.equalsIgnoreCase("lon")) {
-                name = "Geodetic longitude";
+            if (name.equalsIgnoreCase(AxisNames.LATITUDE) || name.equalsIgnoreCase("lat"))
{
+                name = AxisNames.GEODETIC_LATITUDE;
+            } else if (name.equalsIgnoreCase(AxisNames.LONGITUDE) || name.equalsIgnoreCase("long")
|| name.equalsIgnoreCase("lon")) {
+                name = AxisNames.GEODETIC_LONGITUDE;
             }
         }
         final Element orientation = element.pullVoidElement("orientation");
@@ -449,10 +450,10 @@ final class GeodeticObjectParser extends
     /**
      * Creates an axis with the same name than the abbreviation.
      */
-    private CoordinateSystemAxis createAxis(final String abbreviation,
+    private CoordinateSystemAxis createAxis(final String name, final String abbreviation,
             final AxisDirection direction, final Unit<?> unit) throws FactoryException
     {
-        return csFactory.createCoordinateSystemAxis(singletonMap(IdentifiedObject.NAME_KEY,
abbreviation),
+        return csFactory.createCoordinateSystemAxis(singletonMap(IdentifiedObject.NAME_KEY,
name),
                 abbreviation, direction, unit);
     }
 
@@ -767,7 +768,20 @@ final class GeodeticObjectParser extends
         CoordinateSystemAxis axis       = parseAxis(element, false, linearUnit, false);
         try {
             if (axis == null || isAxisIgnored) {
-                axis = createAxis("h", AxisDirection.UP, linearUnit);
+                String sn = "Height", abbreviation = "h";
+                AxisDirection direction = AxisDirection.UP;
+                final VerticalDatumType type = datum.getVerticalDatumType();
+                if (VerticalDatumType.GEOIDAL.equals(type)) {
+                    sn = AxisNames.GRAVITY_RELATED_HEIGHT;
+                    abbreviation = "H";
+                } else if (VerticalDatumType.DEPTH.equals(type)) {
+                    sn = AxisNames.DEPTH;
+                    abbreviation = "D";
+                    direction = AxisDirection.DOWN;
+                } else if (VerticalDatumTypes.ELLIPSOIDAL.equals(type)) {
+                    sn = AxisNames.ELLIPSOIDAL_HEIGHT;
+                }
+                axis = createAxis(sn, abbreviation, direction, linearUnit);
             }
             return crsFactory.createVerticalCRS(parseAuthorityAndClose(element, name), datum,
                     csFactory.createVerticalCS(singletonMap("name", name), axis));
@@ -791,7 +805,7 @@ final class GeodeticObjectParser extends
         CoordinateSystemAxis axis     = parseAxis(element, false, timeUnit, false);
         try {
             if (axis == null || isAxisIgnored) {
-                axis = createAxis("t", AxisDirection.UP, timeUnit);
+                axis = createAxis("Time", "t", AxisDirection.FUTURE, timeUnit);
             }
             return crsFactory.createTemporalCRS(parseAuthorityAndClose(element, name), datum,
                     csFactory.createTimeCS(singletonMap("name", name), axis));
@@ -832,8 +846,8 @@ final class GeodeticObjectParser extends
                 axis1 = parseAxis(element, true, angularUnit, true);
             }
             if (axis0 == null || isAxisIgnored) {
-                axis0 = createAxis("λ", AxisDirection.EAST,  angularUnit);
-                axis1 = createAxis("φ", AxisDirection.NORTH, angularUnit);
+                axis0 = createAxis(AxisNames.GEODETIC_LONGITUDE, "λ", AxisDirection.EAST,
 angularUnit);
+                axis1 = createAxis(AxisNames.GEODETIC_LATITUDE,  "φ", AxisDirection.NORTH,
angularUnit);
             }
             final Map<String,?> properties = parseAuthorityAndClose(element, name);
             return crsFactory.createGeographicCRS(properties, datum,
@@ -871,8 +885,8 @@ final class GeodeticObjectParser extends
                 axis1 = parseAxis(element, false, linearUnit, true);
             }
             if (axis0 == null || isAxisIgnored) {
-                axis0 = createAxis("x", AxisDirection.EAST,  linearUnit);
-                axis1 = createAxis("y", AxisDirection.NORTH, linearUnit);
+                axis0 = createAxis(AxisNames.EASTING,  "E", AxisDirection.EAST,  linearUnit);
+                axis1 = createAxis(AxisNames.NORTHING, "N", AxisDirection.NORTH, linearUnit);
             }
             final Map<String,?> properties = parseAuthorityAndClose(element, name);
             return crsFactory.createProjectedCRS(properties, geoCRS, conversion,

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/CharEncodingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/CharEncodingTest.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/CharEncodingTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/CharEncodingTest.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -20,6 +20,7 @@ import org.opengis.referencing.cs.Spheri
 import org.opengis.referencing.cs.EllipsoidalCS;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
+import org.apache.sis.internal.metadata.AxisNames;
 import org.apache.sis.test.mock.CoordinateSystemAxisMock;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
@@ -41,10 +42,10 @@ public final strictfp class CharEncoding
      */
     @Test
     public void testGetAbbreviation() {
-        assertAbbreviationEquals("B", new Geographic("Geodetic latitude",    "φ"));
-        assertAbbreviationEquals("U", new Geocentric("Geocentric latitude",  "φ′"));
-        assertAbbreviationEquals("L", new Geographic("Geodetic longitude",   "λ"));
-        assertAbbreviationEquals("V", new Geocentric("Geocentric longitude", "θ"));
+        assertAbbreviationEquals("B", new Geographic(AxisNames.GEODETIC_LATITUDE,   "φ"));
+        assertAbbreviationEquals("U", new Geocentric(AxisNames.SPHERICAL_LATITUDE,  "φ′"));
+        assertAbbreviationEquals("L", new Geographic(AxisNames.GEODETIC_LONGITUDE,  "λ"));
+        assertAbbreviationEquals("V", new Geocentric(AxisNames.SPHERICAL_LONGITUDE, "θ"));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -34,6 +34,7 @@ import org.opengis.referencing.cs.Coordi
 import org.opengis.referencing.cs.EllipsoidalCS;
 import org.opengis.referencing.crs.GeographicCRS;
 import org.opengis.referencing.crs.VerticalCRS;
+import org.apache.sis.internal.metadata.AxisNames;
 import org.apache.sis.metadata.iso.extent.Extents;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.datum.DefaultEllipsoid;
@@ -277,7 +278,7 @@ final class StandardDefinitions {
         final AxisDirection dir;
         switch (code) {
             case 108:  // Used in Ellipsoidal 3D.
-            case 106:  name = "Geodetic latitude";
+            case 106:  name = AxisNames.GEODETIC_LATITUDE;
                        abrv = "φ";
                        unit = NonSI.DEGREE_ANGLE;
                        dir  = AxisDirection.NORTH;
@@ -286,7 +287,7 @@ final class StandardDefinitions {
                        rm   = RangeMeaning.EXACT;
                        break;
             case 109:  // Used in Ellipsoidal 3D.
-            case 107:  name = "Geodetic longitude";
+            case 107:  name = AxisNames.GEODETIC_LONGITUDE;
                        abrv = "λ";
                        unit = NonSI.DEGREE_ANGLE;
                        dir  = AxisDirection.EAST;
@@ -294,27 +295,27 @@ final class StandardDefinitions {
                        max  = Longitude.MAX_VALUE;
                        rm   = RangeMeaning.WRAPAROUND;
                        break;
-            case 110:  name = "Ellipsoidal height";
+            case 110:  name = AxisNames.ELLIPSOIDAL_HEIGHT;
                        abrv = "h";
                        dir  = AxisDirection.UP;
                        break;
-            case 114:  name = "Gravity-related height";
+            case 114:  name = AxisNames.GRAVITY_RELATED_HEIGHT;
                        abrv = "H";
                        dir  = AxisDirection.UP;
                        break;
-            case 113:  name = "Depth";
+            case 113:  name = AxisNames.DEPTH;
                        abrv = "D";
                        dir  = AxisDirection.DOWN;
                        break;
-            case 115:  name = "Geocentric X";
+            case 115:  name = AxisNames.GEOCENTRIC_X;
                        abrv = "X";
                        dir  = AxisDirection.GEOCENTRIC_X;
                        break;
-            case 116:  name = "Geocentric Y";
+            case 116:  name = AxisNames.GEOCENTRIC_Y;
                        abrv = "Y";
                        dir  = AxisDirection.GEOCENTRIC_Y;
                        break;
-            case 117:  name = "Geocentric Z";
+            case 117:  name = AxisNames.GEOCENTRIC_Z;
                        abrv = "Z";
                        dir  = AxisDirection.GEOCENTRIC_Z;
                        break;

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -38,6 +38,7 @@ import org.opengis.referencing.cs.Spheri
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.internal.metadata.AxisNames;
 import org.apache.sis.internal.metadata.WKTKeywords;
 import org.apache.sis.internal.referencing.AxisDirections;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
@@ -177,8 +178,8 @@ public class DefaultCoordinateSystemAxis
      * @see #isHeuristicMatchForNameXY(String, String)
      */
     private static final String[] ALIASES_XY = {
-        "Easting", "Northing",
-        "Westing", "Southing"
+        AxisNames.EASTING, AxisNames.NORTHING,
+        AxisNames.WESTING, AxisNames.SOUTHING
     };
 
     /**
@@ -800,10 +801,10 @@ public class DefaultCoordinateSystemAxis
                 name = IdentifiedObjects.getName(this, null);
             }
             if (name != null && !isInternal) {
-                if (name.equalsIgnoreCase("Geodetic latitude")) {
-                    name = "Latitude";    // ISO 19162 §7.5.3(ii)
-                } else if (name.equalsIgnoreCase("Geodetic longitude")) {
-                    name = "Longitude";
+                if (name.equalsIgnoreCase(AxisNames.GEODETIC_LATITUDE)) {
+                    name = AxisNames.LATITUDE;    // ISO 19162 §7.5.3(ii)
+                } else if (name.equalsIgnoreCase(AxisNames.GEODETIC_LONGITUDE)) {
+                    name = AxisNames.LONGITUDE;
                 }
                 // Note: the converse of this operation is done in
                 // org.apache.sis.io.wkt.GeodeticObjectParser.parseAxis(…).

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -18,6 +18,7 @@ package org.apache.sis.geometry;
 
 import org.opengis.geometry.Envelope;
 import org.opengis.geometry.DirectPosition;
+import org.apache.sis.internal.metadata.AxisNames;
 import org.apache.sis.math.MathFunctions;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
@@ -446,7 +447,7 @@ public strictfp class GeneralEnvelopeTes
         } catch (IllegalArgumentException ex) {
             // This is the expected exception.
             final String message = ex.getMessage();
-            assertTrue(message, message.contains("Geodetic latitude"));
+            assertTrue(message, message.contains(AxisNames.GEODETIC_LATITUDE));
         }
         // Verify that the envelope still have the old values.
         assertEnvelopeEquals(e, 3, -5, -8, 2);
@@ -467,7 +468,7 @@ public strictfp class GeneralEnvelopeTes
         } catch (IllegalArgumentException ex) {
             // This is the expected exception.
             final String message = ex.getMessage();
-            assertTrue(message, message.contains("Geodetic latitude"));
+            assertTrue(message, message.contains(AxisNames.GEODETIC_LATITUDE));
         }
         // Verify that the envelope still have the old values.
         assertEnvelopeEquals(e, 2, -5, 3, 2);
@@ -494,7 +495,7 @@ public strictfp class GeneralEnvelopeTes
         } catch (IllegalStateException ex) {
             // This is the expected exception.
             final String message = ex.getMessage();
-            assertTrue(message, message.contains("Geodetic latitude"));
+            assertTrue(message, message.contains(AxisNames.GEODETIC_LATITUDE));
         }
         /*
          * Verify that the envelope values are unchanged.

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -28,6 +28,7 @@ import org.opengis.referencing.cs.*;
 import org.opengis.referencing.crs.*;
 import org.opengis.referencing.datum.*;
 import org.opengis.parameter.ParameterValueGroup;
+import org.apache.sis.internal.metadata.AxisNames;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
@@ -96,7 +97,7 @@ public final strictfp class GeodeticObje
      * because {@link GeodeticObjectParser} should have done the replacement.
      */
     private static void assertLongitudeAxisEquals(final CoordinateSystemAxis axis) {
-        assertAxisEquals("Geodetic longitude", "λ", AxisDirection.EAST, -180, +180, NonSI.DEGREE_ANGLE,
RangeMeaning.WRAPAROUND, axis);
+        assertAxisEquals(AxisNames.GEODETIC_LONGITUDE, "λ", AxisDirection.EAST, -180, +180,
NonSI.DEGREE_ANGLE, RangeMeaning.WRAPAROUND, axis);
     }
 
     /**
@@ -105,7 +106,7 @@ public final strictfp class GeodeticObje
      * because {@link GeodeticObjectParser} should have done the replacement.
      */
     private static void assertLatitudeAxisEquals(final CoordinateSystemAxis axis) {
-        assertAxisEquals("Geodetic latitude", "φ", AxisDirection.NORTH, -90, +90, NonSI.DEGREE_ANGLE,
RangeMeaning.EXACT, axis);
+        assertAxisEquals(AxisNames.GEODETIC_LATITUDE, "φ", AxisDirection.NORTH, -90, +90,
NonSI.DEGREE_ANGLE, RangeMeaning.EXACT, axis);
     }
 
     /**
@@ -151,9 +152,9 @@ public final strictfp class GeodeticObje
         // Verify that the OGC 01-009 axes have been relaced by ISO 19111 axes.
         final CartesianCS cs = (CartesianCS) crs.getCoordinateSystem();
         assertEquals("dimension", 3, cs.getDimension());
-        assertUnboundedAxisEquals("Geocentric X", "X", AxisDirection.GEOCENTRIC_X, SI.METRE,
cs.getAxis(0));
-        assertUnboundedAxisEquals("Geocentric Y", "Y", AxisDirection.GEOCENTRIC_Y, SI.METRE,
cs.getAxis(1));
-        assertUnboundedAxisEquals("Geocentric Z", "Z", AxisDirection.GEOCENTRIC_Z, SI.METRE,
cs.getAxis(2));
+        assertUnboundedAxisEquals(AxisNames.GEOCENTRIC_X, "X", AxisDirection.GEOCENTRIC_X,
SI.METRE, cs.getAxis(0));
+        assertUnboundedAxisEquals(AxisNames.GEOCENTRIC_Y, "Y", AxisDirection.GEOCENTRIC_Y,
SI.METRE, cs.getAxis(1));
+        assertUnboundedAxisEquals(AxisNames.GEOCENTRIC_Z, "Z", AxisDirection.GEOCENTRIC_Z,
SI.METRE, cs.getAxis(2));
     }
 
     /**
@@ -164,7 +165,7 @@ public final strictfp class GeodeticObje
     @Test
     public void testGeographicCRS() throws ParseException {
         verifyGeographicCRS(0, parse(GeographicCRS.class,
-               "  GEOGCS[“WGS84”,\n" +
+               "  GEOGCS[“WGS 84”,\n" +
                "    DATUM[“World Geodetic System 1984”,\n" +
                "      SPHEROID[“WGS84”, 6378137.0, 298.257223563]],\n" +
                "      PRIMEM[“Greenwich”, 0.0],\n" +
@@ -182,7 +183,7 @@ public final strictfp class GeodeticObje
     @DependsOnMethod("testGeographicCRS")
     public void testAxisSwapping() throws ParseException {
         verifyGeographicCRS(1, parse(GeographicCRS.class,
-               "  GEOGCS[“WGS84”,\n" +
+               "  GEOGCS[“WGS 84”,\n" +
                "    DATUM[“World Geodetic System 1984”,\n" +
                "      SPHEROID[“WGS84”, 6378137.0, 298.257223563]],\n" +
                "      PRIMEM[“Greenwich”, 0.0],\n" +
@@ -192,12 +193,29 @@ public final strictfp class GeodeticObje
     }
 
     /**
+     * Tests the parsing of a geographic CRS from a WKT 1 string that does not declare explicitly
the axes.
+     *
+     * @throws ParseException if the parsing failed.
+     */
+    @Test
+    @DependsOnMethod("testGeographicCRS")
+    public void testImplicitAxes() throws ParseException {
+        verifyGeographicCRS(0, parse(GeographicCRS.class,
+               "  GEOGCS[“WGS 84”,\n" +
+               "    DATUM[“World Geodetic System 1984”,\n" +
+               "      SPHEROID[“WGS84”, 6378137.0, 298.257223563]],\n" +
+               "      PRIMEM[“Greenwich”, 0.0],\n" +
+               "    UNIT[“degree”, 0.017453292519943295]]"));
+    }
+
+    /**
      * Implementation of {@link #testGeographicCRS()} and {@link #testAxisSwapping()}.
+     * This test expects no {@code AUTHORITY} element on any component.
      *
      * @param swap 1 if axes are expected to be swapped, or 0 otherwise.
      */
     private void verifyGeographicCRS(final int swap, final GeographicCRS crs) throws ParseException
{
-        assertNameAndIdentifierEqual("WGS84", 0, crs);
+        assertNameAndIdentifierEqual("WGS 84", 0, crs);
 
         final GeodeticDatum datum = crs.getDatum();
         assertNameAndIdentifierEqual("World Geodetic System 1984", 0, datum);
@@ -224,7 +242,7 @@ public final strictfp class GeodeticObje
     public void testProjectedCRS() throws ParseException {
         final ProjectedCRS crs = parse(ProjectedCRS.class,
                 "PROJCS[“Mercator test”,\n" +
-               "  GEOGCS[“WGS84”,\n" +
+               "  GEOGCS[“WGS 84”,\n" +
                "    DATUM[“World Geodetic System 1984”,\n" +
                "      SPHEROID[“WGS84”, 6378137.0, 298.257223563]],\n" +
                "      PRIMEM[“Greenwich”, 0.0],\n" +
@@ -298,15 +316,7 @@ public final strictfp class GeodeticObje
         final Iterator<CoordinateReferenceSystem> components = crs.getComponents().iterator();
 
         // GeographicCRS child
-        final GeographicCRS geoCRS    = (GeographicCRS) components.next();
-        final GeodeticDatum geoDatum  = geoCRS.getDatum();
-        final Ellipsoid     ellipsoid = geoDatum.getEllipsoid();
-        assertNameAndIdentifierEqual("WGS 84", 0, geoCRS);
-        assertNameAndIdentifierEqual("World Geodetic System 1984", 0, geoDatum);
-        assertNameAndIdentifierEqual("WGS84", 0, ellipsoid);
-        assertNameAndIdentifierEqual("Greenwich", 0, geoDatum.getPrimeMeridian());
-        assertEquals("semiMajor", 6378137, ellipsoid.getSemiMajorAxis(), STRICT);
-        assertEquals("inverseFlattening", 298.257223563, ellipsoid.getInverseFlattening(),
STRICT);
+        verifyGeographicCRS(0, (GeographicCRS) components.next());
 
         // VerticalCRS child
         final VerticalCRS vertCRS = (VerticalCRS) components.next();

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -30,6 +30,7 @@ import org.opengis.referencing.cs.Ellips
 import org.opengis.referencing.datum.TemporalDatum;
 import org.opengis.referencing.datum.VerticalDatum;
 import org.opengis.referencing.datum.VerticalDatumType;
+import org.apache.sis.internal.metadata.AxisNames;
 import org.apache.sis.internal.metadata.VerticalDatumTypes;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.test.DependsOnMethod;
@@ -142,11 +143,11 @@ public final strictfp class CommonCRSTes
             final VerticalDatumType datumType;
             final String axisName, datumName;
             switch (e) {
-                case BAROMETRIC:     axisName = "Barometric altitude";    datumName = "Constant
pressure surface"; datumType = VerticalDatumType. BAROMETRIC;    break;
-                case MEAN_SEA_LEVEL: axisName = "Gravity-related height"; datumName = "Mean
Sea Level";            datumType = VerticalDatumType. GEOIDAL;       break;
-                case DEPTH:          axisName = "Depth";                  datumName = "Mean
Sea Level";            datumType = VerticalDatumType. GEOIDAL;       break;
-                case ELLIPSOIDAL:    axisName = "Ellipsoidal height";     datumName = "Ellipsoid";
                datumType = VerticalDatumTypes.ELLIPSOIDAL;   break;
-                case OTHER_SURFACE:  axisName = "Height";                 datumName = "Other
surface";             datumType = VerticalDatumType. OTHER_SURFACE; break;
+                case BAROMETRIC:     axisName = "Barometric altitude";            datumName
= "Constant pressure surface"; datumType = VerticalDatumType. BAROMETRIC;    break;
+                case MEAN_SEA_LEVEL: axisName = AxisNames.GRAVITY_RELATED_HEIGHT; datumName
= "Mean Sea Level";            datumType = VerticalDatumType. GEOIDAL;       break;
+                case DEPTH:          axisName = AxisNames.DEPTH;                  datumName
= "Mean Sea Level";            datumType = VerticalDatumType. GEOIDAL;       break;
+                case ELLIPSOIDAL:    axisName = AxisNames.ELLIPSOIDAL_HEIGHT;     datumName
= "Ellipsoid";                 datumType = VerticalDatumTypes.ELLIPSOIDAL;   break;
+                case OTHER_SURFACE:  axisName = "Height";                         datumName
= "Other surface";             datumType = VerticalDatumType. OTHER_SURFACE; break;
                 default: throw new AssertionError(e);
             }
             final String        name  = e.name();

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -33,6 +33,7 @@ import org.opengis.referencing.cs.Cartes
 import org.opengis.referencing.cs.EllipsoidalCS;
 import org.opengis.referencing.cs.RangeMeaning;
 import org.opengis.referencing.crs.GeodeticCRS;
+import org.apache.sis.internal.metadata.AxisNames;
 
 import static org.apache.sis.test.Assert.*;
 
@@ -308,8 +309,8 @@ public final strictfp class GeodeticObje
         final CoordinateSystemAxis N = cs.getAxis(1);
         assertNotNull("axis", E);
         assertNotNull("axis", N);
-        assertEquals("axis[0].name",         "Easting",           E.getName().getCode());
-        assertEquals("axis[1].name",         "Northing",          N.getName().getCode());
+        assertEquals("axis[0].name",         AxisNames.EASTING,   E.getName().getCode());
+        assertEquals("axis[1].name",         AxisNames.NORTHING,  N.getName().getCode());
         assertEquals("axis[0].abbreviation", "E",                 E.getAbbreviation());
         assertEquals("axis[1].abbreviation", "N",                 N.getAbbreviation());
         assertEquals("axis[0].direction",    AxisDirection.EAST,  E.getDirection());
@@ -363,14 +364,14 @@ public final strictfp class GeodeticObje
         final CoordinateSystemAxis longitude = cs.getAxis(1);
         assertNotNull("axis", latitude);
         assertNotNull("axis", longitude);
-        assertEquals("axis[0].name",      "Geodetic latitude",  latitude .getName().getCode());
-        assertEquals("axis[1].name",      "Geodetic longitude", longitude.getName().getCode());
-        assertEquals("axis[0].direction", AxisDirection.NORTH,  latitude .getDirection());
-        assertEquals("axis[1].direction", AxisDirection.EAST,   longitude.getDirection());
-        assertEquals("axis[0].unit",      NonSI.DEGREE_ANGLE,   latitude .getUnit());
-        assertEquals("axis[1].unit",      NonSI.DEGREE_ANGLE,   longitude.getUnit());
-        verifyRange(latitude,   -90,  +90, RangeMeaning.EXACT, isRangeMandatory);
-        verifyRange(longitude, -180, +180, RangeMeaning.WRAPAROUND, isRangeMandatory);
+        assertEquals("axis[0].name",       AxisNames.GEODETIC_LATITUDE,  latitude .getName().getCode());
+        assertEquals("axis[1].name",       AxisNames.GEODETIC_LONGITUDE, longitude.getName().getCode());
+        assertEquals("axis[0].direction",  AxisDirection.NORTH,          latitude .getDirection());
+        assertEquals("axis[1].direction",  AxisDirection.EAST,           longitude.getDirection());
+        assertEquals("axis[0].unit",       NonSI.DEGREE_ANGLE,           latitude .getUnit());
+        assertEquals("axis[1].unit",       NonSI.DEGREE_ANGLE,           longitude.getUnit());
+        verifyRange(latitude,   -90,  +90, RangeMeaning.EXACT,           isRangeMandatory);
+        verifyRange(longitude, -180, +180, RangeMeaning.WRAPAROUND,      isRangeMandatory);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java?rev=1684160&r1=1684159&r2=1684160&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
[UTF-8] Mon Jun  8 11:33:22 2015
@@ -23,6 +23,7 @@ import javax.measure.unit.SI;
 import javax.measure.unit.NonSI;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.RangeMeaning;
+import org.apache.sis.internal.metadata.AxisNames;
 
 
 /**
@@ -46,7 +47,7 @@ public final strictfp class HardCodedAxe
      * @see #SPHERICAL_LONGITUDE
      * @see #GEODETIC_LATITUDE
      */
-    public static final DefaultCoordinateSystemAxis GEODETIC_LONGITUDE = create("Geodetic
longitude", "λ",
+    public static final DefaultCoordinateSystemAxis GEODETIC_LONGITUDE = create(AxisNames.GEODETIC_LONGITUDE,
"λ",
             AxisDirection.EAST, NonSI.DEGREE_ANGLE, -180, 180, RangeMeaning.WRAPAROUND);
 
     /**
@@ -61,13 +62,13 @@ public final strictfp class HardCodedAxe
      * @see #SPHERICAL_LATITUDE
      * @see #GEODETIC_LONGITUDE
      */
-    public static final DefaultCoordinateSystemAxis GEODETIC_LATITUDE = create("Geodetic
latitude", "φ",
+    public static final DefaultCoordinateSystemAxis GEODETIC_LATITUDE = create(AxisNames.GEODETIC_LATITUDE,
"φ",
             AxisDirection.NORTH, NonSI.DEGREE_ANGLE, -90, 90, RangeMeaning.EXACT);
 
     /**
      * Identical to {@link #GEODETIC_LONGITUDE} except for the range of longitude values.
      */
-    public static final DefaultCoordinateSystemAxis SHIFTED_LONGITUDE = create("Geodetic
longitude", "λ",
+    public static final DefaultCoordinateSystemAxis SHIFTED_LONGITUDE = create(AxisNames.GEODETIC_LONGITUDE,
"λ",
             AxisDirection.EAST, NonSI.DEGREE_ANGLE, 0, 360, RangeMeaning.WRAPAROUND);
 
     /**
@@ -79,7 +80,7 @@ public final strictfp class HardCodedAxe
      * @see #GEODETIC_LONGITUDE
      * @see #SPHERICAL_LONGITUDE
      */
-    public static final DefaultCoordinateSystemAxis LONGITUDE_gon = create("Longitude", "λ",
+    public static final DefaultCoordinateSystemAxis LONGITUDE_gon = create(AxisNames.LONGITUDE,
"λ",
             AxisDirection.EAST, NonSI.GRADE, -200, 200, RangeMeaning.WRAPAROUND);
 
     /**
@@ -91,7 +92,7 @@ public final strictfp class HardCodedAxe
      * @see #GEODETIC_LATITUDE
      * @see #SPHERICAL_LATITUDE
      */
-    public static final DefaultCoordinateSystemAxis LATITUDE_gon = create("Latitude", "φ",
+    public static final DefaultCoordinateSystemAxis LATITUDE_gon = create(AxisNames.LATITUDE,
"φ",
             AxisDirection.NORTH, NonSI.GRADE, -100, 100, RangeMeaning.EXACT);
 
     /**
@@ -108,7 +109,7 @@ public final strictfp class HardCodedAxe
      * @see #GRAVITY_RELATED_HEIGHT
      * @see #DEPTH
      */
-    public static final DefaultCoordinateSystemAxis ELLIPSOIDAL_HEIGHT = create("Ellipsoidal
height", "h",
+    public static final DefaultCoordinateSystemAxis ELLIPSOIDAL_HEIGHT = create(AxisNames.ELLIPSOIDAL_HEIGHT,
"h",
             AxisDirection.UP, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -121,7 +122,7 @@ public final strictfp class HardCodedAxe
      * @see #GEOCENTRIC_RADIUS
      * @see #DEPTH
      */
-    public static final DefaultCoordinateSystemAxis GRAVITY_RELATED_HEIGHT = create("Gravity-related
height", "H",
+    public static final DefaultCoordinateSystemAxis GRAVITY_RELATED_HEIGHT = create(AxisNames.GRAVITY_RELATED_HEIGHT,
"H",
             AxisDirection.UP, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -156,7 +157,7 @@ public final strictfp class HardCodedAxe
      * @see #GEOCENTRIC_RADIUS
      * @see #GRAVITY_RELATED_HEIGHT
      */
-    public static final DefaultCoordinateSystemAxis DEPTH = create("Depth", "D",
+    public static final DefaultCoordinateSystemAxis DEPTH = create(AxisNames.DEPTH, "D",
             AxisDirection.DOWN, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -173,7 +174,7 @@ public final strictfp class HardCodedAxe
      * @see #GRAVITY_RELATED_HEIGHT
      * @see #DEPTH
      */
-    public static final DefaultCoordinateSystemAxis GEOCENTRIC_RADIUS = create("Geocentric
radius", "r",
+    public static final DefaultCoordinateSystemAxis GEOCENTRIC_RADIUS = create(AxisNames.GEOCENTRIC_RADIUS,
"r",
             AxisDirection.UP, SI.METRE, 0, Double.POSITIVE_INFINITY, RangeMeaning.EXACT);
 
     /**
@@ -189,7 +190,7 @@ public final strictfp class HardCodedAxe
      * @see #GEODETIC_LONGITUDE
      * @see #SPHERICAL_LATITUDE
      */
-    public static final DefaultCoordinateSystemAxis SPHERICAL_LONGITUDE = create("Spherical
longitude", "θ",
+    public static final DefaultCoordinateSystemAxis SPHERICAL_LONGITUDE = create(AxisNames.SPHERICAL_LONGITUDE,
"θ",
             AxisDirection.EAST, NonSI.DEGREE_ANGLE, -180, 180, RangeMeaning.WRAPAROUND);
 
     /**
@@ -197,7 +198,7 @@ public final strictfp class HardCodedAxe
      * using {@linkplain org.apache.sis.referencing.cs.DefaultSphericalCS spherical CS}.
      * Increasing ordinates values go {@linkplain AxisDirection#NORTH North}
      * and units are {@linkplain NonSI#DEGREE_ANGLE degrees}.
-     * The ISO 19111 name is <cite>"spherical latitude"</cite> and the abbreviation
is "φ′" (phi).
+     * The ISO 19111 name is <cite>"spherical latitude"</cite> and the abbreviation
is "φ′" (phi prime).
      *
      * <p>This axis is usually part of a {@link #SPHERICAL_LONGITUDE}, {@link #SPHERICAL_LATITUDE},
      * {@link #GEOCENTRIC_RADIUS} set.</p>
@@ -205,7 +206,7 @@ public final strictfp class HardCodedAxe
      * @see #GEODETIC_LATITUDE
      * @see #SPHERICAL_LONGITUDE
      */
-    public static final DefaultCoordinateSystemAxis SPHERICAL_LATITUDE = create("Spherical
latitude", "φ′",
+    public static final DefaultCoordinateSystemAxis SPHERICAL_LATITUDE = create(AxisNames.SPHERICAL_LATITUDE,
"φ′",
             AxisDirection.NORTH, NonSI.DEGREE_ANGLE, -90, 90, RangeMeaning.EXACT);
 
     /**
@@ -262,7 +263,7 @@ public final strictfp class HardCodedAxe
      *
      * <p>This axis is usually part of a {@link #GEOCENTRIC_X}, {@link #GEOCENTRIC_Y},
{@link #GEOCENTRIC_Z} set.</p>
      */
-    public static final DefaultCoordinateSystemAxis GEOCENTRIC_X = create("Geocentric X",
"X",
+    public static final DefaultCoordinateSystemAxis GEOCENTRIC_X = create(AxisNames.GEOCENTRIC_X,
"X",
             AxisDirection.GEOCENTRIC_X, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -277,7 +278,7 @@ public final strictfp class HardCodedAxe
      *
      * <p>This axis is usually part of a {@link #GEOCENTRIC_X}, {@link #GEOCENTRIC_Y},
{@link #GEOCENTRIC_Z} set.</p>
      */
-    public static final DefaultCoordinateSystemAxis GEOCENTRIC_Y = create("Geocentric Y",
"Y",
+    public static final DefaultCoordinateSystemAxis GEOCENTRIC_Y = create(AxisNames.GEOCENTRIC_Y,
"Y",
             AxisDirection.GEOCENTRIC_Y, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -292,7 +293,7 @@ public final strictfp class HardCodedAxe
      *
      * <p>This axis is usually part of a {@link #GEOCENTRIC_X}, {@link #GEOCENTRIC_Y},
{@link #GEOCENTRIC_Z} set.</p>
      */
-    public static final DefaultCoordinateSystemAxis GEOCENTRIC_Z = create("Geocentric Z",
"Z",
+    public static final DefaultCoordinateSystemAxis GEOCENTRIC_Z = create(AxisNames.GEOCENTRIC_Z,
"Z",
             AxisDirection.GEOCENTRIC_Z, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -306,7 +307,7 @@ public final strictfp class HardCodedAxe
      * @see #EASTING
      * @see #WESTING
      */
-    public static final DefaultCoordinateSystemAxis EASTING = create("Easting", "E",
+    public static final DefaultCoordinateSystemAxis EASTING = create(AxisNames.EASTING, "E",
             AxisDirection.EAST, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -318,7 +319,7 @@ public final strictfp class HardCodedAxe
      * @see #EASTING
      * @see #WESTING
      */
-    public static final DefaultCoordinateSystemAxis WESTING = create("Westing", "W",
+    public static final DefaultCoordinateSystemAxis WESTING = create(AxisNames.WESTING, "W",
             AxisDirection.WEST, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -332,7 +333,7 @@ public final strictfp class HardCodedAxe
      * @see #NORTHING
      * @see #SOUTHING
      */
-    public static final DefaultCoordinateSystemAxis NORTHING = create("Northing", "N",
+    public static final DefaultCoordinateSystemAxis NORTHING = create(AxisNames.NORTHING,
"N",
             AxisDirection.NORTH, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**
@@ -344,7 +345,7 @@ public final strictfp class HardCodedAxe
      * @see #NORTHING
      * @see #SOUTHING
      */
-    public static final DefaultCoordinateSystemAxis SOUTHING = create("Southing", "S",
+    public static final DefaultCoordinateSystemAxis SOUTHING = create(AxisNames.SOUTHING,
"S",
             AxisDirection.SOUTH, SI.METRE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
null);
 
     /**



Mime
View raw message