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 6affdaa1555349f11ab16db0c38c342ff8ee8366
Merge: 6eac04b166 611ffb816d
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Sep 28 12:37:07 2023 +0200
Merge branch 'geoapi-3.1'.
README.md | 24 ++-
endorsed/build.gradle.kts | 34 ++--
.../main/module-info.java | 1 -
.../main/org/apache/sis/io/wkt/Convention.java | 2 -
.../main/org/apache/sis/referencing/CRS.java | 23 ++-
.../apache/sis/referencing/GeodeticCalculator.java | 1 -
.../sis/referencing/cs/CoordinateSystems.java | 6 +-
.../referencing/factory/AuthorityFactoryProxy.java | 2 +-
.../apache/sis/referencing/internal/Legacy.java | 4 -
.../sis/referencing/operation/package-info.java | 9 +-
.../operation/projection/AlbersEqualArea.java | 2 +-
.../operation/projection/CassiniSoldner.java | 2 +-
.../operation/projection/CylindricalEqualArea.java | 2 +-
.../projection/LambertConicConformal.java | 2 +-
.../referencing/operation/projection/Mercator.java | 2 +-
.../projection/ModifiedAzimuthalEquidistant.java | 2 +-
.../operation/projection/ObliqueStereographic.java | 2 +-
.../operation/projection/PolarStereographic.java | 2 +-
.../operation/projection/Polyconic.java | 2 +-
.../operation/projection/Sinusoidal.java | 2 +-
.../operation/projection/TransverseMercator.java | 2 +-
.../operation/projection/package-info.java | 7 +-
.../operation/transform/ContextualParameters.java | 47 ++---
.../operation/transform/package-info.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../main/org/apache/sis/storage/geotiff/Type.java | 25 +--
.../org/apache/sis/storage/DataStoreRegistry.java | 6 +-
.../apache/sis/storage/image/DataStoreFilter.java | 29 ++-
.../main/org/apache/sis/measure/Scalar.java | 4 +-
.../org/apache/sis/measure/UnitNames.properties | 2 +
.../main/org/apache/sis/measure/UnitRegistry.java | 3 +-
.../main/org/apache/sis/measure/Units.java | 221 ++++++++++++---------
.../main/org/apache/sis/util/ComparisonMode.java | 9 +-
.../org/apache/sis/measure/UnitFormatTest.java | 2 +
.../test/org/apache/sis/measure/UnitsTest.java | 8 +-
incubator/build.gradle.kts | 4 +-
netbeans-project/ivy.xml | 8 +-
optional/build.gradle.kts | 2 +-
.../gui/referencing/PositionableProjection.java | 8 -
settings.gradle.kts | 10 +-
40 files changed, 294 insertions(+), 233 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index 45e78ca27b,c0316a3cfd..6fda530af2
---
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
@@@ -86,6 -87,12 +87,9 @@@ import org.apache.sis.metadata.iso.exte
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.geometry.Geometry;
-import org.opengis.referencing.ObjectDomain;
-import org.opengis.metadata.extent.BoundingPolygon;
-import org.opengis.metadata.extent.GeographicExtent;
++// Specific to the main branch:
++import org.apache.sis.referencing.internal.Legacy;
+
/**
* Static methods working on {@linkplain CoordinateReferenceSystem Coordinate
Reference Systems}.
@@@ -794,7 -798,15 +795,15 @@@ public final class CRS extends Static
*/
@OptionalCandidate
public static GeographicBoundingBox getGeographicBoundingBox(final
CoordinateReferenceSystem crs) {
- return (crs != null) ?
Extents.getGeographicBoundingBox(crs.getDomainOfValidity()) : null;
+ return (crs != null) ? getDomains(crs).orElse(null) : null;
+ }
+
+ /**
+ * Returns the geographic bounding box computed from the domain of the
given object. This method may be renamed and
+ * refactored as a replacement of {@link
#getGeographicBoundingBox(CoordinateReferenceSystem)} in a future version.
+ */
+ private static Optional<GeographicBoundingBox> getDomains(final
IdentifiedObject object) {
- return
Extents.getGeographicBoundingBox(object.getDomains().stream().map(ObjectDomain::getDomainOfValidity));
++ return
Extents.getGeographicBoundingBox(Legacy.getDomains(object).stream().map(DefaultObjectDomain::getDomainOfValidity));
}
/**
diff --cc netbeans-project/ivy.xml
index 65fa430d8a,a0b405974e..d89626bbf0
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@@ -11,10 -11,8 +11,10 @@@
<ivy-module version="2.0">
<info organisation="org.apache" module="sis"/>
<dependencies defaultconf="default">
+ <dependency org="org.opengis" name="geoapi"
rev="3.0.2"/>
+ <dependency org="org.opengis" name="geoapi-conformance"
rev="3.0.2"/>
<dependency org="javax.measure" name="unit-api"
rev="2.1.3"/>
- <dependency org="org.glassfish.jaxb" name="jaxb-runtime"
rev="4.0.2"/>
+ <dependency org="org.glassfish.jaxb" name="jaxb-runtime"
rev="4.0.3"/>
<dependency org="com.esri.geometry" name="esri-geometry-api"
rev="2.2.4"/>
<dependency org="org.locationtech.jts" name="jts-core"
rev="1.19.0"/>
<dependency org="org.postgresql" name="postgresql"
rev="42.6.0"/>
diff --cc settings.gradle.kts
index 3010f4b832,221fddf6d2..f5dd152e4a
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@@ -55,15 -57,15 +55,15 @@@ dependencyResolutionManagement
*/
versionCatalogs {
create("libs") {
- library("geoapi", "org.opengis",
"geoapi-pending") .version {strictly(geoapiVersion)}
+ library("geoapi", "org.opengis", "geoapi")
.version {strictly(geoapiVersion)}
library("units", "javax.measure", "unit-api")
.version {strictly("[2.1, 3.0["); prefer("2.1.3")}
- library("jaxb.api", "jakarta.xml.bind",
"jakarta.xml.bind-api").version {strictly("[4.0, 5.0["); prefer("4.0.0")}
- library("jaxb.impl", "org.glassfish.jaxb",
"jaxb-runtime") .version {strictly("[4.0, 5.0["); prefer("4.0.2")}
+ library("jaxb.api", "jakarta.xml.bind",
"jakarta.xml.bind-api").version {strictly("[4.0, 5.0["); prefer("4.0.1")}
+ library("jaxb.impl", "org.glassfish.jaxb",
"jaxb-runtime") .version {strictly("[4.0, 5.0["); prefer("4.0.3")}
library("jts.core", "org.locationtech.jts", "jts-core")
.version {strictly("[1.15, 2.0["); prefer("1.19.0")}
library("esri.geometry", "com.esri.geometry",
"esri-geometry-api") .version {strictly("[2.0, 3.0["); prefer("2.2.4")}
- library("libreoffice", "org.libreoffice", "libreoffice")
.version {strictly("[7.0, 8.0["); prefer("7.3.6")}
+ library("libreoffice", "org.libreoffice", "libreoffice")
.version {strictly("[7.0, 8.0["); prefer("7.6.1")}
library("ucar", "edu.ucar", "cdm-core")
.version {strictly("[5.0, 6.0["); prefer("5.5.3")}
- library("aws.s3", "software.amazon.awssdk", "s3")
.version {strictly("[2.0, 3.0["); prefer("2.18.40")}
+ library("aws.s3", "software.amazon.awssdk", "s3")
.version {strictly("[2.0, 3.0["); prefer("2.20.155")}
}
create("tests") {
library("geoapi", "org.opengis",
"geoapi-conformance") .version {strictly(geoapiVersion)}
