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 eb20f53e20 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains initial
version of shapefile writer and improvement in JShell environment.
add f1d35685a5 Resolve external xlinks when parsing a GML document. This
is a first step, not yet resolving fragment and not yet caching.
add 150edb7cae Avoid attempt to download the document at the
"http://test.net"; URL.
add 50c0a3ec29 Partial support of xlink:href referencing a fragment of an
external document.
add 1733c7777a Tune the resolution of `xlink:href` attributes having a
fragment in their URI values.
add 162dc3a5c7 Allow to use an `javax.xml.transform.URIResolver` for
resolving URI to external documents.
add 6b6622b8bd Follow redirections when unmarshalling a document from an
URL. We need to update the URL in order to resolve relative xlink:href.
add f89ffa9afb Spelling fix: "to thrown" → "to throw".
add 51dcbb1305 Add `public` and `protected` modifiers to
`DatumShiftGridLoader` methods. It does not make practical difference because
the class is package-private. However, they are hints about which methods are
invoked by classes other than sub-classes.
add 1c5de085a4 Declare the provider as the source of warning in
`DatumShiftGridLoader.canNotLoad(…)`.
add 4c772ccb11 Move `DatumShiftGridLoader.toAbsolutePath(URI)` to
`DataDirectory`.
add 95cdd7553d Add a `MarshalContext.getDocumentURI()` method.
add 9beb499ee7 When parsing a GML or WKT from a URI, store the URI on a
new `DefaultParameterValue.sourceFile` property. This information allows to
resolve `ParameterValue.valueFile` relatively to the source document.
add 7e3f59dffe Partial migration of some tests to JUnit 5 and addition of
a test for the `WKTFormat.setSourceFile(URI)` method added in previous commit.
add f35825c1dd Move 4 PMC members to emeritus. Three of them were already
ASF emeritus, one of them has his status changed directly on LDAP.
add 1a95478b37 Move `DatumShiftGrid` implementations to a dedicated
internal package. This is in preparation for more gridded data such as
TestBed-19 or GGXF.
add 2514bc80b8 Replace the use of `java.net.URI` by an internal `GridFile`
class which take in charge the URI resolutions. This is for making easier the
cases where the URI needs to be resolved relatively to the GML or WKT file
instead of resolved in the "$SIS_DATA/DatumChanges" directory.
add ea7344752e Fix information lost: - In source file when parameters are
copied. - In root object name when WKT formatting has warnings.
add b325a0c5f8 Allow `CRS.fromCode(String)` to return the CRS definitions
found in the GML document being parsed. This feature make possible for embedded
or linked data to reference CRS defined in the document.
add 11dcc51787 Merge branch 'geoapi-4.0' into geoapi-3.1. The work
includes `xlink:href` to external GML documents, resolve `PARAMETERFILE["foo"]`
values relatively to the WKT of GML file declaring the parameter, and
`CRS.forCode(String)` capable to return CRS defined in the GML document being
parsed.
add 721b3a76ef Automatic import reorganization for tests and
branch-specific dependencies.
add 84d2ffda54 Automatic import reorganization for tests and
branch-specific dependencies.
No new revisions were added by this update.
Summary of changes:
.../org/apache/sis/console/MimeTypeCommand.java | 2 +-
.../org/apache/sis/console/CommandRunnerTest.java | 15 +-
.../sis/coverage/grid/DimensionAppender.java | 2 +-
.../sis/coverage/grid/GridCoverageBuilder.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 23 +-
.../iso/extent/NotSpatioTemporalException.java | 2 +-
.../main/org/apache/sis/xml/MarshalContext.java | 34 +-
.../main/org/apache/sis/xml/MarshallerPool.java | 47 ++-
.../main/org/apache/sis/xml/Pooled.java | 71 +++-
.../main/org/apache/sis/xml/PooledMarshaller.java | 53 +--
.../main/org/apache/sis/xml/PooledTemplate.java | 6 +-
.../org/apache/sis/xml/PooledUnmarshaller.java | 175 ++++++---
.../main/org/apache/sis/xml/ReferenceResolver.java | 228 ++++++++++--
.../main/org/apache/sis/xml/XLink.java | 13 +-
.../main/org/apache/sis/xml/XML.java | 7 +-
.../main/org/apache/sis/xml/bind/Context.java | 341 +++++++++++++----
.../org/apache/sis/xml/bind/ScopedIdentifier.java | 145 ++++++++
.../apache/sis/xml/util/ExternalLinkHandler.java | 290 +++++++++++++++
.../main/org/apache/sis/xml/util/URISource.java | 120 ++++++
.../main/org/apache/sis/xml/util/XmlUtilities.java | 41 ++
.../metadata/iso/citation/DefaultCitationTest.java | 16 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../sis/metadata/xml/2016/UsingExternalXLink.xml | 51 +++
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverTest.java | 66 ++++
.../org/apache/sis/xml/XLinkMarshallingTest.java | 10 +-
.../test/org/apache/sis/xml/XLinkTest.java | 25 +-
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +-
.../test/org/apache/sis/xml/test/TestCase.java | 46 ++-
.../apache/sis/xml/test/TestReferenceResolver.java | 56 +++
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 7 +-
.../main/org/apache/sis/io/wkt/AbstractParser.java | 23 +-
.../org/apache/sis/io/wkt/FormattableObject.java | 17 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 11 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 20 +-
.../main/org/apache/sis/io/wkt/Parser.java | 4 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 129 ++++---
.../main/org/apache/sis/io/wkt/Warnings.java | 2 +
.../sis/parameter/AbstractParameterDescriptor.java | 13 +-
.../sis/parameter/DefaultParameterDescriptor.java | 15 +-
.../parameter/DefaultParameterDescriptorGroup.java | 15 +-
.../sis/parameter/DefaultParameterValue.java | 172 +++++++--
.../main/org/apache/sis/parameter/Parameters.java | 28 ++
.../sis/parameter/UnmodifiableParameterValue.java | 10 +
.../org/apache/sis/parameter/package-info.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 9 +-
.../main/org/apache/sis/referencing/CRS.java | 53 ++-
.../referencing/factory/GeodeticObjectFactory.java | 8 +-
.../referencing/factory/sql/EPSGDataAccess.java | 4 +-
.../CompressedGrid.java} | 20 +-
.../referencing/operation/gridded/GridFile.java | 299 +++++++++++++++
.../GridGroup.java} | 43 ++-
.../referencing/operation/gridded/GridLoader.java | 143 +++++++
.../LoadedGrid.java} | 184 ++++-----
.../operation/gridded}/package-info.java | 7 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../operation/provider/DatumShiftGridLoader.java | 248 ------------
.../provider/FranceGeocentricInterpolation.java | 59 ++-
.../sis/referencing/operation/provider/NADCON.java | 48 +--
.../sis/referencing/operation/provider/NTv2.java | 69 ++--
.../operation/provider/package-info.java | 5 +-
.../operation/transform/ContextualParameters.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 8 +-
.../transform/SpecializableTransform.java | 2 +-
.../util/j2d/ImmutableAffineTransform.java | 2 +-
.../org/apache/sis/referencing/util/j2d/Tile.java | 4 +-
.../referencing/CC_GeneralOperationParameter.java | 1 +
.../xml/bind/referencing/CC_OperationMethod.java | 7 +-
.../org/apache/sis/xml/bind/referencing/Code.java | 28 +-
.../test/org/apache/sis/io/wkt/ColorsTest.java | 14 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 6 +-
.../test/org/apache/sis/io/wkt/ConventionTest.java | 2 +-
.../test/org/apache/sis/io/wkt/ElementTest.java | 144 +++----
.../sis/io/wkt/GeodeticObjectParserTest.java | 336 ++++++++---------
.../apache/sis/io/wkt/MathTransformParserTest.java | 20 +-
.../test/org/apache/sis/io/wkt/SymbolsTest.java | 39 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 20 +-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 109 +++---
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 60 ++-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 78 ++--
.../sis/parameter/DefaultParameterValueTest.java | 414 +++++++++------------
.../sis/parameter/ParameterMarshallingTest.java | 81 ++--
.../referencing/AbstractIdentifiedObjectTest.java | 2 +-
.../operation/SingleOperationMarshallingTest.java | 148 +++++---
.../sis/referencing/operation/Transformation.xml | 4 +-
.../CompressedGridTest.java} | 12 +-
.../LoadedGridTest.java} | 22 +-
.../operation/provider/DatumShiftTestCase.java | 5 +-
.../FranceGeocentricInterpolationTest.java | 31 +-
.../referencing/operation/provider/NADCONTest.java | 23 +-
.../referencing/operation/provider/NTv2Test.java | 36 +-
.../transform/MathTransformFactoryMock.java | 31 ++
.../operation/transform/PoleRotationTest.java | 2 +-
.../sis/test/integration/DatumShiftTest.java | 5 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 2 +-
.../apache/sis/storage/netcdf/base/Variable.java | 4 +-
.../main/org/apache/sis/storage/DataOptionKey.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 4 +-
.../sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../sis/storage/aggregate/DimensionAppender.java | 4 +-
.../org/apache/sis/storage/base/PRJDataStore.java | 21 +-
.../org/apache/sis/storage/base/URIDataStore.java | 2 +-
.../sis/io/stream/ChannelDataOutputTest.java | 20 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 5 +-
.../apache/sis/storage/StorageConnectorTest.java | 49 ++-
.../main/org/apache/sis/measure/UnitFormat.java | 2 +-
.../main/org/apache/sis/system/DataDirectory.java | 33 +-
.../main/org/apache/sis/util/Utilities.java | 2 +-
.../main/org/apache/sis/util/collection/Cache.java | 2 +-
.../apache/sis/util/internal/CheckedArrayList.java | 2 +-
.../apache/sis/util/internal/DefinitionURI.java | 22 +-
.../sis/util/resources/IndexedResourceBundle.java | 2 +-
.../org/apache/sis/util/resources/Messages.java | 4 +-
.../apache/sis/util/resources/Messages.properties | 2 +-
.../sis/util/resources/Messages_fr.properties | 2 +-
.../org/apache/sis/measure/UnitFormatTest.java | 36 +-
.../test/org/apache/sis/test/Assertions.java | 84 +++--
.../org/apache/sis/util/ArgumentChecksTest.java | 44 +--
.../sis/util/internal/DefinitionURITest.java | 10 +
.../sis/storage/shapefile/ShapefileStore.java | 9 +-
.../shapefile/shp/ShapeGeometryEncoder.java | 3 +-
.../sis/storage/shapefile/shp/ShapeRecord.java | 1 +
.../sis/storage/shapefile/shp/ShapeWriter.java | 2 +-
.../sis/storage/shapefile/ShapefileStoreTest.java | 4 +-
.../org/apache/sis/storage/shapefile/Snippets.java | 9 +-
.../apache/sis/storage/shapefile/dbf/Snippets.java | 1 +
.../apache/sis/storage/shapefile/shp/Snippets.java | 5 +-
parent/pom.xml | 9 +-
129 files changed, 3779 insertions(+), 1888 deletions(-)
create mode 100644
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/ScopedIdentifier.java
create mode 100644
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/ExternalLinkHandler.java
create mode 100644
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/URISource.java
create mode 100644
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/2016/UsingExternalXLink.xml
create mode 100644
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
create mode 100644
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestReferenceResolver.java
rename
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/{provider/DatumShiftGridCompressed.java
=> gridded/CompressedGrid.java} (92%)
create mode 100644
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/GridFile.java
rename
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/{provider/DatumShiftGridGroup.java
=> gridded/GridGroup.java} (88%)
create mode 100644
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/GridLoader.java
rename
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/{provider/DatumShiftGridFile.java
=> gridded/LoadedGrid.java} (81%)
copy {buildSrc/src/main/java/org/apache/sis/buildtools/coding =>
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded}/package-info.java
(80%)
delete mode 100644
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridLoader.java
rename
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/{provider/DatumShiftGridCompressedTest.java
=> gridded/CompressedGridTest.java} (75%)
rename
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/{provider/DatumShiftGridFileTest.java
=> gridded/LoadedGridTest.java} (91%)
