This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 6e795b173e4ee2862108a6fee48d53533c93b082 Merge: 670856df6a 75f06b5712 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri May 10 18:42:38 2024 +0200 Merge branch 'geoapi-3.1' .../apache/sis/metadata/iso/DefaultIdentifier.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 19 ++++++----- .../gazetteer/MilitaryGridReferenceSystem.java | 2 +- .../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 ++++---- .../sis/referencing/StandardDefinitions.java | 6 ++-- .../sis/referencing/crs/DefaultGeocentricCRS.java | 4 +-- .../sis/referencing/crs/DefaultGeodeticCRS.java | 2 +- .../sis/referencing/crs/DefaultGeographicCRS.java | 4 +-- .../sis/referencing/cs/CoordinateSystems.java | 2 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 6 ++-- .../sis/referencing/datum/AbstractDatum.java | 2 +- .../sis/referencing/datum/BursaWolfParameters.java | 2 +- .../sis/referencing/datum/DatumShiftGrid.java | 4 +-- .../referencing/datum/DefaultGeodeticDatum.java | 20 +++++++----- .../factory/GeodeticAuthorityFactory.java | 4 +-- .../referencing/factory/GeodeticObjectFactory.java | 14 ++++---- .../factory/MultiAuthoritiesFactory.java | 2 +- .../referencing/factory/sql/EPSGDataAccess.java | 4 +-- .../operation/AbstractSingleOperation.java | 4 +-- .../referencing/operation/DefaultConversion.java | 6 ++-- .../operation/MathTransformContext.java | 6 ++-- .../transform/DefaultMathTransformFactory.java | 4 +-- .../org/apache/sis/referencing/package-info.java | 2 +- .../referencing/privy/GeodeticObjectBuilder.java | 4 +-- .../referencing/privy/ReferencingUtilities.java | 2 +- .../apache/sis/referencing/privy/WKTUtilities.java | 2 +- .../sis/io/wkt/GeodeticObjectParserTest.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +-- .../datum/DefaultGeodeticDatumTest.java | 2 +- .../factory/MultiAuthoritiesFactoryTest.java | 2 +- .../referencing/factory/sql/EPSGFactoryTest.java | 8 ++--- .../operation/DefaultConversionTest.java | 4 +-- .../sis/storage/geotiff/reader/CRSBuilder.java | 8 ++--- .../apache/sis/storage/netcdf/base/Decoder.java | 2 +- .../sis/storage/netcdf/base/GridMapping.java | 2 +- .../org/apache/sis/measure/AbstractConverter.java | 31 ++++++++++++++---- .../main/org/apache/sis/measure/AbstractUnit.java | 5 +-- .../org/apache/sis/measure/ConventionalUnit.java | 38 +++++++++++++++------- .../main/org/apache/sis/measure/Longitude.java | 2 +- .../main/org/apache/sis/measure/PowerOf10.java | 2 +- .../main/org/apache/sis/measure/SystemUnit.java | 7 +++- .../main/org/apache/sis/measure/UnitFormat.java | 6 ++-- .../main/org/apache/sis/measure/Units.java | 22 +++++++++++++ .../main/org/apache/sis/util/resources/Errors.java | 7 +--- .../apache/sis/util/resources/Errors.properties | 1 - .../apache/sis/util/resources/Errors_fr.properties | 1 - .../apache/sis/measure/ConventionalUnitTest.java | 17 ++++++++++ 50 files changed, 201 insertions(+), 125 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java index bc0a859a86,24d1bedcdb..ae28b165c8 --- 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 @@@ -46,12 -46,9 +46,12 @@@ import org.apache.sis.io.wkt.Convention import org.apache.sis.io.wkt.Formatter; import org.apache.sis.measure.Units; +// Specific to the main branch: +import org.opengis.referencing.ReferenceIdentifier; + /** - * 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. *
