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 2019/06/21 15:48:26 UTC
[sis] branch geoapi-3.1 updated (59b8d22 -> 2058ee3)
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 59b8d22 Merge branch 'geoapi-4.0' into geoapi-3.1
add 450ad14 Avoid the use of ImmutableIdentifier in anticipation for its migration to sis-referencing module.
add 2f7d100 Initial move of WKT parser/formatter from sis-metadata module to sis-referencing. https://issues.apache.org/jira/browse/SIS-463
new 2058ee3 Merge branch 'geoapi-4.0' into geoapi-3.1: move of WKT support from sis-metadata to sis-referencing module. This merge contains only the moving part, with the minimal amount of changes needed for compiling and passing tests. Cleanup will be part of a separated merge.
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:
.../jaxb/metadata/replace/RS_Identifier.java | 22 ++++++
.../sis/internal/metadata/ReferencingServices.java | 32 ---------
.../java/org/apache/sis/io/wkt/WKTFormatTest.txt | 4 --
.../java/org/apache/sis/test/MetadataAssert.java | 79 ---------------------
.../apache/sis/test/suite/MetadataTestSuite.java | 8 ---
.../internal/referencing/ServicesForMetadata.java | 6 +-
.../java/org/apache/sis/io/wkt/AbstractParser.java | 0
.../main/java/org/apache/sis/io/wkt/Colors.java | 0
.../java/org/apache/sis/io/wkt/Convention.java | 0
.../main/java/org/apache/sis/io/wkt/Element.java | 0
.../java/org/apache/sis/io/wkt/ElementKind.java | 0
.../org/apache/sis/io/wkt/FormattableObject.java | 0
.../main/java/org/apache/sis/io/wkt/Formatter.java | 6 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 0
.../java/org/apache/sis/io/wkt/KeywordCase.java | 0
.../java/org/apache/sis/io/wkt/KeywordStyle.java | 0
.../org/apache/sis/io/wkt/MathTransformParser.java | 0
.../main/java/org/apache/sis/io/wkt/Parser.java | 0
.../main/java/org/apache/sis/io/wkt/Symbols.java | 0
.../java/org/apache/sis/io/wkt/Transliterator.java | 0
.../sis/io/wkt/UnformattableObjectException.java | 0
.../sis/io/wkt/UnparsableObjectException.java | 0
.../java/org/apache/sis/io/wkt/VerticalInfo.java | 0
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 0
.../main/java/org/apache/sis/io/wkt/Warnings.java | 0
.../java/org/apache/sis/io/wkt/package-info.java | 0
.../sis/metadata/iso/ImmutableIdentifier.java | 0
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 2 +-
.../internal/referencing/provider/AffineTest.java | 2 +-
.../provider/LongitudeRotationTest.java | 2 +-
.../java/org/apache/sis/io/wkt/ColorsTest.java | 0
.../java/org/apache/sis/io/wkt/ConventionTest.java | 0
.../java/org/apache/sis/io/wkt/ElementTest.java | 0
.../java/org/apache/sis/io/wkt/FormatterTest.java | 2 +-
.../java/org/apache/sis/io/wkt/SymbolsTest.java | 0
.../org/apache/sis/io/wkt/TransliteratorTest.java | 0
.../sis/metadata/iso/ImmutableIdentifierTest.java | 4 +-
.../DefaultParameterDescriptorGroupTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 2 +-
.../org/apache/sis/parameter/TensorValuesTest.java | 2 +-
.../referencing/AbstractReferenceSystemTest.java | 2 +-
.../referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../referencing/crs/DefaultGeocentricCRSTest.java | 2 +-
.../referencing/crs/DefaultGeographicCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../referencing/crs/DefaultTemporalCRSTest.java | 2 +-
.../referencing/crs/DefaultVerticalCRSTest.java | 2 +-
.../cs/DefaultCoordinateSystemAxisTest.java | 2 +-
.../referencing/cs/DirectionAlongMeridianTest.java | 2 +-
.../referencing/datum/DefaultEllipsoidTest.java | 2 +-
.../datum/DefaultGeodeticDatumTest.java | 2 +-
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../factory/GeodeticObjectFactoryTest.java | 2 +-
.../DefaultConcatenatedOperationTest.java | 2 +-
.../referencing/operation/DefaultFormulaTest.java | 2 +-
.../operation/DefaultTransformationTest.java | 2 +-
.../org/apache/sis/test/ReferencingAssert.java | 80 +++++++++++++++++++++-
.../sis/test/suite/ReferencingTestSuite.java | 9 +++
.../profile/fra/DirectReferenceSystemTest.java | 4 +-
.../sis/profile/france/FrenchProfileTest.java | 4 +-
62 files changed, 145 insertions(+), 163 deletions(-)
delete mode 100644 core/sis-metadata/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.txt
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/AbstractParser.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Colors.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Convention.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Element.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/ElementKind.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/FormattableObject.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Formatter.java (99%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/KeywordCase.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/KeywordStyle.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Parser.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Symbols.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Transliterator.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/UnparsableObjectException.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/WKTFormat.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/Warnings.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/io/wkt/package-info.java (100%)
rename core/{sis-metadata => sis-referencing}/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/ColorsTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/ConventionTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/ElementTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/FormatterTest.java (98%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java (100%)
rename core/{sis-metadata => sis-referencing}/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java (98%)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: move of WKT
support from sis-metadata to sis-referencing module. This merge contains
only the moving part,
with the minimal amount of changes needed for compiling and passing tests.
Cleanup will be part of a separated merge.
Posted by de...@apache.org.
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 2058ee3170da9fca98b5cb7ea5624bf8d35f697c
Merge: 59b8d22 2f7d100
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Jun 21 11:02:03 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: move of WKT support from sis-metadata to sis-referencing module.
This merge contains only the moving part, with the minimal amount of changes needed for compiling and passing tests.
Cleanup will be part of a separated merge.
.../jaxb/metadata/replace/RS_Identifier.java | 22 ++++++
.../sis/internal/metadata/ReferencingServices.java | 32 ---------
.../java/org/apache/sis/io/wkt/WKTFormatTest.txt | 4 --
.../java/org/apache/sis/test/MetadataAssert.java | 79 ---------------------
.../apache/sis/test/suite/MetadataTestSuite.java | 8 ---
.../internal/referencing/ServicesForMetadata.java | 6 +-
.../java/org/apache/sis/io/wkt/AbstractParser.java | 0
.../main/java/org/apache/sis/io/wkt/Colors.java | 0
.../java/org/apache/sis/io/wkt/Convention.java | 0
.../main/java/org/apache/sis/io/wkt/Element.java | 0
.../java/org/apache/sis/io/wkt/ElementKind.java | 0
.../org/apache/sis/io/wkt/FormattableObject.java | 0
.../main/java/org/apache/sis/io/wkt/Formatter.java | 6 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 0
.../java/org/apache/sis/io/wkt/KeywordCase.java | 0
.../java/org/apache/sis/io/wkt/KeywordStyle.java | 0
.../org/apache/sis/io/wkt/MathTransformParser.java | 0
.../main/java/org/apache/sis/io/wkt/Parser.java | 0
.../main/java/org/apache/sis/io/wkt/Symbols.java | 0
.../java/org/apache/sis/io/wkt/Transliterator.java | 0
.../sis/io/wkt/UnformattableObjectException.java | 0
.../sis/io/wkt/UnparsableObjectException.java | 0
.../java/org/apache/sis/io/wkt/VerticalInfo.java | 0
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 0
.../main/java/org/apache/sis/io/wkt/Warnings.java | 0
.../java/org/apache/sis/io/wkt/package-info.java | 0
.../sis/metadata/iso/ImmutableIdentifier.java | 0
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 2 +-
.../internal/referencing/provider/AffineTest.java | 2 +-
.../provider/LongitudeRotationTest.java | 2 +-
.../java/org/apache/sis/io/wkt/ColorsTest.java | 0
.../java/org/apache/sis/io/wkt/ConventionTest.java | 0
.../java/org/apache/sis/io/wkt/ElementTest.java | 0
.../java/org/apache/sis/io/wkt/FormatterTest.java | 2 +-
.../java/org/apache/sis/io/wkt/SymbolsTest.java | 0
.../org/apache/sis/io/wkt/TransliteratorTest.java | 0
.../sis/metadata/iso/ImmutableIdentifierTest.java | 4 +-
.../DefaultParameterDescriptorGroupTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 2 +-
.../org/apache/sis/parameter/TensorValuesTest.java | 2 +-
.../referencing/AbstractReferenceSystemTest.java | 2 +-
.../referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../referencing/crs/DefaultGeocentricCRSTest.java | 2 +-
.../referencing/crs/DefaultGeographicCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../referencing/crs/DefaultTemporalCRSTest.java | 2 +-
.../referencing/crs/DefaultVerticalCRSTest.java | 2 +-
.../cs/DefaultCoordinateSystemAxisTest.java | 2 +-
.../referencing/cs/DirectionAlongMeridianTest.java | 2 +-
.../referencing/datum/DefaultEllipsoidTest.java | 2 +-
.../datum/DefaultGeodeticDatumTest.java | 2 +-
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../factory/GeodeticObjectFactoryTest.java | 2 +-
.../DefaultConcatenatedOperationTest.java | 2 +-
.../referencing/operation/DefaultFormulaTest.java | 2 +-
.../operation/DefaultTransformationTest.java | 2 +-
.../org/apache/sis/test/ReferencingAssert.java | 80 +++++++++++++++++++++-
.../sis/test/suite/ReferencingTestSuite.java | 9 +++
.../profile/fra/DirectReferenceSystemTest.java | 4 +-
.../sis/profile/france/FrenchProfileTest.java | 4 +-
62 files changed, 145 insertions(+), 163 deletions(-)
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java
index 48b72ed,240a6b5..bf9bc48
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java
@@@ -20,7 -20,6 +20,8 @@@ import org.apache.sis.metadata.iso.*
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.Identifier;
++import org.opengis.metadata.citation.Citation;
+import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.internal.xml.LegacyNamespaces;
@@@ -65,6 -64,6 +66,27 @@@ public final class RS_Identifier extend
}
/**
++ * Creates a new identifier initialized to the given code, code space and version number.
++ *
++ * @param codeSpace identifier or namespace in which the code is valid, or {@code null} if not available.
++ * @param code alphanumeric value identifying an instance in the namespace, or {@code null} if none.
++ * @param version the version identifier for the namespace as specified by the code authority, or {@code null} if none.
++ */
++ public RS_Identifier(final String codeSpace, final String code, final String version) {
++ super(codeSpace, code, version);
++ }
++
++ /**
++ * Creates an identifier initialized to the given authority and code.
++ *
++ * @param authority the the person or party responsible for maintenance of the namespace, or {@code null} if none.
++ * @param code the alphanumeric value identifying an instance in the namespace, or {@code null} if none.
++ */
++ public RS_Identifier(final Citation authority, final String code) {
++ super(authority, code);
++ }
++
++ /**
* Creates a new identifier from the specified one.
*
* @see #wrap(Identifier)
diff --cc core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
index af75e5d,014361a..169d966
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
@@@ -127,16 -127,9 +127,8 @@@ import org.junit.BeforeClass
org.apache.sis.metadata.iso.DefaultMetadataTest.class,
org.apache.sis.metadata.iso.CustomMetadataTest.class,
org.apache.sis.metadata.iso.AllMetadataTest.class,
- org.apache.sis.metadata.iso.MarshallingTest.class,
org.apache.sis.metadata.iso.APIVerifier.class,
- org.apache.sis.io.wkt.ConventionTest.class,
- org.apache.sis.io.wkt.SymbolsTest.class,
- org.apache.sis.io.wkt.TransliteratorTest.class,
- org.apache.sis.io.wkt.ColorsTest.class,
- org.apache.sis.io.wkt.FormatterTest.class,
- org.apache.sis.io.wkt.ElementTest.class,
-
org.apache.sis.internal.metadata.sql.SQLUtilitiesTest.class,
org.apache.sis.internal.metadata.sql.TypeMapperTest.class,
org.apache.sis.internal.metadata.sql.ScriptRunnerTest.class,
diff --cc profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
index 684ff1d,e0ca6e1..41e30ea
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
@@@ -18,12 -18,12 +18,12 @@@ package org.apache.sis.internal.profile
import java.util.Collection;
import javax.xml.bind.JAXBException;
-import org.opengis.metadata.citation.Responsibility;
+import org.opengis.metadata.citation.ResponsibleParty;
import org.apache.sis.metadata.iso.DefaultMetadata;
- import org.apache.sis.metadata.iso.ImmutableIdentifier;
-import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
++import org.apache.sis.internal.jaxb.metadata.replace.RS_Identifier;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.xml.TestCase;
@@@ -63,7 -63,7 +63,7 @@@ public final strictfp class DirectRefer
r = singleton(new DefaultResponsibleParty(TestUtilities.getSingleton(r)));
}
citation.setCitedResponsibleParties(r);
- final DirectReferenceSystem refSys = new DirectReferenceSystem(new ImmutableIdentifier(citation, null, "4326"));
- final DirectReferenceSystem refSys = new DirectReferenceSystem(new DefaultIdentifier(citation, "4326"));
++ final DirectReferenceSystem refSys = new DirectReferenceSystem(new RS_Identifier(citation, "4326"));
metadata.setReferenceSystemInfo(singleton(refSys));
return metadata;
}
diff --cc profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
index 633db90,90a5d6e..773f452
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
@@@ -26,7 -26,7 +26,7 @@@ import org.apache.sis.metadata.iso.cons
import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata;
import org.apache.sis.internal.profile.fra.IndirectReferenceSystem;
import org.apache.sis.internal.profile.fra.DirectReferenceSystem;
- import org.apache.sis.metadata.iso.ImmutableIdentifier;
-import org.apache.sis.metadata.iso.DefaultIdentifier;
++import org.apache.sis.internal.jaxb.metadata.replace.RS_Identifier;
import org.apache.sis.test.TestCase;
import org.junit.Test;
@@@ -77,7 -77,7 +77,7 @@@ public final strictfp class FrenchProfi
public void testReferenceSystemToAFNOR() {
ReferenceSystem std, fra;
- std = new ReferenceSystemMetadata(new ImmutableIdentifier(null, "EPSG", "4326"));
- std = new ReferenceSystemMetadata(new DefaultIdentifier("EPSG", "4326", null));
++ std = new ReferenceSystemMetadata(new RS_Identifier("EPSG", "4326", null));
fra = FrenchProfile.toAFNOR(std, false);
assertInstanceOf("Expected AFNOR instance.", DirectReferenceSystem.class, fra);
assertSame("Already an AFNOR instance.", fra, FrenchProfile.toAFNOR(fra));