Author: desruisseaux
Date: Wed Jan 22 14:16:38 2014
New Revision: 1560357
URL: http://svn.apache.org/r1560357
Log:
Renamed GeodeticObjects as CommonCRS.
Added:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
- copied, changed from r1560354,
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/CommonCRSTest.java
- copied, changed from r1560354,
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectsTest.java
Removed:
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/GeodeticObjectsTest.java
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Legacy.java
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/StandardDefinitions.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.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/StandardDefinitionsTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -460,11 +460,11 @@ public class DefaultGeographicBoundingBo
* is assumed already in appropriate CRS.
*
* <p>When coordinate transformation is required, the target geographic
CRS is not necessarily
- * {@linkplain org.apache.sis.referencing.GeodeticObjects#WGS84 WGS84}.
This method preserves
- * the same {@linkplain org.apache.sis.referencing.datum.DefaultEllipsoid
ellipsoid} than in
- * the envelope CRS when possible. This is because geographic bounding box
are only approximative
- * and the ISO specification do not mandates a particular CRS,
- * so we avoid transformations that are not strictly necessary.</p>
+ * {@linkplain org.apache.sis.referencing.CommonCRS#WGS84 WGS84}. This
method preserves the same
+ * {@linkplain org.apache.sis.referencing.datum.DefaultEllipsoid
ellipsoid} than in the envelope
+ * CRS when possible. This is because geographic bounding box are only
approximative and the ISO
+ * specification do not mandates a particular CRS, so we avoid
transformations that are not
+ * strictly necessary.</p>
*
* <p><b>Note:</b> This method is available only if the referencing module
is on the classpath.</p>
*
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -208,7 +208,7 @@ public final class Extents extends Stati
* it does not specify the datum), the value returned by this method is
also approximative.
*
* <p>The current implementation performs its computation on the
- * {@linkplain org.apache.sis.referencing.GeodeticObjects#SPHERE GRS 1980
Authalic Sphere}.
+ * {@linkplain org.apache.sis.referencing.CommonCRS#SPHERE GRS 1980
Authalic Sphere}.
* However this may change in any future SIS version.</p>
*
* @param box The geographic bounding box for which to compute the area,
or {@code null}.
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -30,7 +30,7 @@ import org.opengis.geometry.MismatchedRe
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.referencing.GeodeticObjects;
+import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.resources.Errors;
@@ -177,7 +177,7 @@ class ArrayEnvelope extends AbstractEnve
/**
* Constructs a new envelope with the same data than the specified
geographic bounding box.
* The coordinate reference system is set to the
- * {@linkplain
org.apache.sis.referencing.GeodeticObjects#defaultGeographic() default
geographic CRS}.
+ * {@linkplain org.apache.sis.referencing.CommonCRS#defaultGeographic()
default geographic CRS}.
* Axis order is (<var>longitude</var>, <var>latitude</var>).
*
* @param box The bounding box to copy.
@@ -196,7 +196,7 @@ class ArrayEnvelope extends AbstractEnve
ArraysExt.swap(ordinates, 1, (ordinates.length >>> 1) + 1);
}
}
- crs = GeodeticObjects.defaultGeographic();
+ crs = CommonCRS.defaultGeographic();
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -25,7 +25,7 @@ import org.opengis.metadata.extent.Geogr
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.cs.AxisDirection;
-import org.apache.sis.referencing.GeodeticObjects;
+import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.Emptiable;
@@ -200,7 +200,7 @@ public class Envelope2D extends Rectangl
/**
* Constructs a new envelope with the same data than the specified
geographic bounding box.
* The coordinate reference system is set to the
- * {@linkplain
org.apache.sis.referencing.GeodeticObjects#defaultGeographic() default
geographic CRS}.
+ * {@linkplain org.apache.sis.referencing.CommonCRS#defaultGeographic()
default geographic CRS}.
* Axis order is (<var>longitude</var>, <var>latitude</var>).
*
* @param box The bounding box to copy (can not be {@code null}).
@@ -210,7 +210,7 @@ public class Envelope2D extends Rectangl
box.getSouthBoundLatitude(),
box.getEastBoundLongitude(),
box.getNorthBoundLatitude());
- crs = GeodeticObjects.defaultGeographic();
+ crs = CommonCRS.defaultGeographic();
if (Boolean.FALSE.equals(box.getInclusion())) {
x += width;
width = -width;
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -185,7 +185,7 @@ public class GeneralEnvelope extends Arr
/**
* Constructs a new envelope with the same data than the specified
geographic bounding box.
* The coordinate reference system is set to the
- * {@linkplain
org.apache.sis.referencing.GeodeticObjects#defaultGeographic() default
geographic CRS}.
+ * {@linkplain org.apache.sis.referencing.CommonCRS#defaultGeographic()
default geographic CRS}.
* Axis order is (<var>longitude</var>, <var>latitude</var>).
*
* @param box The bounding box to copy.
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -88,7 +88,7 @@ public final class ImmutableEnvelope ext
/**
* Constructs a new envelope with the same data than the specified
geographic bounding box.
* The coordinate reference system is set to the
- * {@linkplain
org.apache.sis.referencing.GeodeticObjects#defaultGeographic() default
geographic CRS}.
+ * {@linkplain org.apache.sis.referencing.CommonCRS#defaultGeographic()
default geographic CRS}.
* Axis order is (<var>longitude</var>, <var>latitude</var>).
*
* @param box The bounding box to copy.
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Legacy.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Legacy.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Legacy.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Legacy.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -19,7 +19,7 @@ package org.apache.sis.io.wkt;
import javax.measure.unit.SI;
import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.CartesianCS;
-import org.apache.sis.referencing.GeodeticObjects;
+import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.cs.DefaultCartesianCS;
import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
import org.apache.sis.util.Static;
@@ -65,7 +65,7 @@ final class Legacy extends Static {
* The standard three-dimensional Cartesian CS as defined by ISO 19111.
*/
private static CartesianCS standard() {
- return (CartesianCS)
GeodeticObjects.WGS84.geocentric().getCoordinateSystem();
+ return (CartesianCS)
CommonCRS.WGS84.geocentric().getCoordinateSystem();
}
/**
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=1560357&r1=1560356&r2=1560357&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] Wed Jan 22 14:16:38 2014
@@ -60,18 +60,18 @@ public final class CRS extends Static {
*
* <blockquote><table class="sis">
* <tr><th>Code</th> <th>Enum</th>
<th>CRS Type</th> <th>Description</th></tr>
- * <tr><td>CRS:27</td> <td>{@link GeodeticObjects#NAD27 NAD27}</td>
<td>Geographic</td> <td>Like EPSG:4267 except for (<var>longitude</var>,
<var>latitude</var>) axis order</td></tr>
- * <tr><td>CRS:83</td> <td>{@link GeodeticObjects#NAD83 NAD83}</td>
<td>Geographic</td> <td>Like EPSG:4269 except for (<var>longitude</var>,
<var>latitude</var>) axis order</td></tr>
- * <tr><td>CRS:84</td> <td>{@link GeodeticObjects#WGS84 WGS84}</td>
<td>Geographic</td> <td>Like EPSG:4326 except for (<var>longitude</var>,
<var>latitude</var>) axis order</td></tr>
- * <tr><td>EPSG:4047</td> <td>{@link GeodeticObjects#SPHERE SPHERE}</td>
<td>Geographic</td> <td>GRS 1980 Authalic Sphere</td></tr>
- * <tr><td>EPSG:4230</td> <td>{@link GeodeticObjects#ED50 ED50}</td>
<td>Geographic</td> <td>European Datum 1950</td></tr>
- * <tr><td>EPSG:4258</td> <td>{@link GeodeticObjects#ETRS89 ETRS89}</td>
<td>Geographic</td> <td>European Terrestrial Reference Frame 1989</td></tr>
- * <tr><td>EPSG:4267</td> <td>{@link GeodeticObjects#NAD27 NAD27}</td>
<td>Geographic</td> <td>North American Datum 1927</td></tr>
- * <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: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>
+ * <tr><td>CRS:27</td> <td>{@link CommonCRS#NAD27 NAD27}</td>
<td>Geographic</td> <td>Like EPSG:4267 except for (<var>longitude</var>,
<var>latitude</var>) axis order</td></tr>
+ * <tr><td>CRS:83</td> <td>{@link CommonCRS#NAD83 NAD83}</td>
<td>Geographic</td> <td>Like EPSG:4269 except for (<var>longitude</var>,
<var>latitude</var>) axis order</td></tr>
+ * <tr><td>CRS:84</td> <td>{@link CommonCRS#WGS84 WGS84}</td>
<td>Geographic</td> <td>Like EPSG:4326 except for (<var>longitude</var>,
<var>latitude</var>) axis order</td></tr>
+ * <tr><td>EPSG:4047</td> <td>{@link CommonCRS#SPHERE SPHERE}</td>
<td>Geographic</td> <td>GRS 1980 Authalic Sphere</td></tr>
+ * <tr><td>EPSG:4230</td> <td>{@link CommonCRS#ED50 ED50}</td>
<td>Geographic</td> <td>European Datum 1950</td></tr>
+ * <tr><td>EPSG:4258</td> <td>{@link CommonCRS#ETRS89 ETRS89}</td>
<td>Geographic</td> <td>European Terrestrial Reference Frame 1989</td></tr>
+ * <tr><td>EPSG:4267</td> <td>{@link CommonCRS#NAD27 NAD27}</td>
<td>Geographic</td> <td>North American Datum 1927</td></tr>
+ * <tr><td>EPSG:4269</td> <td>{@link CommonCRS#NAD83 NAD83}</td>
<td>Geographic</td> <td>North American Datum 1983</td></tr>
+ * <tr><td>EPSG:4322</td> <td>{@link CommonCRS#WGS72 WGS72}</td>
<td>Geographic</td> <td>World Geodetic System 1972</td></tr>
+ * <tr><td>EPSG:4326</td> <td>{@link CommonCRS#WGS84 WGS84}</td>
<td>Geographic</td> <td>World Geodetic System 1984</td></tr>
+ * <tr><td>EPSG:5715</td> <td>{@link CommonCRS.Vertical#DEPTH
DEPTH}</td> <td>Vertical</td> <td>Mean Sea Level depth</td></tr>
+ * <tr><td>EPSG:5714</td> <td>{@link CommonCRS.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.
@@ -116,18 +116,18 @@ public final class CRS extends Static {
try {
if (authority.equalsIgnoreCase("CRS")) {
switch (Integer.parseInt(value)) {
- case 27: return
GeodeticObjects.NAD27.normalizedGeographic();
- case 83: return
GeodeticObjects.NAD83.normalizedGeographic();
- case 84: return
GeodeticObjects.WGS84.normalizedGeographic();
+ case 27: return CommonCRS.NAD27.normalizedGeographic();
+ case 83: return CommonCRS.NAD83.normalizedGeographic();
+ case 84: return CommonCRS.WGS84.normalizedGeographic();
}
} else if (authority.equalsIgnoreCase("EPSG")) {
final int n = Integer.parseInt(value);
- for (final GeodeticObjects candidate :
GeodeticObjects.values()) {
+ for (final CommonCRS candidate : CommonCRS.values()) {
if (candidate.geographic == n) {
return candidate.geographic();
}
}
- for (final GeodeticObjects.Vertical candidate :
GeodeticObjects.Vertical.values()) {
+ for (final CommonCRS.Vertical candidate :
CommonCRS.Vertical.values()) {
if (candidate.isEPSG && candidate.crs == n) {
return candidate.crs();
}
Copied:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
(from r1560354,
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/CommonCRS.java?p2=sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java&p1=sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticObjects.java&r1=1560354&r2=1560357&rev=1560357&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/CommonCRS.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -67,9 +67,9 @@ import static org.opengis.referencing.Id
* Frequently-used geodetic CRS and datum that are guaranteed to be available
in SIS.
* Methods in this enumeration are shortcuts for object definitions in the
EPSG database.
* If there is no EPSG database available, or if the query failed, or if there
is no EPSG definition for an object,
- * then {@code GeodeticObjects} fallback on hard-coded values. Consequently,
those methods never return {@code null}.
+ * then {@code CommonCRS} fallback on hard-coded values. Consequently, those
methods never return {@code null}.
*
- * <p>Referencing objects are cached after creation. Invoking the same method
on the same {@code GeodeticObjects}
+ * <p>Referencing objects are cached after creation. Invoking the same method
on the same {@code CommonCRS}
* instance twice will return the same {@link IdentifiedObject} instance,
unless the internal cache has been cleared
* (e.g. the application is running in a container environment and some
modules have been installed or uninstalled).</p>
*
@@ -77,7 +77,7 @@ import static org.opengis.referencing.Id
* (<var>longitude</var>, <var>latitude</var>) axis order on the {@link
#WGS84} geodetic datum:</p>
*
* {@preformat java
- * GeographicCRS crs = GeodeticObjects.WGS84.normalizedGeographic();
+ * GeographicCRS crs = CommonCRS.WGS84.normalizedGeographic();
* }
*
* For each enumeration value, the name of the CRS, datum and ellipsoid
objects may or may not be the same.
@@ -107,7 +107,7 @@ import static org.opengis.referencing.Id
* @version 0.4
* @module
*/
-public enum GeodeticObjects {
+public enum CommonCRS {
/**
* World Geodetic System 1984.
* This is the default CRS for most {@code org.apache.sis} packages.
@@ -287,7 +287,7 @@ public enum GeodeticObjects {
* @param datum The EPSG code for the datum.
* @param ellipsoid The EPSG code for the ellipsoid.
*/
- private GeodeticObjects(final short geographic, final short geocentric,
final short datum, final short ellipsoid) {
+ private CommonCRS(final short geographic, final short geocentric, final
short datum, final short ellipsoid) {
this.geographic = geographic;
this.geocentric = geocentric;
this.datum = datum;
@@ -301,7 +301,7 @@ public enum GeodeticObjects {
static {
SystemListener.add(new SystemListener(Modules.REFERENCING) {
@Override protected void classpathChanged() {
- for (final GeodeticObjects e : values()) {
+ for (final CommonCRS e : values()) {
e.clear();
}
}
@@ -676,7 +676,7 @@ public enum GeodeticObjects {
* above the Mean Sea Level (MSL):</p>
*
* {@preformat java
- * VerticalCRS crs = GeodeticObjects.Vertical.MEAN_SEA_LEVEL.crs();
+ * VerticalCRS crs = CommonCRS.Vertical.MEAN_SEA_LEVEL.crs();
* }
*
* Below is an alphabetical list of object names available in this
enumeration:
@@ -960,7 +960,7 @@ public enum GeodeticObjects {
* <p><b>Example:</b> the following code fetches a temporal Coordinate
Reference System using the Julian calendar:</p>
*
* {@preformat java
- * TemporalCRS crs = GeodeticObjects.Temporal.JULIAN.crs();
+ * TemporalCRS crs = CommonCRS.Temporal.JULIAN.crs();
* }
*
* Below is an alphabetical list of object names available in this
enumeration:
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -57,7 +57,7 @@ import static org.apache.sis.internal.me
/**
- * Definitions of referencing objects identified by the {@link
GeodeticObjects} enumeration values.
+ * Definitions of referencing objects identified by the {@link CommonCRS}
enumeration values.
* This class is used only as a fallback if the objects can not be fetched
from the EPSG database.
*
* @author Martin Desruisseaux (Geomatys)
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -114,7 +114,7 @@ public enum AxesConvention {
* {@note The rules for normalized coordinate systems may be adjusted in
future SIS versions based on experience
* gained. For more predictable results, consider using the
<code>RIGHT_HANDED</code> enum instead.}
*
- * @see org.apache.sis.referencing.GeodeticObjects#normalizedGeographic()
+ * @see org.apache.sis.referencing.CommonCRS#normalizedGeographic()
*/
NORMALIZED,
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -86,7 +86,7 @@ import java.util.Objects;
*
* <ol>
* <li>Create an {@code Ellipsoid} from one of the static convenience
shortcuts listed in
- * {@link org.apache.sis.referencing.GeodeticObjects#ellipsoid()}.</li>
+ * {@link org.apache.sis.referencing.CommonCRS#ellipsoid()}.</li>
* <li>Create an {@code Ellipsoid} from an identifier in a database by
invoking
* {@link
org.opengis.referencing.datum.DatumAuthorityFactory#createEllipsoid(String)}.</li>
* <li>Create an {@code Ellipsoid} by invoking the {@code
createEllipsoid(…)} or {@code createFlattenedSphere(…)}
@@ -100,7 +100,7 @@ import java.util.Objects;
* <b>Example:</b> the following code gets the WGS84 ellipsoid:
*
* {@preformat java
- * Ellipsoid e = GeodeticObjects.WGS84.ellipsoid();
+ * Ellipsoid e = CommonCRS.WGS84.ellipsoid();
* }
*
* {@section Immutability and thread safety}
@@ -114,7 +114,7 @@ import java.util.Objects;
* @version 0.4
* @module
*
- * @see org.apache.sis.referencing.GeodeticObjects#ellipsoid()
+ * @see org.apache.sis.referencing.CommonCRS#ellipsoid()
*/
@XmlType(name="EllipsoidType", propOrder={
"semiMajorAxisMeasure",
@@ -456,7 +456,7 @@ public class DefaultEllipsoid extends Ab
*
* @return The radius of a sphere having the same surface than this
ellipsoid.
*
- * @see org.apache.sis.referencing.GeodeticObjects#SPHERE
+ * @see org.apache.sis.referencing.CommonCRS#SPHERE
*/
public double getAuthalicRadius() {
return Formulas.getAuthalicRadius(getSemiMajorAxis(),
getSemiMinorAxis());
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -88,7 +88,7 @@ import java.util.Objects;
*
* <ol>
* <li>Create a {@code GeodeticDatum} from one of the static convenience
shortcuts listed in
- * {@link org.apache.sis.referencing.GeodeticObjects#datum()}.</li>
+ * {@link org.apache.sis.referencing.CommonCRS#datum()}.</li>
* <li>Create a {@code GeodeticDatum} from an identifier in a database by
invoking
* {@link
org.opengis.referencing.datum.DatumAuthorityFactory#createGeodeticDatum(String)}.</li>
* <li>Create a {@code GeodeticDatum} by invoking the {@code
createGeodeticDatum(…)}
@@ -100,7 +100,7 @@ import java.util.Objects;
* <b>Example:</b> the following code gets a <cite>World Geodetic System
1984</cite> datum:
*
* {@preformat java
- * GeodeticDatum datum = GeodeticObjects.WGS84.datum();
+ * GeodeticDatum datum = CommonCRS.WGS84.datum();
* }
*
* {@section Immutability and thread safety}
@@ -116,7 +116,7 @@ import java.util.Objects;
*
* @see DefaultEllipsoid
* @see DefaultPrimeMeridian
- * @see org.apache.sis.referencing.GeodeticObjects#datum()
+ * @see org.apache.sis.referencing.CommonCRS#datum()
*/
@XmlType(name = "GeodeticDatumType", propOrder = {
"primeMeridian",
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -56,7 +56,7 @@ import java.util.Objects;
*
* <ol>
* <li>Create a {@code PrimeMeridian} from one of the static convenience
shortcuts listed in
- * {@link
org.apache.sis.referencing.GeodeticObjects#primeMeridian()}.</li>
+ * {@link org.apache.sis.referencing.CommonCRS#primeMeridian()}.</li>
* <li>Create a {@code PrimeMeridian} from an identifier in a database by
invoking
* {@link
org.opengis.referencing.datum.DatumAuthorityFactory#createPrimeMeridian(String)}.</li>
* <li>Create a {@code PrimeMeridian} by invoking the {@code
createPrimeMeridian(…)}
@@ -68,7 +68,7 @@ import java.util.Objects;
* <b>Example:</b> the following code gets the Greenwich prime meridian:
*
* {@preformat java
- * PrimeMeridian pm = GeodeticObjects.WGS84.primeMeridian();
+ * PrimeMeridian pm = CommonCRS.WGS84.primeMeridian();
* }
*
* {@section Immutability and thread safety}
@@ -82,7 +82,7 @@ import java.util.Objects;
* @version 0.4
* @module
*
- * @see org.apache.sis.referencing.GeodeticObjects#primeMeridian()
+ * @see org.apache.sis.referencing.CommonCRS#primeMeridian()
*/
@XmlType(name = "PrimeMeridianType")
@XmlRootElement(name = "PrimeMeridian")
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
(original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
Wed Jan 22 14:16:38 2014
@@ -48,7 +48,7 @@ import java.util.Objects;
*
* <ol>
* <li>Create a {@code TemporalDatum} from one of the static convenience
shortcuts listed in
- * {@link
org.apache.sis.referencing.GeodeticObjects.Temporal#datum()}.</li>
+ * {@link org.apache.sis.referencing.CommonCRS.Temporal#datum()}.</li>
* <li>Create a {@code TemporalDatum} from an identifier in a database by
invoking
* {@link
org.opengis.referencing.datum.DatumAuthorityFactory#createTemporalDatum(String)}.</li>
* <li>Create a {@code TemporalDatum} by invoking the {@code
createTemporalDatum(â¦)}
@@ -60,7 +60,7 @@ import java.util.Objects;
* <b>Example:</b> the following code gets a temporal datum having its origin
at January 1st, 4713 BC at 12:00 UTC:
*
* {@preformat java
- * TemporalDatum datum = GeodeticObjects.Temporal.JULIAN.datum();
+ * TemporalDatum datum = CommonCRS.Temporal.JULIAN.datum();
* }
*
* {@section Immutability and thread safety}
@@ -73,7 +73,7 @@ import java.util.Objects;
* @version 0.4
* @module
*
- * @see org.apache.sis.referencing.GeodeticObjects.Temporal#datum()
+ * @see org.apache.sis.referencing.CommonCRS.Temporal#datum()
* @see org.apache.sis.referencing.cs.DefaultTimeCS
* @see org.apache.sis.referencing.crs.DefaultTemporalCRS
*/
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -52,7 +52,7 @@ import java.util.Objects;
*
* <ol>
* <li>Create a {@code VerticalDatum} from one of the static convenience
shortcuts listed in
- * {@link
org.apache.sis.referencing.GeodeticObjects.Vertical#datum()}.</li>
+ * {@link org.apache.sis.referencing.CommonCRS.Vertical#datum()}.</li>
* <li>Create a {@code VerticalDatum} from an identifier in a database by
invoking
* {@link
org.opengis.referencing.datum.DatumAuthorityFactory#createVerticalDatum(String)}.</li>
* <li>Create a {@code VerticalDatum} by invoking the {@code
createVerticalDatum(…)}
@@ -64,7 +64,7 @@ import java.util.Objects;
* <b>Example:</b> the following code gets a vertical datum for height above
the geoid:
*
* {@preformat java
- * VerticalDatum datum = GeodeticObjects.Vertical.GEOID.datum();
+ * VerticalDatum datum = CommonCRS.Vertical.GEOID.datum();
* }
*
* {@section Immutability and thread safety}
@@ -77,7 +77,7 @@ import java.util.Objects;
* @version 0.4
* @module
*
- * @see org.apache.sis.referencing.GeodeticObjects.Vertical#datum()
+ * @see org.apache.sis.referencing.CommonCRS.Vertical#datum()
* @see org.apache.sis.referencing.cs.DefaultVerticalCS
* @see org.apache.sis.referencing.crs.DefaultVerticalCRS
*/
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -30,7 +30,7 @@
* or constructor, or indirectly by specifying the identifier of an entry in a
database. In particular,
* the <a href="http://www.epsg.org";>EPSG</a> database provides definitions
for many geodetic objects,
* and Apache SIS provides convenience shortcuts for some of them in the
- * {@link org.apache.sis.referencing.GeodeticObjects} enumerations.
+ * {@link org.apache.sis.referencing.CommonCRS} enumerations.
*
* {@section The EPSG database}
* The EPSG geodetic parameter dataset is a structured database required to:
@@ -53,7 +53,7 @@
* Relationship with EPSG has two components documented in the javadoc: the
object type and the EPSG code.
* The <var>type</var> specifies which {@link
org.opengis.referencing.AuthorityFactory} method to invoke, while
* the <var>code</var> specifies the argument value to give to that method in
order to get the EPSG object.
- * For example the {@link org.apache.sis.referencing.GeodeticObjects#WGS84}
documentation said that object
+ * For example the {@link org.apache.sis.referencing.CommonCRS#WGS84}
documentation said that object
* of type <cite>geodetic datum</cite> is associated to code {@code EPSG:6326}.
* This means that the EPSG object could be obtained by the following code:
*
Modified:
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -20,7 +20,7 @@ import java.awt.geom.Rectangle2D;
import org.opengis.geometry.Envelope;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.GeographicCRS;
-import org.apache.sis.referencing.GeodeticObjects;
+import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
@@ -56,7 +56,7 @@ public final strictfp class AbstractEnve
/**
* The coordinate reference system used for the tests.
*/
- static final GeographicCRS WGS84 =
GeodeticObjects.WGS84.normalizedGeographic();
+ static final GeographicCRS WGS84 = CommonCRS.WGS84.normalizedGeographic();
/**
* Creates an envelope of the given type. The type shall be one of the
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=1560357&r1=1560356&r2=1560357&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] Wed Jan 22 14:16:38 2014
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
* @module
*/
@DependsOn({
- GeodeticObjectsTest.class
+ CommonCRSTest.class
})
public final strictfp class CRSTest extends TestCase {
/**
@@ -52,17 +52,17 @@ public final strictfp class CRSTest exte
*/
@Test
public void testForEpsgCode() throws FactoryException {
- verifyForCode(GeodeticObjects.WGS84 .geographic(), "EPSG:4326");
- verifyForCode(GeodeticObjects.WGS84 .geographic(),
"urn:ogc:def:crs:EPSG::4326");
- verifyForCode(GeodeticObjects.WGS84 .geographic(),
"http://www.opengis.net/gml/srs/epsg.xml#4326";);
- verifyForCode(GeodeticObjects.WGS72 .geographic(), "EPSG:4322");
- verifyForCode(GeodeticObjects.SPHERE.geographic(), "EPSG:4047");
- verifyForCode(GeodeticObjects.NAD83 .geographic(), "EPSG:4269");
- verifyForCode(GeodeticObjects.NAD27 .geographic(), "EPSG:4267");
- verifyForCode(GeodeticObjects.ETRS89.geographic(), "EPSG:4258");
- verifyForCode(GeodeticObjects.ED50 .geographic(), "EPSG:4230");
- assertSame("EPSG:5714", GeodeticObjects.Vertical.MEAN_SEA_LEVEL.crs(),
CRS.forCode("EPSG:5714"));
- assertSame("EPSG:5715", GeodeticObjects.Vertical.DEPTH.crs(),
CRS.forCode("EPSG:5715"));
+ verifyForCode(CommonCRS.WGS84 .geographic(), "EPSG:4326");
+ verifyForCode(CommonCRS.WGS84 .geographic(),
"urn:ogc:def:crs:EPSG::4326");
+ verifyForCode(CommonCRS.WGS84 .geographic(),
"http://www.opengis.net/gml/srs/epsg.xml#4326";);
+ verifyForCode(CommonCRS.WGS72 .geographic(), "EPSG:4322");
+ verifyForCode(CommonCRS.SPHERE.geographic(), "EPSG:4047");
+ verifyForCode(CommonCRS.NAD83 .geographic(), "EPSG:4269");
+ verifyForCode(CommonCRS.NAD27 .geographic(), "EPSG:4267");
+ verifyForCode(CommonCRS.ETRS89.geographic(), "EPSG:4258");
+ verifyForCode(CommonCRS.ED50 .geographic(), "EPSG:4230");
+ assertSame("EPSG:5714", CommonCRS.Vertical.MEAN_SEA_LEVEL.crs(),
CRS.forCode("EPSG:5714"));
+ assertSame("EPSG:5715", CommonCRS.Vertical.DEPTH.crs(),
CRS.forCode("EPSG:5715"));
}
/**
@@ -73,8 +73,8 @@ public final strictfp class CRSTest exte
@Test
@DependsOnMethod("testForEpsgCode")
public void testForCrsCode() throws FactoryException {
- verifyForCode(GeodeticObjects.WGS84.normalizedGeographic(), "CRS:84");
- verifyForCode(GeodeticObjects.NAD83.normalizedGeographic(), "CRS:83");
- verifyForCode(GeodeticObjects.NAD27.normalizedGeographic(), "CRS:27");
+ verifyForCode(CommonCRS.WGS84.normalizedGeographic(), "CRS:84");
+ verifyForCode(CommonCRS.NAD83.normalizedGeographic(), "CRS:83");
+ verifyForCode(CommonCRS.NAD27.normalizedGeographic(), "CRS:27");
}
}
Copied:
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
(from r1560354,
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/CommonCRSTest.java?p2=sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java&p1=sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectsTest.java&r1=1560354&r2=1560357&rev=1560357&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/CommonCRSTest.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -37,7 +37,7 @@ import static org.apache.sis.test.TestUt
/**
- * Tests the {@link GeodeticObjects} class.
+ * Tests the {@link CommonCRS} class.
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.4 (derived from geotk-2.2)
@@ -49,40 +49,40 @@ import static org.apache.sis.test.TestUt
org.apache.sis.referencing.datum.DefaultVerticalDatumTest.class,
StandardDefinitionsTest.class
})
-public final strictfp class GeodeticObjectsTest extends TestCase {
+public final strictfp class CommonCRSTest extends TestCase {
/**
* Length of a day in milliseconds.
*/
private static final double DAY_LENGTH = 24 * 60 * 60 * 1000;
/**
- * Tests the {@link GeodeticObjects#WGS84} constant.
+ * Tests the {@link CommonCRS#WGS84} constant.
*/
@Test
public void testWGS84() {
- final GeographicCRS geographic = GeodeticObjects.WGS84.geographic();
+ final GeographicCRS geographic = CommonCRS.WGS84.geographic();
Validators.validate(geographic);
GeodeticObjectVerifier.assertIsWGS84(geographic, true, true);
- assertSame("Cached value", geographic,
GeodeticObjects.WGS84.geographic());
+ assertSame("Cached value", geographic, CommonCRS.WGS84.geographic());
/*
* Verifies the variant using (longitude, latitude) axis order.
*/
- final GeographicCRS normalized =
GeodeticObjects.WGS84.normalizedGeographic();
+ final GeographicCRS normalized =
CommonCRS.WGS84.normalizedGeographic();
Validators.validate(normalized);
assertSame(geographic.getDatum(), normalized.getDatum());
final CoordinateSystem φλ = geographic.getCoordinateSystem();
final CoordinateSystem λφ = normalized.getCoordinateSystem();
assertSame("Longitude", φλ.getAxis(1), λφ.getAxis(0));
assertSame("Latitude", φλ.getAxis(0), λφ.getAxis(1));
- assertSame("Cached value", normalized,
GeodeticObjects.WGS84.normalizedGeographic());
+ assertSame("Cached value", normalized,
CommonCRS.WGS84.normalizedGeographic());
}
/**
- * Tests the {@link GeodeticObjects#geocentric()} method.
+ * Tests the {@link CommonCRS#geocentric()} method.
*/
@Test
public void testGeocentric() {
- final GeocentricCRS crs = GeodeticObjects.WGS72.geocentric();
+ final GeocentricCRS crs = CommonCRS.WGS72.geocentric();
assertEquals("WGS 72", crs.getName().getCode());
final CoordinateSystem cs = crs.getCoordinateSystem();
final String name = cs.getName().getCode();
@@ -98,7 +98,7 @@ public final strictfp class GeodeticObje
*/
@Test
public void testVertical() {
- for (final GeodeticObjects.Vertical e :
GeodeticObjects.Vertical.values()) {
+ for (final CommonCRS.Vertical e : CommonCRS.Vertical.values()) {
final VerticalDatumType datumType;
final String axisName, datumName;
switch (e) {
@@ -134,9 +134,9 @@ public final strictfp class GeodeticObje
*/
@Test
public void testTemporal() {
- final double julianEpoch =
GeodeticObjects.Temporal.JULIAN.datum().getOrigin().getTime() / DAY_LENGTH;
+ final double julianEpoch =
CommonCRS.Temporal.JULIAN.datum().getOrigin().getTime() / DAY_LENGTH;
assertTrue(julianEpoch < 0);
- for (final GeodeticObjects.Temporal e :
GeodeticObjects.Temporal.values()) {
+ for (final CommonCRS.Temporal e : CommonCRS.Temporal.values()) {
final String epoch;
final double days;
switch (e) {
Modified:
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -72,7 +72,7 @@ public final strictfp class StandardDefi
public void testCreateGographicCRS() {
final PrimeMeridian pm = StandardDefinitions.primeMeridian();
final EllipsoidalCS cs = (EllipsoidalCS)
StandardDefinitions.createCoordinateSystem((short) 6422);
- for (final GeodeticObjects e : GeodeticObjects.values()) {
+ for (final CommonCRS e : CommonCRS.values()) {
final Ellipsoid ellipsoid =
StandardDefinitions.createEllipsoid(e.ellipsoid);
switch (e) {
case WGS84: compare(GeodeticDatumMock.WGS84 .getEllipsoid(),
ellipsoid); break;
Modified:
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1560357&r1=1560356&r2=1560357&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] Wed Jan 22 14:16:38 2014
@@ -77,7 +77,7 @@ import org.junit.BeforeClass;
org.apache.sis.referencing.crs.DefaultCompoundCRSTest.class,
org.apache.sis.referencing.crs.HardCodedCRSTest.class,
org.apache.sis.referencing.StandardDefinitionsTest.class,
- org.apache.sis.referencing.GeodeticObjectsTest.class,
+ org.apache.sis.referencing.CommonCRSTest.class,
org.apache.sis.referencing.CRSTest.class,
org.apache.sis.geometry.AbstractDirectPositionTest.class,
