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 2022/05/05 13:45:37 UTC
[sis] branch geoapi-3.1 updated (15f1d671c9 -> 8f4b197bc6)
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 15f1d671c9 Merge branch 'geoapi-4.0' into geoapi-3.1
new fa0f89c70f Post-merge cleanup.
add eb41db63c4 Post-merge cleanup.
add 49ceb86450 Replace the way variants of map projections are represented, using enumeration instead of a single integer. This change makes possible to attach more information to the enumeration value. This is a step for making easier to add support for variants such as "Mercator Auxiliary Sphere".
add d5b9780190 Reduce the use of `null` as an enumeration value.
add 4a0ed7a1a3 Add a test case for "Mercator Auxiliary Sphere".
add c8ed9467ae Port `LambertAzimuthalEqualArea` from Geotk. We rewrote the equations from EPSG guidance notes.
add 200602de57 Make the `qm(sinφ)` method always safe to the spherical case. The reason is because `Spherical` inner classes are not public. Consequently users creating their own map projection subclasses could have a non-working instance.
add f70bb327ff Before to replace a map projection by a spherical optimization, verify if it is safe to do so. If user created a subclasses, we should not do such replacement because it would ignore user's code.
add a39fb97d1c Javadoc updates.
add b318c2161a Rename `EqualAreaProjection` as `AuthalicConversion`.
add 4581391386 Slight modification of `AuthalicConversion` parameters for making clearer that this is a conversion between geodetic latitude φ and authalic latitude β.
add 8b97aed4cc Fix the unicode character for Greek Beta letter.
add c01dd455bb Implement ESRI "Mercator Auxiliary Sphere" type 3 (with conversion of geodetic latitudes to authalic latitudes). This feature requires an additional degree of flexibility in the package-private projection constructors.
add 9a87ff27c0 `skipBytes` method implementation should skip all specified bytes when possible, because some `ImageReader` implementation don't check the return value.
add 8a881f42c4 Leverage more a simple helper method for getting the filename without suffix.
add 6b8b00c6a2 Add a boolean argument to `AbstractResource` for making possible to use the parent listeners directly. The use case for direct use is when the resource is only a proxy for a "real" resource.
add 9e5697263d If the World File uses a format which is known to support only one image (PNG, BMP, WBMP and maybe JPEG), returns a data store which implements directly `GridCoverageResource` instead of `Aggregate`.
add 229d919d7e Add a safety against `ImageReader` implementations that do not check if there is enough bytes in the stream.
add bae538e77a Revert the check for EOFException. Instead, a patch is submitted to OpenJDK for fixing `ImageReaderSpi.canDecodeInput(Object)` implementations.
new 8f4b197bc6 Merge branch 'geoapi-4.0' into geoapi-3.1. Includes new map projection and improvements on World File data store.
The 2 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:
.../org/apache/sis/metadata/sql/Dispatcher.java | 2 +-
.../MultiResolutionCoverageLoaderTest.java | 2 +-
.../referencing/provider/AbstractMercator.java | 12 +-
.../referencing/provider/CassiniSoldner.java | 9 +-
...lyconic.java => LambertAzimuthalEqualArea.java} | 87 +++--
...ava => LambertAzimuthalEqualAreaSpherical.java} | 39 ++-
.../provider/LambertCylindricalEqualArea.java | 9 +-
.../internal/referencing/provider/Mercator1SP.java | 9 +-
.../internal/referencing/provider/Mercator2SP.java | 9 +-
.../provider/MercatorAuxiliarySphere.java | 85 +++++
.../referencing/provider/MillerCylindrical.java | 2 +-
.../referencing/provider/ObliqueMercator.java | 6 +-
.../referencing/provider/PseudoMercator.java | 2 +-
.../java/org/apache/sis/referencing/Builder.java | 14 +-
.../operation/projection/AlbersEqualArea.java | 24 +-
...AreaProjection.java => AuthalicConversion.java} | 122 ++++---
.../operation/projection/AuthalicMercator.java | 115 +++++++
.../operation/projection/AzimuthalEquidistant.java | 6 +-
.../operation/projection/CassiniSoldner.java | 87 +++--
.../operation/projection/ConformalProjection.java | 8 +-
.../operation/projection/CylindricalEqualArea.java | 79 +++--
.../operation/projection/Initializer.java | 42 ++-
.../projection/LambertAzimuthalEqualArea.java | 284 ++++++++++++++++
.../projection/LambertConicConformal.java | 95 +++---
.../referencing/operation/projection/Mercator.java | 135 +++++---
.../operation/projection/MeridianArcBased.java | 4 +-
.../projection/ModifiedAzimuthalEquidistant.java | 6 +-
.../operation/projection/Mollweide.java | 31 +-
.../operation/projection/NormalizedProjection.java | 95 +++---
.../operation/projection/ObliqueMercator.java | 80 +++--
.../operation/projection/ObliqueStereographic.java | 10 +-
.../operation/projection/Orthographic.java | 4 +-
.../operation/projection/PolarStereographic.java | 83 +++--
.../operation/projection/Polyconic.java | 6 +-
.../operation/projection/ProjectionVariant.java | 58 ++++
.../operation/projection/SatelliteTracking.java | 4 +-
.../operation/projection/Sinusoidal.java | 6 +-
.../operation/projection/TransverseMercator.java | 44 ++-
.../operation/projection/ZonedGridSystem.java | 2 +-
...g.opengis.referencing.operation.OperationMethod | 3 +
.../referencing/provider/ProvidersTest.java | 3 +
...ectionTest.java => AuthalicConversionTest.java} | 24 +-
.../operation/projection/InitializerTest.java | 2 +-
.../projection/LambertAzimuthalEqualAreaTest.java | 357 +++++++++++++++++++++
.../operation/projection/MercatorTest.java | 72 ++++-
.../sis/referencing/operation/projection/NoOp.java | 4 +-
.../projection/ProjectionResultComparator.java | 2 +-
.../sis/test/suite/ReferencingTestSuite.java | 3 +-
.../org/apache/sis/storage/landsat/BandGroup.java | 2 +-
.../sis/storage/landsat/MetadataReaderTest.java | 2 +-
.../sis/internal/netcdf/DiscreteSampling.java | 2 +-
.../apache/sis/internal/netcdf/RasterResource.java | 2 +-
.../org/apache/sis/internal/netcdf/TestCase.java | 2 +-
.../org/apache/sis/internal/sql/feature/Table.java | 4 +-
.../sis/internal/storage/AggregatedFeatureSet.java | 2 +-
.../sis/internal/storage/MemoryFeatureSet.java | 2 +-
.../sis/internal/storage/MemoryGridResource.java | 2 +-
.../sis/internal/storage/TiledGridResource.java | 2 +-
.../org/apache/sis/internal/storage/csv/Store.java | 6 +-
.../sis/internal/storage/esri/WritableStore.java | 4 +-
.../sis/internal/storage/image/FormatFilter.java | 23 +-
.../sis/internal/storage/image/FormatFinder.java | 288 +++++++++++++++++
.../internal/storage/image/MultiImageStore.java | 62 ++++
.../internal/storage/image/SingleImageStore.java | 191 +++++++++++
.../internal/storage/image/WorldFileResource.java | 16 +-
.../sis/internal/storage/image/WorldFileStore.java | 116 +++----
.../storage/image/WorldFileStoreProvider.java | 67 +++-
.../sis/internal/storage/image/WritableStore.java | 81 ++---
.../sis/internal/storage/io/ChannelData.java | 2 +
.../storage/io/ChannelImageInputStream.java | 31 +-
.../org/apache/sis/storage/AbstractFeatureSet.java | 20 +-
.../sis/storage/AbstractGridCoverageResource.java | 20 +-
.../org/apache/sis/storage/AbstractResource.java | 24 +-
.../org/apache/sis/storage/CoverageSubset.java | 2 +-
.../java/org/apache/sis/storage/DataStore.java | 2 +-
.../java/org/apache/sis/storage/FeatureNaming.java | 1 +
.../java/org/apache/sis/storage/FeatureSubset.java | 2 +-
.../apache/sis/storage/event/StoreListeners.java | 2 +-
.../sis/internal/storage/RangeArgumentTest.java | 2 +-
.../storage/image/SelfConsistencyTest.java | 2 +-
.../internal/storage/image/WorldFileStoreTest.java | 12 +-
.../org/apache/sis/storage/GridResourceMock.java | 2 +-
82 files changed, 2539 insertions(+), 648 deletions(-)
copy core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/{Polyconic.java => LambertAzimuthalEqualArea.java} (63%)
copy core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/{HyperbolicCassiniSoldner.java => LambertAzimuthalEqualAreaSpherical.java} (53%)
create mode 100644 core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorAuxiliarySphere.java
rename core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/{EqualAreaProjection.java => AuthalicConversion.java} (69%)
create mode 100644 core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AuthalicMercator.java
create mode 100644 core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java
create mode 100644 core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ProjectionVariant.java
rename core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/{EqualAreaProjectionTest.java => AuthalicConversionTest.java} (84%)
create mode 100644 core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java
create mode 100644 storage/sis-storage/src/main/java/org/apache/sis/internal/storage/image/FormatFinder.java
create mode 100644 storage/sis-storage/src/main/java/org/apache/sis/internal/storage/image/MultiImageStore.java
create mode 100644 storage/sis-storage/src/main/java/org/apache/sis/internal/storage/image/SingleImageStore.java
[sis] 01/02: Post-merge cleanup.
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 fa0f89c70f5bba5d7dce0f7a69a969ec3e33f8c9
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Apr 26 18:26:42 2022 +0200
Post-merge cleanup.
---
.../src/main/java/org/apache/sis/metadata/sql/Dispatcher.java | 2 +-
.../main/java/org/apache/sis/internal/storage/esri/WritableStore.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
index adb318d941..13e06a9ab9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
@@ -336,7 +336,7 @@ final class Dispatcher implements InvocationHandler {
} else {
/*
* `getIndividualName()`, `getOrganisationName()`, `getPositionName()` and
- * `getContactInfo()` has no direct equivalence in `Responsibility` class.
+ * `getContactInfo()` have no direct equivalence in `Responsibility` class.
*/
return null;
}
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/WritableStore.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/WritableStore.java
index 5e57c11003..1b51c553c2 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/WritableStore.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/WritableStore.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.awt.image.DataBuffer;
import java.awt.image.RenderedImage;
import java.awt.geom.AffineTransform;
-import org.opengis.coverage.grid.SequenceType;
import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.operation.Matrix;
import org.opengis.referencing.operation.MathTransform;
@@ -42,6 +41,9 @@ import org.apache.sis.image.PixelIterator;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.StringBuilders;
+// Branch-dependent imports
+import org.opengis.coverage.grid.SequenceType;
+
/**
* An ASCII Grid store with writing capabilities.
[sis] 02/02: Merge branch 'geoapi-4.0' into geoapi-3.1. Includes new map projection and improvements on World File data store.
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 8f4b197bc60594381cc16e5d941242c81ed8a965
Merge: fa0f89c70f bae538e77a
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu May 5 15:43:59 2022 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
Includes new map projection and improvements on World File data store.
.../MultiResolutionCoverageLoaderTest.java | 2 +-
.../referencing/provider/AbstractMercator.java | 12 +-
.../referencing/provider/CassiniSoldner.java | 9 +-
...Soldner.java => LambertAzimuthalEqualArea.java} | 108 ++++---
.../LambertAzimuthalEqualAreaSpherical.java | 77 +++++
.../provider/LambertCylindricalEqualArea.java | 9 +-
.../internal/referencing/provider/Mercator1SP.java | 9 +-
.../internal/referencing/provider/Mercator2SP.java | 9 +-
.../provider/MercatorAuxiliarySphere.java | 85 +++++
.../referencing/provider/MillerCylindrical.java | 2 +-
.../referencing/provider/ObliqueMercator.java | 6 +-
.../referencing/provider/PseudoMercator.java | 2 +-
.../java/org/apache/sis/referencing/Builder.java | 14 +-
.../operation/projection/AlbersEqualArea.java | 24 +-
...AreaProjection.java => AuthalicConversion.java} | 122 ++++---
.../operation/projection/AuthalicMercator.java | 115 +++++++
.../operation/projection/AzimuthalEquidistant.java | 6 +-
.../operation/projection/CassiniSoldner.java | 87 +++--
.../operation/projection/ConformalProjection.java | 8 +-
.../operation/projection/CylindricalEqualArea.java | 79 +++--
.../operation/projection/Initializer.java | 42 ++-
.../projection/LambertAzimuthalEqualArea.java | 284 ++++++++++++++++
.../projection/LambertConicConformal.java | 95 +++---
.../referencing/operation/projection/Mercator.java | 135 +++++---
.../operation/projection/MeridianArcBased.java | 4 +-
.../projection/ModifiedAzimuthalEquidistant.java | 6 +-
.../operation/projection/Mollweide.java | 31 +-
.../operation/projection/NormalizedProjection.java | 95 +++---
.../operation/projection/ObliqueMercator.java | 80 +++--
.../operation/projection/ObliqueStereographic.java | 10 +-
.../operation/projection/Orthographic.java | 4 +-
.../operation/projection/PolarStereographic.java | 83 +++--
.../operation/projection/Polyconic.java | 6 +-
.../operation/projection/ProjectionVariant.java | 58 ++++
.../operation/projection/SatelliteTracking.java | 4 +-
.../operation/projection/Sinusoidal.java | 6 +-
.../operation/projection/TransverseMercator.java | 44 ++-
.../operation/projection/ZonedGridSystem.java | 2 +-
...g.opengis.referencing.operation.OperationMethod | 3 +
.../referencing/provider/ProvidersTest.java | 3 +
...ectionTest.java => AuthalicConversionTest.java} | 24 +-
.../operation/projection/InitializerTest.java | 2 +-
.../projection/LambertAzimuthalEqualAreaTest.java | 357 +++++++++++++++++++++
.../operation/projection/MercatorTest.java | 72 ++++-
.../sis/referencing/operation/projection/NoOp.java | 4 +-
.../projection/ProjectionResultComparator.java | 2 +-
.../sis/test/suite/ReferencingTestSuite.java | 3 +-
.../org/apache/sis/storage/landsat/BandGroup.java | 2 +-
.../sis/storage/landsat/MetadataReaderTest.java | 2 +-
.../sis/internal/netcdf/DiscreteSampling.java | 2 +-
.../apache/sis/internal/netcdf/RasterResource.java | 2 +-
.../org/apache/sis/internal/netcdf/TestCase.java | 2 +-
.../org/apache/sis/internal/sql/feature/Table.java | 4 +-
.../sis/internal/storage/AggregatedFeatureSet.java | 2 +-
.../sis/internal/storage/MemoryFeatureSet.java | 2 +-
.../sis/internal/storage/MemoryGridResource.java | 2 +-
.../sis/internal/storage/TiledGridResource.java | 2 +-
.../org/apache/sis/internal/storage/csv/Store.java | 6 +-
.../sis/internal/storage/image/FormatFilter.java | 23 +-
.../sis/internal/storage/image/FormatFinder.java | 288 +++++++++++++++++
.../internal/storage/image/MultiImageStore.java | 62 ++++
.../internal/storage/image/SingleImageStore.java | 191 +++++++++++
.../internal/storage/image/WorldFileResource.java | 16 +-
.../sis/internal/storage/image/WorldFileStore.java | 116 +++----
.../storage/image/WorldFileStoreProvider.java | 67 +++-
.../sis/internal/storage/image/WritableStore.java | 81 ++---
.../sis/internal/storage/io/ChannelData.java | 2 +
.../storage/io/ChannelImageInputStream.java | 31 +-
.../org/apache/sis/storage/AbstractFeatureSet.java | 20 +-
.../sis/storage/AbstractGridCoverageResource.java | 20 +-
.../org/apache/sis/storage/AbstractResource.java | 24 +-
.../org/apache/sis/storage/CoverageSubset.java | 2 +-
.../java/org/apache/sis/storage/DataStore.java | 2 +-
.../java/org/apache/sis/storage/FeatureNaming.java | 1 +
.../java/org/apache/sis/storage/FeatureSubset.java | 2 +-
.../apache/sis/storage/event/StoreListeners.java | 2 +-
.../sis/internal/storage/RangeArgumentTest.java | 2 +-
.../storage/image/SelfConsistencyTest.java | 2 +-
.../internal/storage/image/WorldFileStoreTest.java | 12 +-
.../org/apache/sis/storage/GridResourceMock.java | 2 +-
80 files changed, 2590 insertions(+), 650 deletions(-)