This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 75f06b571229e1f41f392b134830b0dc8c303f23 Merge: adb5e5fd85 eef29ecb6c Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri May 10 18:38:47 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/metadata/iso/DefaultIdentifier.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 19 ++++++----- .../metadata/iso/lineage/DefaultProcessStep.java | 10 +++++- .../sis/xml/test/AnnotationConsistencyCheck.java | 6 ---- .../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/GeodeticObjectFactoryTest.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 ++++++++++ geoapi/snapshot | 2 +- 54 files changed, 212 insertions(+), 134 deletions(-) diff --cc geoapi/snapshot index cfb43fa592,1685784018..6eb8f736dc --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit cfb43fa59293e86ad5e1088887674013f095fcde -Subproject commit 1685784018d4e32484a2eedb6e63a41751335101 ++Subproject commit 6eb8f736dc3ea0c927f580d4863cbc19540641aa
