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 b81aa21f9145f2d3c8dd869c54bd418e192e4591
Merge: 6008e5e18d 8043b8130f
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Oct 28 15:55:24 2023 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1.
    Contains the addition of a "coveragejson" module and a first draft of 
GeoTIFF writer.

 .../sis/coverage/grid/j2d/ImageUtilities.java      |  18 +
 .../test/org/apache/sis/image/TiledImageMock.java  |  38 +-
 .../apache/sis/referencing/IdentifiedObjects.java  |  25 +-
 .../referencing/operation/matrix/MatrixSIS.java    |  36 +-
 .../org/apache/sis/storage/geotiff/DataCube.java   |   9 +-
 .../org/apache/sis/storage/geotiff/DataSubset.java |   5 +-
 .../apache/sis/storage/geotiff/DeferredEntry.java  |   2 +
 .../org/apache/sis/storage/geotiff/GeoKeys.java    | 142 ----
 .../apache/sis/storage/geotiff/GeoTiffOption.java  |  60 ++
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 280 +++++--
 .../sis/storage/geotiff/GeoTiffStoreProvider.java  |  26 +-
 .../storage/geotiff/{GeoTIFF.java => IOBase.java}  |  60 +-
 .../sis/storage/geotiff/ImageFileDirectory.java    |  40 +-
 .../apache/sis/storage/geotiff/NativeMetadata.java |  21 +-
 .../org/apache/sis/storage/geotiff/Reader.java     | 107 ++-
 .../org/apache/sis/storage/geotiff/Writer.java     | 826 +++++++++++++++++++++
 .../geotiff/{internal => base}/Compression.java    |   2 +-
 .../sis/storage/geotiff/{ => base}/GeoCodes.java   |  33 +-
 .../apache/sis/storage/geotiff/base/GeoKeys.java   | 126 ++++
 .../geotiff/{internal => base}/Predictor.java      |   2 +-
 .../geotiff/{internal => base}/Resources.java      |  22 +-
 .../{internal => base}/Resources.properties        |   4 +
 .../geotiff/{internal => base}/Resources_en.java   |   2 +-
 .../geotiff/{internal => base}/Resources_fr.java   |   2 +-
 .../{internal => base}/Resources_fr.properties     |   4 +
 .../sis/storage/geotiff/{ => base}/Tags.java       |   8 +-
 .../apache/sis/storage/geotiff/base/UnitKey.java   | 186 +++++
 .../geotiff/{internal => base}/package-info.java   |   4 +-
 .../geotiff/inflater/CompressionChannel.java       |   2 +-
 .../sis/storage/geotiff/inflater/Inflater.java     |   9 +-
 .../apache/sis/storage/geotiff/inflater/LZW.java   |   2 +-
 .../storage/geotiff/inflater/PredictorChannel.java |   2 +-
 .../apache/sis/storage/geotiff/package-info.java   |   2 +-
 .../storage/geotiff/{ => reader}/CRSBuilder.java   | 317 ++++----
 .../geotiff/{ => reader}/GeoKeysLoader.java        |  36 +-
 .../geotiff/{ => reader}/GridGeometryBuilder.java  |  38 +-
 .../geotiff/{ => reader}/ImageMetadataBuilder.java |  46 +-
 .../storage/geotiff/{ => reader}/Localization.java |   2 +-
 .../geotiff/{ => reader}/ReversedBitsChannel.java  |  26 +-
 .../sis/storage/geotiff/{ => reader}/Type.java     |   8 +-
 .../storage/geotiff/{ => reader}/XMLMetadata.java  |  39 +-
 .../geotiff/{internal => reader}/package-info.java |  10 +-
 .../sis/storage/geotiff/writer/GeoEncoder.java     | 800 ++++++++++++++++++++
 .../storage/geotiff/writer/ReformattedImage.java   | 158 ++++
 .../sis/storage/geotiff/writer/TagValue.java       | 105 +++
 .../sis/storage/geotiff/writer/TileMatrix.java     | 212 ++++++
 .../geotiff/{internal => writer}/package-info.java |  10 +-
 .../org/apache/sis/storage/geotiff/WriterTest.java | 479 ++++++++++++
 .../{internal => base}/CompressionTest.java        |   2 +-
 .../storage/geotiff/{ => base}/GeoCodesTest.java   |   2 +-
 .../storage/geotiff/{ => base}/GeoIdentifiers.java |   2 +-
 .../storage/geotiff/{ => base}/GeoKeysTest.java    |  14 +-
 .../sis/storage/geotiff/{ => base}/TagsTest.java   |   2 +-
 .../geotiff/{ => reader}/CRSBuilderTest.java       |   2 +-
 .../sis/storage/geotiff/{ => reader}/TypeTest.java |   2 +-
 .../geotiff/{ => reader}/XMLMetadataTest.java      |   2 +-
 .../org/apache/sis/storage/gpx/StoreProvider.java  |   2 +-
 .../org.apache.sis.storage/main/module-info.java   |   4 +-
 .../main/org/apache/sis/io/stream/ChannelData.java | 285 ++++---
 .../org/apache/sis/io/stream/ChannelDataInput.java | 298 ++++++--
 .../apache/sis/io/stream/ChannelDataOutput.java    | 407 +++++++---
 .../sis/io/stream/ChannelImageInputStream.java     | 115 +--
 .../sis/io/stream/ChannelImageOutputStream.java    | 223 +++---
 .../apache/sis/io/stream/HyperRectangleReader.java |   2 +-
 .../apache/sis/io/stream/HyperRectangleWriter.java | 301 ++++++++
 .../main/org/apache/sis/io/stream/IOUtilities.java |  75 +-
 .../apache/sis/io/stream/InputStreamAdapter.java   |  58 +-
 .../main/org/apache/sis/io/stream/Markable.java    |   2 +-
 .../apache/sis/io/stream/OutputStreamAdapter.java  |  11 +-
 .../main/org/apache/sis/io/stream/Region.java      |  38 +-
 .../org/apache/sis/io/stream/UpdatableWrite.java   | 352 +++++++++
 .../sis/storage/ReadOnlyStorageException.java      |   1 +
 .../org/apache/sis/storage/StorageConnector.java   | 138 ++--
 ...ception.java => WriteOnlyStorageException.java} |  30 +-
 .../apache/sis/storage/base/MetadataBuilder.java   |   6 +-
 .../apache/sis/storage/base/MetadataFetcher.java   | 395 ++++++++++
 .../org/apache/sis/storage/base/URIDataStore.java  |  31 +-
 .../sis/storage/esri/AsciiGridStoreProvider.java   |   2 +-
 .../org/apache/sis/storage/image/FormatFinder.java |   2 +-
 .../storage/internal/WritableResourceSupport.java  |   1 -
 .../main/org/apache/sis/storage/package-info.java  |   2 +-
 .../org/apache/sis/io/stream/ByteArrayChannel.java |  49 +-
 .../sis/io/stream/ChannelDataOutputTest.java       | 406 +++++-----
 .../apache/sis/io/stream/ChannelDataTestCase.java  |  53 +-
 .../sis/io/stream/ChannelImageInputStreamTest.java |  97 ++-
 .../io/stream/ChannelImageOutputStreamTest.java    | 257 ++++---
 .../sis/io/stream/HyperRectangleWriterTest.java    | 206 +++++
 .../io/stream/MemoryCacheImageOutputStream.java    |  68 +-
 .../apache/sis/io/stream/UpdatableWriteTest.java   | 145 ++++
 .../apache/sis/storage/StorageConnectorTest.java   |  10 +-
 .../org/apache/sis/util/internal/Numerics.java     |   6 +
 .../main/org/apache/sis/util/resources/Errors.java |  10 +
 .../apache/sis/util/resources/Errors.properties    |   2 +
 .../apache/sis/util/resources/Errors_fr.properties |   2 +
 incubator/build.gradle.kts                         |   1 +
 .../org.apache.sis.storage.DataStoreProvider       |   4 +
 .../main/module-info.java                          |  54 ++
 .../storage/coveragejson/CoverageJsonStore.java    | 195 +++++
 .../coveragejson/CoverageJsonStoreProvider.java    | 104 +++
 .../sis/storage/coveragejson/CoverageResource.java | 723 ++++++++++++++++++
 .../sis/storage/coveragejson/binding/Axe.java      | 153 ++++
 .../sis/storage/coveragejson/binding/Axes.java     |  63 ++
 .../sis/storage/coveragejson/binding/Category.java |  76 ++
 .../coveragejson/binding/CategoryEncoding.java     |  82 ++
 .../sis/storage/coveragejson/binding/Coverage.java | 147 ++++
 .../coveragejson/binding/CoverageCollection.java   | 103 +++
 .../coveragejson/binding/CoverageJsonObject.java   |  58 ++
 .../storage/coveragejson/binding/Dictionary.java   |  73 ++
 .../sis/storage/coveragejson/binding/Domain.java   |  99 +++
 .../coveragejson/binding/GeographicCRS.java        |  79 ++
 .../sis/storage/coveragejson/binding/I18N.java     | 125 ++++
 .../storage/coveragejson/binding/IdentifierRS.java |  95 +++
 .../storage/coveragejson/binding/Identifiers.java  |  17 +-
 .../sis/storage/coveragejson/binding/NdArray.java  | 116 +++
 .../coveragejson/binding/ObservedProperty.java     |  94 +++
 .../storage/coveragejson/binding/Parameter.java    | 105 +++
 .../coveragejson/binding/ParameterGroup.java       |  98 +++
 .../storage/coveragejson/binding/Parameters.java   |  78 ++
 .../storage/coveragejson/binding/ProjectedCRS.java |  71 ++
 .../sis/storage/coveragejson/binding/Ranges.java   |  74 ++
 .../binding/ReferenceSystemConnection.java         |  74 ++
 .../sis/storage/coveragejson/binding/Symbol.java   |  65 ++
 .../coveragejson/binding/TargetConcept.java        |  59 ++
 .../storage/coveragejson/binding/TemporalRS.java   |  86 +++
 .../sis/storage/coveragejson/binding/TileSet.java  |  81 ++
 .../storage/coveragejson/binding/TiledNdArray.java |  90 +++
 .../sis/storage/coveragejson/binding/Unit.java     |  85 +++
 .../storage/coveragejson/binding/VerticalCRS.java  |  68 ++
 .../storage/coveragejson/binding/package-info.java |  15 +-
 .../sis/storage/coveragejson/package-info.java     |  15 +-
 .../coveragejson/CoverageJsonStoreTest.java        | 142 ++++
 .../storage/coveragejson/binding/BindingTest.java  | 236 ++++++
 .../sis/storage/coveragejson/binding/LICENSE.md    |   5 +
 .../storage/coveragejson/binding/axe_bounds.json   |  12 +
 .../storage/coveragejson/binding/axe_polygon.json  |  33 +
 .../storage/coveragejson/binding/axe_regular.json  |   5 +
 .../storage/coveragejson/binding/axe_tuples.json   |  20 +
 .../binding/coverage_vertical_profile.json         |  91 +++
 .../binding/coverage_vertical_profile_nocs.json    |  80 ++
 .../coveragejson/binding/coveragecollection.json   |  92 +++
 .../storage/coveragejson/binding/domain_grid.json  |  26 +
 .../coveragejson/binding/domain_trajectory.json    |  27 +
 .../coveragejson/binding/domaintype_grid.json      |   5 +
 .../binding/domaintype_multipoint.json             |  30 +
 .../binding/domaintype_multipointseries.json       |  31 +
 .../binding/domaintype_multipolygon.json           |  32 +
 .../binding/domaintype_multipolygonseries.json     |  32 +
 .../coveragejson/binding/domaintype_point.json     |  24 +
 .../binding/domaintype_pointseries.json            |  26 +
 .../coveragejson/binding/domaintype_polygon.json   |  29 +
 .../binding/domaintype_polygonseries.json          |  31 +
 .../coveragejson/binding/domaintype_section.json   |  31 +
 .../binding/domaintype_trajectory.json             |  30 +
 .../binding/domaintype_vertical_profile.json       |  26 +
 .../binding/geographiccrs_longlat.json             |   4 +
 .../binding/geographiccrs_longlatheight.json       |   4 +
 .../sis/storage/coveragejson/binding/ndarray.json  |  10 +
 .../binding/parameter_categoricaldata.json         |  33 +
 .../binding/parameter_continuousdata.json          |  24 +
 .../binding/parametergroup_uncertainty.json        |  13 +
 .../binding/parametergroup_vectorquantity.json     |   9 +
 .../binding/projectedcrs_britishnationalgrid.json  |   4 +
 .../binding/reference_system_connection.json       |   7 +
 .../storage/coveragejson/binding/temporalrs.json   |   4 +
 .../storage/coveragejson/binding/tiledndarray.json |  16 +
 .../coveragejson/binding/verticalcrs_navd88.json   |   4 +
 .../sis/storage/coveragejson/coverage_xyzt.json    |  58 ++
 netbeans-project/ivy.xml                           |   1 +
 netbeans-project/nbproject/project.properties      |   1 +
 settings.gradle.kts                                |   1 +
 170 files changed, 11756 insertions(+), 1571 deletions(-)


Reply via email to