[jira] [Resolved] (SIS-508) MD_Scope in place of DQ_Scope when generating old 2007 iso 19139
[
https://issues.apache.org/jira/browse/SIS-508?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Desruisseaux resolved SIS-508.
-
Resolution: Fixed
Fixed on {{master}} and on branches {{geoapi-3.1}} and {{geoapi-4.0}}. Given
that the fix was a little bit more complex than I thought, if anyone has a
chance to test if there is no regression, that would be appreciated.
> MD_Scope in place of DQ_Scope when generating old 2007 iso 19139
> -
>
> Key: SIS-508
> URL: https://issues.apache.org/jira/browse/SIS-508
> Project: Spatial Information Systems
> Issue Type: Bug
> Components: Metadata
>Affects Versions: 1.0
>Reporter: jean-marc Bourdaret
>Assignee: Martin Desruisseaux
>Priority: Minor
> Fix For: 1.1
>
>
> When building _DefaultDataQuality_ objects with a _Scope ,_
> Generated XML may not contain the appropriate *+_DQ_Scope_+* tag.
> I understand that *DQ_Scope* was deprecated in *iso19115:2014*, in favor of
> MD_Scope. but it might still be valid when generating iso19115:*2007* XML.
> h4. exemple:
> {code:java}
> DefaultDataQuality dataQuality = new
> DefaultDataQuality(ScopeCode.DATASET);{code}
> and then :
> {code:java}
> XML.marshal(sisMetadata,new StreamResult( xmlOut ),
> Map.of(XML.METADATA_VERSION, "2007"))
> {code}
> will produce :
> {code:java}
> ...
>
>
>
>
>{code}
> and I was expecting :
> {code:java}
> ...
>
>
>
>
>{code}
> because it should be a iso19115:2007 compliant document.
> using SIS v2.0 on the Geomatys repo.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[sis] 01/01: Merge branch 'geoapi-3.1'
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 a56028b94c7dadf011fad9eaa4a3ed6ccc36bfa4 Merge: 4863545 e495c9f Author: Martin Desruisseaux AuthorDate: Sun Sep 19 19:03:23 2021 +0200 Merge branch 'geoapi-3.1' application/sis-console/pom.xml| 6 - .../apache/sis/gui/dataset/ResourceExplorer.java | 8 +- .../org/apache/sis/internal/setup/FXFinder.java| 2 +- application/sis-openoffice/pom.xml | 33 +- .../src/main/unopkg/build-instruction.html | 18 +- .../sis-openoffice/src/main/unopkg/license.txt | 21 +- .../java/org/apache/sis/image/Interpolation.java | 8 +- .../org/apache/sis/image/LanczosInterpolation.java | 94 ++- .../internal/coverage/j2d/ColorModelFactory.java | 7 + .../apache/sis/internal/feature/Geometries.java| 4 +- .../apache/sis/internal/feature/GeometryType.java | 11 + .../apache/sis/internal/feature/esri/Factory.java | 97 ++- .../apache/sis/internal/feature/esri/Wrapper.java | 78 +- .../apache/sis/internal/feature/j2d/Factory.java | 64 ++ .../sis/internal/feature/j2d/PointWrapper.java | 117 ++- .../apache/sis/internal/feature/j2d/Wrapper.java | 199 - .../sis/internal/filter/GeometryConverter.java | 2 +- .../org/apache/sis/feature/CustomAttribute.java| 2 +- .../org/apache/sis/feature/FeatureTestCase.java| 2 +- .../builder/AssociationRoleBuilderTest.java| 2 +- .../BinarySpatialFilterUsingESRI_Test.java}| 39 +- .../BinarySpatialFilterUsingJava2D_Test.java | 102 +++ .../org/apache/sis/image/InterpolationTest.java| 22 +- .../internal/filter/sqlmm/RegistryTestCase.java| 27 +- ...ngJTS_Test.java => RegistryUsingESRI_Test.java} | 46 +- .../filter/sqlmm/RegistryUsingJTS_Test.java| 2 +- .../filter/sqlmm/RegistryUsingJava2D_Test.java | 82 ++ .../apache/sis/test/suite/FeatureTestSuite.java| 4 + .../apache/sis/internal/jaxb/cat/CodeListUID.java | 2 +- .../jaxb/gco/InternationalStringAdapter.java | 2 +- .../jaxb/gco/InternationalStringConverter.java | 2 +- .../apache/sis/internal/jaxb/gco/PropertyType.java | 5 +- .../sis/internal/jaxb/gts/TM_PeriodDuration.java | 2 +- .../apache/sis/internal/jaxb/lan/PT_FreeText.java | 4 +- .../sis/internal/jaxb/metadata/MD_Scope.java | 16 + .../apache/sis/internal/simple/SimpleCitation.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 2 +- .../sis/metadata/iso/quality/DefaultScope.java | 2 +- .../sis/metadata/iso/quality/package-info.java | 2 +- .../java/org/apache/sis/util/iso/AbstractName.java | 3 +- .../org/apache/sis/util/iso/DefaultLocalName.java | 3 +- .../apache/sis/util/iso/DefaultNameFactory.java| 2 + .../org/apache/sis/util/iso/DefaultNameSpace.java | 1 + .../main/java/org/apache/sis/util/iso/Types.java | 34 +- .../java/org/apache/sis/util/iso/package-info.java | 9 - .../java/org/apache/sis/xml/MarshalContext.java| 2 +- .../java/org/apache/sis/xml/TransformVersion.java | 2 +- .../java/org/apache/sis/xml/TransformedEvent.java | 1 + .../main/java/org/apache/sis/xml/Transformer.java | 92 ++- .../org/apache/sis/xml/TransformingNamespaces.java | 4 +- .../org/apache/sis/xml/TransformingReader.java | 4 +- .../org/apache/sis/xml/TransformingWriter.java | 34 +- .../src/main/java/org/apache/sis/xml/XML.java | 2 +- .../src/main/java/org/apache/sis/xml/readme.html | 21 +- .../org/apache/sis/xml/RenameOnExport.lst | 4 +- .../org/apache/sis/xml/RenameOnImport.lst | 2 +- .../sis/internal/jaxb/gco/PropertyTypeTest.java| 2 +- .../sis/internal/jaxb/gco/StringAdapterTest.java | 4 +- .../internal/jaxb/lan/FreeTextMarshallingTest.java | 2 +- .../java/org/apache/sis/metadata/HashCodeTest.java | 2 +- .../apache/sis/metadata/MetadataStandardTest.java | 2 +- .../sis/metadata/ModifiableMetadataTest.java | 2 +- .../apache/sis/metadata/PropertyAccessorTest.java | 2 +- .../apache/sis/metadata/TreeNodeChildrenTest.java | 2 +- .../apache/sis/metadata/TreeTableFormatTest.java | 2 +- .../java/org/apache/sis/metadata/ValueMapTest.java | 2 +- .../sis/metadata/iso/CustomMetadataTest.java | 2 +- .../sis/metadata/iso/DefaultMetadataTest.java | 2 +- .../metadata/iso/citation/DefaultCitationTest.java | 4 +- .../metadata/iso/citation/HardCodedCitations.java | 2 +- .../sis/metadata/iso/extent/DefaultExtentTest.java | 2 +- .../iso/identification/DefaultKeywordsTest.java| 2 +- .../metadata/iso/lineage/DefaultLineageTest.java | 2 +- .../iso/lineage/DefaultProcessStepTest.java| 2 +- .../sis/metadata/iso/quality/ScopeCodeTest.java| 79 ++ .../iso/spatial/DefaultGeorectifiedTest.java | 2 +-
[sis] 02/02: Fix the lost of `Scope` element in `DataQuality` at unmarshalling time. The problem and the fix are specific to the geoapi-3.x branches.
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 e495c9ff26b63345b02dfe4ba7c24be23b5fb7d8
Author: Martin Desruisseaux
AuthorDate: Sun Sep 19 16:58:59 2021 +0200
Fix the lost of `Scope` element in `DataQuality` at unmarshalling time.
The problem and the fix are specific to the geoapi-3.x branches.
---
.../org/apache/sis/internal/jaxb/gco/PropertyType.java | 3 ++-
.../org/apache/sis/internal/jaxb/metadata/MD_Scope.java | 16
.../apache/sis/metadata/iso/quality/DefaultScope.java| 6 +++---
.../apache/sis/metadata/iso/quality/package-info.java| 2 +-
.../apache/sis/metadata/iso/quality/ScopeCodeTest.java | 1 -
5 files changed, 22 insertions(+), 6 deletions(-)
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
index 7de63d7..cc450ef 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
@@ -583,7 +583,8 @@ public abstract class PropertyType {
}
/**
+ * On unmarshalling, creates an instance of the deprecated
+ * {@link org.apache.sis.metadata.iso.quality.DefaultScope} subclass.
+ */
+public static final class Legacy extends MD_Scope {
+/** Empty constructor used only by JAXB. */
+public Legacy() {
+}
+
+/** Converts an adapter read from an XML stream. */
+@Override public Scope unmarshal(final MD_Scope value) throws
URISyntaxException {
+return
org.apache.sis.metadata.iso.quality.DefaultScope.castOrCopy(
super.unmarshal(value));
+}
+}
+
+/**
* Wraps the value only if marshalling an element from the ISO 19115:2003
metadata model.
* Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model),
omits the element.
*/
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
index b7fe7ab..6b48ff8 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
@@ -40,7 +40,7 @@ import org.apache.sis.internal.util.CollectionsExt;
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
- * @version 1.0
+ * @version 1.1
* @since 0.3
* @module
*
@@ -79,7 +79,7 @@ public class DefaultScope extends
org.apache.sis.metadata.iso.maintenance.Defaul
*
* @see #castOrCopy(Scope)
*/
-public DefaultScope(final Scope object) {
+public DefaultScope(final org.opengis.metadata.maintenance.Scope object) {
super(object);
}
@@ -101,7 +101,7 @@ public class DefaultScope extends
org.apache.sis.metadata.iso.maintenance.Defaul
* @return a SIS implementation containing the values of the given object
(may be the
* given object itself), or {@code null} if the argument was null.
*/
-public static DefaultScope castOrCopy(final Scope object) {
+public static DefaultScope castOrCopy(final
org.opengis.metadata.maintenance.Scope object) {
if (object == null || object instanceof DefaultScope) {
return (DefaultScope) object;
}
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
index 8fb66e9..f68c3e3 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
@@ -141,7 +141,7 @@
@XmlJavaTypeAdapter(MD_ContentInformation.class),
@XmlJavaTypeAdapter(MD_Format.class),
@XmlJavaTypeAdapter(MD_Identifier.class),
-@XmlJavaTypeAdapter(MD_Scope.class),
+@XmlJavaTypeAdapter(MD_Scope.Legacy.class),
@XmlJavaTypeAdapter(MD_SpatialRepresentation.class),
@XmlJavaTypeAdapter(MD_SpatialRepresentationTypeCode.class),
@XmlJavaTypeAdapter(MX_DataFile.class),
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
index 4d0f706..126617c 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
@@ -70,7 +70,6 @@ public final strictfp class ScopeCodeTest extends TestCase {
* @throws JAXBException if an error occurred during XML
[sis] branch geoapi-3.1 updated (f0b9441 -> e495c9f)
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 f0b9441 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains mostly documentation fixes. add 143f5ae Improve the support of ESRI geometry library. add 8f0d46b Add basic Java2D support for a few filter/expression operations. add face965 Fix a `NullPointerException` when arithmetic operation results in a `Quantity` having no pre-defined specialized interface. add b7a6c8c Fix the Lanczos interpolation. add 411009b Modify Lanczos implementation for: - reducing the amount of `Math.sin(x)` computation - create only one temporary array instead of two - make unnecessary the call to `Arrays.fill(…)`. add fed8f69 Avoid a null `ColorModel` with some image shown in JavaFX applications. add e354739 Minor cleanup following the port of `org.apache.sis.measure` to Seshat. add 6835186 Bug fix in Lanczos optimisation: first row of pixel values in the "interpolation window" were not correctly used. add 8ff80c8 Fix a “Missing value for tgt_semi_major parameter” error when parsing coordinate operation from WKT. add c1eddc7 Record some "too aggressive simplification" problems that still need to be fixed. add 9d36a8d Move `InternationalString` implementations to `org.apache.sis.util` package. This is in anticipation for Jigsaw modularization. add 97fcad5 Remove the sis-gdal module. It is replaced by the https://github.com/OSGeo/PROJ-JNI project. add 32936ed Following removal of "sis-gdal" module in previous commit, remove (for now) the `SpecializedOperationFactory` interface. Remove also the code for loading a native library (not used anymore). add c2bc991 Document that derivative is not yet supported. add f05d801 Upgrade OpenOffice dependency. Four JAR files are replaced by a single one. add 7dead6c Add JAXB dependency (required for avoiding a ClassNotFoundError). Update debug instruction, reformat license text on multi-lines. add 2bdcb91 Fix type and wrong path to a runtime dependency. add 8a6d8c3 `MD_Scope` should be marshalled as `DQ_Scope` when writing legacy ISO 19139 document. new 839b395 Merge branch 'geoapi-4.0' into geoapi-3.1. new e495c9f Fix the lost of `Scope` element in `DataQuality` at unmarshalling time. The problem and the fix are specific to the geoapi-3.x branches. The 2 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: application/sis-console/pom.xml| 6 - .../apache/sis/gui/dataset/ResourceExplorer.java | 8 +- .../org/apache/sis/internal/setup/FXFinder.java| 2 +- application/sis-openoffice/pom.xml | 33 +- .../src/main/unopkg/build-instruction.html | 18 +- .../sis-openoffice/src/main/unopkg/license.txt | 21 +- .../java/org/apache/sis/image/Interpolation.java | 8 +- .../org/apache/sis/image/LanczosInterpolation.java | 94 ++- .../internal/coverage/j2d/ColorModelFactory.java | 7 + .../apache/sis/internal/feature/Geometries.java| 4 +- .../apache/sis/internal/feature/GeometryType.java | 11 + .../apache/sis/internal/feature/esri/Factory.java | 97 ++- .../apache/sis/internal/feature/esri/Wrapper.java | 78 +- .../apache/sis/internal/feature/j2d/Factory.java | 64 ++ .../sis/internal/feature/j2d/PointWrapper.java | 115 ++- .../apache/sis/internal/feature/j2d/Wrapper.java | 199 - .../sis/internal/filter/GeometryConverter.java | 2 +- .../org/apache/sis/feature/CustomAttribute.java| 2 +- .../org/apache/sis/feature/FeatureTestCase.java| 2 +- .../builder/AssociationRoleBuilderTest.java| 2 +- ...java => BinarySpatialFilterUsingESRI_Test.java} | 37 +- .../BinarySpatialFilterUsingJava2D_Test.java | 102 +++ .../org/apache/sis/image/InterpolationTest.java| 22 +- .../internal/filter/sqlmm/RegistryTestCase.java| 27 +- ...ngJTS_Test.java => RegistryUsingESRI_Test.java} | 46 +- .../filter/sqlmm/RegistryUsingJTS_Test.java| 2 +- .../filter/sqlmm/RegistryUsingJava2D_Test.java | 82 ++ .../apache/sis/test/suite/FeatureTestSuite.java| 4 + .../apache/sis/internal/jaxb/cat/CodeListUID.java | 2 +- .../jaxb/gco/InternationalStringAdapter.java | 2 +- .../jaxb/gco/InternationalStringConverter.java | 2 +- .../apache/sis/internal/jaxb/gco/PropertyType.java | 5 +- .../sis/internal/jaxb/gts/TM_PeriodDuration.java | 2 +- .../apache/sis/internal/jaxb/lan/PT_FreeText.java | 4 +- .../sis/internal/jaxb/metadata/MD_Scope.java | 16 + .../apache/sis/internal/simple/SimpleCitation.java | 2 +-
[sis] 01/02: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 839b395a11cb2474f1b2945caf4e79fe46beb301 Merge: f0b9441 8a6d8c3 Author: Martin Desruisseaux AuthorDate: Sun Sep 19 15:23:00 2021 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. application/sis-console/pom.xml| 6 - .../apache/sis/gui/dataset/ResourceExplorer.java | 8 +- .../org/apache/sis/internal/setup/FXFinder.java| 2 +- application/sis-openoffice/pom.xml | 33 +- .../src/main/unopkg/build-instruction.html | 18 +- .../sis-openoffice/src/main/unopkg/license.txt | 21 +- .../java/org/apache/sis/image/Interpolation.java | 8 +- .../org/apache/sis/image/LanczosInterpolation.java | 94 ++- .../internal/coverage/j2d/ColorModelFactory.java | 7 + .../apache/sis/internal/feature/Geometries.java| 4 +- .../apache/sis/internal/feature/GeometryType.java | 11 + .../apache/sis/internal/feature/esri/Factory.java | 97 ++- .../apache/sis/internal/feature/esri/Wrapper.java | 78 +- .../apache/sis/internal/feature/j2d/Factory.java | 64 ++ .../sis/internal/feature/j2d/PointWrapper.java | 115 ++- .../apache/sis/internal/feature/j2d/Wrapper.java | 199 - .../sis/internal/filter/GeometryConverter.java | 2 +- .../org/apache/sis/feature/CustomAttribute.java| 2 +- .../org/apache/sis/feature/FeatureTestCase.java| 2 +- .../builder/AssociationRoleBuilderTest.java| 2 +- .../BinarySpatialFilterUsingESRI_Test.java}| 39 +- .../BinarySpatialFilterUsingJava2D_Test.java | 102 +++ .../org/apache/sis/image/InterpolationTest.java| 22 +- .../internal/filter/sqlmm/RegistryTestCase.java| 27 +- ...ngJTS_Test.java => RegistryUsingESRI_Test.java} | 46 +- .../filter/sqlmm/RegistryUsingJTS_Test.java| 2 +- .../filter/sqlmm/RegistryUsingJava2D_Test.java | 82 ++ .../apache/sis/test/suite/FeatureTestSuite.java| 4 + .../apache/sis/internal/jaxb/cat/CodeListUID.java | 2 +- .../jaxb/gco/InternationalStringAdapter.java | 2 +- .../jaxb/gco/InternationalStringConverter.java | 2 +- .../apache/sis/internal/jaxb/gco/PropertyType.java | 2 +- .../sis/internal/jaxb/gts/TM_PeriodDuration.java | 2 +- .../apache/sis/internal/jaxb/lan/PT_FreeText.java | 4 +- .../apache/sis/internal/simple/SimpleCitation.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 2 +- .../java/org/apache/sis/util/iso/AbstractName.java | 3 +- .../org/apache/sis/util/iso/DefaultLocalName.java | 3 +- .../apache/sis/util/iso/DefaultNameFactory.java| 2 + .../org/apache/sis/util/iso/DefaultNameSpace.java | 1 + .../main/java/org/apache/sis/util/iso/Types.java | 36 +- .../java/org/apache/sis/util/iso/package-info.java | 9 - .../java/org/apache/sis/xml/MarshalContext.java| 2 +- .../java/org/apache/sis/xml/TransformVersion.java | 2 +- .../java/org/apache/sis/xml/TransformedEvent.java | 1 + .../main/java/org/apache/sis/xml/Transformer.java | 92 ++- .../org/apache/sis/xml/TransformingNamespaces.java | 4 +- .../org/apache/sis/xml/TransformingReader.java | 4 +- .../org/apache/sis/xml/TransformingWriter.java | 34 +- .../src/main/java/org/apache/sis/xml/XML.java | 2 +- .../src/main/java/org/apache/sis/xml/readme.html | 21 +- .../org/apache/sis/xml/RenameOnExport.lst | 4 +- .../org/apache/sis/xml/RenameOnImport.lst | 2 +- .../sis/internal/jaxb/gco/PropertyTypeTest.java| 2 +- .../sis/internal/jaxb/gco/StringAdapterTest.java | 4 +- .../internal/jaxb/lan/FreeTextMarshallingTest.java | 2 +- .../java/org/apache/sis/metadata/HashCodeTest.java | 2 +- .../apache/sis/metadata/MetadataStandardTest.java | 2 +- .../sis/metadata/ModifiableMetadataTest.java | 2 +- .../apache/sis/metadata/PropertyAccessorTest.java | 2 +- .../apache/sis/metadata/TreeNodeChildrenTest.java | 2 +- .../apache/sis/metadata/TreeTableFormatTest.java | 2 +- .../java/org/apache/sis/metadata/ValueMapTest.java | 2 +- .../sis/metadata/iso/CustomMetadataTest.java | 2 +- .../sis/metadata/iso/DefaultMetadataTest.java | 2 +- .../metadata/iso/citation/DefaultCitationTest.java | 4 +- .../metadata/iso/citation/HardCodedCitations.java | 2 +- .../sis/metadata/iso/extent/DefaultExtentTest.java | 2 +- .../iso/identification/DefaultKeywordsTest.java| 2 +- .../metadata/iso/lineage/DefaultLineageTest.java | 2 +- .../iso/lineage/DefaultProcessStepTest.java| 2 +- .../sis/metadata/iso/quality/ScopeCodeTest.java| 80 ++ .../iso/spatial/DefaultGeorectifiedTest.java | 2 +- .../sis/metadata/sql/MetadataSourceTest.java | 2 +- .../apache/sis/test/suite/MetadataTestSuite.java | 3 +- .../sis/util/iso/DefaultNameFactoryTest.java |
