This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
from 3d377745a9 Merge branch 'geoapi-3.1'. Contains improvements in:
`SQLStore`, ShapeFile (incubator), conversions from AWT shapes to JTS, partial
DuckDB support, and use of HTTP ranges in GeoHEIF.
add a245c9783f Clarification in required dependencies.
add 906fcdf516 Missing EOF detection when using HTTP ranges or S3.
add cf0f31d12a When a `FeatureQuery` contains a projection (in SQL sense),
and if some properties in the projection are links, recreate the result types
of the links if they changed.
add 3a5fcfaa4a Generalize the update of properties of operations to all
kinds of `AbstractOperation` instead of only links. This is a generalization of
the previous commit ("recreate the result types of the links if they changed").
The intent is to the CRS characteristic updated not only for links, but also
for the envelope operation.
add fe843c865e Documentation fix: "did not specified" → "did not specify".
add 94597927c0 Remove `FeatureCatalogBuilder`, which was not really used.
add 2e3f2c2370 Add a conversion from geographic to spherical coordinates.
https://issues.apache.org/jira/browse/SIS-302
add 2b1ed5b6c5 Find a coordinate operation path between two CRS when a
step requires a change from spherical coordinates to geodetic coordinates.
Note: when the spherical coordinates are two-dimensional, current version
assumes a radius of zero, which is incorrect. The missing radius problem will
be adressed in a separated commit.
add e471fe0cf0 Add a "Spherical 2D to 3D" operation where the third
dimension is the distance R from the centre to the ellipsoid surface. This new
operation, while apparently simple, has many implications on the way to
concatenate and optimize a chain of transforms. Therefore, this commit also
contains:
add f416e5744b Refactor the
`CoordinateOperationFinder.createOperationStep(GeodeticCRS source, GeodeticCRS
target)` method for adding a "spherical to ellipsoidal" step (or its inverse)
when needed, including addition of radius coordinate ("spherical 2D to 3D").
add 3abad8c520 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains support
for conversion from geographic to spherical coordinates without going through
Cartesian coordinates, and improvements in `SQLStore` with projections (in SQL
sense) of properties that are links (e.g. "sis:identifier").
new 95d808c404 Merge branch 'geoapi-3.1'.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 4 +-
.../org/apache/sis/cloud/aws/s3/FileService.java | 2 +-
.../sis/coverage/grid/ResampledGridCoverage.java | 2 +-
.../apache/sis/feature/AbstractIdentifiedType.java | 90 ++-
.../org/apache/sis/feature/AbstractOperation.java | 67 +-
.../apache/sis/feature/DefaultAssociationRole.java | 15 +-
.../apache/sis/feature/DefaultAttributeType.java | 15 +-
.../org/apache/sis/feature/EnvelopeOperation.java | 194 +++--
.../org/apache/sis/feature/FeatureOperations.java | 18 +-
.../main/org/apache/sis/feature/Features.java | 4 +-
.../sis/feature/GroupAsPolylineOperation.java | 40 +-
.../main/org/apache/sis/feature/LinkOperation.java | 15 +
.../apache/sis/feature/StringJoinOperation.java | 80 ++-
.../feature/builder/AssociationRoleBuilder.java | 2 +-
.../sis/feature/builder/AttributeTypeBuilder.java | 2 +-
.../feature/builder/CharacteristicTypeBuilder.java | 2 +-
.../sis/feature/builder/FeatureTypeBuilder.java | 6 +-
.../sis/feature/builder/OperationWrapper.java | 37 +
.../sis/feature/builder/PropertyTypeBuilder.java | 13 +
.../apache/sis/feature/builder/TypeBuilder.java | 2 +-
.../org/apache/sis/feature/internal/Resources.java | 5 +
.../sis/feature/internal/Resources.properties | 1 +
.../sis/feature/internal/Resources_fr.properties | 1 +
.../feature/privy/FeatureProjectionBuilder.java | 51 +-
.../main/org/apache/sis/xml/XML.java | 2 +-
...g.opengis.referencing.operation.OperationMethod | 2 +
.../main/module-info.java | 2 +
.../apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../org/apache/sis/parameter/ParameterFormat.java | 2 +-
.../org/apache/sis/parameter/Parameterized.java | 3 +
.../sis/referencing/cs/CoordinateSystems.java | 63 +-
.../sis/referencing/cs/DefaultCompoundCS.java | 7 +-
.../sis/referencing/datum/BursaWolfParameters.java | 2 +-
.../referencing/datum/DefaultDatumEnsemble.java | 2 +-
.../sis/referencing/datum/DefaultEllipsoid.java | 55 +-
.../referencing/datum/DefaultGeodeticDatum.java | 2 +-
.../org/apache/sis/referencing/datum/Sphere.java | 15 +-
.../internal/ParameterizedTransformBuilder.java | 235 +++---
.../operation/CoordinateOperationFinder.java | 210 ++----
.../operation/CoordinateOperationRegistry.java | 2 +-
.../referencing/operation/DefaultConversion.java | 2 +-
.../DefaultCoordinateOperationFactory.java | 11 +-
.../operation/MathTransformContext.java | 90 ++-
.../operation/matrix/GeneralMatrix.java | 22 +-
.../sis/referencing/operation/matrix/Matrices.java | 3 +
.../operation/provider/AbstractProvider.java | 52 +-
.../GeocentricAffineBetweenGeographic.java | 53 +-
.../operation/provider/GeocentricToGeographic.java | 4 +-
.../provider/GeocentricToTopocentric.java | 16 +-
.../provider/GeocentricTranslation3D.java | 1 +
.../operation/provider/Geographic2Dto3D.java | 26 +-
.../operation/provider/Geographic3Dto2D.java | 19 +-
.../operation/provider/GeographicToGeocentric.java | 40 +-
.../operation/provider/MapProjection.java | 28 +-
...{Geographic2Dto3D.java => Spherical2Dto3D.java} | 59 +-
...{Geographic2Dto3D.java => Spherical3Dto2D.java} | 63 +-
.../operation/transform/AbstractMathTransform.java | 183 ++++-
.../operation/transform/CartesianToPolar.java | 6 +-
.../operation/transform/CartesianToSpherical.java | 6 +-
.../operation/transform/ConcatenatedTransform.java | 24 +-
.../operation/transform/ContextualParameters.java | 80 ++-
.../transform/CoordinateSystemTransform.java | 34 +-
.../CoordinateSystemTransformBuilder.java | 350 ++++++---
.../operation/transform/CopyTransform.java | 25 +-
.../operation/transform/DatumShiftTransform.java | 3 +-
.../transform/DefaultMathTransformFactory.java | 8 +-
.../transform/EllipsoidToCentricTransform.java | 787 ++++++++++++---------
.../transform/EllipsoidToRadiusTransform.java | 505 +++++++++++++
.../transform/InterpolatedGeocentricTransform.java | 9 +-
.../operation/transform/LinearTransform1D.java | 5 +-
.../operation/transform/MathTransforms.java | 20 +-
.../operation/transform/MolodenskyTransform.java | 1 +
.../operation/transform/OnewayLinearTransform.java | 190 +++++
.../operation/transform/PolarToCartesian.java | 6 +-
.../operation/transform/PoleRotation.java | 13 +-
.../operation/transform/SphericalToCartesian.java | 8 +-
.../operation/transform/TransformSeparator.java | 6 +-
.../org/apache/sis/referencing/privy/Formulas.java | 26 +-
.../referencing/privy/ReferencingUtilities.java | 27 +
.../ParameterizedTransformBuilderTest.java | 2 +-
.../operation/CoordinateOperationFinderTest.java | 64 ++
.../provider/GeocentricTranslationTest.java | 10 +-
.../operation/provider/Geographic3Dto2DTest.java | 5 +-
.../operation/provider/ProvidersTest.java | 2 +
.../transform/EllipsoidToCentricTransformTest.java | 135 ++--
.../transform/EllipsoidToRadiusTransformTest.java | 162 +++++
.../EllipsoidToSphericalTransformTest.java | 198 ++++++
.../operation/transform/MathTransformWrapper.java | 4 +-
.../transform/TransformSeparatorTest.java | 4 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../apache/sis/storage/sql/feature/Relation.java | 2 +-
.../main/org/apache/sis/storage/gpx/Store.java | 17 -
.../main/org/apache/sis/storage/gpx/Types.java | 26 +-
.../apache/sis/io/stream/FileCacheByteChannel.java | 24 +-
.../main/org/apache/sis/storage/FeatureQuery.java | 12 +-
.../main/org/apache/sis/storage/FeatureSet.java | 1 -
.../main/org/apache/sis/storage/FeatureSubset.java | 4 +-
.../org/apache/sis/storage/StorageConnector.java | 2 +-
.../sis/storage/UnsupportedQueryException.java | 12 +
.../sis/storage/base/FeatureCatalogBuilder.java | 81 ---
.../apache/sis/storage/base/MetadataBuilder.java | 3 -
.../org/apache/sis/storage/FeatureQueryTest.java | 2 +-
.../sis/storage/base/MetadataBuilderTest.java | 4 +-
.../main/org/apache/sis/pending/jdk/JDK21.java | 24 +-
.../org/apache/sis/util/privy/CollectionsExt.java | 8 +-
netbeans-project/nbproject/project.xml | 2 +
optional/src/org.apache.sis.gui/bundle/README | 2 +-
settings.gradle.kts | 1 +
108 files changed, 3550 insertions(+), 1350 deletions(-)
copy
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/{Geographic2Dto3D.java
=> Spherical2Dto3D.java} (63%)
copy
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/{Geographic2Dto3D.java
=> Spherical3Dto2D.java} (62%)
create mode 100644
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToRadiusTransform.java
create mode 100644
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OnewayLinearTransform.java
create mode 100644
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToRadiusTransformTest.java
create mode 100644
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToSphericalTransformTest.java
delete mode 100644
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/FeatureCatalogBuilder.java
