This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sis.git
commit 0d88ef7e00851457f6af0c03c7183148337e943c Merge: 29bfa755d5 93cf288665 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Mon Nov 28 14:14:57 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains documentation, ISO 19115 amendment 1 and minor bug fixes. .../apache/sis/gui/coverage/CoverageExplorer.java | 2 +- .../org/apache/sis/gui/map/GestureFollower.java | 2 +- .../gui/referencing/RecentReferenceSystems.java | 1 + .../apache/sis/feature/AbstractAssociation.java | 4 +- .../org/apache/sis/feature/AbstractAttribute.java | 4 +- .../java/org/apache/sis/feature/AttributeView.java | 10 +- .../main/java/org/apache/sis/feature/Field.java | 9 +- .../apache/sis/feature/MultiValuedAssociation.java | 4 +- .../apache/sis/feature/MultiValuedAttribute.java | 4 +- .../java/org/apache/sis/feature/PropertyView.java | 6 +- .../sis/feature/builder/AttributeTypeBuilder.java | 4 +- .../sis/feature/builder/FeatureTypeBuilder.java | 2 +- .../org/apache/sis/filter/ArithmeticFunction.java | 8 ++ .../org/apache/sis/filter/AssociationValue.java | 5 + .../java/org/apache/sis/filter/BinaryFunction.java | 2 + .../apache/sis/filter/BinaryGeometryFilter.java | 2 + .../org/apache/sis/filter/BinarySpatialFilter.java | 8 +- .../org/apache/sis/filter/ComparisonFilter.java | 14 +++ .../org/apache/sis/filter/ConvertFunction.java | 1 + .../org/apache/sis/filter/DefaultSortProperty.java | 1 + .../java/org/apache/sis/filter/DistanceFilter.java | 1 + .../java/org/apache/sis/filter/LeafExpression.java | 10 +- .../java/org/apache/sis/filter/LikeFilter.java | 1 + .../java/org/apache/sis/filter/LogicalFilter.java | 8 ++ .../java/org/apache/sis/filter/PropertyValue.java | 6 ++ .../java/org/apache/sis/filter/TemporalFilter.java | 30 +++++- .../java/org/apache/sis/filter/UnaryFunction.java | 7 +- .../jaxb/metadata/MI_RangeElementDescription.java | 29 +++++- .../metadata/replace}/SensorType.java | 6 +- .../sis/internal/metadata/RecordSchemaSIS.java | 36 +++++-- .../apache/sis/internal/metadata/Resources.java | 15 +++ .../sis/internal/metadata/Resources.properties | 3 + .../sis/internal/metadata/Resources_fr.properties | 3 + .../iso/DefaultApplicationSchemaInformation.java | 4 +- .../iso/DefaultExtendedElementInformation.java | 6 +- .../apache/sis/metadata/iso/DefaultIdentifier.java | 6 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 6 +- .../iso/DefaultMetadataExtensionInformation.java | 4 +- .../sis/metadata/iso/DefaultMetadataScope.java | 4 +- .../iso/DefaultPortrayalCatalogueReference.java | 4 +- .../org/apache/sis/metadata/iso/ISOMetadata.java | 2 +- .../acquisition/DefaultAcquisitionInformation.java | 4 +- .../acquisition/DefaultEnvironmentalRecord.java | 6 +- .../sis/metadata/iso/acquisition/DefaultEvent.java | 6 +- .../iso/acquisition/DefaultInstrument.java | 6 +- .../metadata/iso/acquisition/DefaultObjective.java | 6 +- .../metadata/iso/acquisition/DefaultOperation.java | 6 +- .../sis/metadata/iso/acquisition/DefaultPlan.java | 6 +- .../metadata/iso/acquisition/DefaultPlatform.java | 6 +- .../iso/acquisition/DefaultPlatformPass.java | 6 +- .../iso/acquisition/DefaultRequestedDate.java | 6 +- .../iso/acquisition/DefaultRequirement.java | 6 +- .../sis/metadata/iso/acquisition/package-info.java | 2 +- .../sis/metadata/iso/citation/AbstractParty.java | 49 ++++++++- .../sis/metadata/iso/citation/DefaultAddress.java | 6 +- .../sis/metadata/iso/citation/DefaultCitation.java | 6 +- .../metadata/iso/citation/DefaultCitationDate.java | 6 +- .../sis/metadata/iso/citation/DefaultContact.java | 6 +- .../metadata/iso/citation/DefaultIndividual.java | 6 +- .../iso/citation/DefaultOnlineResource.java | 6 +- .../metadata/iso/citation/DefaultOrganisation.java | 6 +- .../iso/citation/DefaultResponsibility.java | 6 +- .../iso/citation/DefaultResponsibleParty.java | 6 +- .../sis/metadata/iso/citation/DefaultSeries.java | 6 +- .../metadata/iso/citation/DefaultTelephone.java | 6 +- .../sis/metadata/iso/citation/package-info.java | 4 +- .../iso/constraint/DefaultConstraints.java | 6 +- .../iso/constraint/DefaultLegalConstraints.java | 6 +- .../iso/constraint/DefaultReleasability.java | 4 +- .../iso/constraint/DefaultSecurityConstraints.java | 6 +- .../sis/metadata/iso/constraint/package-info.java | 2 +- .../iso/content/AbstractContentInformation.java | 6 +- .../iso/content/DefaultAttributeGroup.java | 6 +- .../sis/metadata/iso/content/DefaultBand.java | 6 +- .../iso/content/DefaultCoverageDescription.java | 6 +- .../DefaultFeatureCatalogueDescription.java | 4 +- .../iso/content/DefaultFeatureTypeInfo.java | 6 +- .../iso/content/DefaultImageDescription.java | 6 +- .../iso/content/DefaultRangeDimension.java | 6 +- .../content/DefaultRangeElementDescription.java | 6 +- .../iso/content/DefaultSampleDimension.java | 46 +++++++- .../sis/metadata/iso/content/package-info.java | 4 +- .../metadata/iso/distribution/DefaultDataFile.java | 6 +- .../DefaultDigitalTransferOptions.java | 4 +- .../iso/distribution/DefaultDistribution.java | 6 +- .../iso/distribution/DefaultDistributor.java | 6 +- .../metadata/iso/distribution/DefaultFormat.java | 6 +- .../metadata/iso/distribution/DefaultMedium.java | 6 +- .../distribution/DefaultStandardOrderProcess.java | 6 +- .../metadata/iso/distribution/package-info.java | 2 +- .../iso/extent/AbstractGeographicExtent.java | 6 +- .../iso/extent/DefaultBoundingPolygon.java | 6 +- .../sis/metadata/iso/extent/DefaultExtent.java | 6 +- .../iso/extent/DefaultGeographicBoundingBox.java | 6 +- .../iso/extent/DefaultGeographicDescription.java | 6 +- .../iso/extent/DefaultSpatialTemporalExtent.java | 6 +- .../metadata/iso/extent/DefaultTemporalExtent.java | 6 +- .../metadata/iso/extent/DefaultVerticalExtent.java | 6 +- .../sis/metadata/iso/extent/package-info.java | 2 +- .../iso/identification/AbstractIdentification.java | 6 +- .../DefaultAggregateInformation.java | 6 +- .../identification/DefaultAssociatedResource.java | 4 +- .../iso/identification/DefaultBrowseGraphic.java | 6 +- .../iso/identification/DefaultCoupledResource.java | 4 +- .../identification/DefaultDataIdentification.java | 6 +- .../iso/identification/DefaultKeywordClass.java | 6 +- .../iso/identification/DefaultKeywords.java | 6 +- .../DefaultOperationChainMetadata.java | 4 +- .../identification/DefaultOperationMetadata.java | 6 +- .../DefaultRepresentativeFraction.java | 2 +- .../iso/identification/DefaultResolution.java | 6 +- .../DefaultServiceIdentification.java | 6 +- .../metadata/iso/identification/DefaultUsage.java | 6 +- .../metadata/iso/identification/package-info.java | 2 +- .../sis/metadata/iso/lineage/DefaultAlgorithm.java | 6 +- .../sis/metadata/iso/lineage/DefaultLineage.java | 6 +- .../iso/lineage/DefaultNominalResolution.java | 6 +- .../metadata/iso/lineage/DefaultProcessStep.java | 6 +- .../iso/lineage/DefaultProcessStepReport.java | 6 +- .../metadata/iso/lineage/DefaultProcessing.java | 6 +- .../sis/metadata/iso/lineage/DefaultSource.java | 6 +- .../sis/metadata/iso/lineage/package-info.java | 2 +- .../maintenance/DefaultMaintenanceInformation.java | 4 +- .../sis/metadata/iso/maintenance/DefaultScope.java | 6 +- .../iso/maintenance/DefaultScopeDescription.java | 6 +- .../sis/metadata/iso/maintenance/package-info.java | 2 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../metadata/iso/quality/AbstractCompleteness.java | 6 +- .../iso/quality/AbstractDataEvaluation.java | 6 +- .../sis/metadata/iso/quality/AbstractElement.java | 4 +- .../iso/quality/AbstractLogicalConsistency.java | 6 +- .../metadata/iso/quality/AbstractMetaquality.java | 4 +- .../iso/quality/AbstractPositionalAccuracy.java | 6 +- .../sis/metadata/iso/quality/AbstractResult.java | 4 +- .../iso/quality/AbstractTemporalAccuracy.java | 6 +- .../iso/quality/AbstractTemporalQuality.java | 4 +- .../iso/quality/AbstractThematicAccuracy.java | 6 +- .../DefaultAbsoluteExternalPositionalAccuracy.java | 4 +- .../quality/DefaultAccuracyOfATimeMeasurement.java | 4 +- .../iso/quality/DefaultAggregationDerivation.java | 4 +- .../metadata/iso/quality/DefaultBasicMeasure.java | 6 +- .../iso/quality/DefaultCompletenessCommission.java | 4 +- .../iso/quality/DefaultCompletenessOmission.java | 4 +- .../iso/quality/DefaultConceptualConsistency.java | 4 +- .../metadata/iso/quality/DefaultConfidence.java | 6 +- .../iso/quality/DefaultConformanceResult.java | 6 +- .../iso/quality/DefaultCoverageResult.java | 6 +- .../metadata/iso/quality/DefaultDataQuality.java | 6 +- .../metadata/iso/quality/DefaultDescription.java | 4 +- .../iso/quality/DefaultDescriptiveResult.java | 4 +- .../iso/quality/DefaultDomainConsistency.java | 6 +- .../iso/quality/DefaultEvaluationMethod.java | 6 +- .../iso/quality/DefaultFormatConsistency.java | 6 +- .../iso/quality/DefaultFullInspection.java | 6 +- .../DefaultGriddedDataPositionalAccuracy.java | 4 +- .../metadata/iso/quality/DefaultHomogeneity.java | 6 +- .../iso/quality/DefaultIndirectEvaluation.java | 6 +- .../sis/metadata/iso/quality/DefaultMeasure.java | 4 +- .../iso/quality/DefaultMeasureReference.java | 6 +- .../DefaultNonQuantitativeAttributeAccuracy.java | 4 +- ...DefaultNonQuantitativeAttributeCorrectness.java | 4 +- .../DefaultQuantitativeAttributeAccuracy.java | 4 +- .../iso/quality/DefaultQuantitativeResult.java | 6 +- .../DefaultRelativeInternalPositionalAccuracy.java | 4 +- .../iso/quality/DefaultRepresentativity.java | 6 +- .../iso/quality/DefaultSampleBasedInspection.java | 6 +- .../sis/metadata/iso/quality/DefaultScope.java | 6 +- .../iso/quality/DefaultSourceReference.java | 4 +- .../DefaultStandaloneQualityReportInformation.java | 4 +- .../iso/quality/DefaultTemporalConsistency.java | 6 +- .../iso/quality/DefaultTemporalValidity.java | 6 +- .../DefaultThematicClassificationCorrectness.java | 4 +- .../iso/quality/DefaultTopologicalConsistency.java | 4 +- .../sis/metadata/iso/quality/DefaultUsability.java | 6 +- .../iso/quality/DefaultUsabilityElement.java | 4 +- .../sis/metadata/iso/quality/package-info.java | 2 +- .../spatial/AbstractGeolocationInformation.java | 4 +- .../iso/spatial/AbstractSpatialRepresentation.java | 42 +++++++- .../sis/metadata/iso/spatial/DefaultDimension.java | 6 +- .../sis/metadata/iso/spatial/DefaultGCP.java | 6 +- .../metadata/iso/spatial/DefaultGCPCollection.java | 6 +- .../iso/spatial/DefaultGeometricObjects.java | 6 +- .../metadata/iso/spatial/DefaultGeorectified.java | 6 +- .../iso/spatial/DefaultGeoreferenceable.java | 6 +- .../spatial/DefaultGridSpatialRepresentation.java | 6 +- .../DefaultVectorSpatialRepresentation.java | 4 +- .../sis/metadata/iso/spatial/package-info.java | 4 +- .../org/apache/sis/util/iso/DefaultMemberName.java | 2 +- .../apache/sis/util/iso/DefaultNameFactory.java | 3 +- .../apache/sis/util/iso/DefaultRecordSchema.java | 22 +++- .../org/apache/sis/util/iso/DefaultRecordType.java | 13 ++- .../main/java/org/apache/sis/util/iso/Names.java | 14 +++ .../main/java/org/apache/sis/util/iso/Types.java | 2 +- .../iso/quality/DefaultQuantitativeResultTest.java | 116 +++++++++++++++++++++ .../sis/test/xml/AnnotationConsistencyCheck.java | 8 +- .../org/apache/sis/test/xml/PackageVerifier.java | 17 +++ .../sis/xml/CharSequenceSubstitutionTest.java | 2 +- .../sis/parameter/AbstractParameterDescriptor.java | 12 --- .../sis/parameter/DefaultParameterValueGroup.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 6 +- .../sis/referencing/ImmutableIdentifier.java | 2 +- .../apache/sis/referencing/NamedIdentifier.java | 4 +- .../apache/sis/referencing/crs/AbstractCRS.java | 4 +- .../org/apache/sis/referencing/cs/AbstractCS.java | 4 +- .../sis/referencing/datum/AbstractDatum.java | 2 +- .../operation/AbstractCoordinateOperation.java | 4 +- .../operation/DefaultConcatenatedOperation.java | 2 +- .../referencing/operation/DefaultConversion.java | 4 +- .../operation/DefaultPassThroughOperation.java | 2 +- .../operation/DefaultTransformation.java | 2 +- .../main/java/org/apache/sis/math/ArrayVector.java | 5 +- .../org/apache/sis/measure/ConventionalUnit.java | 5 +- .../java/org/apache/sis/measure/DerivedScalar.java | 6 +- .../main/java/org/apache/sis/measure/Scalar.java | 3 +- .../org/apache/sis/measure/ScalarFallback.java | 5 +- .../org/apache/sis/util/collection/DerivedMap.java | 21 ++++ .../org/apache/sis/util/collection/DerivedSet.java | 3 + .../sis/util/collection/FrequencySortedSet.java | 3 + .../org/apache/sis/util/collection/RangeSet.java | 3 + .../org/apache/sis/util/collection/TreeTable.java | 2 +- .../apache/sis/util/resources/package-info.java | 10 +- ide-project/NetBeans/nbproject/project.properties | 2 +- pom.xml | 4 +- .../storage/aggregate/AggregatedFeatureSet.java | 9 +- .../sis/storage/aggregate/CoverageAggregator.java | 1 + .../apache/sis/internal/storage/gpx/Copyright.java | 13 ++- 226 files changed, 1000 insertions(+), 511 deletions(-)