This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
from c4eceb3ef1 Merge branch 'geoapi-4.0' into geoapi-3.1 add 58dee5a542 Documentation updates. add 94d30d99d2 The referencing module needs to check if the datum is null, and fallback on the datum ensemble if needed. This commit does not resolve all cases. In particular, the cases that depend on the EPSG database update are not yet done: EPSGDataAccess, CoordinateOperationRegistry and CoordinateOperationFinder. add 3bbf94a004 Modification in the implementation strategy of datum ensemble: allow a datum ensemble to be viewed as a pseudo-datum. This is trick for reducing the amount of null checks. add f8421abcf5 Add "the" in some English error messages. new d3af997759 Merge branch 'geoapi-4.0' into 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: .../org/apache/sis/feature/AbstractAttribute.java | 2 +- .../org/apache/sis/feature/AbstractFeature.java | 2 +- .../apache/sis/feature/SingletonAttributeTest.java | 2 +- .../org/apache/sis/portrayal/CanvasContext.java | 12 +- .../gazetteer/GeohashReferenceSystem.java | 6 +- .../gazetteer/MilitaryGridReferenceSystem.java | 2 +- .../org/apache/sis/geometry/CoordinateFormat.java | 7 +- .../main/org/apache/sis/io/wkt/VerticalInfo.java | 13 +- .../sis/referencing/AbstractIdentifiedObject.java | 7 +- .../main/org/apache/sis/referencing/CRS.java | 34 +- .../main/org/apache/sis/referencing/CommonCRS.java | 76 ++- .../referencing/EllipsoidalHeightSeparator.java | 28 +- .../sis/referencing/MultiRegisterOperations.java | 26 +- .../apache/sis/referencing/crs/AbstractCRS.java | 79 +-- .../sis/referencing/crs/AbstractSingleCRS.java | 314 +++++++++++ .../sis/referencing/crs/DefaultDerivedCRS.java | 22 +- .../sis/referencing/crs/DefaultEngineeringCRS.java | 48 +- .../sis/referencing/crs/DefaultGeocentricCRS.java | 6 +- .../sis/referencing/crs/DefaultGeodeticCRS.java | 44 +- .../sis/referencing/crs/DefaultGeographicCRS.java | 42 +- .../sis/referencing/crs/DefaultImageCRS.java | 30 +- .../sis/referencing/crs/DefaultParametricCRS.java | 48 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 23 +- .../sis/referencing/crs/DefaultTemporalCRS.java | 82 ++- .../sis/referencing/crs/DefaultVerticalCRS.java | 48 +- .../sis/referencing/crs/ExplicitParameters.java | 6 +- .../referencing/datum/DefaultDatumEnsemble.java | 18 +- .../apache/sis/referencing/datum/PseudoDatum.java | 601 +++++++++++++++++++++ .../referencing/factory/GeodeticObjectFactory.java | 12 +- .../apache/sis/referencing/internal/Resources.java | 4 +- .../sis/referencing/internal/Resources.properties | 4 +- .../referencing/internal/Resources_fr.properties | 2 +- .../operation/CoordinateOperationFinder.java | 21 +- .../operation/CoordinateOperationRegistry.java | 12 +- .../referencing/operation/DefaultConversion.java | 15 +- .../DefaultCoordinateOperationFactory.java | 16 +- .../transform/DefaultMathTransformFactory.java | 5 +- .../sis/referencing/privy/DefinitionVerifier.java | 29 +- .../privy/EllipsoidalHeightCombiner.java | 27 +- .../referencing/privy/GeodeticObjectBuilder.java | 47 +- .../referencing/privy/ReferencingUtilities.java | 132 +++-- .../referencing/AbstractIdentifiedObjectTest.java | 2 +- .../sis/storage/geotiff/reader/CRSBuilder.java | 13 +- .../sis/storage/geotiff/writer/GeoEncoder.java | 5 +- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 37 +- .../sis/storage/netcdf/base/GridMapping.java | 9 +- .../main/org/apache/sis/storage/csv/Store.java | 9 +- .../main/org/apache/sis/util/resources/Errors.java | 11 +- .../apache/sis/util/resources/Errors.properties | 7 +- .../apache/sis/util/resources/Errors_fr.properties | 1 + .../org/apache/sis/gui/map/OperationFinder.java | 5 +- .../main/org/apache/sis/gui/referencing/Utils.java | 6 +- 52 files changed, 1535 insertions(+), 524 deletions(-) create mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java create mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java