sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1559074 - in /sis/branches/JDK7/core: sis-referencing/src/main/java/org/apache/sis/referencing/ sis-referencing/src/test/java/org/apache/sis/referencing/ sis-utility/src/main/java/org/apache/sis/util/resources/
Date Fri, 17 Jan 2014 11:28:41 GMT
Author: desruisseaux
Date: Fri Jan 17 11:28:41 2014
New Revision: 1559074

URL: http://svn.apache.org/r1559074
Log:
Better names for vertical CRS.

Modified:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectsTest.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java?rev=1559074&r1=1559073&r2=1559074&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] Fri Jan 17 11:28:41 2014
@@ -70,8 +70,8 @@ public final class CRS extends Static {
      *   <tr><td>EPSG:4269</td> <td>{@link GeodeticObjects#NAD83
 NAD83}</td>  <td>Geographic</td> <td>North American Datum 1983</td></tr>
      *   <tr><td>EPSG:4322</td> <td>{@link GeodeticObjects#WGS72
 WGS72}</td>  <td>Geographic</td> <td>World Geodetic System 1972</td></tr>
      *   <tr><td>EPSG:4326</td> <td>{@link GeodeticObjects#WGS84
 WGS84}</td>  <td>Geographic</td> <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG:5714</td> <td>{@link GeodeticObjects.Vertical#MSL_HEIGHT
MSL_HEIGHT}</td> <td>Vertical</td> <td>Mean Sea Level height</td></tr>
-     *   <tr><td>EPSG:5715</td> <td>{@link GeodeticObjects.Vertical#MSL_DEPTH
 MSL_DEPTH}</td>  <td>Vertical</td> <td>Mean Sea Level depth</td></tr>
+     *   <tr><td>EPSG:5715</td> <td>{@link GeodeticObjects.Vertical#DEPTH
 DEPTH}</td> <td>Vertical</td> <td>Mean Sea Level depth</td></tr>
+     *   <tr><td>EPSG:5714</td> <td>{@link GeodeticObjects.Vertical#MEAN_SEA_LEVEL
MEAN_SEA_LEVEL}</td> <td>Vertical</td> <td>Mean Sea Level height</td></tr>
      * </table></blockquote>
      *
      * This method accepts also the URN and URL syntax.
@@ -122,16 +122,14 @@ public final class CRS extends Static {
                 }
             } else if (authority.equalsIgnoreCase("EPSG")) {
                 final int n = Integer.parseInt(value);
-                if (n != 0) { // 0 stands for "no EPSG code" in GeodeticObjects.Vertical
-                    for (final GeodeticObjects candidate : GeodeticObjects.values()) {
-                        if (candidate.geographic == n) {
-                            return candidate.geographic();
-                        }
+                for (final GeodeticObjects candidate : GeodeticObjects.values()) {
+                    if (candidate.geographic == n) {
+                        return candidate.geographic();
                     }
-                    for (final GeodeticObjects.Vertical candidate : GeodeticObjects.Vertical.values())
{
-                        if (candidate.crs == n) {
-                            return candidate.crs();
-                        }
+                }
+                for (final GeodeticObjects.Vertical candidate : GeodeticObjects.Vertical.values())
{
+                    if (candidate.isEPSG && candidate.crs == n) {
+                        return candidate.crs();
                     }
                 }
             } else {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java?rev=1559074&r1=1559073&r2=1559074&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java
[UTF-8] Fri Jan 17 11:28:41 2014
@@ -576,7 +576,7 @@ public enum GeodeticObjects {
      * above the Mean Sea Level (MSL):</p>
      *
      * {@preformat java
-     *   VerticalCRS crs = GeodeticObjects.Vertical.MSL_HEIGHT.crs();
+     *   VerticalCRS crs = GeodeticObjects.Vertical.MEAN_SEA_LEVEL.crs();
      * }
      *
      * Below is an alphabetical list of object names available in this enumeration:
@@ -585,15 +585,15 @@ public enum GeodeticObjects {
      *   <tr><th>Name or alias</th>             <th>Object type</th>
<th>Enumeration value</th></tr>
      *   <tr><td>Barometric altitude</td>       <td>CRS, Datum</td>
 <td>{@link #BAROMETRIC}</td></tr>
      *   <tr><td><s>Ellipsoidal height</s></td> <td>CRS,
Datum</td>  <td><s>{@link #ELLIPSOIDAL}</s></td></tr>
-     *   <tr><td>Mean Sea Level</td>            <td>Datum</td>
      <td>{@link #MSL_HEIGHT}</td></tr>
-     *   <tr><td>Mean Sea Level height</td>     <td>CRS</td>
        <td>{@link #MSL_HEIGHT}</td></tr>
-     *   <tr><td>Mean Sea Level depth</td>      <td>CRS</td>
        <td>{@link #MSL_DEPTH}</td></tr>
+     *   <tr><td>Mean Sea Level</td>            <td>Datum</td>
      <td>{@link #MEAN_SEA_LEVEL}</td></tr>
+     *   <tr><td>Mean Sea Level depth</td>      <td>CRS</td>
        <td>{@link #DEPTH}</td></tr>
+     *   <tr><td>Mean Sea Level height</td>     <td>CRS</td>
        <td>{@link #MEAN_SEA_LEVEL}</td></tr>
      *   <tr><td>Other surface</td>             <td>CRS, Datum</td>
 <td>{@link #OTHER_SURFACE}</td></tr>
      * </table></blockquote>
      *
      * {@note We do not provide a <code>GEOIDAL</code> value because its definition
depends on the realization epoch.
-     *        For example EGM84, EGM96 and EGM2008 are applications of three different geoid
models on the WGS 84
-     *        ellipsoid. The <code>MSL_HEIGHT</code> value can be used instead
as an approximation of geoidal heights.}
+     * For example EGM84, EGM96 and EGM2008 are applications of three different geoid models
on the WGS 84 ellipsoid.
+     * The <code>MEAN_SEA_LEVEL</code> value can be used instead as an approximation
of geoidal heights.}
      *
      * @author  Martin Desruisseaux (Geomatys)
      * @since   0.4
@@ -603,11 +603,12 @@ public enum GeodeticObjects {
     public static enum Vertical {
         /**
          * Height measured by atmospheric pressure in hectopascals (hPa).
+         * Hectopascals are the units of measurement used by the worldwide meteorological
community.
          * The datum is not specific to any location or epoch.
          *
          * @see VerticalDatumType#BAROMETRIC
          */
-        BAROMETRIC(Vocabulary.Keys.BarometricAltitude, (short) 0, (short) 0),
+        BAROMETRIC(false, Vocabulary.Keys.BarometricAltitude, Vocabulary.Keys.ConstantPressureSurface),
 
         /**
          * Height measured above the Mean Sea Level (MSL) in metres. Can be used as an approximation
of geoidal heights
@@ -616,14 +617,14 @@ public enum GeodeticObjects {
          * <blockquote><table class="compact" style="text-align:left">
          *   <tr><th>EPSG identifiers:</th>         <td>5714 &nbsp;(<i>datum:</i>
5100)</td></tr>
          *   <tr><th>Primary names:</th>            <td>"MSL height"
&nbsp;(<i>datum:</i> "Mean Sea Level")</td></tr>
-         *   <tr><th>Abbreviations or aliases:</th> <td>"mean sea
level height" &nbp;(<i>datum:</i> "MSL")</td></tr>
+         *   <tr><th>Abbreviations or aliases:</th> <td>"mean sea
level height" &nbsp;(<i>datum:</i> "MSL")</td></tr>
          *   <tr><th>Direction:</th>                <td>{@link AxisDirection#UP}</td></tr>
          *   <tr><th>Unit:</th>                     <td>{@link SI#METRE}</td></tr>
          * </table></blockquote>
          *
          * @see VerticalDatumType#GEOIDAL
          */
-        MSL_HEIGHT(Vocabulary.Keys.Geoidal, (short) 5714, (short) 5100),
+        MEAN_SEA_LEVEL(true, (short) 5714, (short) 5100),
 
         /**
          * Depth measured below the Mean Sea Level (MSL) in metres.
@@ -631,14 +632,14 @@ public enum GeodeticObjects {
          * <blockquote><table class="compact" style="text-align:left">
          *   <tr><th>EPSG identifiers:</th>         <td>5715 &nbsp;(<i>datum:</i>
5100)</td></tr>
          *   <tr><th>Primary names:</th>            <td>"MSL depth"
&nbsp;(<i>datum:</i> "Mean Sea Level")</td></tr>
-         *   <tr><th>Abbreviations or aliases:</th> <td>"mean sea
level depth" &nbp;(<i>datum:</i> "MSL")</td></tr>
+         *   <tr><th>Abbreviations or aliases:</th> <td>"mean sea
level depth" &nbsp;(<i>datum:</i> "MSL")</td></tr>
          *   <tr><th>Direction:</th>                <td>{@link AxisDirection#DOWN}</td></tr>
          *   <tr><th>Unit:</th>                     <td>{@link SI#METRE}</td></tr>
          * </table></blockquote>
          *
          * @see VerticalDatumType#GEOIDAL
          */
-        MSL_DEPTH(Vocabulary.Keys.Geoidal, (short) 5715, (short) 5100),
+        DEPTH(true, (short) 5715, (short) 5100),
 
         /**
          * Height measured along the normal to the ellipsoid used in the definition of horizontal
datum.
@@ -651,7 +652,7 @@ public enum GeodeticObjects {
          * because it is sometime useful to temporarily express ellipsoidal heights independently
from other
          * ordinate values.</p>
          */
-        ELLIPSOIDAL(Vocabulary.Keys.Ellipsoidal, (short) 0, (short) 0),
+        ELLIPSOIDAL(false, Vocabulary.Keys.EllipsoidalHeight, Vocabulary.Keys.Ellipsoid),
 
         /**
          * Height measured above other kind of surface, for example a geological feature.
@@ -659,20 +660,21 @@ public enum GeodeticObjects {
          *
          * @see VerticalDatumType#OTHER_SURFACE
          */
-        OTHER_SURFACE(Vocabulary.Keys.OtherSurface, (short) 0, (short) 0);
+        OTHER_SURFACE(false, Vocabulary.Keys.Height, Vocabulary.Keys.OtherSurface);
 
         /**
-         * The resource keys for the name as one of the {@code Vocabulary.Keys} constants.
+         * {@code true} if {@link #crs} and {@link #datum} are EPSG codes, or {@code false}
if
+         * they are resource keys for the name as one of the {@code Vocabulary.Keys} constants.
          */
-        private final short key;
+        final boolean isEPSG;
 
         /**
-         * The EPSG code for the CRS, or 0 if none.
+         * The EPSG code for the CRS or the resource keys, depending on {@link #isEPSG} value.
          */
         final short crs;
 
         /**
-         * The EPSG code for the datum, or 0 if none.
+         * The EPSG code for the datum or the resource keys, depending on {@link #isEPSG}
value.
          */
         final short datum;
 
@@ -690,10 +692,10 @@ public enum GeodeticObjects {
          *        early class initialization. In particular, we do not want early dependency
to the SIS-specific
          *        <code>VerticalDatumTypes.ELLIPSOIDAL</code> constant.}
          */
-        private Vertical(final short name, final short crs, final short datum) {
-            this.key   = name;
-            this.crs   = crs;
-            this.datum = datum;
+        private Vertical(final boolean isEPSG, final short crs, final short datum) {
+            this.isEPSG = isEPSG;
+            this.crs    = crs;
+            this.datum  = datum;
         }
 
         /**
@@ -726,8 +728,8 @@ public enum GeodeticObjects {
          *   <tr><th>Name or alias</th>             <th>Enum</th>
                       <th>EPSG</th></tr>
          *   <tr><td>Barometric altitude</td>       <td>{@link #BAROMETRIC}</td>
        <td></td></tr>
          *   <tr><td><s>Ellipsoidal height</s></td> <td><s>{@link
#ELLIPSOIDAL}</s></td> <td></td></tr>
-         *   <tr><td>Mean Sea Level height</td>     <td>{@link #MSL_HEIGHT}</td>
        <td>5714</td></tr>
-         *   <tr><td>Mean Sea Level depth</td>      <td>{@link #MSL_DEPTH}</td>
         <td>5715</td></tr>
+         *   <tr><td>Mean Sea Level depth</td>      <td>{@link #DEPTH}</td>
             <td>5715</td></tr>
+         *   <tr><td>Mean Sea Level height</td>     <td>{@link #MEAN_SEA_LEVEL}</td>
    <td>5714</td></tr>
          *   <tr><td>Other surface</td>             <td>{@link #OTHER_SURFACE}</td>
     <td></td></tr>
          * </table></blockquote>
          *
@@ -741,7 +743,7 @@ public enum GeodeticObjects {
                 synchronized (this) {
                     object = crs(cached);
                     if (object == null) {
-                        if (crs != 0) {
+                        if (isEPSG) {
                             final CRSAuthorityFactory factory = crsFactory();
                             if (factory != null) try {
                                 cached = object = factory.createVerticalCRS(String.valueOf(crs));
@@ -751,8 +753,8 @@ public enum GeodeticObjects {
                             }
                             object = StandardDefinitions.createVerticalCRS(crs, datum());
                         } else {
-                            final VerticalDatum datum = datum();
-                            object = new DefaultVerticalCRS(IdentifiedObjects.getProperties(datum),
datum, cs());
+                            final VerticalCS cs = cs();
+                            object = new DefaultVerticalCRS(IdentifiedObjects.getProperties(cs),
datum(), cs);
                         }
                         cached = object;
                     }
@@ -766,30 +768,20 @@ public enum GeodeticObjects {
          * This method does not cache the coordinate system.
          */
         private VerticalCS cs() {
-            final Map<String,?> cs, axis;
+            final Map<String,?> properties = properties(crs);
             final Unit<?> unit;
             switch (this) {
                 default: {
-                    // Share the coordinate system created for ellipsoidal height.
-                    return ELLIPSOIDAL.crs().getCoordinateSystem();
-                }
-                case ELLIPSOIDAL: {
-                    // Create all properties for a new coordinate system.
-                    cs   = properties(Vocabulary.Keys.Vertical);
-                    axis = properties(Vocabulary.Keys.Height);
                     unit = SI.METRE;
                     break;
                 }
                 case BAROMETRIC: {
-                    // Share the NamedIdentifier created for ellipsoidal height.
-                    final VerticalCS share = ELLIPSOIDAL.crs().getCoordinateSystem();
-                    cs   = IdentifiedObjects.getProperties(share);
-                    axis = IdentifiedObjects.getProperties(share.getAxis(0));
                     unit = SI.MetricPrefix.HECTO(SI.PASCAL);
                     break;
                 }
             }
-            return new DefaultVerticalCS(cs, new DefaultCoordinateSystemAxis(axis, "h", AxisDirection.UP,
unit));
+            return new DefaultVerticalCS(properties,
+                    new DefaultCoordinateSystemAxis(properties, "h", AxisDirection.UP, unit));
         }
 
         /**
@@ -801,7 +793,7 @@ public enum GeodeticObjects {
          *   <tr><th>Name or alias</th>             <th>Enum</th>
                       <th>EPSG</th></tr>
          *   <tr><td>Barometric altitude</td>       <td>{@link #BAROMETRIC}</td>
        <td></td></tr>
          *   <tr><td><s>Ellipsoidal height</s></td> <td><s>{@link
#ELLIPSOIDAL}</s></td> <td></td></tr>
-         *   <tr><td>Mean Sea Level</td>            <td>{@link #MSL_HEIGHT}</td>
        <td>5100</td></tr>
+         *   <tr><td>Mean Sea Level</td>            <td>{@link #MEAN_SEA_LEVEL}</td>
    <td>5100</td></tr>
          *   <tr><td>Other surface</td>             <td>{@link #OTHER_SURFACE}</td>
     <td></td></tr>
          * </table></blockquote>
          *
@@ -815,7 +807,7 @@ public enum GeodeticObjects {
                 synchronized (this) {
                     object = datum(cached);
                     if (object == null) {
-                        if (datum != 0) {
+                        if (isEPSG) {
                             final DatumAuthorityFactory factory = datumFactory();
                             if (factory != null) try {
                                 cached = object = factory.createVerticalDatum(String.valueOf(datum));
@@ -825,7 +817,7 @@ public enum GeodeticObjects {
                             }
                             object = StandardDefinitions.createVerticalDatum(datum);
                         } else {
-                            object = new DefaultVerticalDatum(properties(key), VerticalDatumType.valueOf(name()));
+                            object = new DefaultVerticalDatum(properties(datum), VerticalDatumType.valueOf(name()));
                         }
                         cached = object;
                     }

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java?rev=1559074&r1=1559073&r2=1559074&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
[UTF-8] Fri Jan 17 11:28:41 2014
@@ -61,8 +61,8 @@ public final strictfp class CRSTest exte
         verifyForCode(GeodeticObjects.NAD27 .geographic(), "EPSG:4267");
         verifyForCode(GeodeticObjects.ETRS89.geographic(), "EPSG:4258");
         verifyForCode(GeodeticObjects.ED50  .geographic(), "EPSG:4230");
-        assertSame("EPSG:5714", GeodeticObjects.Vertical.MSL_HEIGHT.crs(), CRS.forCode("EPSG:5714"));
-        assertSame("EPSG:5715", GeodeticObjects.Vertical.MSL_DEPTH .crs(), CRS.forCode("EPSG:5715"));
+        assertSame("EPSG:5714", GeodeticObjects.Vertical.MEAN_SEA_LEVEL.crs(), CRS.forCode("EPSG:5714"));
+        assertSame("EPSG:5715", GeodeticObjects.Vertical.DEPTH.crs(), CRS.forCode("EPSG:5715"));
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectsTest.java?rev=1559074&r1=1559073&r2=1559074&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectsTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectsTest.java
[UTF-8] Fri Jan 17 11:28:41 2014
@@ -81,19 +81,20 @@ public final strictfp class GeodeticObje
     @Test
     public void testVertical() {
         for (final GeodeticObjects.Vertical e : GeodeticObjects.Vertical.values()) {
-            final VerticalDatumType expectedType;
+            final VerticalDatumType datumType;
+            final String axisName, datumName;
             switch (e) {
-                case MSL_DEPTH:     // Fall through
-                case MSL_HEIGHT:    expectedType = VerticalDatumType. GEOIDAL;       break;
-                case BAROMETRIC:    expectedType = VerticalDatumType. BAROMETRIC;    break;
-                case ELLIPSOIDAL:   expectedType = VerticalDatumTypes.ELLIPSOIDAL;   break;
-                case OTHER_SURFACE: expectedType = VerticalDatumType. OTHER_SURFACE; break;
+                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;
                 default: throw new AssertionError(e);
             }
             final String        name  = e.name();
             final VerticalDatum datum = e.datum();
             final VerticalCRS   crs   = e.crs();
-            if (!crs.getCoordinateSystem().getAxis(0).getName().getCode().equals("Height"))
{
+            if (e.isEPSG) {
                 /*
                  * BAROMETRIC, ELLIPSOIDAL and OTHER_SURFACE uses an axis named "Height",
which is not
                  * a valid axis name according ISO 19111. We skip the validation test for
those enums.
@@ -102,7 +103,9 @@ public final strictfp class GeodeticObje
             }
             assertSame  (name, datum,          e.datum()); // Datum before CRS creation.
             assertSame  (name, crs.getDatum(), e.datum()); // Datum after CRS creation.
-            assertEquals(name, expectedType, datum.getVerticalDatumType());
+            assertEquals(name, datumName, datum.getName().getCode());
+            assertEquals(name, datumType, datum.getVerticalDatumType());
+            assertEquals(name, axisName,  crs.getCoordinateSystem().getAxis(0).getName().getCode());
         }
     }
 

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1559074&r1=1559073&r2=1559074&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
[UTF-8] Fri Jan 17 11:28:41 2014
@@ -105,6 +105,11 @@ public final class Vocabulary extends In
         public static final short Commands = 9;
 
         /**
+         * Constant pressure surface
+         */
+        public static final short ConstantPressureSurface = 19;
+
+        /**
          * Current date and time
          */
         public static final short CurrentDateTime = 10;
@@ -145,14 +150,14 @@ public final class Vocabulary extends In
         public static final short DublinJulian = 17;
 
         /**
-         * Ellipsoidal
+         * Ellipsoid
          */
-        public static final short Ellipsoidal = 18;
+        public static final short Ellipsoid = 70;
 
         /**
-         * Geoidal
+         * Ellipsoidal height
          */
-        public static final short Geoidal = 19;
+        public static final short EllipsoidalHeight = 18;
 
         /**
          * Height

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties?rev=1559074&r1=1559073&r2=1559074&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
[ISO-8859-1] Fri Jan 17 11:28:41 2014
@@ -14,73 +14,74 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-Angle              = Angle
-AngularDegrees     = Degrees
-AngularMinutes     = Minutes
-AngularSeconds     = Seconds
-Attributes         = Attributes
-BarometricAltitude = Barometric altitude
-CharacterEncoding  = Character encoding
-Classpath          = Classpath
-Code_1             = {0} code
-Commands           = Commands
-CurrentDateTime    = Current date and time
-CurrentDirectory   = Current directory
-CycleOmitted       = Cycle omitted
-DaylightTime       = Daylight time
-Destination        = Destination
-Dimensions         = Dimensions
-Directory          = Directory
-DublinJulian       = Dublin Julian
-Ellipsoidal        = Ellipsoidal
-Geoidal            = Geoidal
-Height             = Height
-Identifier         = Identifier
-Implementation     = Implementation
-Index              = Index
-JavaExtensions     = Java extensions
-JavaHome           = Java home directory
-Julian             = Julian
-Latitude           = Latitude
-Longitude          = Longitude
-Libraries          = Libraries
-LocalConfiguration = Local configuration
-Locale             = Locale
-Localization       = Localization
-Logging            = Logging
-MaximumValue       = Maximum value
-MeanValue          = Mean value
-MinimumValue       = Minimum value
-ModifiedJulian     = Modified Julian
-Name               = Name
-NumberOfValues     = Number of values
-NumberOfNaN        = Number of \u2018NaN\u2019
-Of_3               = {0} ({1} of {2})
-Offset             = Offset
-OperatingSystem    = Operating system
-Options            = Options
-Others             = Others
-OtherSurface       = Other surface
-Paths              = Paths
-Root               = Root
-RootMeanSquare     = Root Mean Square
-Scale              = Scale
-Source             = Source
-StandardDeviation  = Standard deviation
-TemporaryFiles     = Temporary files
-Temporal           = Temporal
-Time               = Time
-Time_1             = {0} time
-Timezone           = Timezone
-TruncatedJulian    = Truncated Julian
-Type               = Type
-Unnamed            = Unnamed
-Untitled           = Untitled
-UnavailableContent = Unavailable content.
-UserHome           = User home directory
-Value              = Value
-Variables          = Variables
-Version_2          = {0} version {1}
-Versions           = Versions
-Vertical           = Vertical
-World              = World
+Angle                   = Angle
+AngularDegrees          = Degrees
+AngularMinutes          = Minutes
+AngularSeconds          = Seconds
+Attributes              = Attributes
+BarometricAltitude      = Barometric altitude
+CharacterEncoding       = Character encoding
+Classpath               = Classpath
+Code_1                  = {0} code
+Commands                = Commands
+ConstantPressureSurface = Constant pressure surface
+CurrentDateTime         = Current date and time
+CurrentDirectory        = Current directory
+CycleOmitted            = Cycle omitted
+DaylightTime            = Daylight time
+Destination             = Destination
+Dimensions              = Dimensions
+Directory               = Directory
+DublinJulian            = Dublin Julian
+Ellipsoid               = Ellipsoid
+EllipsoidalHeight       = Ellipsoidal height
+Height                  = Height
+Identifier              = Identifier
+Implementation          = Implementation
+Index                   = Index
+JavaExtensions          = Java extensions
+JavaHome                = Java home directory
+Julian                  = Julian
+Latitude                = Latitude
+Longitude               = Longitude
+Libraries               = Libraries
+LocalConfiguration      = Local configuration
+Locale                  = Locale
+Localization            = Localization
+Logging                 = Logging
+MaximumValue            = Maximum value
+MeanValue               = Mean value
+MinimumValue            = Minimum value
+ModifiedJulian          = Modified Julian
+Name                    = Name
+NumberOfValues          = Number of values
+NumberOfNaN             = Number of \u2018NaN\u2019
+Of_3                    = {0} ({1} of {2})
+Offset                  = Offset
+OperatingSystem         = Operating system
+Options                 = Options
+Others                  = Others
+OtherSurface            = Other surface
+Paths                   = Paths
+Root                    = Root
+RootMeanSquare          = Root Mean Square
+Scale                   = Scale
+Source                  = Source
+StandardDeviation       = Standard deviation
+TemporaryFiles          = Temporary files
+Temporal                = Temporal
+Time                    = Time
+Time_1                  = {0} time
+Timezone                = Timezone
+TruncatedJulian         = Truncated Julian
+Type                    = Type
+Unnamed                 = Unnamed
+Untitled                = Untitled
+UnavailableContent      = Unavailable content.
+UserHome                = User home directory
+Value                   = Value
+Variables               = Variables
+Version_2               = {0} version {1}
+Versions                = Versions
+Vertical                = Vertical
+World                   = World

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties?rev=1559074&r1=1559073&r2=1559074&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
[ISO-8859-1] Fri Jan 17 11:28:41 2014
@@ -14,73 +14,74 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-Angle              = Angle
-AngularDegrees     = Degr\u00e9s
-AngularMinutes     = Minutes
-AngularSeconds     = Secondes
-Attributes         = Attributs
-BarometricAltitude = Altitude barom\u00e9trique
-CharacterEncoding  = Encodage des caract\u00e8res
-Classpath          = Chemin de classes
-Code_1             = Code {0}
-Commands           = Commandes
-CurrentDateTime    = Date et heure courantes
-CurrentDirectory   = R\u00e9pertoire courant
-CycleOmitted       = Cycle omit
-DaylightTime       = Heure normale
-Destination        = Destination
-Dimensions         = Dimensions
-Directory          = R\u00e9pertoire
-DublinJulian       = Julien Dublin
-Ellipsoidal        = Ellipso\u00efdal
-Geoidal            = Geo\u00efdal
-Height             = Hauteur
-Identifier         = Identifiant
-Implementation     = Impl\u00e9mentation
-Index              = Index
-JavaExtensions     = Extensions du Java
-JavaHome           = R\u00e9pertoire du Java
-Julian             = Julien
-Latitude           = Latitude
-Longitude          = Longitude
-Libraries          = Biblioth\u00e8ques
-LocalConfiguration = Configuration locale
-Locale             = Locale
-Localization       = R\u00e9gionalisation
-Logging            = Journalisation
-MaximumValue       = Valeur maximale
-MeanValue          = Valeur moyenne
-MinimumValue       = Valeur minimale
-ModifiedJulian     = Julien modifi\u00e9
-Name               = Nom
-NumberOfValues     = Nombre de valeurs
-NumberOfNaN        = Nombre de \u2018NaN\u2019
-Of_3               = {0} ({1} de {2})
-Offset             = D\u00e9calage
-OperatingSystem    = Syst\u00e8me d'exploitation
-Options            = Options
-Others             = Autres
-OtherSurface       = Autre surface
-Paths              = Chemins
-Root               = Racine
-RootMeanSquare     = Moyenne quadratique
-Scale              = \u00c9chelle
-Source             = Source
-StandardDeviation  = \u00c9cart type
-TemporaryFiles     = Fichiers temporaires
-Temporal           = Temporel
-Time               = Temps
-Time_1             = Heure {0}
-Timezone           = Fuseau horaire
-TruncatedJulian    = Julien tronqu\u00e9
-Type               = Type
-Unnamed            = Sans nom
-Untitled           = Sans titre
-UnavailableContent = Contenu non-disponible.
-UserHome           = R\u00e9pertoire de l'utilisateur
-Value              = Valeur
-Variables          = Variables
-Version_2          = {0} version {1}
-Versions           = Versions
-Vertical           = Vertical
-World              = Monde
+Angle                   = Angle
+AngularDegrees          = Degr\u00e9s
+AngularMinutes          = Minutes
+AngularSeconds          = Secondes
+Attributes              = Attributs
+BarometricAltitude      = Altitude barom\u00e9trique
+CharacterEncoding       = Encodage des caract\u00e8res
+Classpath               = Chemin de classes
+Code_1                  = Code {0}
+Commands                = Commandes
+ConstantPressureSurface = Surface \u00e0 pression constante
+CurrentDateTime         = Date et heure courantes
+CurrentDirectory        = R\u00e9pertoire courant
+CycleOmitted            = Cycle omit
+DaylightTime            = Heure normale
+Destination             = Destination
+Dimensions              = Dimensions
+Directory               = R\u00e9pertoire
+DublinJulian            = Julien Dublin
+Ellipsoid               = Ellipso\u00efde
+EllipsoidalHeight       = Hauteur ellipso\u00efdale
+Height                  = Hauteur
+Identifier              = Identifiant
+Implementation          = Impl\u00e9mentation
+Index                   = Index
+JavaExtensions          = Extensions du Java
+JavaHome                = R\u00e9pertoire du Java
+Julian                  = Julien
+Latitude                = Latitude
+Longitude               = Longitude
+Libraries               = Biblioth\u00e8ques
+LocalConfiguration      = Configuration locale
+Locale                  = Locale
+Localization            = R\u00e9gionalisation
+Logging                 = Journalisation
+MaximumValue            = Valeur maximale
+MeanValue               = Valeur moyenne
+MinimumValue            = Valeur minimale
+ModifiedJulian          = Julien modifi\u00e9
+Name                    = Nom
+NumberOfValues          = Nombre de valeurs
+NumberOfNaN             = Nombre de \u2018NaN\u2019
+Of_3                    = {0} ({1} de {2})
+Offset                  = D\u00e9calage
+OperatingSystem         = Syst\u00e8me d'exploitation
+Options                 = Options
+Others                  = Autres
+OtherSurface            = Autre surface
+Paths                   = Chemins
+Root                    = Racine
+RootMeanSquare          = Moyenne quadratique
+Scale                   = \u00c9chelle
+Source                  = Source
+StandardDeviation       = \u00c9cart type
+TemporaryFiles          = Fichiers temporaires
+Temporal                = Temporel
+Time                    = Temps
+Time_1                  = Heure {0}
+Timezone                = Fuseau horaire
+TruncatedJulian         = Julien tronqu\u00e9
+Type                    = Type
+Unnamed                 = Sans nom
+Untitled                = Sans titre
+UnavailableContent      = Contenu non-disponible.
+UserHome                = R\u00e9pertoire de l'utilisateur
+Value                   = Valeur
+Variables               = Variables
+Version_2               = {0} version {1}
+Versions                = Versions
+Vertical                = Vertical
+World                   = Monde



Mime
View raw message