This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 1afd88a5b9971e4bf9aa3c2fb67da51ce33b867e Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri May 10 11:32:18 2024 +0200 Documentation update: "geodetic datum" → "geodetic reference frame". --- .../apache/sis/metadata/iso/DefaultIdentifier.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 19 +++++++++++-------- .../gazetteer/MilitaryGridReferenceSystem.java | 2 +- .../org/apache/sis/io/wkt/GeodeticObjectParser.java | 4 ++-- .../sis/referencing/AbstractIdentifiedObject.java | 4 ++-- .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/CommonCRS.java | 14 +++++++------- .../apache/sis/referencing/StandardDefinitions.java | 6 +++--- .../sis/referencing/crs/DefaultGeocentricCRS.java | 4 ++-- .../sis/referencing/crs/DefaultGeodeticCRS.java | 2 +- .../sis/referencing/crs/DefaultGeographicCRS.java | 4 ++-- .../apache/sis/referencing/cs/CoordinateSystems.java | 2 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 6 +++--- .../apache/sis/referencing/datum/AbstractDatum.java | 2 +- .../sis/referencing/datum/BursaWolfParameters.java | 2 +- .../apache/sis/referencing/datum/DatumShiftGrid.java | 4 ++-- .../sis/referencing/datum/DefaultGeodeticDatum.java | 20 +++++++++++--------- .../factory/GeodeticAuthorityFactory.java | 4 ++-- .../referencing/factory/GeodeticObjectFactory.java | 14 +++++++------- .../referencing/factory/MultiAuthoritiesFactory.java | 2 +- .../sis/referencing/factory/sql/EPSGDataAccess.java | 4 ++-- .../operation/AbstractSingleOperation.java | 4 ++-- .../sis/referencing/operation/DefaultConversion.java | 6 +++--- .../referencing/operation/MathTransformContext.java | 6 +++--- .../transform/DefaultMathTransformFactory.java | 4 ++-- .../org/apache/sis/referencing/package-info.java | 2 +- .../sis/referencing/privy/GeodeticObjectBuilder.java | 4 ++-- .../sis/referencing/privy/ReferencingUtilities.java | 2 +- .../apache/sis/referencing/privy/WKTUtilities.java | 2 +- .../apache/sis/io/wkt/GeodeticObjectParserTest.java | 2 +- .../org/apache/sis/referencing/crs/HardCodedCRS.java | 4 ++-- .../referencing/datum/DefaultGeodeticDatumTest.java | 2 +- .../factory/GeodeticObjectFactoryTest.java | 2 +- .../factory/MultiAuthoritiesFactoryTest.java | 2 +- .../sis/referencing/factory/sql/EPSGFactoryTest.java | 8 ++++---- .../referencing/operation/DefaultConversionTest.java | 4 ++-- .../sis/storage/geotiff/reader/CRSBuilder.java | 8 ++++---- .../org/apache/sis/storage/netcdf/base/Decoder.java | 2 +- .../apache/sis/storage/netcdf/base/GridMapping.java | 2 +- .../main/org/apache/sis/measure/Longitude.java | 2 +- 40 files changed, 98 insertions(+), 93 deletions(-) diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java index e8fec6a5d8..53fdf8276a 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java @@ -48,7 +48,7 @@ import org.apache.sis.xml.Namespaces; * * <p>Referencing objects like * {@linkplain org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis coordinate system axis}, - * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum}, + * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic reference frame}, * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS} and more * rather use the {@link org.apache.sis.referencing.ImmutableIdentifier} implementation, * which is a class unrelated to the usual {@code org.apache.metadata} hierarchy diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java index d7449715cf..5c307fc531 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java @@ -80,14 +80,17 @@ import org.apache.sis.metadata.privy.ReferencingServices; * <h2>Relationship with Envelope classes</h2> * The {@link org.apache.sis.geometry} package provides various {@code Envelope} classes serving a similar purpose. * The main difference is that envelopes can be expressed in any {@linkplain org.apache.sis.referencing.crs.AbstractCRS - * Coordinate Reference System} (for example using any map projection), may have any number of dimensions, axes may have - * any {@linkplain org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis#getDirection() direction} (some maps are south-oriented) - * and may use any units of measurement. By contrast, geographic bounding box are restricted to two-dimensional - * geographic CRS with latitude and longitude in decimal degrees, inside the [-90 … +90]° and [-180 … +180]° range - * respectively, increasing toward north and east respectively, and longitude measured from the <i>international - * reference meridian</i> (Greenwich on Earth). However, {@code GeographicBoundingBox} said nothing about the - * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum}. Consequently, this bounding - * box should be used only as a convenient way to give an <em>approximate</em> description of a location. + * Coordinate Reference System} (for example using any map projection), may have any number of dimensions, + * may have axes is any {@linkplain org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis#getDirection() direction} + * (some maps are south-oriented), and may use any units of measurement. + * By contrast, {@code GeographicBoundingBox} is restricted to two-dimensional + * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS} + * with latitude and longitude in decimal degrees in the [-90 … +90]° and [-180 … +180]° range respectively, + * increasing toward north and east respectively, + * and with longitude measured from the <i>international reference meridian</i> (Greenwich). + * However, {@code GeographicBoundingBox} said nothing about the + * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic reference frame}. + * Consequently, this box should be used only as a convenient way to give an <em>approximate</em> description of a location. * Users can assume a precision of about 0.01° for the latitude and longitude values in this class. * If more precision is desired, an {@code Envelope} should be considered instead. * diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java index 50f61b01a4..63da0a1b4b 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java @@ -573,7 +573,7 @@ public class MilitaryGridReferenceSystem extends ReferencingByIdentifiers { } /** - * Returns the ellipsoid of the geodetic datum of MGRS identifiers. + * Returns the ellipsoid of the geodetic reference frame of MGRS identifiers. */ final Ellipsoid getEllipsoid() { return datum.geographic().getDatum().getEllipsoid(); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java index 613eabf205..f68f512eec 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java @@ -403,7 +403,7 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo * <h4>Fallback</h4> * The name is a mandatory property, but some invalid WKT with an empty string exist. In such case, * we will use the name of the enclosed datum. Indeed, it is not uncommon to have the same name for - * a geographic CRS and its geodetic datum. + * a geographic CRS and its geodetic reference frame. * * @param parent the parent element. * @param name the name of the parent object being parsed. @@ -771,7 +771,7 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo Unit<?> unit = defaultUnit; // Depth, height or time axis unit. switch (type) { /* - * Cartesian — we can create axes only for geodetic datum, in which case the axes + * Cartesian — we can create axes only if the datum is geodetic, in which case the axes * are for two- or three-dimensional Projected or three-dimensional Geocentric CRS. */ case WKTKeywords.Cartesian: { diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java index 45216444f8..00cbf9c294 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java @@ -79,7 +79,7 @@ import org.opengis.referencing.ObjectDomain; /** * Base class for objects identified by a name or a code. Those objects are typically - * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum} (e.g. <q>World Geodetic System 1984</q>), + * {@linkplain org.apache.sis.referencing.datum.AbstractDatum datum} (e.g. <q>World Geodetic System 1984</q>), * {@linkplain org.apache.sis.referencing.crs.AbstractCRS Coordinate Reference System} (e.g. <q>WGS 84 / World Mercator</q>) or * {@linkplain org.apache.sis.referencing.operation.DefaultConversion map projection} (e.g. <q>Mercator (variant A)</q>). * Those names, or a code (e.g. {@code "EPSG:3395"}), can be used for fetching an object from a database. @@ -660,7 +660,7 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident * Comparisons of datum names} ignore the {@code "D_"} prefix, if any. * This prefix appears in ESRI datum name (e.g. {@code "D_WGS_1984"}).</li> * <li>{@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum#isHeuristicMatchForName(String) - * Comparisons of geodetic datum names} may ignore the prime meridian name, if any. + * Comparisons of geodetic reference frame names} may ignore the prime meridian name, if any. * Example: <q>(Paris)</q> in <q>Nouvelle Triangulation Française (Paris)</q>.</li> * </ul> * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java index 62a8e7e973..8003fd784a 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java @@ -238,7 +238,7 @@ public final class CRS extends Static { * </ul> * * <p>URNs (but not URLs) can also combine a - * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum} with an + * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic reference frame} with an * {@linkplain org.apache.sis.referencing.cs.DefaultEllipsoidalCS ellipsoidal coordinate system} for creating a new * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}, or a base geographic CRS with a * {@linkplain org.apache.sis.referencing.operation.DefaultConversion conversion} and a diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java index 25ff65a93d..b2a1bd5534 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java @@ -116,7 +116,7 @@ import org.opengis.referencing.datum.RealizationMethod; * * <h2>Example</h2> * The following code fetches a geographic Coordinate Reference System - * using (<var>longitude</var>, <var>latitude</var>) axis order on the {@link #WGS84} geodetic datum: + * using (<var>longitude</var>, <var>latitude</var>) axis order on the {@link #WGS84} geodetic reference frame: * * {@snippet lang="java" : * GeographicCRS crs = CommonCRS.WGS84.normalizedGeographic(); @@ -269,7 +269,7 @@ public enum CommonCRS { /** * Unknown datum based upon the GRS 1980 ellipsoid. - * Use only in cases where geodetic datum is unknown. + * Use only in cases where geodetic reference frame is unknown. * * <blockquote><table class="compact"> * <caption>GRS1980 properties</caption> @@ -468,7 +468,7 @@ public enum CommonCRS { * or an instance of {@link org.opengis.referencing.crs.CompoundCRS} * with an {@linkplain CRS#getHorizontalComponent horizontal component}.</li> * <li>The {@code crs} or the horizontal component of {@code crs} is associated to a {@link GeodeticDatum}.</li> - * <li>The geodetic datum either<ul> + * <li>The geodetic reference frame either<ul> * <li>has the same EPSG code as one of the {@code CommonCRS} enumeration values, or</li> * <li>has no EPSG code but is {@linkplain Utilities#equalsIgnoreMetadata equal, ignoring metadata}, * to the {@link #datum()} value of one of the {@code CommonCRS} enumeration values.</li> @@ -480,7 +480,7 @@ public enum CommonCRS { * supported by {@code CommonCRS} is known to be sufficient. * * @param crs the coordinate reference system for which to get a {@code CommonCRS} value. - * @return the {@code CommonCRS} value for the geodetic datum of the given CRS. + * @return the {@code CommonCRS} value for the geodetic reference frame of the given CRS. * @throws IllegalArgumentException if no {@code CommonCRS} value can be found for the given CRS. * * @see #datum() @@ -837,12 +837,12 @@ public enum CommonCRS { } /** - * Returns the geodetic datum associated to this geodetic object. + * Returns the geodetic reference frame associated to this geodetic object. * The following table summarizes the datums known to this class, * together with an enumeration value that can be used for fetching that datum: * * <blockquote><table class="sis"> - * <caption>Commonly used geodetic datums</caption> + * <caption>Commonly used geodetic reference frames</caption> * <tr><th>Name or alias</th> <th>Enum</th> <th>EPSG</th></tr> * <tr><td>European Datum 1950</td> <td>{@link #ED50}</td> <td>6230</td></tr> * <tr><td>European Terrestrial Reference System 1989</td> <td>{@link #ETRS89}</td> <td>6258</td></tr> @@ -854,7 +854,7 @@ public enum CommonCRS { * <tr><td>World Geodetic System 1984</td> <td>{@link #WGS84}</td> <td>6326</td></tr> * </table></blockquote> * - * @return the geodetic datum associated to this enum. + * @return the geodetic reference frame associated to this enum. * * @see #forDatum(CoordinateReferenceSystem) * @see org.apache.sis.referencing.datum.DefaultGeodeticDatum diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java index 882f14cc30..d5b763cbb7 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java @@ -206,7 +206,7 @@ final class StandardDefinitions { * Creates a geodetic CRS from hard-coded values for the given code. * * @param code the EPSG code. - * @param datum the geodetic datum. + * @param datum the geodetic reference frame. * @param cs the coordinate system. * @return the geographic CRS for the given code. */ @@ -229,12 +229,12 @@ final class StandardDefinitions { } /** - * Creates a geodetic datum from hard-coded values for the given code. + * Creates a geodetic reference frame from hard-coded values for the given code. * * @param code the EPSG code. * @param ellipsoid the datum ellipsoid. * @param meridian the datum prime meridian. - * @return the geodetic datum for the given code. + * @return the geodetic reference frame for the given code. */ static GeodeticDatum createGeodeticDatum(final short code, final Ellipsoid ellipsoid, final PrimeMeridian meridian) { final String name; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java index 0a812d4823..09c421933d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java @@ -212,10 +212,10 @@ public class DefaultGeocentricCRS extends DefaultGeodeticCRS { } /** - * Returns the geodetic datum associated to this geocentric CRS. + * Returns the geodetic reference frame associated to this geocentric CRS. * This is the datum given at construction time. * - * @return the geodetic datum associated to this geocentric CRS. + * @return the geodetic reference frame associated to this geocentric CRS. */ @Override public final GeodeticDatum getDatum() { diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java index 231d4cfc14..24d1bedcdb 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java @@ -48,7 +48,7 @@ import org.apache.sis.measure.Units; /** - * A 2- or 3-dimensional coordinate reference system based on a geodetic datum. + * A 2- or 3-dimensional coordinate reference system based on a geodetic reference frame. * The CRS is geographic if associated with an ellipsoidal coordinate system, * or geocentric if associated with a spherical or Cartesian coordinate system. * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java index 0fb4bc2ff0..6e0fdf0fe9 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java @@ -227,10 +227,10 @@ public class DefaultGeographicCRS extends DefaultGeodeticCRS implements Geograph } /** - * Returns the geodetic datum associated to this geographic CRS. + * Returns the geodetic reference frame associated to this geographic CRS. * This is the datum given at construction time. * - * @return the geodetic datum associated to this geographic CRS. + * @return the geodetic reference frame associated to this geographic CRS. */ @Override public final GeodeticDatum getDatum() { diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java index 6245402729..80de0f4a98 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java @@ -128,7 +128,7 @@ public final class CoordinateSystems extends Static { * * <h4>Reference meridian</h4> * The reference meridian depends on the context. It is usually the prime meridian of the - * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum} of the + * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic reference frame} of the * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS} instance * that contains (through its coordinate system) the axes having those directions. * This policy is consistent with diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java index 640690fe0b..af9a8a86bc 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java @@ -38,9 +38,9 @@ import org.apache.sis.util.resources.Errors; * * <h2>Reference meridian</h2> * This class does not know whether the meridian is relative to Greenwich or any other reference meridian. - * The reference meridian shall be inferred from the geodetic datum of the {@code GeographicCRS} instance - * that contains (through its coordinate system) the axes having those directions. This is consistent with - * ISO 19162:2015 §7.5.4(iv) - WKT 2 formatting. + * The reference meridian shall be inferred from the geodetic reference frame of the {@code GeographicCRS} + * instance that contains (through its coordinate system) the axes having those directions. + * This is consistent with ISO 19162:2015 §7.5.4(iv) - WKT 2 formatting. * * @author Martin Desruisseaux (IRD) */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java index 28cba21999..a525851b79 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java @@ -248,7 +248,7 @@ public class AbstractDatum extends AbstractIdentifiedObject implements Datum { * Also known as the "origin", especially for Engineering and Image Datums. * * <ul> - * <li>For a {@linkplain DefaultGeodeticDatum geodetic datum}, the anchor may be the point(s) where the + * <li>For a {@linkplain DefaultGeodeticDatum geodetic reference frame}, the anchor may be the point(s) where the * relationship between geoid and ellipsoid is defined.</li> * * <li>For an {@linkplain DefaultEngineeringDatum engineering datum}, the anchor may be an identified diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/BursaWolfParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/BursaWolfParameters.java index 03fc38e034..b40c64b03d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/BursaWolfParameters.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/BursaWolfParameters.java @@ -93,7 +93,7 @@ import static org.apache.sis.referencing.operation.matrix.Matrix4.SIZE; * The Position Vector convention is used by IAG and recommended by ISO 19111.</li> * </ul> * - * <h2>Source and target geodetic datum</h2> + * <h2>Source and target geodetic reference frames</h2> * The <var>source datum</var> in above coordinates transformation is the {@link DefaultGeodeticDatum} instance * that contain this {@code BursaWolfParameters}. It can be any datum, including datum that are valid only locally. * The <var>{@linkplain #getTargetDatum() target datum}</var> is specified at construction time and is often, diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java index fd9c598ad2..9fd4158ee0 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java @@ -88,8 +88,8 @@ import org.apache.sis.measure.Units; * * <li><b>Localization grid of raster data</b><br> * Some remote sensing raster data are provided with a <i>localization grid</i> giving pixel coordinates - * (e.g. latitude and longitude). This can be seen as a change from {@linkplain DefaultEngineeringDatum - * image datum} to {@linkplain DefaultGeodeticDatum geodetic datum}. The coordinate transformation process + * (e.g. latitude and longitude). This can be seen as a change from {@linkplain DefaultEngineeringDatum image datum} + * to {@linkplain DefaultGeodeticDatum geodetic reference frame}. The coordinate transformation process * can sometimes be performed by a mathematical conversion (for example an affine transform) applied as a * {@linkplain org.apache.sis.referencing.operation.builder.LinearTransformBuilder first approximation}, * followed by small corrections for the residual part. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java index b7273fee42..1dbce36a07 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java @@ -61,19 +61,21 @@ import org.opengis.metadata.Identifier; /** * Defines the location and orientation of an ellipsoid that approximates the shape of the earth. - * Geodetic datum are used together with ellipsoidal coordinate system, and also with Cartesian - * coordinate system centered in the ellipsoid (or sphere). + * This concept, known as <q>geodetic datum</q> in traditional geodesy, + * is now better known as <q>geodetic reference frame</q>. + * Geodetic reference frames are used together with ellipsoidal coordinate system, + * and also with Cartesian coordinate system centered in the ellipsoid (or sphere). * * <h2>Bursa-Wolf parameters</h2> * One or many {@link BursaWolfParameters} can optionally be associated to each {@code DefaultGeodeticDatum} instance. * This association is not part of the ISO 19111 model, but still a common practice (especially in older standards). - * Associating Bursa-Wolf parameters to geodetic datum is known as the <i>early-binding</i> approach. + * Associating Bursa-Wolf parameters to a geodetic reference frame is known as the <i>early-binding</i> approach. * A recommended alternative, discussed below, is the <i>late-binding</i> approach. * * <p>The Bursa-Wolf parameters serve two purposes:</p> * <ol class="verbose"> * <li><b>Fallback for datum shifts</b><br> - * There is different methods for transforming coordinates from one geodetic datum to another datum, + * There is different methods for transforming coordinates from one geodetic reference frame to another frame, * and Bursa-Wolf parameters are used with some of them. However, different set of parameters may exist * for the same pair of (<var>source</var>, <var>target</var>) datum, so it is often not sufficient to * know those datum. The (<var>source</var>, <var>target</var>) pair of CRS are often necessary, @@ -98,10 +100,10 @@ import org.opengis.metadata.Identifier; * </li> * </ol> * - * <h2>Creating new geodetic datum instances</h2> + * <h2>Creating new geodetic reference frame instances</h2> * New instances can be created either directly by specifying all information to a factory method (choices 3 * and 4 below), or indirectly by specifying the identifier of an entry in a database (choices 1 and 2 below). - * Choice 1 in the following list is the easiest but most restrictive way to get a geodetic datum. + * Choice 1 in the following list is the easiest but most restrictive way to get a geodetic reference frame. * The other choices provide more freedom. * * <ol> @@ -194,7 +196,7 @@ public class DefaultGeodeticDatum extends AbstractDatum implements GeodeticDatum private final BursaWolfParameters[] bursaWolf; /** - * Creates a geodetic datum from the given properties. The properties map is given + * Creates a geodetic reference frame from the given properties. The properties map is given * unchanged to the {@linkplain AbstractDatum#AbstractDatum(Map) super-class constructor}. * In addition to the properties documented in the parent constructor, * the following properties are understood by this constructor: @@ -630,7 +632,7 @@ public class DefaultGeodeticDatum extends AbstractDatum implements GeodeticDatum * } * * Note that the {@linkplain #getPrimeMeridian() prime meridian} shall be formatted by the caller - * as a separated element after the geodetic datum (for compatibility with WKT 1). + * as a separated element after the geodetic reference frame (for compatibility with WKT 1). * * @return {@code "Datum"} or {@code "GeodeticDatum"}. * @@ -645,7 +647,7 @@ public class DefaultGeodeticDatum extends AbstractDatum implements GeodeticDatum if (isWKT1) { /* * Note that at the different of other datum (in particular vertical datum), - * WKT of geodetic datum do not have a numerical code for the datum type. + * WKT of geodetic reference frame do not have a numerical code for the datum type. */ if (bursaWolf != null) { for (final BursaWolfParameters candidate : bursaWolf) { diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java index d32f19d9bc..e2d7464def 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java @@ -559,8 +559,8 @@ public abstract class GeodeticAuthorityFactory extends AbstractFactory implement /** * Creates a datum defining the location and orientation of an ellipsoid that approximates the shape of the earth. - * Geodetic datum are used together with ellipsoidal coordinate system, and also with Cartesian coordinate system - * centered in the ellipsoid (or sphere). + * Geodetic reference frame are used together with ellipsoidal coordinate system, + * and also with Cartesian coordinate system centered in the ellipsoid (or sphere). * * <h4>Examples</h4> * The {@linkplain #getAuthorityCodes(Class) set of available codes} depends on the defining diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java index 5d66b76bff..20f614cbf8 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java @@ -336,7 +336,7 @@ public class GeodeticObjectFactory extends AbstractFactory implements CRSFactory * The default implementation creates a {@link DefaultGeocentricCRS} instance. * * @param properties name and other properties to give to the new object. - * @param datum the geodetic datum to use in created CRS. + * @param datum the geodetic reference frame to use in created CRS. * @param cs the three-dimensional Cartesian coordinate system for the created CRS. * @throws FactoryException if the object creation failed. * @@ -416,7 +416,7 @@ public class GeodeticObjectFactory extends AbstractFactory implements CRSFactory * The default implementation creates a {@link DefaultGeocentricCRS} instance. * * @param properties name and other properties to give to the new object. - * @param datum geodetic datum to use in created CRS. + * @param datum geodetic reference frame to use in created CRS. * @param cs the spherical coordinate system for the created CRS. * @throws FactoryException if the object creation failed. * @@ -532,7 +532,7 @@ public class GeodeticObjectFactory extends AbstractFactory implements CRSFactory * The default implementation creates a {@link DefaultGeographicCRS} instance. * * @param properties name and other properties to give to the new object. - * @param datum geodetic datum to use in created CRS. + * @param datum geodetic reference frame to use in created CRS. * @param cs the two- or three-dimensional ellipsoidal coordinate system for the created CRS. * @throws FactoryException if the object creation failed. * @@ -553,8 +553,8 @@ public class GeodeticObjectFactory extends AbstractFactory implements CRSFactory } /** - * Creates geodetic datum from ellipsoid and (optionally) Bursa-Wolf parameters. - * Geodetic datum defines the location and orientation of an ellipsoid that approximates the shape of the earth. + * Creates a geodetic reference frame from ellipsoid and (optionally) Bursa-Wolf parameters. + * Geodetic reference frame defines the location and orientation of an ellipsoid that approximates the shape of the earth. * This datum can be used with geographic, geocentric and engineering CRS. * * <h4>Dependencies</h4> @@ -570,8 +570,8 @@ public class GeodeticObjectFactory extends AbstractFactory implements CRSFactory * The default implementation creates a {@link DefaultGeodeticDatum} instance. * * @param properties name and other properties to give to the new object. - * @param ellipsoid the ellipsoid to use in new geodetic datum. - * @param primeMeridian the prime meridian to use in new geodetic datum. + * @param ellipsoid the ellipsoid to use in new geodetic reference frame. + * @param primeMeridian the prime meridian to use in new geodetic reference frame. * @throws FactoryException if the object creation failed. * * @see DefaultGeodeticDatum#DefaultGeodeticDatum(Map, Ellipsoid, PrimeMeridian) diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java index 9db5519cb2..bf0ecb7ebb 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java @@ -115,7 +115,7 @@ import org.apache.sis.util.collection.BackingStoreException; * Given such URIs, {@code MultiAuthoritiesFactory} invokes {@link #createObject(String)} for each component * and combines the result as described by the {@link CRS#compound(CoordinateReferenceSystem...)} method. * URNs (but not URLs) can also combine a - * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum} with an + * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic reference frame} with an * {@linkplain org.apache.sis.referencing.cs.DefaultEllipsoidalCS ellipsoidal coordinate system} for creating a new * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}, or a base geographic CRS with a * {@linkplain org.apache.sis.referencing.operation.DefaultConversion conversion} and a diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java index 7f7a4fdf29..2b75a22d37 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java @@ -1765,8 +1765,8 @@ codes: for (int i=0; i<codes.length; i++) { } /** - * Returns Bursa-Wolf parameters for a geodetic datum. If the specified datum has no conversion information, - * then this method returns {@code null}. + * Returns Bursa-Wolf parameters for a geodetic reference frame. + * If the specified datum has no conversion information, then this method returns {@code null}. * * <p>This method is for compatibility with <i>Well Known Text</i> (WKT) version 1 formatting. * That legacy format had a {@code TOWGS84} element which needs the information provided by this method. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractSingleOperation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractSingleOperation.java index b6da3ac7f1..a721f0d225 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractSingleOperation.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractSingleOperation.java @@ -310,8 +310,8 @@ class AbstractSingleOperation extends AbstractCoordinateOperation implements Sin * * Comparing the MathTransforms instead of parameters avoid the problem of implicit parameters. For example, in * a ProjectedCRS, the "semiMajor" and "semiMinor" axis lengths are sometimes provided as explicit parameters, - * and sometimes inferred from the geodetic datum. The two cases would be different set of parameters from the - * OperationMethod's point of view, but still result in the creation of identical MathTransforms. + * and sometimes inferred from the geodetic reference frame. The two cases would be different set of parameters + * from the OperationMethod's point of view, but still result in the creation of identical MathTransforms. * * Another rational for treating OperationMethod as metadata is that SIS's MathTransform providers extend * DefaultOperationMethod. Consequently, there is a wide range of subclasses, which make the comparisons more diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java index 669883827c..b3d96d3e2a 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java @@ -131,10 +131,10 @@ public class DefaultConversion extends AbstractSingleOperation implements Conver * * <h4>Example</h4> * Converting time instants from a {@linkplain org.apache.sis.referencing.crs.DefaultTemporalCRS temporal CRS} - * using the <i>January 1st, 1950</i> epoch to another temporal CRS using the <i>January 1st, 1970</i> epoch - * is a datum change, since the epoch is part of {@linkplain org.apache.sis.referencing.datum.DefaultTemporalDatum + * using the <i>January 1st, 1950</i> epoch to another temporal CRS using the <i>January 1st, 1970</i> epoch is + * a datum change, since the epoch is part of {@linkplain org.apache.sis.referencing.datum.DefaultTemporalDatum * temporal datum} definition. However, such operation does not have all the accuracy issues of transformations - * between geodetic datum (empirically determined, over-determined systems, stochastic nature of the parameters). + * between geodetic reference frames (empirically determined, over-determined systems, stochastic nature of the parameters). * Consequently, some users may consider sufficient to represent temporal epoch changes as conversions instead * than transformations. * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/MathTransformContext.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/MathTransformContext.java index 7d720b7d81..90b94e6f6d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/MathTransformContext.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/MathTransformContext.java @@ -36,9 +36,9 @@ import org.apache.sis.measure.Units; /** * Information about the context in which a {@code MathTransform} is created. * This class performs the same normalization as the super-class (namely axis swapping and unit conversions), - * with the addition of longitude rotation for supporting change of prime meridian. This latter change is not - * applied by the super-class because prime meridian is part of geodetic datum, and the public math transform - * factory know nothing about datum (on design, for separation of concerns). + * with the addition of longitude rotation for supporting change of prime meridian. + * This latter change is not applied by the super-class because prime meridian is part of geodetic reference frame, + * and the public math transform factory knows nothing about datum (on design, for separation of concerns). * * @author Martin Desruisseaux (Geomatys) */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java index 25949cec40..7c37eb6c01 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java @@ -631,7 +631,7 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math /** * Sets the source coordinate system and related ellipsoid to the components of given CRS. - * The {@link Ellipsoid}, fetched from the geodetic datum, is often used together with an {@link EllipsoidalCS}, + * The {@link Ellipsoid}, fetched from the geodetic reference frame, is often used together with an {@link EllipsoidalCS}, * but not necessarily. The geodetic CRS may also be associated with a spherical or Cartesian coordinate system, * and the ellipsoid information may still be needed even with those non-ellipsoidal coordinate systems. * @@ -665,7 +665,7 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math /** * Sets the target coordinate system and related ellipsoid to the components of given CRS. - * The {@link Ellipsoid}, fetched from the geodetic datum, is often used together with an {@link EllipsoidalCS}, + * The {@link Ellipsoid}, fetched from the geodetic reference frame, is often used together with an {@link EllipsoidalCS}, * but not necessarily. The geodetic CRS may also be associated with a spherical or Cartesian coordinate system, * and the ellipsoid information may still be needed even with those non-ellipsoidal coordinate systems. * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java index e14de6d674..0fad8ba46f 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java @@ -82,7 +82,7 @@ * 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.CommonCRS#WGS84} documentation said that object - * of type <i>geodetic datum</i> is associated to code {@code EPSG:6326}. + * of type <i>geodetic reference frame</i> is associated to code {@code EPSG:6326}. * This means that the EPSG object could be obtained by the following code: * * {@snippet lang="java" : diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/GeodeticObjectBuilder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/GeodeticObjectBuilder.java index 50cae3a3de..6ae2d2789c 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/GeodeticObjectBuilder.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/GeodeticObjectBuilder.java @@ -81,7 +81,7 @@ import org.opengis.referencing.crs.GeodeticCRS; */ public class GeodeticObjectBuilder extends Builder<GeodeticObjectBuilder> { /** - * The geodetic datum, or {@code null} if none. + * The geodetic reference frame, or {@code null} if none. */ private GeodeticDatum datum; @@ -195,7 +195,7 @@ public class GeodeticObjectBuilder extends Builder<GeodeticObjectBuilder> { } /** - * Creates a geodetic datum with an ellipsoid of the given shape. + * Creates a geodetic reference frame with an ellipsoid of the given shape. * * @param name ellipsoid and datum name. * @param semiMajorAxis equatorial radius in supplied linear units. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java index c4c66b60b4..3179cdfb67 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java @@ -233,7 +233,7 @@ public final class ReferencingUtilities extends Static { * <li>If the given CRS is an instance of {@link SingleCRS} and its datum is a {@link GeodeticDatum}, * then this method returns the datum ellipsoid.</li> * <li>Otherwise if the given CRS is an instance of {@link CompoundCRS}, then this method - * invokes itself recursively for each component until a geodetic datum is found.</li> + * invokes itself recursively for each component until a geodetic reference frame is found.</li> * <li>Otherwise this method returns {@code null}.</li> * </ul> * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTUtilities.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTUtilities.java index 0ca7754a66..ddb558e8d3 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTUtilities.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTUtilities.java @@ -178,7 +178,7 @@ public final class WKTUtilities extends Static { } /** - * Returns the given geodetic datum as a formattable object. + * Returns the given geodetic reference frame as a formattable object. * * @param object the datum, or {@code null}. * @return the given datum as a formattable object, or {@code null}. diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java index fab9ed6afd..3b3719cfcd 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java @@ -211,7 +211,7 @@ public final class GeodeticObjectParserTest extends TestCase { } /** - * Tests the parsing of a geodetic datum from a WKT 2 string. + * Tests the parsing of a geodetic reference frame from a WKT 2 string. * * @throws ParseException if the parsing failed. */ diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java index 9e9b11e690..7644bf76bc 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java @@ -199,7 +199,7 @@ public final class HardCodedCRS { /** * A geocentric CRS with a spherical coordinate system. - * Prime meridian is Greenwich, geodetic datum is WGS84 and linear units are metres. + * Prime meridian is Greenwich, geodetic reference frame is WGS84 and linear units are metres. */ @SuppressWarnings("deprecation") public static final DefaultGeocentricCRS SPHERICAL = new DefaultGeocentricCRS( @@ -207,7 +207,7 @@ public final class HardCodedCRS { /** * A geocentric CRS with a Cartesian coordinate system. - * Prime meridian is Greenwich, geodetic datum is WGS84 and linear units are metres. + * Prime meridian is Greenwich, geodetic reference frame is WGS84 and linear units are metres. * The <var>X</var> axis points towards the prime meridian. * The <var>Y</var> axis points East. * The <var>Z</var> axis points North. diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java index 96f373a1a1..b693b6c742 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java @@ -63,7 +63,7 @@ public final class DefaultGeodeticDatumTest extends TestCase { } /** - * Opens the stream to the XML file in this package containing a geodetic datum definition. + * Opens the stream to the XML file in this package containing a geodetic reference frame definition. * * @return stream opened on the XML document to use for testing purpose. */ diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java index 9df81f3fa9..d96503c7c5 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java @@ -165,7 +165,7 @@ public final class GeodeticObjectFactoryTest extends ObjectFactoryTest { assertWktEquals(Convention.WKT1, "SPHEROID[“Airy1830”, 6377563.396, 299.3249753150345]", ellipsoid); /* - * Geodetic datum + * Geodetic reference frame */ datum = datumFactory.createGeodeticDatum(name("Airy1830"), ellipsoid, meridian); assertWktEquals(Convention.WKT1, diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java index 7811744d27..6c4e5ec5ee 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java @@ -337,7 +337,7 @@ public final class MultiAuthoritiesFactoryTest extends TestCaseWithLogs { assertTrue(codes.contains(" mock :: 84")); // A geographic CRS. assertTrue(codes.contains("http://www.opengis.net/gml/srs/mock.xml#4326";)); - assertFalse(codes.contains("MOCK:6326")); // A geodetic datum. + assertFalse(codes.contains("MOCK:6326")); // A geodetic reference frame. assertFalse(codes.isEmpty()); assertArrayEquals(new String[] {"MOCK:4979", "MOCK:84", "MOCK:4326", "MOCK:5714", "MOCK:9905"}, codes.toArray()); loggings.assertNoUnexpectedLog(); diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java index cff1f41696..ec037182a5 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java @@ -585,10 +585,10 @@ public final class EPSGFactoryTest extends TestCaseWithLogs { assertTrue (datum.contains("5100"), "Shall contain MSL."); final Set<String> geodeticDatum = factory.getAuthorityCodes(GeodeticDatum.class); - assertFalse(geodeticDatum.isEmpty(), "Geodetic datums not found."); + assertFalse(geodeticDatum.isEmpty(), "Geodetic reference frames not found."); assertTrue (geodeticDatum.contains("6326"), "Shall contain WGS84."); assertFalse(geodeticDatum.contains("5100"), "Shall not contain vertical datum."); - assertFalse(geodeticDatum.containsAll(datum), "Geodetic datum should be a subset of datum."); // Iteration should stop at the first mismatch. + assertFalse(geodeticDatum.containsAll(datum), "Geodetic reference frame should be a subset of datum."); // Iteration should stop at the first mismatch. final Set<String> verticalDatum = factory.getAuthorityCodes(VerticalDatum.class); assertFalse(verticalDatum.isEmpty(), "Vertical datums not found."); @@ -600,9 +600,9 @@ public final class EPSGFactoryTest extends TestCaseWithLogs { if (RUN_EXTENSIVE_TESTS) { assertTrue(geodeticDatum.size() >= 445, "size() consistency check."); - assertTrue(datum.size() > geodeticDatum.size(), "Geodetic datum should be a subset of datum."); + assertTrue(datum.size() > geodeticDatum.size(), "Geodetic reference frame should be a subset of datum."); assertTrue(datum.size() > verticalDatum.size(), "Vertical datum should be a subset of datum."); - assertTrue(datum.containsAll(geodeticDatum), "Geodetic datum should be a subset of datum."); + assertTrue(datum.containsAll(geodeticDatum), "Geodetic reference frame should be a subset of datum."); } /* diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java index 2f693ca840..ba2fd69401 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java @@ -332,12 +332,12 @@ public final class DefaultConversionTest extends TestCase { IllegalArgumentException e; e = assertThrows(IllegalArgumentException.class, () -> op.specialize(HardCodedCRS.WGS84, HardCodedCRS.NTF_NORMALIZED_AXES, null), - "Should not have accepted to change the geodetic datum."); + "Should not have accepted to change the geodetic reference frame."); assertMessageContains(e, "sourceCRS", "Nouvelle Triangulation Française"); e = assertThrows(IllegalArgumentException.class, () -> op.specialize(HardCodedCRS.NTF_NORMALIZED_AXES, HardCodedCRS.WGS84, null), - "Should not have accepted to change the geodetic datum."); + "Should not have accepted to change the geodetic reference frame."); assertMessageContains(e, "targetCRS", "Nouvelle Triangulation Française"); } diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/CRSBuilder.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/CRSBuilder.java index 3f2cae1de1..5f752fcf5d 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/CRSBuilder.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/CRSBuilder.java @@ -849,7 +849,7 @@ public final class CRSBuilder extends ReferencingFactoryContainer { } /** - * Creates a geodetic datum from an EPSG code or from user-defined parameters. + * Creates a geodetic reference frame from an EPSG code or from user-defined parameters. * The GeoTIFF values used by this method are: * * <ul> @@ -861,7 +861,7 @@ public final class CRSBuilder extends ReferencingFactoryContainer { * </ul></li> * </ul> * - * @param names the component names to use if the geodetic datum is user-defined. + * @param names the component names to use if the geodetic reference frame is user-defined. * @param angularUnit the angular unit of the longitude value relative to Greenwich. * @param linearUnit the linear unit of the ellipsoid semi-axis lengths. * @throws NoSuchElementException if a mandatory value is missing. @@ -1060,7 +1060,7 @@ public final class CRSBuilder extends ReferencingFactoryContainer { } case GeoCodes.userDefined: { /* - * Creates the geodetic datum, then a geographic CRS assuming (longitude, latitude) axis order. + * Creates the geodetic reference frame, then a geographic CRS assuming (longitude, latitude) axis order. * We use the coordinate system of CRS:84 as a template and modify its unit of measurement if needed. */ final String[] names = splitName(getAsString(GeoKeys.GeodeticCitation)); @@ -1130,7 +1130,7 @@ public final class CRSBuilder extends ReferencingFactoryContainer { } case GeoCodes.userDefined: { /* - * Creates the geodetic datum, then a geocentric CRS. We use the coordinate system of + * Creates the geodetic reference frame, then a geocentric CRS. We use the coordinate system of * the WGS84 geocentric CRS as a template and modify its unit of measurement if needed. */ final String[] names = splitName(getAsString(GeoKeys.GeodeticCitation)); diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java index 4d0c22c96b..794f49b29c 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java @@ -111,7 +111,7 @@ public abstract class Decoder extends ReferencingFactoryContainer { public final GeometryLibrary geomlib; /** - * The geodetic datum, created when first needed. The datum are generally not specified in netCDF files. + * The geodetic reference frame, created when first needed. The datum are generally not specified in netCDF files. * To make that clearer, we will build datum with names like "Unknown datum presumably based on GRS 1980". * Index in the cache are one of the {@code CACHE_INDEX} constants declared in {@link CRSBuilder}. * diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java index eb38482e4f..9dcf61b978 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java @@ -363,7 +363,7 @@ final class GridMapping { ellipsoid = defaultDefinitions.ellipsoid(); } /* - * Geodetic datum built from "towgs84" and above properties. + * Geodetic reference frame built from "towgs84" and above properties. */ final Object bursaWolf = definition.remove(Convention.TOWGS84); final GeodeticDatum datum; diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Longitude.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Longitude.java index 5b47e2090a..50c128432d 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Longitude.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Longitude.java @@ -28,7 +28,7 @@ import org.apache.sis.math.MathFunctions; * * <p>Longitudes are not necessarily relative to the Greenwich meridian. The * {@linkplain org.apache.sis.referencing.datum.DefaultPrimeMeridian prime meridian} - * depends on the context, typically specified through the geodetic datum of a + * depends on the context, typically specified through the geodetic reference frame of a * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}.</p> * * <h2>Immutability and thread safety</h2>
