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 61ccf78904895ad11de1530a475625254dc7ed21 Merge: a39ae80 f0f7cc4 Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Oct 15 00:18:41 2018 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .gitignore | 18 +- .../org/apache/sis/openoffice/Registration.java | 4 +- .../org/apache/sis/feature/AbstractAttribute.java | 10 +- .../org/apache/sis/feature/AbstractFeature.java | 4 +- .../org/apache/sis/feature/DefaultFeatureType.java | 12 +- .../java/org/apache/sis/feature/FeatureFormat.java | 26 +- .../java/org/apache/sis/feature/FieldType.java | 2 +- .../org/apache/sis/feature/PropertySingleton.java | 4 +- .../java/org/apache/sis/feature/Validator.java | 2 +- .../sis/feature/builder/AttributeTypeBuilder.java | 2 +- .../sis/feature/builder/FeatureTypeBuilder.java | 33 +- .../sis/feature/builder/OperationWrapper.java | 2 +- .../apache/sis/feature/builder/package-info.java | 14 +- .../java/org/apache/sis/feature/package-info.java | 2 +- .../sis/feature/DefaultAttributeTypeTest.java | 2 +- .../apache/sis/feature/DefaultFeatureTypeTest.java | 4 +- .../org/apache/sis/feature/FeatureFormatTest.java | 52 +-- .../org/apache/sis/feature/FeatureTestCase.java | 14 +- .../sis/feature/MultiValuedAttributeTest.java | 2 +- .../builder/AssociationRoleBuilderTest.java | 2 +- .../apache/sis/internal/jaxb/TypeRegistration.java | 133 +++++--- .../internal/jaxb/metadata/RS_ReferenceSystem.java | 5 +- .../sis/internal/metadata/AxisDirections.java | 41 +-- .../sis/internal/metadata/MetadataTypes.java | 13 +- .../apache/sis/internal/xml/LegacyNamespaces.java | 6 + .../org/apache/sis/metadata/KeyNamePolicy.java | 2 +- .../apache/sis/metadata/PropertyComparator.java | 2 +- .../org/apache/sis/metadata/TitleProperty.java | 2 +- .../org/apache/sis/metadata/iso/ISOMetadata.java | 4 +- .../org/apache/sis/util/iso/DefaultRecord.java | 2 +- .../main/java/org/apache/sis/util/iso/Names.java | 4 +- .../java/org/apache/sis/xml/MarshallerPool.java | 2 +- .../src/main/java/org/apache/sis/xml/Pooled.java | 10 +- .../java/org/apache/sis/xml/PooledMarshaller.java | 10 +- .../main/java/org/apache/sis/xml/Transformer.java | 176 ++++++---- .../org/apache/sis/xml/TransformingNamespaces.java | 2 - .../org/apache/sis/xml/TransformingReader.java | 55 ++-- .../org/apache/sis/xml/TransformingWriter.java | 9 +- .../src/main/java/org/apache/sis/xml/readme.html | 79 +++++ .../org/apache/sis/xml/RenameOnExport.lst | 15 +- .../org/apache/sis/xml/RenameOnImport.lst | 363 ++++----------------- .../apache/sis/metadata/TreeTableFormatTest.java | 4 +- .../apache/sis/test/suite/MetadataTestSuite.java | 1 + .../org/apache/sis/test/xml/PackageVerifier.java | 2 +- .../org/apache/sis/xml/RenameListGenerator.java | 19 +- .../java/org/apache/sis/xml/TransformerTest.java | 63 ++++ .../apache/sis/xml/TransformingNamespacesTest.java | 1 - .../org/apache/sis/coverage/grid/GridExtent.java | 102 ++++++ .../org/apache/sis/coverage/grid/GridGeometry.java | 137 ++++++-- .../apache/sis/coverage/grid/GridExtentTest.java | 80 +++++ .../apache/sis/coverage/grid/GridGeometryTest.java | 21 ++ .../org/apache/sis/test/suite/RasterTestSuite.java | 1 + .../org/apache/sis/geometry/ArrayEnvelope.java | 2 +- .../org/apache/sis/geometry/DirectPosition2D.java | 2 +- .../java/org/apache/sis/geometry/Envelopes.java | 67 +++- .../org/apache/sis/geometry/GeneralEnvelope.java | 26 +- .../java/org/apache/sis/geometry/Shapes2D.java | 2 +- .../sis/internal/referencing/ReferencingTypes.java | 16 +- .../internal/referencing/j2d/ShapeUtilities.java | 2 +- .../provider/DatumShiftGridCompressed.java | 4 +- .../referencing/provider/DatumShiftGridFile.java | 12 +- .../provider/FranceGeocentricInterpolation.java | 2 +- .../sis/internal/referencing/provider/NTv2.java | 30 +- .../sis/parameter/DefaultParameterValueGroup.java | 2 +- .../org/apache/sis/parameter/ParameterBuilder.java | 14 +- .../apache/sis/parameter/ParameterValueList.java | 2 +- .../java/org/apache/sis/parameter/Verifier.java | 49 +-- .../java/org/apache/sis/referencing/Builder.java | 4 +- .../main/java/org/apache/sis/referencing/CRS.java | 3 + .../sis/referencing/StandardDefinitions.java | 2 +- .../apache/sis/referencing/crs/AbstractCRS.java | 2 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 2 +- .../sis/referencing/datum/BursaWolfParameters.java | 2 +- .../sis/referencing/datum/DatumShiftGrid.java | 6 +- .../factory/LazySynchronizedIterator.java | 2 +- .../factory/MultiAuthoritiesFactory.java | 4 +- .../sis/referencing/factory/sql/package-info.java | 2 +- .../operation/builder/LinearTransformBuilder.java | 343 ++++++++++++++++++- .../operation/builder/LocalizationGridBuilder.java | 110 ++++++- .../operation/builder/ResidualGrid.java | 4 +- .../sis/referencing/operation/matrix/Matrices.java | 2 +- .../referencing/operation/matrix/MatrixSIS.java | 2 +- .../sis/referencing/operation/matrix/Solver.java | 2 +- .../transform/AbstractLinearTransform.java | 2 +- .../operation/transform/AbstractMathTransform.java | 2 +- .../operation/transform/MathTransforms.java | 25 +- .../operation/transform/TransformSeparator.java | 4 +- .../org/apache/sis/geometry/EnvelopesTest.java | 38 ++- .../apache/sis/geometry/GeneralEnvelopeTest.java | 20 +- .../sis/internal/metadata/AxisDirectionsTest.java | 10 +- .../parameter/DefaultParameterValueGroupTest.java | 16 +- .../referencing/factory/sql/EPSGInstallerTest.java | 27 ++ .../builder/LinearTransformBuilderTest.java | 81 ++++- .../builder/LocalizationGridBuilderTest.java | 41 ++- .../operation/builder/ResidualGridTest.java | 152 +++++++++ .../projection/ConformalProjectionTest.java | 2 +- .../projection/LambertConicConformalTest.java | 36 +- .../operation/projection/MercatorTest.java | 8 +- .../sis/test/suite/ReferencingTestSuite.java | 1 + .../sis/internal/converter/FallbackConverter.java | 2 +- .../sis/internal/system/DelayedExecutor.java | 2 +- .../sis/internal/system/DelayedRunnable.java | 14 +- .../org/apache/sis/internal/util/Citations.java | 2 +- .../org/apache/sis/internal/util/Numerics.java | 21 ++ .../java/org/apache/sis/io/CompoundFormat.java | 52 +-- .../main/java/org/apache/sis/io/DefaultFormat.java | 13 +- .../java/org/apache/sis/math/DecimalFunctions.java | 6 +- .../org/apache/sis/measure/ConventionalUnit.java | 113 +++++-- .../java/org/apache/sis/measure/NumberRange.java | 15 +- .../main/java/org/apache/sis/measure/Range.java | 2 +- .../java/org/apache/sis/measure/SystemUnit.java | 98 ++++-- .../java/org/apache/sis/measure/UnitFormat.java | 72 ++-- .../main/java/org/apache/sis/measure/Units.java | 2 +- .../main/java/org/apache/sis/util/Characters.java | 16 +- .../java/org/apache/sis/util/ObjectConverter.java | 2 +- .../util/UnsupportedImplementationException.java | 2 +- .../java/org/apache/sis/util/collection/Cache.java | 2 +- .../org/apache/sis/util/collection/Containers.java | 14 +- .../sis/util/collection/TreeTableFormat.java | 80 ++++- .../apache/sis/util/logging/MonolineFormatter.java | 73 ++++- .../java/org/apache/sis/util/resources/Errors.java | 7 +- .../apache/sis/util/resources/Errors.properties | 3 +- .../apache/sis/util/resources/Errors_fr.properties | 1 + .../org/apache/sis/util/resources/Vocabulary.java | 5 + .../sis/util/resources/Vocabulary.properties | 1 + .../sis/util/resources/Vocabulary_fr.properties | 1 + .../org/apache/sis/internal/util/NumericsTest.java | 11 + .../org/apache/sis/measure/UnitFormatTest.java | 79 ++++- .../java/org/apache/sis/test/TestUtilities.java | 2 +- .../sis/util/logging/MonolineFormatterTest.java | 13 +- ide-project/NetBeans/build.xml | 10 + ide-project/NetBeans/nbproject/project.properties | 15 +- pom.xml | 25 +- .../sis/internal/profile/fra/ProfileTypes.java | 14 +- .../sis/internal/profile/fra/package-info.java | 2 +- .../sis/internal/profile/fra/RenameOnImport.lst | 13 + .../profile/fra/DataIdentificationTest.java | 2 - src/main/config/logging.properties | 21 +- .../sis/storage/earthobservation/LandsatStore.java | 69 ++-- .../apache/sis/storage/geotiff/GeoTiffStore.java | 105 +++++- .../sis/storage/geotiff/ImageFileDirectory.java | 24 +- .../apache/sis/storage/geotiff/Localization.java | 2 +- .../org/apache/sis/storage/geotiff/Reader.java | 20 +- .../org/apache/sis/internal/netcdf/Decoder.java | 24 +- .../sis/internal/netcdf/impl/ChannelDecoder.java | 4 +- .../sis/internal/netcdf/impl/FeaturesInfo.java | 36 +- .../sis/internal/netcdf/ucar/DecoderWrapper.java | 4 +- .../sis/internal/netcdf/ucar/FeaturesWrapper.java | 8 +- .../apache/sis/storage/netcdf/MetadataReader.java | 14 +- .../org/apache/sis/storage/netcdf/NetcdfStore.java | 29 ++ .../apache/sis/internal/sql/feature/Database.java | 6 +- .../org/apache/sis/internal/sql/feature/Table.java | 10 +- .../java/org/apache/sis/storage/sql/SQLStore.java | 44 ++- .../org/apache/sis/index/tree/QuadTreeWriter.java | 94 +++--- .../sis/internal/storage/AbstractResource.java | 81 ++++- .../sis/internal/storage/JoinFeatureSet.java | 10 + .../sis/internal/storage/MemoryFeatureSet.java | 13 +- .../sis/internal/storage/StoreUtilities.java | 46 ++- .../org/apache/sis/internal/storage/csv/Store.java | 12 + .../apache/sis/internal/storage/folder/Store.java | 62 +++- .../sis/internal/storage/folder/WritableStore.java | 8 +- .../sis/internal/storage/query/FeatureSubset.java | 9 + .../sis/internal/storage/xml/StoreProvider.java | 1 + .../java/org/apache/sis/storage/DataStore.java | 190 +++++++---- .../java/org/apache/sis/storage/FeatureSet.java | 2 +- .../apache/sis/storage/IllegalNameException.java | 3 + .../main/java/org/apache/sis/storage/Resource.java | 28 +- .../java/org/apache/sis/storage/DataStoreMock.java | 4 +- .../storage/gpx/GroupAsPolylineOperation.java | 8 +- .../org/apache/sis/internal/storage/gpx/Types.java | 144 ++++---- 170 files changed, 3426 insertions(+), 1282 deletions(-)
