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 b22144ecf83f176f70e0d411d7a59f6ed04d7a75 Merge: f358804252 6011e9f39f Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Jun 25 19:26:02 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../org/apache/sis/coverage/grid/PixelInCell.java | 5 ++- .../org/apache/sis/temporal/DefaultInstant.java | 2 +- .../main/org/apache/sis/util/iso/Types.java | 9 ++-- .../apache/sis/xml/bind/gml/TimePeriodBound.java | 5 ++- .../org/apache/sis/geometry/CoordinateFormat.java | 4 +- .../apache/sis/io/wkt/GeodeticObjectParser.java | 7 ++- .../org/apache/sis/io/wkt/MathTransformParser.java | 22 +++++----- .../operation/CoordinateOperationRegistry.java | 5 +-- .../DefaultCoordinateOperationFactory.java | 20 ++------- .../transform/DefaultMathTransformFactory.java | 7 +-- .../sis/referencing/privy/AxisDirections.java | 3 +- .../referencing/privy/CoordinateOperations.java | 26 ++++++++--- .../referencing/privy/GeodeticObjectBuilder.java | 4 +- .../privy/ReferencingFactoryContainer.java | 51 ++++++++++++++++++++-- .../sis/storage/geotiff/reader/CRSBuilder.java | 17 ++++++-- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 9 ++-- .../apache/sis/storage/netcdf/base/Decoder.java | 13 +++++- .../sis/storage/netcdf/base/GridMapping.java | 5 ++- .../sis/storage/netcdf/classic/ChannelDecoder.java | 4 +- .../sis/storage/netcdf/ucar/DecoderWrapper.java | 2 +- .../apache/sis/util/privy/MetadataServices.java | 2 +- .../sis/util/resources/IndexedResourceBundle.java | 2 +- geoapi/snapshot | 2 +- .../org/apache/sis/cql/FilterToCQLVisitor.java | 4 +- .../test/org/apache/sis/cql/FilterReadingTest.java | 4 +- .../apache/sis/storage/shapefile/dbf/DBFField.java | 38 ++++++++++++++-- 26 files changed, 180 insertions(+), 92 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java index 29b606fbce,0b756d9f7c..2cec5bccff --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java @@@ -685,9 -698,11 +685,8 @@@ next: for (int i=0; i <= limit; i if (abbreviation != null) { return abbreviation; } - if (isLegacyOther(direction)) { - return "m"; // Arbitrary abbreviation, may change in any future SIS version. - } } - final String id = direction.identifier(); // UML identifier, or null if none. - return camelCaseToAcronym(id != null ? id : direction.name()).toString().intern(); + return camelCaseToAcronym(direction.identifier().orElse(direction.name())).toString().intern(); } /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java index 7c9070000d,a00de5c76d..dcd9cc99b3 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java @@@ -43,10 -45,11 +45,11 @@@ import org.apache.sis.util.Deprecable import org.apache.sis.util.Static; import org.apache.sis.util.privy.CollectionsExt; import org.apache.sis.util.privy.Numerics; + import org.apache.sis.util.privy.URLs; import org.apache.sis.util.collection.Containers; -// Specific to the geoapi-4.0 branch: -import org.opengis.referencing.crs.DerivedCRS; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.crs.GeneralDerivedCRS; /** diff --cc geoapi/snapshot index db2b62d7c4,a07e965123..e32e9fca0a --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit db2b62d7c4452ba91c90fa98f58721e7f5485174 -Subproject commit a07e965123706be9092d0dc615592c23c8401450 ++Subproject commit e32e9fca0a1b0f7f07b98cb7d396bff23a6a35c2
