You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/11/19 16:28:34 UTC
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains bug fix in parsing of GML documents.
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 2afe9dfcf6ce881df024e7b98b8500ccb33b80d5
Merge: 34b68d4160 ec0eaa68d9
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Nov 19 17:27:49 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
Contains bug fix in parsing of GML documents.
.../sis/internal/jaxb/IdentifierMapAdapter.java | 30 +++++-
.../sis/internal/jaxb/SpecializedIdentifier.java | 2 +
.../org/apache/sis/internal/jaxb/package-info.java | 2 +-
.../org/apache/sis/internal/metadata/Merger.java | 6 +-
.../java/org/apache/sis/xml/NilObjectHandler.java | 2 +-
.../java/org/apache/sis/xml/ReferenceResolver.java | 8 +-
.../referencing/CC_GeneralOperationParameter.java | 39 +++++--
.../jaxb/referencing/CC_GeneralParameterValue.java | 11 +-
.../jaxb/referencing/CC_OperationMethod.java | 11 +-
.../jaxb/referencing/CC_OperationParameter.java | 54 +++++++---
.../internal/jaxb/referencing/package-info.java | 2 +-
.../sis/internal/referencing/AxisDirections.java | 57 +++++++++--
.../sis/parameter/AbstractParameterDescriptor.java | 4 +-
.../sis/parameter/DefaultParameterDescriptor.java | 70 ++++++++++---
.../sis/parameter/DefaultParameterValue.java | 13 ++-
.../sis/parameter/DefaultParameterValueGroup.java | 8 +-
.../org/apache/sis/parameter/ParameterFormat.java | 3 +-
.../java/org/apache/sis/parameter/Parameters.java | 9 +-
.../sis/parameter/UnmodifiableParameterValue.java | 13 ++-
.../sis/referencing/crs/AbstractDerivedCRS.java | 13 +--
.../sis/referencing/cs/CoordinateSystems.java | 7 ++
.../org/apache/sis/referencing/cs/Normalizer.java | 26 +++--
.../operation/AbstractCoordinateOperation.java | 20 +---
.../operation/AbstractSingleOperation.java | 9 +-
.../operation/DefaultConcatenatedOperation.java | 2 +-
.../referencing/operation/DefaultConversion.java | 16 +--
.../operation/DefaultOperationMethod.java | 26 +++--
.../operation/DefaultPassThroughOperation.java | 112 +++++++++++++++------
.../apache/sis/referencing/operation/SubTypes.java | 2 +-
.../java/org/apache/sis/io/wkt/WKTParserTest.java | 1 +
.../storage/csv/MovingFeatureIterator.java | 3 +-
.../org/apache/sis/internal/storage/csv/Store.java | 2 +-
32 files changed, 406 insertions(+), 177 deletions(-)
diff --cc core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
index deb48c7238,c67f5b7249..0126b5ce17
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
@@@ -260,9 -286,9 +287,9 @@@ public final class CC_GeneralOperationP
* be invoked recursively for each parameter in the group.
*/
final Map<String,Object> merged = new HashMap<>(expected);
- merged.putAll(actual); // May overwrite predefined properties.
- mergeArrays(GeneralParameterDescriptor.ALIAS_KEY, GenericName.class, provided.getAlias(), merged, complete.getName());
+ merged.putAll(actual); // May overwrite predefined properties.
+ mergeArrays(GeneralParameterDescriptor.ALIAS_KEY, GenericName.class, provided.getAlias(), merged, complete.getName());
- mergeArrays(GeneralParameterDescriptor.IDENTIFIERS_KEY, Identifier.class, provided.getIdentifiers(), merged, null);
+ mergeArrays(GeneralParameterDescriptor.IDENTIFIERS_KEY, ReferenceIdentifier.class, provided.getIdentifiers(), merged, null);
if (isGroup) {
final List<GeneralParameterDescriptor> descriptors = ((ParameterDescriptorGroup) provided).descriptors();
return merge(DefaultParameterValueGroup.class, merged, merged, minimumOccurs, maximumOccurs,
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
index 5020acd1bb,1d3b09fc96..7499f5c35f
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
@@@ -22,8 -23,9 +23,10 @@@ import javax.xml.bind.Unmarshaller
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.opengis.parameter.ParameterValueGroup;
+ import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.MathTransform;
+ import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.PassThroughOperation;
import org.opengis.referencing.crs.CoordinateReferenceSystem;