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 c4821c0942c9023e4396a579a2a2741e8a24670a Merge: ba5a515 8d6e178 Author: Martin Desruisseaux AuthorDate: Thu Nov 8 14:22:19 2018 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 application/sis-console/pom.xml | 2 +- application/sis-console/src/main/artifact/README | 6 +- application/sis-console/src/main/artifact/bin/sis | 10 - core/sis-build-helper/pom.xml | 2 +- .../org/apache/sis/internal/maven/Assembler.java | 192 ++++++++---- .../apache/sis/internal/maven/BundleCreator.java | 114 ------- .../org/apache/sis/internal/maven/Filenames.java | 42 +-- .../apache/sis/internal/maven/JarCollector.java | 20 +- .../org/apache/sis/internal/maven/PackInput.java | 227 -------------- .../org/apache/sis/internal/maven/PackOutput.java | 338 --------------------- .../java/org/apache/sis/internal/maven/Packer.java | 123 -------- .../apache/sis/internal/maven/package-info.java | 10 +- .../apache/sis/internal/metadata/Resources.java | 33 ++ .../sis/internal/metadata/Resources.properties | 1 + .../sis/internal/metadata/Resources_fr.properties | 1 + .../apache/sis/internal/simple/SimpleDuration.java | 77 +++++ .../java/org/apache/sis/io/wkt/AbstractParser.java | 2 +- .../apache/sis/io/wkt/GeodeticObjectParser.java | 6 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 85 +++++- .../org/apache/sis/metadata/AbstractMetadata.java | 5 + .../org/apache/sis/metadata/MetadataFormat.java | 65 ++++ .../org/apache/sis/metadata/MetadataStandard.java | 5 + .../org/apache/sis/metadata/PropertyAccessor.java | 11 +- .../java/org/apache/sis/metadata/SpecialCases.java | 21 +- .../java/org/apache/sis/metadata/TreeNode.java | 19 +- .../org/apache/sis/metadata/TreeTableView.java | 50 ++- .../apache/sis/metadata/iso/DefaultIdentifier.java | 23 +- .../org/apache/sis/metadata/TreeTableViewTest.java | 30 +- .../DefaultDataIdentificationTest.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 23 +- .../java/org/apache/sis/image/PixelIterator.java | 8 +- .../gazetteer/MilitaryGridReferenceSystem.java | 11 +- .../referencing/provider/GeodeticOperation.java | 2 +- .../internal/referencing/provider/Molodensky.java | 4 +- .../operation/CoordinateOperationFinder.java | 19 +- .../sis/referencing/operation/matrix/Matrices.java | 3 +- .../apache/sis/geometry/CoordinateFormatTest.java | 4 +- .../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 161 ++++++++++ .../sis/io/wkt/GeodeticObjectParserTest.java | 4 +- .../sis/referencing/factory/TestFactorySource.java | 2 +- .../operation/CoordinateOperationFinderTest.java | 32 +- .../sis/test/suite/ReferencingTestSuite.java | 1 + .../org/apache/sis/internal/system/Modules.java | 5 + .../org/apache/sis/internal/util/Numerics.java | 34 +++ .../java/org/apache/sis/io/CompoundFormat.java | 3 + .../main/java/org/apache/sis/io/DefaultFormat.java | 2 +- .../java/org/apache/sis/math/DecimalFunctions.java | 108 ++++++- .../java/org/apache/sis/math/StatisticsFormat.java | 135 ++++---- .../java/org/apache/sis/measure/UnitFormat.java | 87 +++++- .../java/org/apache/sis/util/CharSequences.java | 19 +- .../apache/sis/util/collection/TableColumn.java | 11 + .../sis/util/collection/TreeTableFormat.java | 48 ++- .../org/apache/sis/measure/UnitAliases.properties | 1 + .../org/apache/sis/measure/UnitNames.properties | 2 +- .../org/apache/sis/measure/UnitNames_fr.properties | 2 +- .../org/apache/sis/internal/util/NumericsTest.java | 15 + .../org/apache/sis/math/DecimalFunctionsTest.java | 55 +++- .../org/apache/sis/math/StatisticsFormatTest.java | 40 ++- .../org/apache/sis/measure/UnitFormatTest.java | 19 +- .../src/test/java/org/apache/sis/test/Assert.java | 4 +- .../java/org/apache/sis/test/TestUtilities.java | 9 +- .../org/apache/sis/util/CharSequencesTest.java | 8 +- pom.xml | 4 +- .../java/org/apache/sis/internal/netcdf/Axis.java | 3 + .../org/apache/sis/internal/netcdf/DataType.java | 19 +- .../apache/sis/internal/netcdf/GridGeometry.java | 2 + .../apache/sis/internal/netcdf/NamedElement.java | 13 +- .../org/apache/sis/internal/netcdf/Resources.java | 20 ++ .../sis/internal/netcdf/Resources.properties | 4 + .../sis/internal/netcdf/Resources_fr.properties | 4 + .../org/apache/sis/internal/netcdf/Variable.java | 15 +- .../sis/internal/netcdf/impl/ChannelDecoder.java | 78 +++-- .../apache/sis/internal/netcdf/impl/Dimension.java | 26 +- .../sis/internal/netcdf/impl/FeaturesInfo.java | 4 + .../sis/internal/netcdf/impl/GridGeometryInfo.java | 21 +- .../sis/internal/netcdf/impl/VariableInfo.java | 205 +++++++++++-- .../sis/internal/netcdf/impl/package-info.java | 1 + .../internal/netcdf/ucar/GridGeometryWrapper.java | 1 + .../sis/internal/netcdf/ucar/VariableWrapper.java | 11 +- .../apache/sis/storage/netcdf/MetadataReader.java | 2 + .../org/apache/sis/storage/netcdf/NetcdfStore.java | 4 +- .../sis/storage/netcdf/NetcdfStoreProvider.java | 2 +- .../org/apache/sis/internal/netcdf/TestCase.java | 6 +- .../sis/internal/storage/MetadataBuilder.java | 22 +- .../org/apache/sis/internal/storage/Resources.java | 2 +- .../sis/internal/storage/Resources.properties | 2 +- .../sis/internal/storage/Resources_fr.properties | 2 +- .../sis/internal/storage/io/ChannelDataInput.java | 16 +- .../sis/internal/storage/io/DataTransfer.java | 8 +- .../internal/storage/io/HyperRectangleReader.java | 27 +- .../org/apache/sis/internal/storage/io/Region.java | 89 ++++-- .../sis/storage/DataStoreContentException.java | 6 + .../org/apache/sis/storage/DataStoreException.java | 6 + 93 files changed, 1807 insertions(+), 1221 deletions(-)