(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 5dab0950ead118f6ea2ebdd046db0da3cc8dc58d Merge: 715d2bf6ff 24d7b6901d Author: Martin Desruisseaux AuthorDate: Mon May 20 14:05:19 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../org/apache/sis/coverage/CoverageCombiner.java | 2 +- .../org/apache/sis/coverage/RegionOfInterest.java | 2 +- .../coverage/grid/CoordinateOperationFinder.java | 1 - .../apache/sis/coverage/grid/DefaultEvaluator.java | 1 - .../sis/coverage/grid/DimensionalityReduction.java | 11 +- .../apache/sis/coverage/grid/DomainLinearizer.java | 1 - .../coverage/grid/FractionalGridCoordinates.java | 1 - .../apache/sis/coverage/grid/GridCoverage2D.java | 1 - .../sis/coverage/grid/GridCoverageProcessor.java | 1 - .../apache/sis/coverage/grid/GridDerivation.java | 1 - .../org/apache/sis/coverage/grid/GridExtent.java | 3 +- .../apache/sis/coverage/grid/GridExtentCRS.java| 1 - .../org/apache/sis/coverage/grid/GridGeometry.java | 11 +- .../apache/sis/coverage/grid/GridOrientation.java | 1 - .../org/apache/sis/coverage/grid/PixelInCell.java | 129 + .../apache/sis/coverage/grid/PixelTranslation.java | 29 + .../sis/coverage/grid/ResampledGridCoverage.java | 1 - .../apache/sis/coverage/grid/SliceGeometry.java| 1 - .../sis/coverage/privy/CommonDomainFinder.java | 2 +- .../sis/coverage/privy/MultiSourceArgument.java| 2 +- .../main/org/apache/sis/image/ImageCombiner.java | 2 +- .../main/org/apache/sis/image/ImageProcessor.java | 2 +- .../main/org/apache/sis/image/ResampledImage.java | 4 +- .../grid/BandAggregateGridCoverageTest.java| 1 - .../coverage/grid/BufferedGridCoverageTest.java| 1 - .../coverage/grid/ConvertedGridCoverageTest.java | 1 - .../sis/coverage/grid/DimensionAppenderTest.java | 1 - .../coverage/grid/DimensionalityReductionTest.java | 1 - .../sis/coverage/grid/GridCoverage2DTest.java | 1 - .../sis/coverage/grid/GridCoverageBuilderTest.java | 1 - .../sis/coverage/grid/GridDerivationTest.java | 1 - .../apache/sis/coverage/grid/GridGeometryTest.java | 1 - .../sis/coverage/grid/PixelTranslationTest.java| 1 - .../coverage/grid/ResampledGridCoverageTest.java | 2 +- .../coverage/grid/TranslatedGridCoverageTest.java | 1 - .../test/org/apache/sis/util/iso/TypesTest.java| 10 +- .../org/apache/sis/xml/RenameListGenerator.java| 2 +- .../org/apache/sis/xml/test/PackageVerifier.java | 8 +- .../org/apache/sis/xml/test/SchemaCompliance.java | 8 +- .../coverage/MultiResolutionCoverageLoader.java| 2 +- .../org/apache/sis/map/coverage/RenderingData.java | 2 +- .../main/org/apache/sis/portrayal/Canvas.java | 2 +- .../org/apache/sis/portrayal/CanvasExtent.java | 2 +- .../MultiResolutionCoverageLoaderTest.java | 2 +- .../apache/sis/io/wkt/GeodeticObjectParser.java| 4 +- .../apache/sis/referencing/cs/DefaultAffineCS.java | 3 - .../sis/referencing/cs/DefaultCartesianCS.java | 3 - .../sis/referencing/datum/DatumShiftGrid.java | 2 +- .../referencing/datum/DefaultVerticalDatum.java| 4 +- .../referencing/factory/GeodeticObjectFactory.java | 2 +- .../referencing/operation/SubOperationInfo.java| 2 +- .../operation/builder/LinearTransformBuilder.java | 2 +- .../operation/builder/LocalizationGridBuilder.java | 4 +- .../sis/referencing/operation/gridded/Tile.java| 13 +-- .../referencing/operation/provider/Robinson.java | 12 +- .../referencing/operation/provider/Sinusoidal.java | 13 ++- .../transform/DefaultMathTransformFactory.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 2 +- .../sis/storage/geotiff/MultiResolutionImage.java | 2 +- .../geotiff/reader/GridGeometryBuilder.java| 2 +- .../sis/storage/geotiff/writer/GeoEncoder.java | 2 +- .../org/apache/sis/storage/netcdf/base/Grid.java | 2 +- .../sis/storage/netcdf/base/GridAdjustment.java| 2 +- .../sis/storage/netcdf/base/GridMapping.java | 2 +- .../sis/storage/sql/postgis/RasterFormat.java | 2 +- .../sis/storage/aggregate/CoverageAggregator.java | 2 +- .../sis/storage/aggregate/DimensionAppender.java | 2 +- .../apache/sis/storage/aggregate/GridSlice.java| 2 +- .../sis/storage/base/MemoryGridResource.java | 2 +- .../apache/sis/storage/base/TiledGridCoverage.java | 2 +- .../apache/sis/storage/esri/AsciiGridStore.java| 2 +- .../apache/sis/storage/esri/RawRasterStore.java| 2 +- .../org/apache/sis/storage/esri/WritableStore.java | 2 +- .../apache/sis/storage/image/WorldFileStore.java | 2 +- .../org/apache/sis/storage/tiling/TileMatrix.java | 2 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1, but continue to throw the deprecated `MismatchedDimensionException` internally. This is for compatibility with `catch` clause of user code. The
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 ecb7e5eb33ce477bc2f2f4aa24d2231425b26701
Merge: 9c83ff49c1 9e0e1fb26b
Author: Martin Desruisseaux
AuthorDate: Thu May 16 17:37:51 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, but continue to throw the
deprecated `MismatchedDimensionException` internally.
This is for compatibility with `catch` clause of user code. The deprecated
exception may be removed in GeoAPI 4.
.../coverage/MismatchedCoverageRangeException.java | 2 +-
.../sis/coverage/grid/BufferedGridCoverage.java| 2 +-
.../sis/coverage/grid/DimensionalityReduction.java | 2 +-
.../coverage/grid/FractionalGridCoordinates.java | 4 +--
.../org/apache/sis/coverage/grid/GridCoverage.java | 2 +-
.../apache/sis/coverage/grid/GridCoverage2D.java | 4 +--
.../org/apache/sis/coverage/grid/GridExtent.java | 4 +--
.../org/apache/sis/coverage/grid/GridGeometry.java | 4 +--
.../sis/coverage/privy/CommonDomainFinder.java | 2 +-
.../sis/filter/internal/GeometryConverter.java | 2 +-
.../sis/coverage/grid/GridCoverage2DTest.java | 2 +-
.../apache/sis/geometry/wrapper/jts/JTSTest.java | 2 +-
.../metadata/iso/extent/DefaultVerticalExtent.java | 8 ++---
.../apache/sis/metadata/iso/extent/Extents.java| 4 +--
.../sis/pending/temporal/TemporalUtilities.java| 35 +++---
.../org/apache/sis/xml/bind/gml/TM_Primitive.java | 5 ++--
.../main/org/apache/sis/portrayal/Canvas.java | 8 ++---
.../sis/geometry/AbstractDirectPosition.java | 12
.../org/apache/sis/geometry/AbstractEnvelope.java | 10 +++
.../org/apache/sis/geometry/ArrayEnvelope.java | 10 +++
.../org/apache/sis/geometry/DirectPosition1D.java | 2 +-
.../org/apache/sis/geometry/DirectPosition2D.java | 2 +-
.../main/org/apache/sis/geometry/Envelope2D.java | 8 ++---
.../apache/sis/geometry/GeneralDirectPosition.java | 2 +-
.../org/apache/sis/geometry/GeneralEnvelope.java | 10 +++
.../org/apache/sis/geometry/ImmutableEnvelope.java | 8 ++---
.../sis/referencing/crs/AbstractDerivedCRS.java| 2 +-
.../sis/referencing/crs/DefaultDerivedCRS.java | 2 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 2 +-
.../sis/referencing/datum/DefaultEllipsoid.java| 17 +--
.../referencing/internal/PositionTransformer.java | 2 +-
.../apache/sis/referencing/internal/RTreeNode.java | 4 +--
.../operation/InverseOperationMethod.java | 2 +-
.../operation/MismatchedDatumException.java| 4 +--
.../operation/TransformedCoordinateSet.java| 2 +-
.../operation/builder/LinearTransformBuilder.java | 14 +
.../operation/builder/LocalizationGridBuilder.java | 7 +++--
.../sis/referencing/operation/matrix/Matrices.java | 4 +--
.../matrix/MismatchedMatrixSizeException.java | 4 +--
.../operation/transform/AbstractMathTransform.java | 5 ++--
.../transform/AbstractMathTransform1D.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 16 ++
.../operation/transform/MathTransforms.java| 2 +-
.../operation/transform/PassThroughTransform.java | 7 +++--
.../wkt/{WKTParserTest.java => CRSParserTest.java} | 6 ++--
.../operation/provider/ProviderMock.java | 2 +-
.../operation/provider/SeismicBinGridMock.java | 2 +-
.../transform/MathTransformFactoryBase.java| 6
.../transform/MathTransformFactoryMock.java| 13
.../operation/transform/MathTransformWrapper.java | 2 +-
.../transform/TransformResultComparator.java | 2 +-
.../main/org/apache/sis/math/Line.java | 7 +++--
.../main/org/apache/sis/math/Plane.java| 7 +++--
.../main/org/apache/sis/util/ArgumentChecks.java | 21 ++---
geoapi/snapshot| 2 +-
.../sis/map/service/se1/PresentationToScene2D.java | 2 +-
.../main/org/apache/sis/gui/map/MapCanvas.java | 2 +-
.../main/org/apache/sis/gui/map/StatusBar.java | 2 +-
58 files changed, 199 insertions(+), 131 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
index a7e59a1e39,c1a3fd6284..0058248a1b
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
@@@ -248,7 -248,7 +248,7 @@@ public class FractionalGridCoordinates
if (bounds != null) {
final int bd = bounds.getDimension();
if (bd != dimension) {
--throw new MismatchedDimensionException(Errors.format(
++throw new
org.opengis.geometry.MismatchedDimensionException(Errors.format(
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1, except for `IdentifiedObject.getRemarks()` which is kept unchanged for compatibility with GeoAPI 3.0.
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 01b0b23c5baa0a2099531485ce1883ea6d20fd01
Merge: 75f06b5712 805379d32e
Author: Martin Desruisseaux
AuthorDate: Sat May 11 17:16:53 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, except for
`IdentifiedObject.getRemarks()` which is kept unchanged for compatibility with
GeoAPI 3.0.
.../apache/sis/feature/AbstractIdentifiedType.java | 13 +++
.../org/apache/sis/feature/AbstractOperation.java | 4 +--
.../main/org/apache/sis/feature/FeatureFormat.java | 7 ++--
.../apache/sis/feature/builder/TypeBuilder.java| 4 +--
.../sis/feature/DefaultAttributeTypeTest.java | 5 ++-
.../builder/AssociationRoleBuilderTest.java| 4 +--
.../feature/builder/AttributeTypeBuilderTest.java | 12 +++
.../builder/CharacteristicTypeBuilderTest.java | 4 +--
.../feature/builder/FeatureTypeBuilderTest.java| 4 +--
.../org/apache/sis/metadata/PropertyAccessor.java | 5 +--
.../org/apache/sis/metadata/TypeValuePolicy.java | 15
.../metadata/simple/SimpleIdentifiedObject.java| 7 ++--
.../org/apache/sis/metadata/sql/Dispatcher.java| 2 +-
.../apache/sis/metadata/sql/MetadataSource.java| 2 +-
.../bind/metadata/replace/QualityParameter.java| 13 +++
.../bind/metadata/replace/ServiceParameter.java| 9 ++---
.../metadata/replace/QualityParameterTest.java | 4 +--
.../metadata/replace/ServiceParameterTest.java | 4 +--
.../org/apache/sis/xml/test/PackageVerifier.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 33 --
.../org/apache/sis/referencing/Properties.java | 2 +-
.../operation/AbstractCoordinateOperation.java | 23 +++--
.../operation/LooselyDefinedMethod.java| 4 +--
.../operation/TransformedCoordinateSet.java| 2 ++
.../apache/sis/parameter/ParameterBuilderTest.java | 15
.../org/apache/sis/parameter/ParametersTest.java | 35 ++-
.../referencing/AbstractIdentifiedObjectTest.java | 19 +-
.../referencing/AbstractReferenceSystemTest.java | 5 +--
.../org/apache/sis/referencing/Assertions.java | 15
.../sis/referencing/cs/DefaultCartesianCSTest.java | 3 +-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 3 +-
.../referencing/datum/DefaultEllipsoidTest.java| 5 +--
.../datum/DefaultGeodeticDatumTest.java| 21 +---
.../datum/DefaultPrimeMeridianTest.java| 3 +-
.../datum/DefaultTemporalDatumTest.java| 3 +-
.../datum/DefaultVerticalDatumTest.java| 7 ++--
.../operation/SingleOperationMarshallingTest.java | 4 +--
.../operation/provider/ProvidersTest.java | 6 ++--
.../CC_GeneralOperationParameterTest.java | 40 ++
.../CC_OperationParameterGroupTest.java| 4 +--
.../test/org/apache/sis/storage/gpx/TypesTest.java | 2 +-
.../apache/sis/storage/folder/StoreProvider.java | 2 +-
.../main/org/apache/sis/util/Classes.java | 30
.../main/org/apache/sis/util/Deprecable.java | 6 ++--
geoapi/snapshot| 2 +-
.../org/apache/sis/gui/dataset/FeatureTable.java | 2 +-
46 files changed, 229 insertions(+), 187 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index a34a79c73f,679b1ed56e..8b4b5d266b
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@@ -594,12 -592,11 +595,11 @@@ public class AbstractIdentifiedObject e
* If this object {@linkplain #isDeprecated() is deprecated}, then the
remarks should give
* indication about the replacement (e.g. superceded by …).
*
- * @return the remarks.
+ * @return the remarks, or {@code null} if none.
*/
@Override
- @XmlElement(name = "remarks")
-public Optional getRemarks() {
-return Optional.ofNullable(remarks);
+public InternationalString getRemarks() {
+return remarks;
}
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/LooselyDefinedMethod.java
index e60f56ebad,ce9430289b..b8a11e9b86
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/LooselyDefinedMethod.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/LooselyDefinedMethod.java
@@@ -65,13 -65,13 +65,13 @@@ final class LooselyDefinedMethod
static final DefaultOperationMethod AFFINE_GEOCENTRIC;
static {
- final HashMap properties = new HashMap<>(4);
+ final
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 75f06b571229e1f41f392b134830b0dc8c303f23 Merge: adb5e5fd85 eef29ecb6c Author: Martin Desruisseaux AuthorDate: Fri May 10 18:38:47 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/metadata/iso/DefaultIdentifier.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 19 ++- .../metadata/iso/lineage/DefaultProcessStep.java | 10 +- .../sis/xml/test/AnnotationConsistencyCheck.java | 6 .../gazetteer/MilitaryGridReferenceSystem.java | 2 +- .../apache/sis/io/wkt/GeodeticObjectParser.java| 4 +-- .../sis/referencing/AbstractIdentifiedObject.java | 4 +-- .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/CommonCRS.java | 14 .../sis/referencing/StandardDefinitions.java | 6 ++-- .../sis/referencing/crs/DefaultGeocentricCRS.java | 4 +-- .../sis/referencing/crs/DefaultGeodeticCRS.java| 2 +- .../sis/referencing/crs/DefaultGeographicCRS.java | 4 +-- .../sis/referencing/cs/CoordinateSystems.java | 2 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 6 ++-- .../sis/referencing/datum/AbstractDatum.java | 2 +- .../sis/referencing/datum/BursaWolfParameters.java | 2 +- .../sis/referencing/datum/DatumShiftGrid.java | 4 +-- .../referencing/datum/DefaultGeodeticDatum.java| 20 +++- .../factory/GeodeticAuthorityFactory.java | 4 +-- .../referencing/factory/GeodeticObjectFactory.java | 14 .../factory/MultiAuthoritiesFactory.java | 2 +- .../referencing/factory/sql/EPSGDataAccess.java| 4 +-- .../operation/AbstractSingleOperation.java | 4 +-- .../referencing/operation/DefaultConversion.java | 6 ++-- .../operation/MathTransformContext.java| 6 ++-- .../transform/DefaultMathTransformFactory.java | 4 +-- .../org/apache/sis/referencing/package-info.java | 2 +- .../referencing/privy/GeodeticObjectBuilder.java | 4 +-- .../referencing/privy/ReferencingUtilities.java| 2 +- .../apache/sis/referencing/privy/WKTUtilities.java | 2 +- .../sis/io/wkt/GeodeticObjectParserTest.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +-- .../datum/DefaultGeodeticDatumTest.java| 2 +- .../factory/GeodeticObjectFactoryTest.java | 2 +- .../factory/MultiAuthoritiesFactoryTest.java | 2 +- .../referencing/factory/sql/EPSGFactoryTest.java | 8 ++--- .../operation/DefaultConversionTest.java | 4 +-- .../sis/storage/geotiff/reader/CRSBuilder.java | 8 ++--- .../apache/sis/storage/netcdf/base/Decoder.java| 2 +- .../sis/storage/netcdf/base/GridMapping.java | 2 +- .../org/apache/sis/measure/AbstractConverter.java | 31 ++ .../main/org/apache/sis/measure/AbstractUnit.java | 5 +-- .../org/apache/sis/measure/ConventionalUnit.java | 38 +++--- .../main/org/apache/sis/measure/Longitude.java | 2 +- .../main/org/apache/sis/measure/PowerOf10.java | 2 +- .../main/org/apache/sis/measure/SystemUnit.java| 7 +++- .../main/org/apache/sis/measure/UnitFormat.java| 6 ++-- .../main/org/apache/sis/measure/Units.java | 22 + .../main/org/apache/sis/util/resources/Errors.java | 7 +--- .../apache/sis/util/resources/Errors.properties| 1 - .../apache/sis/util/resources/Errors_fr.properties | 1 - .../apache/sis/measure/ConventionalUnitTest.java | 17 ++ geoapi/snapshot| 2 +- 54 files changed, 212 insertions(+), 134 deletions(-) diff --cc geoapi/snapshot index cfb43fa592,1685784018..6eb8f736dc --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit cfb43fa59293e86ad5e107674013f095fcde -Subproject commit 1685784018d4e32484a2eedb6e63a41751335101 ++Subproject commit 6eb8f736dc3ea0c927f580d4863cbc19540641aa
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: removal of some `org.opengis.temporal` interfaces.
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 ea550df01ab4c54f6d7a8068165003bb8edb8ad5
Merge: b0a78e75af 362154b28d
Author: Martin Desruisseaux
AuthorDate: Thu May 9 12:59:09 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: removal of some
`org.opengis.temporal` interfaces.
.../main/org/apache/sis/filter/TemporalFilter.java | 94 ++
.../test/org/apache/sis/filter/PeriodLiteral.java | 27 +--
.../org.apache.sis.metadata/main/module-info.java | 1 -
.../DefaultDigitalTransferOptions.java | 17 +-
.../metadata/iso/distribution/package-info.java| 2 +-
.../sis/metadata/iso/extent/DefaultExtent.java | 2 -
.../metadata/iso/extent/DefaultTemporalExtent.java | 31 ++--
.../apache/sis/metadata/iso/extent/Extents.java| 4 -
.../iso/identification/AbstractIdentification.java | 25 +--
.../metadata/iso/identification/package-info.java | 2 +-
.../metadata/iso/lineage/DefaultProcessStep.java | 5 +-
.../maintenance/DefaultMaintenanceInformation.java | 14 +-
.../sis/metadata/iso/maintenance/package-info.java | 6 +-
.../sis/metadata/privy/TemporalUtilities.java | 144 ---
.../apache/sis/metadata/simple/SimpleDuration.java | 76
.../apache/sis/pending/temporal/DefaultPeriod.java | 9 +-
.../org/apache/sis/pending/temporal/Primitive.java | 17 +-
.../sis/pending/temporal/TemporalUtilities.java| 103 +++
.../apache/sis/pending/temporal/package-info.java | 6 +-
.../org/apache/sis/xml/bind/gml/TM_Primitive.java | 9 +-
.../org/apache/sis/xml/bind/gml/TimeInstant.java | 21 +--
.../apache/sis/xml/bind/gml/TimePeriodBound.java | 2 +-
.../org/apache/sis/xml/bind/gts/TM_Duration.java | 127 ++---
.../apache/sis/xml/bind/gts/TM_PeriodDuration.java | 203 -
.../apache/sis/metadata/PropertyAccessorTest.java | 4 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 26 +--
.../referencing/operation/projection/Robinson.java | 20 +-
.../sis/storage/geotiff/reader/XMLMetadata.java| 3 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 4 +-
.../apache/sis/storage/base/MetadataBuilder.java | 26 ++-
.../src/org.apache.sis.util/main/module-info.java | 3 -
.../sis/pending/temporal/DefaultInstant.java | 65 ---
.../pending/temporal/DefaultPeriodDuration.java| 87 -
.../pending/temporal/DefaultTemporalFactory.java | 155
geoapi/snapshot| 2 +-
35 files changed, 373 insertions(+), 969 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java
index 74f99cbe45,e9738893d7..2df1ede402
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java
@@@ -23,6 -23,6 +23,8 @@@ import java.io.Serializable
import org.apache.sis.test.TestUtilities;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
++import java.time.Instant;
++import java.time.temporal.TemporalAmount;
import org.opengis.feature.Feature;
import org.opengis.filter.Expression;
import org.opengis.filter.Literal;
@@@ -62,29 -62,14 +62,14 @@@ final class PeriodLiteral implements Pe
@Override public Period getValue() {return this;}
/** Returns a bound of this period. */
- @Override public org.opengis.temporal.Instant getBeginning() {return
instant(begin);}
- @Override public org.opengis.temporal.Instant getEnding(){return
instant(end);}
-
- /** Wraps the value that defines a period. */
- private static org.opengis.temporal.Instant instant(final long t) {
- return new org.opengis.temporal.Instant() {
- @Override public Date getDate() {return new Date(t);}
- @Override public String toString() {return "Instant[" +
TestUtilities.format(getDate()) + '[';}
-
- /** Not needed for the tests. */
- @Override public ReferenceIdentifier getName()
{throw new UnsupportedOperationException();}
- @Override public TemporalPosition getTemporalPosition()
{throw new UnsupportedOperationException();}
- @Override public RelativePosition
relativePosition(TemporalPrimitive o) {throw new
UnsupportedOperationException();}
- @Override public Duration
distance(TemporalGeometricPrimitive o) {throw new
UnsupportedOperationException();}
- @Override public Duration length()
{throw new UnsupportedOperationException();}
- };
- }
+ @Override public Instant getBeginning() {return
Instant.ofEpochMilli(begin);}
+ @Override public Instant getEnding(){return
Instant.ofEpochMilli(end);}
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 b0a78e75afe62279c8aa0b0650cb4ecceab46a33
Merge: 12371196a0 a65df89e7f
Author: Martin Desruisseaux
AuthorDate: Fri May 3 11:19:14 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
...g.opengis.referencing.operation.OperationMethod | 2 +
.../main/module-info.java | 2 +
.../operation/projection/AlbersEqualArea.java | 19 +-
.../operation/projection/CassiniSoldner.java | 16 +-
.../operation/projection/CylindricalEqualArea.java | 23 +-
.../projection/EquidistantCylindrical.java | 261
.../operation/projection/Initializer.java | 7 +-
.../projection/LambertConicConformal.java | 19 +-
.../referencing/operation/projection/Mercator.java | 19 +-
.../projection/ModifiedAzimuthalEquidistant.java | 19 +-
.../operation/projection/Mollweide.java| 11 -
.../operation/projection/NormalizedProjection.java | 79 ++
.../operation/projection/ObliqueStereographic.java | 27 ++-
.../operation/projection/PolarStereographic.java | 19 +-
.../operation/projection/Polyconic.java| 19 +-
.../operation/projection/ProjectionVariant.java| 19 +-
.../referencing/operation/projection/Robinson.java | 264 +
.../operation/projection/SatelliteTracking.java| 16 +-
.../operation/projection/Sinusoidal.java | 24 +-
.../operation/projection/TransverseMercator.java | 26 +-
.../operation/provider/AlbersEqualArea.java| 2 +-
.../provider/AzimuthalEquidistantSpherical.java| 2 +-
.../operation/provider/CassiniSoldner.java | 2 +-
.../sis/referencing/operation/provider/ESRI.java | 2 +-
.../operation/provider/EquidistantCylindrical.java | 81 +++
.../operation/provider/Equirectangular.java| 26 +-
.../provider/LambertAzimuthalEqualArea.java| 2 +-
.../operation/provider/LambertConformal1SP.java| 2 +-
.../operation/provider/LambertConformal2SP.java| 2 +-
.../provider/LambertConformalBelgium.java | 2 +-
.../provider/LambertCylindricalEqualArea.java | 2 +-
.../operation/provider/MapProjection.java | 2 +-
.../operation/provider/Mercator1SP.java| 2 +-
.../operation/provider/Mercator2SP.java| 2 +-
.../operation/provider/MillerCylindrical.java | 2 +-
.../provider/ModifiedAzimuthalEquidistant.java | 2 +-
.../referencing/operation/provider/Mollweide.java | 11 +-
.../operation/provider/ObliqueMercator.java| 2 +-
.../operation/provider/ObliqueMercatorCenter.java | 2 +-
.../operation/provider/ObliqueStereographic.java | 2 +-
.../operation/provider/Orthographic.java | 2 +-
.../operation/provider/PolarStereographicA.java| 19 ++
.../operation/provider/PolarStereographicB.java| 2 +-
.../provider/PolarStereographicSouth.java | 2 +-
.../referencing/operation/provider/Polyconic.java | 2 +-
.../provider/{Mollweide.java => Robinson.java} | 39 ++-
.../referencing/operation/provider/Sinusoidal.java | 13 +-
.../operation/provider/TransverseMercator.java | 2 +-
.../provider/TransverseMercatorSouth.java | 2 +-
.../referencing/operation/provider/Wraparound.java | 7 +-
.../operation/transform/ContextualParameters.java | 17 +-
.../operation/transform/MathTransformProvider.java | 8 +-
.../apache/sis/referencing/ClenshawSummation.java | 214 +++--
.../operation/projection/CassiniSoldnerTest.java | 6 +-
.../projection/EquidistantCylindricalTest.java | 90 +++
.../projection/LambertAzimuthalEqualAreaTest.java | 2 +-
.../projection/MapProjectionTestCase.java | 26 ++
.../operation/projection/ObliqueMercatorTest.java | 3 +-
.../projection/ObliqueStereographicTest.java | 4 +-
.../projection/PolarStereographicTest.java | 2 +-
.../operation/projection/RobinsonTest.java | 118 +
.../operation/provider/ProvidersTest.java | 2 +
.../apache/sis/storage/landsat/MetadataReader.java | 2 +-
.../apache/sis/storage/geotiff/base/GeoKeys.java | 2 +-
.../apache/sis/storage/geotiff/package-info.java | 2 +-
.../geotiff/reader/ImageMetadataBuilder.java | 2 +-
.../sis/storage/geotiff/writer/GeoEncoder.java | 4 +-
.../apache/sis/storage/base/MetadataBuilder.java | 83 ++-
.../main/org/apache/sis/storage/tiling/Tile.java | 21 +-
.../org/apache/sis/storage/tiling/TileMatrix.java | 71 +-
.../apache/sis/storage/tiling/TileMatrixSet.java | 52 +++-
.../main/org/apache/sis/storage/wkt/Store.java | 4 +-
.../main/org/apache/sis/math/Fraction.java | 42 ++--
.../main/org/apache/sis/pending/jdk/JDK15.java | 48
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: automatic reorganization of imports.
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 12371196a02296c3fb2bac05e17fc9f63efbf92b
Merge: ff6542a3f7 aacdba9e62
Author: Martin Desruisseaux
AuthorDate: Mon Apr 22 16:14:58 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1:
automatic reorganization of imports.
.../org/apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++-
.../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +-
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +-
.../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++---
.../main/org/apache/sis/referencing/CRS.java | 6 --
.../main/org/apache/sis/referencing/CommonCRS.java| 4 +++-
.../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++-
.../org/apache/sis/referencing/EllipsoidalHeightSeparator.java| 4 +++-
.../main/org/apache/sis/referencing/StandardDefinitions.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 --
.../org/apache/sis/referencing/datum/DefaultPrimeMeridian.java| 4 +++-
.../org/apache/sis/referencing/datum/DefaultVerticalDatum.java| 6 --
.../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++-
.../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java| 4 +++-
.../main/org/apache/sis/referencing/factory/sql/TableInfo.java| 2 +-
.../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 ++--
.../org/apache/sis/referencing/internal/VerticalDatumTypes.java | 8 ++--
.../sis/referencing/operation/AbstractCoordinateOperation.java| 6 --
.../sis/referencing/operation/CoordinateOperationRegistry.java| 4 +++-
.../org/apache/sis/referencing/operation/DefaultConversion.java | 4 ++--
.../referencing/operation/DefaultCoordinateOperationFactory.java | 6 --
.../apache/sis/referencing/operation/DefaultOperationMethod.java | 6 --
.../org/apache/sis/referencing/privy/CoordinateOperations.java| 4 +++-
.../main/org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++-
.../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +-
.../test/org/apache/sis/referencing/CommonCRSTest.java| 2 +-
.../apache/sis/referencing/datum/DefaultVerticalDatumTest.java| 4 +++-
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +-
.../apache/sis/referencing/internal/VerticalDatumTypesTest.java | 8 ++--
.../apache/sis/referencing/operation/provider/ProvidersTest.java | 4 +++-
.../referencing/operation/transform/OperationMethodSetTest.java | 4 +++-
.../apache/sis/referencing/report/CoordinateOperationMethods.java | 2 +-
.../sis/test/integration/CoordinateReferenceSystemTest.java | 4 +++-
.../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++-
37 files changed, 107 insertions(+), 49 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index ed14df684c,208b00e466..0ef3b23ce2
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
@@@ -47,6 -46,6 +46,9 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.util.privy.Constants;
import org.apache.sis.metadata.iso.citation.Citations;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.DistanceOperatorName;
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 4ea1c59659,5063035c46..441c62d0fd
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -28,10 -28,6 +28,10 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.privy.Constants;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
+// Specific to the main and geoapi-3.1 branches:
- import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.opengis.metadata.extent.Extent;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated `AxisDirection.OTHER` and `VerticalDatumType`.
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 43241772b657472a14b8ff52fde9cc2e8f18fca9
Merge: 74a6061f9e adbe2180c3
Author: Martin Desruisseaux
AuthorDate: Fri Apr 19 19:18:45 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated
`AxisDirection.OTHER` and `VerticalDatumType`.
.../apache/sis/coverage/grid/GridExtentCRS.java| 6 +-
.../apache/sis/metadata/iso/extent/Extents.java| 66 +++---
.../sis/metadata/iso/extent/ExtentsTest.java | 9 +-
.../org/apache/sis/test/mock/VerticalCRSMock.java | 25 +--
.../apache/sis/io/wkt/GeodeticObjectParser.java| 29 ++-
.../main/org/apache/sis/referencing/CRS.java | 4 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 28 +--
.../org/apache/sis/referencing/cs/AbstractCS.java | 5 +-
.../main/org/apache/sis/referencing/cs/Codes.java | 24 ++-
.../org/apache/sis/referencing/cs/Normalizer.java | 4 +-
.../referencing/datum/DefaultVerticalDatum.java| 82 ++-
.../referencing/factory/GeodeticObjectFactory.java | 28 ++-
.../referencing/factory/sql/EPSGCodeFinder.java| 7 -
.../referencing/factory/sql/EPSGDataAccess.java| 14 +-
.../sis/referencing/factory/sql/TableInfo.java | 1 -
.../apache/sis/referencing/internal/Legacy.java| 7 +-
.../referencing/internal/VerticalDatumTypes.java | 240 ++---
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../sis/referencing/privy/AxisDirections.java | 8 +-
.../privy/EllipsoidalHeightCombiner.java | 2 +-
.../referencing/privy/ReferencingUtilities.java| 8 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 12 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 24 ++-
.../apache/sis/referencing/cs/HardCodedAxes.java | 4 +-
.../apache/sis/referencing/cs/NormalizerTest.java | 1 +
.../datum/DefaultVerticalDatumTest.java| 43 +---
.../sis/referencing/datum/HardCodedDatum.java | 6 +-
.../referencing/datum/VerticalDatum (GML 3.1).xml | 2 +-
.../internal/VerticalDatumTypesTest.java | 25 +--
.../sis/referencing/privy/AxisDirectionsTest.java | 20 +-
.../sis/test/integration/MetadataVerticalTest.java | 2 -
.../org/apache/sis/storage/netcdf/base/Axis.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +-
geoapi/snapshot| 2 +-
34 files changed, 328 insertions(+), 416 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index e189a2e320,4b9315783c..2ad61c5b4f
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
@@@ -23,13 -23,8 +23,12 @@@ import org.opengis.referencing.cs.Coord
import org.opengis.referencing.cs.RangeMeaning;
import org.opengis.referencing.cs.VerticalCS;
import org.opengis.referencing.datum.VerticalDatum;
- import org.opengis.referencing.datum.VerticalDatumType;
import org.apache.sis.measure.Units;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.extent.Extent;
+import org.opengis.util.InternationalString;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Optional;
import org.opengis.referencing.datum.RealizationMethod;
@@@ -135,10 -119,7 +123,9 @@@ public final class VerticalCRSMock exte
}
@Override public String getAbbreviation()
{return up ? "h" : "d";}
+@Override public InternationalString getScope()
{return null;}
+@Override public Extent getDomainOfValidity()
{return null;}
@Override public Optional getRealizationMethod()
{return Optional.ofNullable(method);}
- @Override public VerticalDatumType getVerticalDatumType()
{return type;}
@Override public VerticalDatum getDatum()
{return this;}
@Override public VerticalCS getCoordinateSystem()
{return this;}
@Override public int getDimension()
{return 1;}
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
index 1bd437faf7,f69e8f1555..1625e20723
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
@@@ -197,6 -197,6 +197,7 @@@ public class AbstractCS extends Abstrac
* @param properties properties given at construction time, or {@code
null} if none.
* @throws IllegalArgumentException if an axis has an illegal direction
or an illegal unit of measurement.
*/
++
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: quasi-removal of non-standard `Projection` interface.
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 74a6061f9ea89eddb33461af10c672c4dfe920fd
Merge: 883dfe7e9b 7a049f9417
Author: Martin Desruisseaux
AuthorDate: Thu Apr 18 17:27:13 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: quasi-removal of non-standard
`Projection` interface.
.../main/org/apache/sis/xml/XLink.java | 1 +
.../sis/referencing/crs/AbstractDerivedCRS.java| 10 +--
.../referencing/factory/sql/AuthorityCodes.java| 45 -
.../referencing/factory/sql/EPSGDataAccess.java| 32 +
.../sis/referencing/factory/sql/TableInfo.java | 4 +-
.../operation/AbstractCoordinateOperation.java | 4 +-
.../referencing/operation/DefaultConversion.java | 71 +---
.../DefaultCoordinateOperationFactory.java | 6 +-
.../operation/DefaultOperationMethod.java | 20 +++---
.../operation/DefaultPassThroughOperation.java | 3 +-
.../referencing/operation/DefaultProjection.java | 36 +--
.../apache/sis/referencing/operation/SubTypes.java | 75 --
.../operation/provider/AbstractProvider.java | 6 +-
.../operation/provider/Equirectangular.java| 4 +-
.../operation/provider/MapProjection.java | 4 +-
.../operation/provider/PseudoPlateCarree.java | 3 -
.../provider/ZonedTransverseMercator.java | 4 +-
.../transform/DefaultMathTransformFactory.java | 12 ++--
.../referencing/factory/sql/EPSGFactoryTest.java | 11 +---
.../operation/CoordinateOperationFinderTest.java | 3 +-
.../operation/DefaultConversionTest.java | 21 +++---
.../operation/provider/ProvidersTest.java | 3 +-
.../transform/DefaultMathTransformFactoryTest.java | 19 +++---
.../report/CoordinateOperationMethods.java | 4 +-
geoapi/snapshot| 2 +-
25 files changed, 108 insertions(+), 295 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
index ebbd881eee,7b2f7e7655..29391a9043
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
@@@ -168,7 -165,7 +168,7 @@@ abstract class AbstractDerivedCRSWARNING: this method is invoked (indirectly) at construction
time.
+ * Consequently, it shall return a constant value - this method is not
allowed to
+ * depend on the object state.
+ */
+abstract Class getConversionType();
+
- /**
- * Returns the GeoAPI interface implemented by this class.
- */
- @Override
- public abstract Class getInterface();
-
+/**
+ * Returns the datum of the {@linkplain #getBaseCRS() base CRS}.
*
* @return the datum of the base CRS.
*/
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
index 4aadfc1fa5,90cf08b7bd..44cb55e6e2
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
@@@ -41,6 -40,6 +41,10 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeographicCRS;
++import org.opengis.referencing.crs.ProjectedCRS;
++
/**
* A parameterized mathematical operation that converts coordinates to
another CRS without any change of
@@@ -219,14 -217,11 +222,12 @@@ public class DefaultConversion extends
* @param source the new source CRS.
* @param target the new target CRS.
* @param factory the factory to use for creating a transform from
the parameters or for performing axis changes.
- * @param actual an array of length 1 where to store the actual
operation method used by the math transform factory.
*/
-private DefaultConversion(final Conversion definition,
- final CoordinateReferenceSystem source,
- final CoordinateReferenceSystem target,
- final MathTransformFactory factory) throws
FactoryException
+@SuppressWarnings("deprecation")
+DefaultConversion(final Conversion definition,
+ final CoordinateReferenceSystem source,
+ final CoordinateReferenceSystem target,
- final MathTransformFactory factory,
- final OperationMethod[] actual) throws FactoryException
++ final MathTransformFactory factory)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: removal of non-standard PlanarProjection, ConicProjection and CylindricalProjection interfaces.
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 883dfe7e9b481d6163c3f483e4b4a8c5eea61c78
Merge: 20ded9bfa1 1182c4c724
Author: Martin Desruisseaux
AuthorDate: Thu Apr 18 11:38:35 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: removal of non-standard
PlanarProjection, ConicProjection and CylindricalProjection interfaces.
https://issues.apache.org/jira/browse/SIS-597
.../org/apache/sis/buildtools/book/OGC.lst | 1 -
.../org/apache/sis/portrayal/CanvasContext.java| 4 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 4 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 19 ++--
.../referencing/factory/sql/EPSGDataAccess.java| 2 +-
.../operation/AbstractCoordinateOperation.java | 3 -
.../operation/DefaultConicProjection.java | 108 -
.../referencing/operation/DefaultConversion.java | 41
.../DefaultCoordinateOperationFactory.java | 15 +--
.../operation/DefaultCylindricalProjection.java| 108 -
.../operation/DefaultOperationMethod.java | 5 +-
.../operation/DefaultPlanarProjection.java | 108 -
.../referencing/operation/DefaultProjection.java | 13 ++-
.../apache/sis/referencing/operation/SubTypes.java | 40 +---
.../operation/provider/AbstractLambert.java| 3 +-
.../operation/provider/AbstractMercator.java | 3 +-
.../operation/provider/AbstractStereographic.java | 3 +-
.../operation/provider/AlbersEqualArea.java| 3 +-
.../provider/AzimuthalEquidistantSpherical.java| 3 +-
.../operation/provider/CassiniSoldner.java | 3 +-
.../operation/provider/Equirectangular.java| 4 +-
.../provider/LambertAzimuthalEqualArea.java| 3 +-
.../provider/LambertCylindricalEqualArea.java | 3 +-
.../LambertCylindricalEqualAreaSpherical.java | 3 +-
.../operation/provider/MapProjection.java | 9 +-
.../provider/ModifiedAzimuthalEquidistant.java | 3 +-
.../referencing/operation/provider/Mollweide.java | 3 +-
.../operation/provider/Orthographic.java | 3 +-
.../referencing/operation/provider/Polyconic.java | 3 +-
.../operation/provider/SatelliteTracking.java | 3 +-
.../referencing/operation/provider/Sinusoidal.java | 3 +-
.../org/apache/sis/geometry/TransformTestCase.java | 15 +--
.../sis/io/wkt/GeodeticObjectParserTest.java | 4 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 4 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 3 +-
.../transform/OperationMethodSetTest.java | 52 +-
.../report/CoordinateOperationMethods.java | 19 ++--
.../report/CoordinateReferenceSystems.java | 2 +-
.../integration/CoordinateReferenceSystemTest.java | 6 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 4 +-
geoapi/snapshot| 2 +-
41 files changed, 117 insertions(+), 523 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
index 1202bad9c7,0a69f68c58..d2bfb89b47
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
@@@ -23,7 -23,7 +23,8 @@@ import jakarta.xml.bind.annotation.XmlR
import javax.measure.Unit;
import javax.measure.quantity.Angle;
import org.opengis.referencing.crs.ProjectedCRS;
+import org.opengis.referencing.crs.GeographicCRS;
+ import org.opengis.referencing.crs.GeodeticCRS;
import org.opengis.referencing.cs.CartesianCS;
import org.opengis.referencing.cs.CoordinateSystem; // For
javadoc
import org.opengis.referencing.datum.GeodeticDatum;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
index b4f4c42b55,bbf45d2eef..1903225188
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
@@@ -593,17 -592,7 +592,7 @@@ next: for (int i=components.size(); -
throw new IllegalArgumentException(Errors.format(
Errors.Keys.ForbiddenAttribute_2, "interpolationCRS",
baseType));
}
- final GeographicCRS baseCRS = (GeographicCRS) sourceCRS;
- final ProjectedCRS crs = (ProjectedCRS) targetCRS;
- if (CylindricalProjection.class.isAssignableFrom(baseType)) {
- op = new DefaultCylindricalProjection(properties, baseCRS,
crs, method,
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1, but keep checking for `GeneralDerivedCRS` in `instanceof` checks.
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 20ded9bfa17d1c1217c96f5bb3a897bbc25d535b
Merge: d9303f1d7d 6c50bd371c
Author: Martin Desruisseaux
AuthorDate: Tue Apr 16 15:36:18 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, but keep checking for
`GeneralDerivedCRS` in `instanceof` checks.
.../org/apache/sis/buildtools/book/GEOAPI.lst | 1 -
.../geometry/wrapper/SpatialOperationContext.java | 2 ++
.../apache/sis/io/wkt/GeodeticObjectParser.java| 2 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 2 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++--
.../main/org/apache/sis/referencing/CRS.java | 7 +++---
.../sis/referencing/crs/AbstractDerivedCRS.java| 1 +
.../sis/referencing/crs/DefaultDerivedCRS.java | 5 ++---
.../referencing/datum/DefaultPrimeMeridian.java| 1 +
.../referencing/factory/AuthorityFactoryProxy.java | 1 +
.../factory/MultiAuthoritiesFactory.java | 4 +++-
.../referencing/factory/sql/AuthorityCodes.java| 10 +
.../factory/sql/CoordinateOperationSet.java| 1 +
.../referencing/factory/sql/EPSGCodeFinder.java| 2 +-
.../sis/referencing/factory/sql/TableInfo.java | 25 +-
.../operation/AbstractCoordinateOperation.java | 11 +-
.../operation/CoordinateOperationFinder.java | 21 +++---
.../operation/DefaultOperationMethod.java | 1 +
.../referencing/operation/SubOperationInfo.java| 1 +
.../operation/transform/ConcatenatedTransform.java | 2 +-
.../referencing/privy/CoordinateOperations.java| 1 +
.../sis/referencing/privy/DefinitionVerifier.java | 1 +
.../report/CoordinateOperationMethods.java | 6 +++---
.../report/CoordinateReferenceSystems.java | 5 ++---
.../integration/CoordinateReferenceSystemTest.java | 5 ++---
geoapi/snapshot| 2 +-
.../src/org.apache.sis.gui/bundle/conf/imports.jsh | 1 -
27 files changed, 82 insertions(+), 43 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index 871ce7619b,c372eff258..ed14df684c
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
@@@ -304,6 -304,6 +304,7 @@@ select: if (commonCRS == null)
* @throws TransformException if a coordinate conversion was required but
failed.
* @throws IncommensurableException if a coordinate system does not use
the expected units.
*/
++@SuppressWarnings("deprecation")
private static CoordinateReferenceSystem usingSystemUnit(final
GeometryWrapper geometry,
final
CoordinateReferenceSystem geometryCRS,
CoordinateReferenceSystem targetCRS,
@@@ -372,6 -372,6 +373,7 @@@
* @throws TransformException if a coordinate conversion was required
but failed.
* @throws IncommensurableException if a coordinate system does not
use the expected units.
*/
++@SuppressWarnings("deprecation")
ProjectedCRS create(final GeographicCRS baseCRS, DirectPosition
centroid, CoordinateReferenceSystem geometryCRS)
throws FactoryException, TransformException,
IncommensurableException
{
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 5ce1cc255d,4fb5f64603..d6ab6fa8cf
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -1714,8 -1708,8 +1714,8 @@@ class GeodeticObjectParser extends Math
* @param parent the parent element.
* @param dimension the minimal number of dimensions (usually 2).
* @param csType the default coordinate system type, or {@code null}
if unknown.
- *Should be non-null only when parsing a {@link
GeneralDerivedCRS#getBaseCRS()} component.
+ *Should be non-null only when parsing a {@link
DerivedCRS#getBaseCRS()} component.
- * @return the {@code "GeodeticCRS"} element as a {@link GeographicCRS}
or {@link GeodeticCRS} object.
+ * @return the {@code "GeodeticCRS"} element as a {@link GeographicCRS}
or {@link GeocentricCRS} object.
* @throws ParseException if the {@code "GeodeticCRS"} element cannot be
parsed.
*
* @see
org.apache.sis.referencing.crs.DefaultGeographicCRS#formatTo(Formatter)
diff --cc
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1, but keep implementing the `GeocentricCRS` interface even if deprecated. However with this commit, the code now avoids to depend on that interfac
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 798a145e1e56c102494c63cadba1f286fb1a9bad
Merge: f0d4a254e4 247d4bb78e
Author: Martin Desruisseaux
AuthorDate: Mon Apr 15 19:01:28 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, but keep implementing the
`GeocentricCRS` interface even if deprecated.
However with this commit, the code now avoids to depend on that interface.
.../org/apache/sis/buildtools/book/GEOAPI.lst | 1 -
.../apache/sis/io/wkt/GeodeticObjectParser.java| 7 +--
.../main/org/apache/sis/referencing/CommonCRS.java | 17 +++---
.../apache/sis/referencing/crs/AbstractCRS.java| 26 -
.../sis/referencing/crs/DefaultDerivedCRS.java | 51 ++
.../sis/referencing/crs/DefaultGeocentricCRS.java | 52 ++
.../sis/referencing/crs/DefaultGeodeticCRS.java| 15 +-
.../sis/referencing/crs/DefaultGeographicCRS.java | 32 +--
.../sis/referencing/crs/DefaultParametricCRS.java | 1 +
.../sis/referencing/crs/DefaultTemporalCRS.java| 1 +
.../sis/referencing/crs/DefaultVerticalCRS.java| 1 +
.../sis/referencing/crs/SC_GeographicCRS.java | 5 +-
.../org/apache/sis/referencing/crs/SubTypes.java | 32 ++-
.../referencing/factory/AuthorityFactoryProxy.java | 13 -
.../factory/ConcurrentAuthorityFactory.java| 24 +++--
.../factory/GeodeticAuthorityFactory.java | 18 ++-
.../referencing/factory/GeodeticObjectFactory.java | 62 +++---
.../factory/MultiAuthoritiesFactory.java | 17 --
.../referencing/factory/sql/EPSGDataAccess.java| 4 +-
.../referencing/internal/EPSGFactoryProxyCRS.java | 9 +++-
.../apache/sis/referencing/internal/Legacy.java| 14 +
.../operation/DefaultOperationMethod.java | 1 -
.../operation/provider/AbstractProvider.java | 2 +-
.../referencing/privy/ReferencingUtilities.java| 2 +-
.../apache/sis/referencing/privy/WKTKeywords.java | 5 +-
.../apache/sis/xml/bind/referencing/SC_CRS.java| 4 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 3 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 8 ++-
.../sis/referencing/EPSGFactoryFallbackTest.java | 14 +++--
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 24 -
.../referencing/factory/AuthorityFactoryMock.java | 5 +-
.../factory/MultiAuthoritiesFactoryTest.java | 3 --
.../referencing/factory/sql/EPSGFactoryTest.java | 3 +-
.../operation/CoordinateOperationFinderTest.java | 5 +-
.../sis/referencing/privy/WKTKeywordsTest.java | 5 +-
.../report/CoordinateReferenceSystems.java | 4 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 12 ++---
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 7 ++-
geoapi/snapshot| 2 +-
.../org/apache/sis/gui/referencing/CRSChooser.java | 4 +-
40 files changed, 324 insertions(+), 191 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
index 3a6a1f637a,38c5dff592..44dd64e661
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
@@@ -223,12 -246,10 +246,11 @@@ public class AbstractCRS extends Abstra
* If the given object is {@code null}, then this method returns
{@code null}.
* Otherwise if the given object is an instance of
* {@link org.opengis.referencing.crs.GeodeticCRS} (including the
- * {@link org.opengis.referencing.crs.GeographicCRS} and
- * {@link org.opengis.referencing.crs.GeocentricCRS} subtypes),
+ * {@link org.opengis.referencing.crs.GeographicCRS subtype}),
* {@link org.opengis.referencing.crs.VerticalCRS},
* {@link org.opengis.referencing.crs.TemporalCRS},
- * {@link org.opengis.referencing.crs.EngineeringCRS} or
+ * {@link org.opengis.referencing.crs.EngineeringCRS},
+ * {@link org.opengis.referencing.crs.ImageCRS} or
* {@link org.apache.sis.referencing.cs.DefaultCompoundCS},
* then this method delegates to the {@code castOrCopy(…)} method
of the corresponding SIS subclass.
* Note that if the given object implements more than one of the
above-cited interfaces,
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
index 1cc86465d3,21aec9e2b5..6a01107efb
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
@@@ -368,7 -369,7 +369,7 @@@ public class
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 f0d4a254e4122b119e2939a5ac73b6dfca8052f3 Merge: 9696bd8bfe 184ea54db1 Author: Martin Desruisseaux AuthorDate: Sat Apr 13 11:08:30 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../apache/sis/io/wkt/GeodeticObjectParser.java| 13 +- .../sis/referencing/PropertiesConverter.java | 3 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 20 ++- .../referencing/factory/GeodeticObjectFactory.java | 22 +-- .../apache/sis/referencing/internal/Resources.java | 7 +- .../sis/referencing/internal/Resources.properties | 1 - .../referencing/internal/Resources_fr.properties | 1 - .../operation/CoordinateOperationFinder.java | 8 +- .../operation/CoordinateOperationRegistry.java | 2 +- .../operation/DefaultOperationMethod.java | 2 +- .../operation/projection/NormalizedProjection.java | 8 +- .../operation/provider/AbridgedMolodensky.java | 46 + .../operation/provider/AbstractMercator.java | 3 +- .../operation/provider/AbstractProvider.java | 199 - .../operation/provider/AbstractStereographic.java | 3 +- .../sis/referencing/operation/provider/Affine.java | 88 +++-- .../operation/provider/AxisOrderReversal.java | 84 ++--- .../operation/provider/AxisOrderReversal3D.java| 23 ++- .../provider/CoordinateFrameRotation2D.java| 34 ++-- .../provider/CoordinateFrameRotation3D.java| 41 +++-- .../operation/provider/Equirectangular.java| 17 +- .../provider/FranceGeocentricInterpolation.java| 91 ++ .../operation/provider/GeocentricAffine.java | 71 .../GeocentricAffineBetweenGeographic.java | 64 +++ .../operation/provider/GeocentricToGeographic.java | 64 ++- .../provider/GeocentricToTopocentric.java | 41 ++--- .../provider/GeocentricTranslation2D.java | 34 ++-- .../provider/GeocentricTranslation3D.java | 42 +++-- .../operation/provider/GeodeticOperation.java | 188 --- .../operation/provider/Geographic2Dto3D.java | 66 --- .../operation/provider/Geographic3Dto2D.java | 100 ++- .../provider/GeographicAndVerticalOffsets.java | 31 +--- .../operation/provider/GeographicOffsets.java | 94 +- .../operation/provider/GeographicOffsets2D.java| 44 +++-- .../operation/provider/GeographicRedimension.java | 95 -- .../operation/provider/GeographicToGeocentric.java | 113 +++- .../provider/GeographicToTopocentric.java | 33 +--- .../operation/provider/Interpolation1D.java| 36 +--- .../operation/provider/LongitudeRotation.java | 44 + .../operation/provider/MapProjection.java | 85 - .../operation/provider/MapProjection3D.java| 92 -- .../referencing/operation/provider/Molodensky.java | 77 ++-- .../sis/referencing/operation/provider/NADCON.java | 16 +- .../sis/referencing/operation/provider/NTv1.java | 14 +- .../sis/referencing/operation/provider/NTv2.java | 24 +-- .../operation/provider/NorthPoleRotation.java | 16 +- .../operation/provider/ObliqueMercator.java| 2 +- .../operation/provider/ObliqueStereographic.java | 3 +- .../operation/provider/PositionVector7Param2D.java | 34 ++-- .../operation/provider/PositionVector7Param3D.java | 41 +++-- .../operation/provider/PseudoPlateCarree.java | 15 +- .../operation/provider/SatelliteTracking.java | 3 +- .../referencing/operation/provider/Sinusoidal.java | 3 +- .../operation/provider/SouthPoleRotation.java | 16 +- .../operation/provider/VerticalOffset.java | 28 +-- .../referencing/operation/provider/Wraparound.java | 19 +- .../provider/ZonedTransverseMercator.java | 14 +- .../transform/DefaultMathTransformFactory.java | 106 +++ .../transform/EllipsoidToCentricTransform.java | 4 + .../operation/transform/MathTransformProvider.java | 172 +++--- .../operation/transform/MolodenskyTransform.java | 1 + .../referencing/crs/DefaultProjectedCRSTest.java | 53 +- .../operation/CoordinateOperationRegistryTest.java | 4 +- .../FranceGeocentricInterpolationTest.java | 8 - .../operation/provider/Geographic3Dto2DTest.java | 19 +- .../operation/provider/LongitudeRotationTest.java | 9 +- .../operation/provider/MolodenskyTest.java | 60 --- .../operation/provider/ProviderMock.java | 16 +- .../operation/provider/ProvidersTest.java | 119 geoapi/snapshot| 2 +- 70 files changed, 1131 insertions(+), 1820 deletions(-) diff --cc geoapi/snapshot index d7b6639c48,0c4eba464e..b03ead17de ---
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 9696bd8bfe4ee87cf7432196327aa9ead17ededa Merge: e111cc6c47 e5d010c2e1 Author: Martin Desruisseaux AuthorDate: Tue Apr 9 16:55:33 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../sis/buildtools/coding/ReorganizeImports.java | 11 +++- .../apache/sis/metadata/ModifiableMetadata.java| 11 ++-- .../apache/sis/metadata/iso/extent/Extents.java| 6 ++--- .../iso/quality/AbstractTemporalQuality.java | 1 - ...DefaultNonQuantitativeAttributeCorrectness.java | 1 - .../metadata/simple/SimpleIdentifiedObject.java| 6 +++-- .../org/apache/sis/xml/PooledUnmarshaller.java | 2 +- .../sis/util/iso/DefaultRecordSchemaTest.java | 2 +- .../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 + .../sis/referencing/EPSGFactoryFallback.java | 15 ++- .../referencing/privy/ReferencingUtilities.java| 1 + .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 3 ++- .../sis/util/DefaultInternationalString.java | 30 -- .../main/org/apache/sis/util/Locales.java | 17 ++-- .../test/org/apache/sis/test/LoggingWatcher.java | 8 -- .../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++--- 18 files changed, 68 insertions(+), 60 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`.
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 abe39d4ffccdf0e5209169c26bde265bf9e27377 Merge: 72bf4148b1 938f77504b Author: Martin Desruisseaux AuthorDate: Tue Apr 9 11:16:12 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. .../sis/buildtools/coding/ReorganizeImports.java | 1 + .../apache/sis/coverage/grid/GridExtentCRS.java| 9 ++-- .../sis/metadata/iso/extent/DefaultExtent.java | 3 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 ++ .../metadata/simple/SimpleIdentifiedObject.java| 1 + .../referencing/gazetteer/FinalLocationType.java | 9 ++-- .../gazetteer/ModifiableLocationType.java | 2 +- .../gazetteer/ReferencingByIdentifiers.java| 38 ++- .../gazetteer/ReferencingByIdentifiersTest.java| 5 +- .../main/org/apache/sis/io/wkt/ElementKind.java| 50 .../apache/sis/io/wkt/GeodeticObjectParser.java| 8 ++-- .../sis/referencing/AbstractIdentifiedObject.java | 13 +++--- .../main/org/apache/sis/referencing/Builder.java | 4 +- .../main/org/apache/sis/referencing/CRS.java | 26 --- .../apache/sis/referencing/IdentifiedObjects.java | 54 +- .../org/apache/sis/referencing/Properties.java | 7 +-- .../sis/referencing/StandardDefinitions.java | 2 +- .../apache/sis/referencing/crs/AbstractCRS.java| 5 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 4 +- .../sis/referencing/datum/BursaWolfParameters.java | 5 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../referencing/factory/sql/EPSGDataAccess.java| 7 +-- .../operation/AbstractCoordinateOperation.java | 5 +- .../operation/AbstractSingleOperation.java | 3 +- .../operation/CoordinateOperationFinder.java | 3 +- .../operation/CoordinateOperationSorter.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 3 +- .../referencing/operation/DefaultConversion.java | 4 +- .../DefaultCoordinateOperationFactory.java | 18 .../operation/DefaultPassThroughOperation.java | 3 +- .../operation/DefaultTransformation.java | 4 +- .../operation/InverseOperationMethod.java | 5 +- .../operation/transform/AbstractMathTransform.java | 2 +- .../operation/transform/DomainDefinition.java | 2 +- .../operation/transform/MathTransforms.java| 2 +- .../privy/EllipsoidalHeightCombiner.java | 11 +++-- .../referencing/privy/GeodeticObjectBuilder.java | 5 +- .../referencing/privy/NilReferencingObject.java| 21 ++--- .../referencing/AbstractReferenceSystemTest.java | 15 -- .../test/org/apache/sis/referencing/CRSTest.java | 5 +- .../sis/referencing/GeodeticObjectVerifier.java| 37 ++- .../referencing/crs/DefaultGeodeticCRSTest.java| 3 +- .../referencing/crs/DefaultProjectedCRSTest.java | 3 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +- .../datum/DefaultGeodeticDatumTest.java| 12 +++-- .../datum/DefaultTemporalDatumTest.java| 16 --- .../datum/DefaultVerticalDatumTest.java| 5 +- .../sis/referencing/datum/HardCodedDatum.java | 26 +-- .../operation/SingleOperationMarshallingTest.java | 12 +++-- .../apache/sis/test/integration/MetadataTest.java | 3 +- .../sis/test/integration/MetadataVerticalTest.java | 5 +- .../apache/sis/storage/base/MetadataBuilder.java | 5 +- .../main/org/apache/sis/util/ComparisonMode.java | 4 +- .../org/apache/sis/util/LenientComparable.java | 3 +- .../test/org/apache/sis/test/TestUtilities.java| 32 + geoapi/snapshot| 2 +- .../org/apache/sis/gui/referencing/CRSChooser.java | 24 ++ .../gui/referencing/RecentReferenceSystems.java| 2 +- .../main/org/apache/sis/gui/referencing/Utils.java | 24 ++ 59 files changed, 390 insertions(+), 207 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java index 1b9ca46297,b882cec7f4..798c00d7e8 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java @@@ -85,9 -84,13 +84,12 @@@ import org.apache.sis.util.privy.String import org.apache.sis.util.resources.Errors; import org.apache.sis.util.iso.Types; -// Specific to the geoapi-4.0 branch: -import org.apache.sis.referencing.crs.DefaultImageCRS; -import org.apache.sis.referencing.datum.DefaultImageDatum; +// Specific to the main and geoapi-3.1 branches: +import
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1, but without the removal of deprecated interfaces and methods.
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 f173cc01f50286ae1e9b854a39b2b5b1ad95f84f
Merge: b86dbe8b92 c39f9ef256
Author: Martin Desruisseaux
AuthorDate: Fri Apr 5 22:53:07 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, but without the removal of
deprecated interfaces and methods.
.../main/org/apache/sis/util/iso/Types.java | 4 ++--
.../apache/sis/openoffice/ReferencingFunctions.java | 1 +
.../main/org/apache/sis/io/wkt/Convention.java | 7 +--
.../org/apache/sis/io/wkt/GeodeticObjectParser.java | 8
.../main/org/apache/sis/referencing/CRS.java | 20 ++--
.../apache/sis/referencing/EPSGFactoryFallback.java | 1 +
.../sis/referencing/crs/DefaultEngineeringCRS.java | 4
.../sis/referencing/crs/DefaultGeocentricCRS.java| 2 +-
.../apache/sis/referencing/crs/DefaultImageCRS.java | 6 +++---
.../sis/referencing/cs/DefaultUserDefinedCS.java | 4 ++--
.../sis/referencing/datum/DefaultImageDatum.java | 6 +++---
.../referencing/factory/AuthorityFactoryProxy.java | 1 +
.../referencing/factory/CommonAuthorityFactory.java | 1 +
.../factory/ConcurrentAuthorityFactory.java | 3 ++-
.../factory/GeodeticAuthorityFactory.java| 4 ++--
.../referencing/factory/GeodeticObjectFactory.java | 12 ++--
.../referencing/factory/MultiAuthoritiesFactory.java | 3 ++-
.../sis/referencing/factory/sql/EPSGDataAccess.java | 1 +
.../sis/referencing/internal/EPSGFactoryProxy.java | 2 +-
.../referencing/internal/EPSGFactoryProxyCRS.java| 2 +-
.../apache/sis/referencing/internal/Resources.java | 5 +
.../sis/referencing/internal/Resources.properties| 1 +
.../sis/referencing/internal/Resources_fr.properties | 1 +
.../operation/AbstractCoordinateOperation.java | 2 +-
.../operation/TransformedCoordinateSet.java | 2 +-
.../sis/referencing/AuthorityFactoriesTest.java | 3 ++-
.../referencing/factory/AuthorityFactoryMock.java| 4
.../operation/provider/ProvidersTest.java| 1 -
geoapi/snapshot | 2 +-
29 files changed, 69 insertions(+), 44 deletions(-)
diff --cc
endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
index 2701a8bf28,2fbfc7b4d3..3883c2dee6
---
a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
+++
b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
@@@ -106,6 -110,6 +106,7 @@@ public class ReferencingFunctions exten
* @throws FactoryException if an error occurred while creating the
object.
* @throws DataStoreException if an error occurred while reading a data
file.
*/
++@SuppressWarnings("removal")
private IdentifiedObject getIdentifiedObject(final String codeOrPath,
CodeType type)
throws FactoryException, DataStoreException
{
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 840710fe4c,56001c098e..1b9ca46297
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -1563,11 -1564,10 +1563,11 @@@ class GeodeticObjectParser extends Math
*
* @param mode{@link #FIRST}, {@link #OPTIONAL} or {@link
#MANDATORY}.
* @param parent the parent element.
- * @return the {@code "ImageDatum"} element as an {@link ImageDatum}
object.
+ * @return the {@code "ImageDatum"} element.
* @throws ParseException if the {@code "ImageDatum"} element cannot be
parsed.
*/
-private DefaultImageDatum parseImageDatum(final int mode, final Element
parent) throws ParseException {
+@SuppressWarnings("deprecation")
+private ImageDatum parseImageDatum(final int mode, final Element parent)
throws ParseException {
final Element element = parent.pullElement(mode,
WKTKeywords.ImageDatum, WKTKeywords.IDatum);
if (element == null) {
return null;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
index 38a495452a,38a495452a..5970702890
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
@@@ -264,6 -264,6 +264,7 @@@ final class EPSGFactoryFallback extend
* Returns a coordinate reference system, datum or ellipsoid for the
given EPSG code.
*/
@Override
++@SuppressWarnings("removal")
public IdentifiedObject createObject(final String code) throws
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: First round of upgrade to ISO 19111:2019.
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 b86dbe8b92f1e17747cb2acf85534c629ec6454b Merge: 9ca908d78d 4ec3a9b103 Author: Martin Desruisseaux AuthorDate: Thu Apr 4 18:20:21 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1: First round of upgrade to ISO 19111:2019. https://issues.apache.org/jira/browse/SIS-592 .../org/apache/sis/metadata/PropertyAccessor.java | 7 +- .../apache/sis/metadata/PropertyComparator.java| 2 +- .../apache/sis/metadata/iso/extent/Extents.java| 1 + .../main/org/apache/sis/util/iso/Types.java| 10 +- .../apache/sis/metadata/PropertyAccessorTest.java | 6 +- .../apache/sis/test/mock/GeographicCRSMock.java} | 35 ++-- .../org/apache/sis/test/mock/VerticalCRSMock.java | 53 -- .../org/apache/sis/util/iso/TypeNamesTest.java | 2 +- .../test/org/apache/sis/util/iso/TypesTest.java| 13 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../main/module-info.java | 1 + .../sis/coordinate/AbstractCoordinateSet.java | 80 .../sis/coordinate/DefaultCoordinateMetadata.java | 208 + .../package-info.java} | 32 +--- .../apache/sis/geometry/WraparoundAdjustment.java | 2 +- .../main/org/apache/sis/io/wkt/Convention.java | 3 +- .../main/org/apache/sis/io/wkt/Formatter.java | 26 ++- .../apache/sis/io/wkt/GeodeticObjectParser.java| 16 +- .../main/org/apache/sis/io/wkt/VerticalInfo.java | 10 +- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 20 +- .../main/org/apache/sis/referencing/CRS.java | 75 ++-- .../main/org/apache/sis/referencing/CommonCRS.java | 4 +- .../org/apache/sis/referencing/DisplayName.java| 84 + .../sis/referencing/EPSGFactoryFallback.java | 1 + .../apache/sis/referencing/IdentifiedObjects.java | 26 ++- .../sis/referencing/StandardDefinitions.java | 6 +- .../apache/sis/referencing/crs/AbstractCRS.java| 1 + .../sis/referencing/crs/DefaultCompoundCRS.java| 79 ++-- .../sis/referencing/crs/DefaultDerivedCRS.java | 36 +++- .../sis/referencing/crs/DefaultEngineeringCRS.java | 3 + .../sis/referencing/crs/DefaultGeocentricCRS.java | 4 + .../sis/referencing/crs/DefaultImageCRS.java | 4 + .../org/apache/sis/referencing/crs/SubTypes.java | 7 +- .../apache/sis/referencing/cs/DefaultTimeCS.java | 16 ++ .../sis/referencing/cs/DefaultUserDefinedCS.java | 3 + .../org/apache/sis/referencing/cs/Normalizer.java | 12 +- .../org/apache/sis/referencing/cs/SubTypes.java| 1 + .../sis/referencing/datum/AbstractDatum.java | 111 +++ .../referencing/datum/DefaultEngineeringDatum.java | 10 +- .../referencing/datum/DefaultGeodeticDatum.java| 10 +- .../sis/referencing/datum/DefaultImageDatum.java | 16 +- .../referencing/datum/DefaultParametricDatum.java | 11 +- .../referencing/datum/DefaultTemporalDatum.java| 10 +- .../referencing/datum/DefaultVerticalDatum.java| 85 - .../org/apache/sis/referencing/datum/SubTypes.java | 1 + .../apache/sis/referencing/datum/package-info.java | 2 +- .../referencing/factory/AuthorityFactoryProxy.java | 25 ++- .../factory/CommonAuthorityFactory.java| 30 +-- .../factory/ConcurrentAuthorityFactory.java| 23 ++- .../factory/GeodeticAuthorityFactory.java | 53 +- .../referencing/factory/GeodeticObjectFactory.java | 35 +++- .../factory/IdentifiedObjectFinder.java| 4 +- .../factory/MultiAuthoritiesFactory.java | 26 ++- .../referencing/factory/sql/AuthorityCodes.java| 8 +- .../referencing/factory/sql/EPSGDataAccess.java| 39 ++-- .../sis/referencing/factory/sql/TableInfo.java | 1 + .../sis/referencing/factory/sql/package-info.java | 2 +- .../sis/referencing/internal/EPSGFactoryProxy.java | 8 +- .../referencing/internal/EPSGFactoryProxyCRS.java | 2 + .../internal/EPSGFactoryProxyDatum.java| 1 + .../org/apache/sis/referencing/internal/Epoch.java | 93 + .../apache/sis/referencing/internal/Resources.java | 5 + .../sis/referencing/internal/Resources.properties | 1 + .../referencing/internal/Resources_fr.properties | 1 + .../referencing/internal/VerticalDatumTypes.java | 1 + .../operation/AbstractCoordinateOperation.java | 74 ++-- .../operation/CoordinateOperationRegistry.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 4 +- .../referencing/operation/DefaultConversion.java | 7 +- .../DefaultCoordinateOperationFactory.java | 2 +- .../referencing/operation/SubOperationInfo.java| 1 + .../operation/TransformedCoordinateSet.java| 151 +++
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: cleanup before work on ISO 19111:2019.
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 9ca908d78de921ff6914acf1c971ce7bed6d885d Merge: 969036a87b 0580fecf48 Author: Martin Desruisseaux AuthorDate: Tue Apr 2 19:06:40 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1: cleanup before work on ISO 19111:2019. NOTICE | 5 ++- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../coverage/grid/FractionalGridCoordinates.java | 17 -- .../apache/sis/geometry/wrapper/Geometries.java| 4 +-- .../gazetteer/GeohashReferenceSystem.java | 4 +-- .../sis/referencing/gazetteer/SimpleLocation.java | 6 ++-- .../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +- .../sis/geometry/AbstractDirectPosition.java | 38 +++--- .../org/apache/sis/geometry/DirectPosition1D.java | 8 - .../org/apache/sis/geometry/DirectPosition2D.java | 5 +-- .../main/org/apache/sis/geometry/Envelope2D.java | 4 +-- .../apache/sis/referencing/GeodeticCalculator.java | 4 +-- .../sis/referencing/operation/matrix/Matrices.java | 2 +- .../transform/EllipsoidToCentricTransform.java | 2 +- .../sis/referencing/privy/AffineTransform2D.java | 6 ++-- .../apache/sis/geometry/AbstractEnvelopeTest.java | 16 - .../org/apache/sis/referencing/Assertions.java | 4 +-- .../apache/sis/math/CompoundDirectPositions.java | 37 - .../apache/sis/test/FailureDetailsReporter.java| 4 ++- geoapi/snapshot| 2 +- .../apache/sis/gui/coverage/CoverageCanvas.java| 6 ++-- .../main/org/apache/sis/gui/map/StatusBar.java | 2 +- 22 files changed, 56 insertions(+), 124 deletions(-) diff --cc geoapi/snapshot index a8fd5fbba6,1162a09f9c..f9a461bdd6 --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit a8fd5fbba605327efa4fba0be01f8e349b5ec1ba -Subproject commit 1162a09f9ca0ca5afb29356de81d8e5b938a2dcf ++Subproject commit f9a461bdd615ccddd270eb38dea04f943ed1d941
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 969036a87b7163b6bd1a79ce29d49ac3a09b3ca8 Merge: 9b511f4d6a 925df3bf08 Author: Martin Desruisseaux AuthorDate: Thu Mar 14 17:16:21 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. .gitignore | 3 + .../buildtools/coding/VerifyVersionInJavadoc.java | 2 +- .../main/org/apache/sis/coverage/CategoryList.java | 4 +- .../coverage/grid/CoordinateOperationFinder.java | 2 +- .../apache/sis/coverage/grid/DefaultEvaluator.java | 2 +- .../apache/sis/coverage/grid/DimensionReducer.java | 4 +- .../sis/coverage/grid/DimensionalityReduction.java | 2 +- .../coverage/grid/FractionalGridCoordinates.java | 8 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../org/apache/sis/coverage/grid/GridExtent.java | 8 +- .../apache/sis/coverage/privy/TileOpExecutor.java | 2 +- .../apache/sis/geometry/wrapper/Geometries.java| 12 +- .../geometry/wrapper/SpatialOperationContext.java | 2 +- .../apache/sis/geometry/wrapper/jts/Wrapper.java | 6 +- .../main/org/apache/sis/image/ErrorHandler.java| 2 +- .../org/apache/sis/image/MultiSourceLayout.java| 5 +- .../main/org/apache/sis/image/ResamplingGrid.java | 12 +- .../org/apache/sis/image/SourceAlignedImage.java | 8 +- .../apache/sis/image/processing/TiledProcess.java | 6 +- .../sis/image/processing/isoline/Tracer.java | 2 +- .../coverage/grid/DimensionalityReductionTest.java | 2 +- .../sis/coverage/grid/GridDerivationTest.java | 4 +- .../apache/sis/coverage/grid/GridExtentTest.java | 2 +- .../apache/sis/filter/sqlmm/RegistryTestCase.java | 2 +- .../apache/sis/geometry/wrapper/jts/JTSTest.java | 8 +- .../sis/metadata/iso/citation/Citations.java | 2 +- .../main/org/apache/sis/util/iso/Names.java| 2 +- .../main/org/apache/sis/xml/Namespaces.java| 2 +- .../org/apache/sis/xml/TransformingReader.java | 2 +- .../sis/metadata/iso/extent/ExtentsTest.java | 8 +- .../org/apache/sis/openoffice/Transformer.java | 6 +- .../main/org/apache/sis/portrayal/Canvas.java | 4 +- .../org/apache/sis/portrayal/CanvasExtent.java | 4 +- .../referencing/gazetteer/AbstractLocation.java| 2 +- .../gazetteer/GeohashReferenceSystem.java | 8 +- .../sis/referencing/gazetteer/LocationFormat.java | 4 +- .../gazetteer/MilitaryGridReferenceSystem.java | 24 +- .../sis/referencing/gazetteer/SimpleLocation.java | 8 +- .../gazetteer/GeohashReferenceSystemTest.java | 4 +- .../gazetteer/MilitaryGridReferenceSystemTest.java | 102 ++-- .../sis/geometry/AbstractDirectPosition.java | 22 +- .../org/apache/sis/geometry/AbstractEnvelope.java | 38 +- .../org/apache/sis/geometry/ArrayEnvelope.java | 8 +- .../org/apache/sis/geometry/CoordinateFormat.java | 2 +- .../org/apache/sis/geometry/DirectPosition1D.java | 8 +- .../org/apache/sis/geometry/DirectPosition2D.java | 22 +- .../main/org/apache/sis/geometry/Envelope2D.java | 4 +- .../main/org/apache/sis/geometry/Envelopes.java| 24 +- .../apache/sis/geometry/GeneralDirectPosition.java | 32 +- .../org/apache/sis/geometry/GeneralEnvelope.java | 14 +- .../apache/sis/geometry/WraparoundAdjustment.java | 8 +- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 2 +- .../apache/sis/referencing/GeodeticCalculator.java | 10 +- .../operation/builder/LinearTransformBuilder.java | 16 +- .../sis/referencing/operation/matrix/Matrices.java | 8 +- .../operation/transform/AbstractMathTransform.java | 12 +- .../transform/AbstractMathTransform1D.java | 4 +- .../transform/EllipsoidToCentricTransform.java | 6 +- .../operation/transform/IdentityTransform.java | 2 +- .../operation/transform/MathTransforms.java| 4 +- .../operation/transform/PassThroughTransform.java | 2 +- .../operation/transform/ProjectiveTransform.java | 2 +- .../transform/SpecializableTransform.java | 4 +- .../sis/referencing/privy/AffineTransform2D.java | 10 +- .../sis/referencing/privy/DirectPositionView.java | 6 +- .../sis/referencing/privy/IntervalRectangle.java | 8 +- .../referencing/privy/WraparoundApplicator.java| 4 +- .../apache/sis/geometry/AbstractEnvelopeTest.java | 64 +-- .../apache/sis/geometry/CoordinateFormatTest.java | 21 +- .../apache/sis/geometry/DirectPosition1DTest.java | 2 +- .../apache/sis/geometry/DirectPosition2DTest.java | 2 +- .../sis/geometry/GeneralDirectPositionTest.java| 6 +- .../apache/sis/geometry/GeneralEnvelopeTest.java | 24 +- .../sis/geometry/WraparoundAdjustmentTest.java | 4 +- .../org/apache/sis/referencing/Assertions.java | 8 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 9b511f4d6a5fcfaa6f5c15bbff892496a6e61aa3
Merge: b8b49e9bc2 03ea47e94c
Author: Martin Desruisseaux
AuthorDate: Tue Mar 12 20:14:39 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../main/org/apache/sis/xml/bind/cat/CodeListAdapter.java | 2 ++
.../main/org/apache/sis/referencing/GeodeticCalculator.java | 2 +-
.../main/org/apache/sis/referencing/internal/VerticalDatumTypes.java | 4 +---
.../referencing/operation/transform/DefaultMathTransformFactory.java | 2 +-
.../main/org/apache/sis/storage/netcdf/base/RasterResource.java | 2 +-
.../main/org/apache/sis/util/collection/DefaultTreeTable.java | 2 +-
.../main/org/apache/sis/map/service/Scene2D.java | 1 +
7 files changed, 8 insertions(+), 7 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
index 4de8e1f5e3,9adc3ef22a..ffd8e31acf
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
@@@ -21,8 -21,7 +21,10 @@@ import org.opengis.util.CodeList
import org.apache.sis.util.privy.CodeLists;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
+
++// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.util.iso.Types;
+
/**
* An adapter for {@link CodeList}, in order to implement the ISO 19115-3
standard.
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 b8b49e9bc23a69c2f35e915e4cc77ff78cc7c40e
Merge: 9048ae55d3 dca5af8fc9
Author: Martin Desruisseaux
AuthorDate: Tue Mar 12 18:58:07 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../metadata/iso/distribution/DefaultMedium.java | 2 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 9 +-
.../apache/sis/metadata/sql/MetadataSource.java| 14 ++-
.../main/org/apache/sis/util/iso/Types.java| 78 +--
.../apache/sis/xml/bind/cat/CodeListAdapter.java | 10 +-
.../sis/xml/bind/gco/GO_CharacterString.java | 24 +++--
.../apache/sis/xml/bind/gml/CodeListAdapter.java | 11 ++-
.../apache/sis/xml/bind/gml/SC_VerticalCRS.java| 2 +-
.../sis/xml/bind/metadata/replace/SensorType.java | 49 ++
.../apache/sis/metadata/TreeNodeChildrenTest.java | 18 ++--
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../test/org/apache/sis/util/iso/TypesTest.java| 22 ++---
.../apache/sis/io/wkt/GeodeticObjectParser.java| 4 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 2 +-
.../referencing/internal/VerticalDatumTypes.java | 7 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 12 ++-
.../org/apache/sis/storage/netcdf/base/Axis.java | 4 +-
.../org/apache/sis/converter/StringConverter.java | 10 +-
.../apache/sis/util/collection/CodeListSet.java| 5 +-
.../main/org/apache/sis/util/privy/CodeLists.java | 106 -
.../sis/util/collection/CodeListSetTest.java | 2 +-
.../apache/sis/util/collection/LargeCodeList.java | 31 +++---
geoapi/snapshot| 2 +-
.../apache/sis/map/service/GraphicsPortrayer.java | 37 ++-
.../apache/sis/map/service/RenderingException.java | 2 +-
.../main/org/apache/sis/map/service/Scene2D.java | 54 ++-
.../org/apache/sis/map/service/StylePainter.java | 40 +++-
.../org/apache/sis/map/service/se1/SEPainter.java | 15 ++-
.../sis/map/service/GraphicsPortrayerTest.java | 45 -
.../gui/referencing/PositionableProjection.java| 48 +++---
.../apache/sis/gui/referencing/package-info.java | 2 +-
31 files changed, 450 insertions(+), 219 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index e3c2ed9667,faf89f0a1c..4b41ed32eb
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
@@@ -434,12 -422,7 +434,12 @@@ public class DefaultMedium extends ISOM
/**
* Sets the name of the medium on which the resource can be received.
*/
-private void setLegacyName(final MediumName newValue) {
-name = newValue;
+private void setNewName(final Citation newValue) {
+if (newValue != null) {
+final InternationalString title = newValue.getTitle();
+if (title != null) {
- name = CodeLists.forName(MediumName.class, title.toString(),
false);
++name = CodeLists.forCodeName(MediumName.class,
title.toString());
+}
+}
}
}
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
index 97a095e51f,9adc3ef22a..4de8e1f5e3
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
@@@ -18,9 -18,9 +18,10 @@@ package org.apache.sis.xml.bind.cat
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.opengis.util.CodeList;
- import org.apache.sis.util.iso.Types;
+ import org.apache.sis.util.privy.CodeLists;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
++import org.apache.sis.util.iso.Types;
/**
diff --cc geoapi/snapshot
index 3d58e2c44d,b2c419d046..bd981a850c
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 3d58e2c44d64d0b84df243363f1ee1e571b081fd
-Subproject commit b2c419d046315ef580eb8eb746bb20361df79f7d
++Subproject commit bd981a850cb1c23962d8db960580a31348a24347
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. https://issues.apache.org/jira/browse/SIS-596
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 9048ae55d3d4015181edbec6d937e354a88a546e Merge: 6cbd4e47c3 069553e76c Author: Martin Desruisseaux AuthorDate: Thu Mar 7 18:42:19 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. https://issues.apache.org/jira/browse/SIS-596 endorsed/build.gradle.kts |6 +- .../apache/sis/cloud/aws/s3/ClientFileSystem.java |2 +- .../main/org/apache/sis/console/AboutCommand.java |4 +- .../main/org/apache/sis/console/Command.java |2 +- .../main/org/apache/sis/console/CommandRunner.java |2 +- .../apache/sis/console/FormattedOutputCommand.java |2 +- .../org/apache/sis/console/IdentifierCommand.java |2 +- .../apache/sis/console/ResourcesDownloader.java|2 +- .../org/apache/sis/console/TransformCommand.java |8 +- .../org.apache.sis.feature/main/module-info.java | 13 +- .../org/apache/sis/coverage/CoverageCombiner.java |6 +- .../org/apache/sis/coverage/SampleDimension.java |2 +- .../org/apache/sis/coverage/SampleRangeFormat.java |2 +- .../coverage/grid/BandAggregateGridCoverage.java |4 +- .../coverage/grid/CoordinateOperationFinder.java |6 +- .../apache/sis/coverage/grid/DefaultEvaluator.java |8 +- .../sis/coverage/grid/DimensionAppender.java |2 +- .../apache/sis/coverage/grid/DimensionReducer.java |2 +- .../sis/coverage/grid/DimensionalityReduction.java |2 +- .../coverage/grid/FractionalGridCoordinates.java |2 +- .../org/apache/sis/coverage/grid/GridCoverage.java |4 +- .../apache/sis/coverage/grid/GridCoverage2D.java |4 +- .../sis/coverage/grid/GridCoverageBuilder.java | 10 +- .../sis/coverage/grid/GridCoverageProcessor.java |8 +- .../apache/sis/coverage/grid/GridDerivation.java |2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 10 +- .../apache/sis/coverage/grid/GridExtentCRS.java|2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 18 +- .../apache/sis/coverage/grid/ImageRenderer.java| 12 +- .../sis/coverage/grid/ReducedGridCoverage.java |2 +- .../sis/coverage/grid/ResampledGridCoverage.java |6 +- .../apache/sis/coverage/grid/SliceGeometry.java|8 +- .../sis/coverage/grid/j2d/BatchComputedImage.java | 213 .../sis/coverage/grid/j2d/ColorModelBuilder.java | 701 -- .../sis/coverage/grid/j2d/ColorModelFactory.java | 864 - .../sis/coverage/grid/j2d/ColorModelType.java | 106 -- .../sis/coverage/grid/j2d/ColorsForRange.java | 291 -- .../sis/coverage/grid/j2d/DeferredProperty.java| 124 --- .../apache/sis/coverage/grid/j2d/FillValues.java | 208 .../apache/sis/coverage/grid/j2d/ImageLayout.java | 438 - .../sis/coverage/grid/j2d/ImageUtilities.java | 673 - .../grid/j2d/MultiBandsIndexColorModel.java| 314 -- .../sis/coverage/grid/j2d/ObservableImage.java | 288 -- .../sis/coverage/grid/j2d/RasterFactory.java | 314 -- .../sis/coverage/grid/j2d/SampleModelFactory.java | 291 -- .../sis/coverage/grid/j2d/ScaledColorModel.java| 162 .../sis/coverage/grid/j2d/ScaledColorSpace.java| 223 - .../sis/coverage/grid/j2d/TileErrorHandler.java| 120 --- .../sis/coverage/grid/j2d/TileOpExecutor.java | 1019 .../sis/coverage/grid/j2d/TilePlaceholder.java | 404 .../apache/sis/coverage/grid/j2d/TiledImage.java | 274 -- .../sis/coverage/grid/j2d/WritableTiledImage.java | 217 - .../apache/sis/coverage/grid/j2d/package-info.java | 31 - .../sis/coverage/internal/CommonDomainFinder.java | 374 --- .../sis/coverage/internal/MultiSourceArgument.java | 619 .../sis/coverage/internal/RangeArgument.java | 395 .../sis/coverage/internal/SampleDimensions.java| 179 .../apache/sis/coverage/internal/package-info.java |2 +- .../sis/coverage/privy/BatchComputedImage.java | 213 .../sis/coverage/privy/ColorModelBuilder.java | 701 ++ .../sis/coverage/privy/ColorModelFactory.java | 864 + .../apache/sis/coverage/privy/ColorModelType.java | 106 ++ .../apache/sis/coverage/privy/ColorsForRange.java | 291 ++ .../sis/coverage/privy/CommonDomainFinder.java | 374 +++ .../sis/coverage/privy/DeferredProperty.java | 124 +++ .../org/apache/sis/coverage/privy/FillValues.java | 208 .../org/apache/sis/coverage/privy/ImageLayout.java | 438 + .../apache/sis/coverage/privy/ImageUtilities.java | 673 + .../coverage/privy/MultiBandsIndexColorModel.java | 314 ++ .../sis/coverage/privy/MultiSourceArgument.java| 619
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 6cbd4e47c3e8f44e123ab6c374e05473e99d003c Merge: 445620db52 a5633e743a Author: Martin Desruisseaux AuthorDate: Thu Mar 7 10:59:29 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../sis/buildtools/coding/ReorganizeImports.java | 15 +- .../apache/sis/buildtools/gradle/Dependency.java | 1 + .../sis/buildtools/gradle/ModularCompilation.java | 13 -- .../resources/IndexedResourceCompiler.java | 14 +- .../apache/sis/console/MetadataCommandTest.java| 10 +- .../org.apache.sis.metadata/main/module-info.java | 9 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 9 +- .../apache/sis/referencing/cs/AxesConvention.java | 32 +-- .../operation/provider/AbstractProvider.java | 5 +- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 34 +++ .../sis/referencing/EPSGFactoryFallbackTest.java | 14 +- .../sis/referencing/report/HTMLGenerator.java | 5 +- .../main/org/apache/sis/storage/landsat/Band.java | 37 +-- .../apache/sis/storage/landsat/LandsatStore.java | 2 + .../org/apache/sis/storage/geotiff/DataCube.java | 2 + .../apache/sis/storage/geotiff/GeoTiffStore.java | 4 +- .../sis/storage/geotiff/ImageFileDirectory.java| 101 ++--- .../sis/storage/geotiff/spi/SchemaModifier.java| 250 ++--- .../apache/sis/storage/netcdf/NetcdfStoreTest.java | 9 +- .../org/apache/sis/storage/AbstractResource.java | 5 + .../org/apache/sis/storage/wkt/StoreFormat.java| 2 +- .../org/apache/sis/storage/folder/StoreTest.java | 9 +- .../src/org.apache.sis.util/main/module-info.java | 8 +- incubator/build.gradle.kts | 12 + 24 files changed, 442 insertions(+), 160 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: post-merge imports organization.
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 445620db529dee795eabbaa298ffec67dcf4f345 Merge: 05dc18652a 3ac45c141f Author: Martin Desruisseaux AuthorDate: Wed Feb 21 16:56:06 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: post-merge imports organization. .../test/org/apache/sis/coverage/grid/GridCoverage2DTest.java | 2 +- .../test/org/apache/sis/coverage/grid/GridDerivationTest.java | 2 +- .../org/apache/sis/coverage/grid/ResampledGridCoverageTest.java | 2 +- .../test/org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java | 2 +- .../test/org/apache/sis/feature/FeatureTestCase.java| 2 +- .../apache/sis/feature/builder/CharacteristicTypeBuilderTest.java | 2 +- .../test/org/apache/sis/feature/test/FeatureComparator.java | 2 +- .../test/org/apache/sis/geometry/wrapper/esri/FactoryTest.java | 2 +- .../test/org/apache/sis/geometry/wrapper/j2d/FactoryTest.java | 2 +- .../test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java | 2 ++ .../test/org/apache/sis/geometry/wrapper/jts/FactoryTest.java | 2 +- .../test/org/apache/sis/image/MaskedImageTest.java | 4 +++- .../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java | 2 +- .../test/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java | 2 +- .../iso/identification/DefaultServiceIdentificationTest.java| 2 +- .../org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java | 2 +- .../sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java| 2 +- .../test/org/apache/sis/util/iso/DefaultNameFactoryTest.java| 2 +- .../test/org/apache/sis/util/iso/SerializableRecordSchema.java | 2 ++ .../test/org/apache/sis/xml/ReferenceResolverTest.java | 2 +- .../test/org/apache/sis/xml/bind/gco/MultiplicityTest.java | 2 +- .../test/org/apache/sis/xml/bind/lan/PT_LocaleTest.java | 2 +- .../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java| 4 ++-- .../test/org/apache/sis/xml/test/TestCase.java | 2 +- .../test/org/apache/sis/geometry/GeneralEnvelopeTest.java | 2 +- .../test/org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 2 +- .../test/org/apache/sis/referencing/GeodeticCalculatorTest.java | 4 ++-- .../apache/sis/referencing/factory/GeodeticObjectFactoryTest.java | 2 +- .../test/org/apache/sis/referencing/factory/TestFactorySource.java | 2 ++ .../sis/referencing/operation/CoordinateOperationFinderTest.java| 2 +- .../sis/referencing/operation/CoordinateOperationRegistryTest.java | 2 +- .../operation/DefaultCoordinateOperationFactoryTest.java| 2 +- .../apache/sis/referencing/operation/builder/LinearizerTest.java| 4 +++- .../referencing/operation/builder/LocalizationGridBuilderTest.java | 2 +- .../referencing/operation/projection/ConformalProjectionTest.java | 2 +- .../sis/referencing/operation/projection/MapProjectionTestCase.java | 2 +- .../apache/sis/referencing/operation/projection/MercatorTest.java | 2 +- .../referencing/operation/provider/CoordinateFrameRotationTest.java | 2 +- .../referencing/operation/provider/GeocentricTranslationTest.java | 2 +- .../sis/referencing/operation/provider/GeographicOffsetsTest.java | 2 +- .../referencing/operation/provider/PositionVector7ParamTest.java| 2 +- .../operation/transform/CoordinateSystemTransformTest.java | 2 +- .../sis/referencing/operation/transform/MathTransformTestCase.java | 6 +++--- .../referencing/operation/transform/ProjectiveTransformTest.java| 6 +++--- .../org/apache/sis/test/integration/CoordinateOperationTest.java| 2 +- .../test/org/apache/sis/storage/netcdf/MetadataReaderTest.java | 2 +- .../test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java | 2 +- .../org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java | 2 +- .../main/org/apache/sis/storage/base/LegalSymbols.java | 2 +- .../test/org/apache/sis/storage/image/WorldFileStoreTest.java | 2 +- .../test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java | 2 +- .../test/org/apache/sis/test/FailureDetailsReporter.java| 2 ++ .../test/org/apache/sis/test/TestCaseWithLogs.java | 2 ++ .../test/org/apache/sis/util/collection/CacheTest.java | 2 +- .../test/org/apache/sis/util/collection/RangeSetTest.java | 2 +- .../test/org/apache/sis/map/SEPortrayerTest.java| 2 +- 57 files changed, 72 insertions(+), 58 deletions(-) diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java index 8bb334613c,53632953da..6636413810 ---
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 05dc18652a3a65b13bab12d6256e9145f39c9b79 Merge: f4bb5471ef 7812f5c6af Author: Martin Desruisseaux AuthorDate: Wed Feb 21 16:15:39 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/geometry/wrapper/jts/Wrapper.java | 13 ++-- .../test/org/apache/sis/image/ImageTestCase.java | 9 +-- .../org/apache/sis/metadata/sql/TestDatabase.java | 6 ++ .../apache/sis/referencing/IdentifiedObjects.java | 7 +- .../operation/CoordinateOperationRegistry.java | 32 .../sis/referencing/GeodeticCalculatorTest.java| 4 +- .../referencing/factory/sql/EPSGInstallerTest.java | 4 + .../sis/test/integration/ConsistencyTest.java | 2 +- .../org/apache/sis/test/widget/VisualCheck.java| 8 -- .../sis/storage/geotiff/writer/GeoEncoder.java | 17 +++- .../apache/sis/io/stream/FileCacheByteChannel.java | 18 +++-- .../org/apache/sis/measure/UnitNames.properties| 2 + .../apache/sis/measure/UnitNames_en_US.properties | 1 + .../org/apache/sis/measure/UnitNames_fr.properties | 1 + .../main/org/apache/sis/measure/Units.java | 53 - .../org/apache/sis/measure/UnitFormatTest.java | 2 + .../test/org/apache/sis/measure/UnitsTest.java | 7 +- .../test/org/apache/sis/test/TestCase.java | 91 -- .../org/apache/sis/test/TestConfiguration.java | 29 +++ .../test/org/apache/sis/test/package-info.java | 25 -- 20 files changed, 246 insertions(+), 85 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: Last cleanups (for now) about migration to JUnit 5.
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 f4bb5471ef2637d63f9396644acaade913b4a7ab
Merge: 6879e93e0e 86578a47d9
Author: Martin Desruisseaux
AuthorDate: Wed Feb 21 11:09:39 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1:
Last cleanups (for now) about migration to JUnit 5.
endorsed/build.gradle.kts | 5 +
.../sis/coverage/grid/j2d/TilePlaceholder.java | 4 +-
.../main/org/apache/sis/image/TileCache.java | 3 +-
.../apache/sis/feature/AbstractFeatureTest.java| 14 +-
.../apache/sis/feature/FeatureMemoryBenchmark.java | 6 +-
.../org/apache/sis/feature/FeatureTestCase.java| 2 +-
.../feature/builder/FeatureTypeBuilderTest.java| 4 +-
.../apache/sis/feature/test/FeatureComparator.java | 34 ++-
.../test/org/apache/sis/filter/PeriodLiteral.java | 3 +-
.../apache/sis/filter/sqlmm/RegistryTestCase.java | 57 +++--
.../apache/sis/image/StatisticsCalculatorTest.java | 18 +-
.../org.apache.sis.metadata/main/module-info.java | 1 +
.../sis/metadata/PropertyConsistencyCheck.java | 9 +-
.../test/org/apache/sis/metadata/TreeNodeTest.java | 4 +-
.../org/apache/sis/metadata/TreeTableViewTest.java | 4 +-
.../apache/sis/metadata/iso/AllMetadataTest.java | 10 -
.../iso/identification/DefaultResolutionTest.java | 25 +-
.../maintenance/DefaultScopeDescriptionTest.java | 24 +-
.../iso/spatial/DefaultGeorectifiedTest.java | 24 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 2 +-
.../sis/metadata/sql/MetadataSourceTest.java | 2 +
.../sis/metadata/sql/MetadataWriterTest.java | 2 +
.../org/apache/sis/metadata/sql/TestDatabase.java | 43 +++-
.../sis/util/iso/DefaultNameFactoryTest.java | 28 +-
.../org/apache/sis/util/iso/DefaultRecordTest.java | 43 ++--
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 30 +--
.../apache/sis/util/iso/NameMarshallingTest.java | 33 +--
.../sis/util/iso/SerializableRecordSchema.java | 20 +-
.../apache/sis/xml/bind/gco/MultiplicityTest.java | 16 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 45 +---
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 29 +--
.../sis/xml/test/AnnotationConsistencyCheck.java | 11 +-
.../apache/sis/xml/test/DocumentComparator.java| 48 ++--
.../org/apache/sis/xml/test/PackageVerifier.java | 22 +-
.../test/org/apache/sis/xml/test/TestCase.java | 38 +++
.../sis/openoffice/ReferencingFunctionsTest.java | 23 +-
.../org/apache/sis/openoffice/TransformerTest.java | 23 +-
.../coverage/MultiResolutionCoverageLoader.java| 3 +-
.../apache/sis/referencing/AuthorityFactories.java | 2 +
.../main/org/apache/sis/referencing/CommonCRS.java | 281 +++--
.../referencing/factory/sql/EPSGDataAccess.java| 22 +-
.../apache/sis/geometry/AbstractEnvelopeTest.java | 6 +-
.../apache/sis/geometry/GeneralEnvelopeTest.java | 3 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 33 ++-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 4 +-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 3 +
.../apache/sis/parameter/ParameterFormatTest.java | 28 +-
.../sis/parameter/ParameterMarshallingTest.java| 33 +--
.../org/apache/sis/referencing/Assertions.java | 26 +-
.../sis/referencing/AuthorityFactoriesTest.java| 30 +--
.../test/org/apache/sis/referencing/CRSTest.java | 46 ++--
.../sis/referencing/EPSGFactoryFallbackTest.java | 5 +
.../sis/referencing/GeodeticObjectVerifier.java| 4 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 47 ++--
.../org/apache/sis/referencing/cs/CodesTest.java | 2 +-
.../factory/ConcurrentAuthorityFactoryTest.java| 46 +++-
.../factory/GeodeticObjectFactoryTest.java | 3 +
.../factory/MultiAuthoritiesFactoryTest.java | 32 +--
.../sis/referencing/factory/TestFactorySource.java | 91 +++
.../referencing/factory/sql/EPSGFactoryTest.java | 150 +--
.../referencing/factory/sql/EPSGInstallerTest.java | 35 +--
.../referencing/geoapi/AuthorityFactoryTest.java | 3 +
.../geoapi/ParameterizedTransformTest.java | 3 +
.../operation/CoordinateOperationFinderTest.java | 91 +++
.../operation/CoordinateOperationRegistryTest.java | 48 ++--
.../DefaultCoordinateOperationFactoryTest.java | 38 +--
.../operation/SingleOperationMarshallingTest.java | 24 +-
.../builder/LocalizationGridBuilderTest.java | 3 +
.../projection/ConformalProjectionTest.java| 5 +-
.../projection/MapProjectionTestCase.java | 4 +-
.../projection/MercatorMethodComparison.java | 4 +
.../projection/NormalizedProjectionTest.java | 3 +
.../{Benchmark.java => ProjectionBenchmark.java} | 14 +-
.../projection/ProjectionResultComparator.java | 3
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: Removal of unsupported custom annotations.
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 6879e93e0e9ca1bd073da058829da15f383d265f Merge: 6cd28b5cd2 1ee5ff885a Author: Martin Desruisseaux AuthorDate: Sat Feb 17 23:54:53 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: Removal of unsupported custom annotations. .../org/apache/sis/console/AboutCommandTest.java | 2 - .../org/apache/sis/console/CRSCommandTest.java | 5 -- .../org/apache/sis/console/CommandRunnerTest.java | 3 -- .../org/apache/sis/console/HelpCommandTest.java| 2 - .../apache/sis/console/MetadataCommandTest.java| 4 -- .../apache/sis/console/MimeTypeCommandTest.java| 2 - .../org/apache/sis/coverage/CategoryListTest.java | 7 --- .../sis/coverage/grid/GridCoverage2DTest.java | 2 - .../sis/coverage/grid/GridDerivationTest.java | 8 .../apache/sis/coverage/grid/GridGeometryTest.java | 2 - .../coverage/grid/ResampledGridCoverageTest.java | 5 -- .../sis/coverage/grid/ReshapedImageTest.java | 2 - .../apache/sis/feature/AbstractFeatureTest.java| 5 -- .../apache/sis/feature/AbstractOperationTest.java | 2 - .../apache/sis/feature/CharacteristicMapTest.java | 7 --- .../sis/feature/CharacteristicTypeMapTest.java | 2 - .../sis/feature/DefaultAssociationRoleTest.java| 4 -- .../sis/feature/DefaultAttributeTypeTest.java | 2 - .../apache/sis/feature/DefaultFeatureTypeTest.java | 13 -- .../org/apache/sis/feature/DenseFeatureTest.java | 8 .../org/apache/sis/feature/FeatureFormatTest.java | 5 -- .../apache/sis/feature/FeatureOperationsTest.java | 5 -- .../org/apache/sis/feature/FeatureTestCase.java| 7 --- .../test/org/apache/sis/feature/FeaturesTest.java | 2 - .../org/apache/sis/feature/LinkOperationTest.java | 5 -- .../sis/feature/MultiValuedAttributeTest.java | 8 .../apache/sis/feature/PropertySingletonTest.java | 4 -- .../sis/feature/SingletonAssociationTest.java | 5 -- .../apache/sis/feature/SingletonAttributeTest.java | 11 - .../org/apache/sis/feature/SparseFeatureTest.java | 8 .../sis/feature/StringJoinOperationTest.java | 5 -- .../feature/builder/AttributeTypeBuilderTest.java | 9 .../feature/builder/FeatureTypeBuilderTest.java| 10 .../sis/geometry/wrapper/GeometriesTestCase.java | 2 - .../apache/sis/image/BandAggregateImageTest.java | 7 --- .../org/apache/sis/image/ComputedImageTest.java| 2 - .../org/apache/sis/image/ImageCombinerTest.java| 2 - .../org/apache/sis/image/ImageProcessorTest.java | 2 - .../org/apache/sis/image/PixelIteratorTest.java| 32 - .../apache/sis/image/StatisticsCalculatorTest.java | 2 - .../org/apache/sis/index/tree/PointTreeTest.java | 2 - .../apache/sis/metadata/AbstractMetadataTest.java | 2 - .../test/org/apache/sis/metadata/HashCodeTest.java | 5 -- .../apache/sis/metadata/InformationMapTest.java| 2 - .../apache/sis/metadata/MetadataCopierTest.java| 2 - .../apache/sis/metadata/MetadataStandardTest.java | 17 --- .../sis/metadata/ModifiableMetadataTest.java | 2 - .../test/org/apache/sis/metadata/NameMapTest.java | 2 - .../org/apache/sis/metadata/NilReasonMapTest.java | 2 - .../apache/sis/metadata/PropertyAccessorTest.java | 14 -- .../sis/metadata/PropertyConsistencyCheck.java | 2 - .../sis/metadata/PropertyInformationTest.java | 2 - .../test/org/apache/sis/metadata/PrunerTest.java | 6 --- .../org/apache/sis/metadata/SpecialCasesTest.java | 6 --- .../apache/sis/metadata/TreeNodeChildrenTest.java | 17 --- .../test/org/apache/sis/metadata/TreeNodeTest.java | 12 - .../apache/sis/metadata/TreeTableFormatTest.java | 2 - .../org/apache/sis/metadata/TreeTableViewTest.java | 4 -- .../test/org/apache/sis/metadata/TypeMapTest.java | 2 - .../test/org/apache/sis/metadata/ValueMapTest.java | 8 .../sis/metadata/internal/NameMeaningTest.java | 2 - .../apache/sis/metadata/iso/AllMetadataTest.java | 2 - .../sis/metadata/iso/DefaultIdentifierTest.java| 2 - .../sis/metadata/iso/DefaultMetadataTest.java | 2 - .../sis/metadata/iso/citation/CitationsTest.java | 6 --- .../metadata/iso/citation/DefaultCitationTest.java | 3 -- .../metadata/iso/citation/DefaultContactTest.java | 3 -- .../sis/metadata/iso/extent/DefaultExtentTest.java | 2 - .../extent/DefaultGeographicBoundingBoxTest.java | 3 -- .../sis/metadata/iso/extent/ExtentsTest.java | 2 - .../identification/DefaultBrowseGraphicTest.java | 9 .../identification/DefaultCoupledResourceTest.java | 2 - .../DefaultDataIdentificationTest.java | 8 .../DefaultRepresentativeFractionTest.java | 2 - .../iso/identification/DefaultResolutionTest.java | 2 - .../DefaultServiceIdentificationTest.java
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 df1eb4f7d0600792dd3a4ea7645ff50bac2c5700 Merge: 5909d8a9de 52e92eab1e Author: Martin Desruisseaux AuthorDate: Sat Feb 17 22:24:48 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../projection/ObliqueStereographicTest.java | 5 ++--- .../operation/projection/TransverseMercatorTest.java | 2 +- .../transform/AbridgedMolodenskyTransformTest.java | 2 +- .../operation/transform/MolodenskyTransformTest.java | 6 -- .../transform/PassThroughTransformTest.java | 20 ++-- geoapi/snapshot | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) diff --cc geoapi/snapshot index d537df759d,84e48733a2..b0d7ebf742 --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit d537df759d406cf8ea20d021a551fbadcb9de94f -Subproject commit 84e48733a2ec792e1af71ed51f15e70683182e53 ++Subproject commit b0d7ebf742ee7d7683a42f1cec27826310b7438f
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: Change of argument order in `Assertions` classes for consistency with JUnit 5 convention.
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 5909d8a9dec6d091f05db20aac62976fb83f2d2f Merge: 84992dfbd2 cf0f562292 Author: Martin Desruisseaux AuthorDate: Sat Feb 17 16:16:23 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: Change of argument order in `Assertions` classes for consistency with JUnit 5 convention. .../sis/coverage/grid/DimensionAppenderTest.java | 4 +- .../coverage/grid/DimensionalityReductionTest.java | 6 +- .../sis/coverage/grid/GridDerivationTest.java | 64 - .../apache/sis/coverage/grid/GridExtentTest.java | 36 +++-- .../apache/sis/coverage/grid/GridGeometryTest.java | 117 .../sis/coverage/grid/PixelTranslationTest.java| 30 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 8 +- .../test/org/apache/sis/metadata/Assertions.java | 9 +- .../apache/sis/metadata/PropertyAccessorTest.java | 10 +- .../sis/metadata/PropertyInformationTest.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 2 +- .../sis/metadata/iso/DefaultIdentifierTest.java| 4 +- .../sis/metadata/iso/DefaultMetadataTest.java | 28 ++-- .../sis/metadata/iso/citation/CitationsTest.java | 32 ++--- .../metadata/iso/citation/DefaultCitationTest.java | 15 +- .../DefaultDataIdentificationTest.java | 3 +- .../DefaultServiceIdentificationTest.java | 9 +- .../apache/sis/xml/NilReasonMarshallingTest.java | 11 +- .../org/apache/sis/xml/UUIDMarshallingTest.java| 12 +- .../sis/xml/bind/fra/DataIdentificationTest.java | 4 +- .../apache/sis/io/wkt/MathTransformParserTest.java | 30 ++-- .../org/apache/sis/io/wkt/WKTDictionaryTest.java | 10 +- .../org/apache/sis/referencing/Assertions.java | 4 +- .../org/apache/sis/referencing/CommonCRSTest.java | 9 +- .../sis/referencing/GeodeticCalculatorTest.java| 10 +- .../sis/referencing/ImmutableIdentifierTest.java | 18 +-- .../referencing/crs/DefaultCompoundCRSTest.java| 8 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 16 +-- .../referencing/crs/DefaultEngineeringCRSTest.java | 6 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 4 +- .../referencing/crs/DefaultProjectedCRSTest.java | 6 +- .../sis/referencing/cs/CoordinateSystemsTest.java | 52 +++ .../referencing/cs/DefaultCylindricalCSTest.java | 8 +- .../sis/referencing/cs/DefaultPolarCSTest.java | 8 +- .../sis/referencing/cs/DefaultSphericalCSTest.java | 6 +- .../referencing/datum/BursaWolfParametersTest.java | 20 +-- .../datum/DefaultGeodeticDatumTest.java| 12 +- .../datum/DefaultTemporalDatumTest.java| 6 +- .../referencing/datum/TimeDependentBWPTest.java| 6 +- .../factory/CommonAuthorityFactoryTest.java| 20 +-- .../factory/GeodeticObjectFactoryTest.java | 7 - .../sis/referencing/factory/TestFactorySource.java | 4 +- .../referencing/factory/sql/EPSGFactoryTest.java | 32 ++--- .../operation/CoordinateOperationFinderTest.java | 33 ++--- .../DefaultConcatenatedOperationTest.java | 12 +- .../operation/DefaultConversionTest.java | 49 --- .../operation/DefaultOperationMethodTest.java | 4 +- .../operation/DefaultPassThroughOperationTest.java | 10 +- .../operation/SingleOperationMarshallingTest.java | 14 +- .../builder/LinearTransformBuilderTest.java| 39 +++--- .../operation/builder/LinearizerTest.java | 16 +-- .../builder/LocalizationGridBuilderTest.java | 6 +- .../operation/builder/ResidualGridTest.java| 4 +- .../referencing/operation/matrix/MatricesTest.java | 42 +++--- .../referencing/operation/matrix/Matrix4Test.java | 16 ++- .../operation/matrix/MatrixTestCase.java | 4 +- .../operation/matrix/NonSquareMatrixTest.java | 26 ++-- .../operation/projection/MercatorTest.java | 6 +- .../operation/provider/Geographic3Dto2DTest.java | 24 ++-- .../operation/provider/LongitudeRotationTest.java | 13 +- .../referencing/operation/provider/NADCONTest.java | 11 +- .../referencing/operation/provider/NTv2Test.java | 11 +- .../transform/ConcatenatedTransformTest.java | 30 ++-- .../transform/ContextualParametersTest.java| 26 ++-- .../transform/DefaultMathTransformFactoryTest.java | 21 +-- .../operation/transform/MathTransformsTest.java| 24 ++-- .../transform/ProjectiveTransformTest.java | 12 +- .../operation/transform/ScaleTransformTest.java| 7 +- .../operation/transform/TransferFunctionTest.java | 12 +- .../transform/TransformResultComparator.java | 4 +- .../transform/TransformSeparatorTest.java | 38 +++--- .../transform/TranslationTransformTest.java| 7 +- .../transform/WraparoundTransformTest.java | 42
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: Upgrade from JUnit 4 to JUnit 5.
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 84992dfbd2f67a78bf4e20b877d3d807397f7787 Merge: 9adef8be22 1355d5ca81 Author: Martin Desruisseaux AuthorDate: Fri Feb 16 15:43:55 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: Upgrade from JUnit 4 to JUnit 5. NOTICE | 2 +- buildSrc/build.gradle.kts | 7 +- .../apache/sis/buildtools/gradle/ModularTest.java | 11 +- .../resources/IndexedResourceCompilerTest.java | 7 +- endorsed/build.gradle.kts | 20 +- .../sis/cloud/aws/s3/ClientFileSystemTest.java | 4 +- .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 4 +- .../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 4 +- .../org/apache/sis/console/AboutCommandTest.java | 2 +- .../org/apache/sis/console/CRSCommandTest.java | 2 +- .../org/apache/sis/console/CommandRunnerTest.java | 4 +- .../org/apache/sis/console/HelpCommandTest.java| 2 +- .../apache/sis/console/MetadataCommandTest.java| 2 +- .../apache/sis/console/MimeTypeCommandTest.java| 2 +- .../main/org/apache/sis/filter/internal/Node.java | 2 +- .../geometry/wrapper/SpatialOperationContext.java | 2 +- .../org/apache/sis/coverage/CategoryListTest.java | 134 +++ .../test/org/apache/sis/coverage/CategoryTest.java | 167 .../apache/sis/coverage/CoverageCombinerTest.java | 6 +- .../apache/sis/coverage/SampleDimensionTest.java | 81 ++-- .../apache/sis/coverage/SampleRangeFormatTest.java | 2 +- .../grid/BandAggregateGridCoverageTest.java| 4 +- .../coverage/grid/BufferedGridCoverageTest.java| 2 +- .../coverage/grid/ConvertedGridCoverageTest.java | 19 +- .../sis/coverage/grid/DimensionAppenderTest.java | 2 +- .../coverage/grid/DimensionalityReductionTest.java | 2 +- .../grid/FractionalGridCoordinatesTest.java| 4 +- .../sis/coverage/grid/GridCoverage2DTest.java | 81 ++-- .../sis/coverage/grid/GridCoverageBuilderTest.java | 42 +- .../sis/coverage/grid/GridDerivationTest.java | 20 +- .../apache/sis/coverage/grid/GridExtentTest.java | 2 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 2 +- .../sis/coverage/grid/GridOrientationTest.java | 16 +- .../sis/coverage/grid/PixelTranslationTest.java| 10 +- .../coverage/grid/ResampledGridCoverageTest.java | 35 +- .../sis/coverage/grid/ReshapedImageTest.java | 4 +- .../coverage/grid/TranslatedGridCoverageTest.java | 6 +- .../coverage/grid/j2d/ColorModelBuilderTest.java | 22 +- .../sis/coverage/grid/j2d/ImageLayoutTest.java | 8 +- .../sis/coverage/grid/j2d/ImageUtilitiesTest.java | 16 +- .../coverage/grid/j2d/SampleModelFactoryTest.java | 41 +- .../coverage/grid/j2d/ScaledColorSpaceTest.java| 4 +- .../sis/coverage/internal/RangeArgumentTest.java | 52 +-- .../apache/sis/feature/AbstractFeatureTest.java| 18 +- .../apache/sis/feature/AbstractOperationTest.java | 4 +- .../test/org/apache/sis/feature/Assertions.java| 46 +-- .../apache/sis/feature/CharacteristicMapTest.java | 262 ++-- .../sis/feature/CharacteristicTypeMapTest.java | 60 +-- .../org/apache/sis/feature/CustomAttribute.java| 6 +- .../sis/feature/DefaultAssociationRoleTest.java| 60 +-- .../sis/feature/DefaultAttributeTypeTest.java | 47 +-- .../apache/sis/feature/DefaultFeatureTypeTest.java | 292 ++ .../apache/sis/feature/EnvelopeOperationTest.java | 41 +- .../org/apache/sis/feature/FeatureFormatTest.java | 7 +- .../apache/sis/feature/FeatureMemoryBenchmark.java | 5 +- .../apache/sis/feature/FeatureOperationsTest.java | 19 +- .../org/apache/sis/feature/FeatureTestCase.java| 131 +++--- .../test/org/apache/sis/feature/FeaturesTest.java | 52 +-- .../sis/feature/GroupAsPolylineOperationTest.java | 33 +- .../org/apache/sis/feature/LinkOperationTest.java | 12 +- .../sis/feature/MultiValuedAttributeTest.java | 48 ++- .../apache/sis/feature/PropertySingletonTest.java | 74 ++-- .../sis/feature/SingletonAssociationTest.java | 17 +- .../apache/sis/feature/SingletonAttributeTest.java | 44 +- .../sis/feature/StringJoinOperationTest.java | 94 ++--- .../builder/AssociationRoleBuilderTest.java| 19 +- .../feature/builder/AttributeTypeBuilderTest.java | 176 .../builder/CharacteristicTypeBuilderTest.java | 50 +-- .../feature/builder/FeatureTypeBuilderTest.java| 345 .../feature/internal/AttributeConventionTest.java | 59 ++- .../apache/sis/feature/test/FeatureComparator.java | 54 ++- .../apache/sis/filter/ArithmeticFunctionTest.java | 29 +- .../sis/filter/BinarySpatialFilterTestCase.java| 262 ++--
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 9adef8be22a3a8e0e18a93e85da5fb132b532577
Merge: 99f667e72b 0b7455bf80
Author: Martin Desruisseaux
AuthorDate: Sat Feb 10 14:07:13 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../apache/sis/referencing/operation/DefaultFormula.java | 2 +-
.../operation/builder/LinearTransformBuilder.java | 2 +-
.../main/org/apache/sis/storage/base/LegalSymbols.java | 14 ++
.../main/org/apache/sis/gui/map/MapCanvas.java | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
index 8f6675256b,ffd3155d80..385e6ea2e5
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
@@@ -19,13 -19,19 +19,19 @@@ package org.apache.sis.storage.base
import java.time.LocalDate;
import java.util.Date;
import java.util.Collections;
- import org.opengis.metadata.citation.*;
- import org.opengis.metadata.constraint.*;
+ import org.opengis.metadata.citation.Role;
+ import org.opengis.metadata.citation.DateType;
+ import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.util.CharSequences;
- import org.apache.sis.metadata.iso.citation.*;
- import org.apache.sis.metadata.iso.constraint.*;
+ import org.apache.sis.metadata.iso.citation.AbstractParty;
+ import org.apache.sis.metadata.iso.citation.DefaultCitation;
+ import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
+ import org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints;
import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
++// Specific to the geoapi-3.1 and master branches:
++import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
+
/**
* Elements to omit in the legal notice to be parsed by {@link
MetadataBuilder#parseLegalNotice(String)}.
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. The changes are mostly cleanups.
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 99f667e72beb6b521ff0e247a9a318cbc23a5f47 Merge: fadb6e856b daa2c40eaa Author: Martin Desruisseaux AuthorDate: Sat Feb 10 13:02:43 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. The changes are mostly cleanups. .../sis/buildtools/coding/ReorganizeImports.java | 5 +- .../org/apache/sis/cloud/aws/s3/FileService.java | 2 +- .../main/org/apache/sis/console/SIS.java | 2 +- .../org/apache/sis/coverage/BandedCoverage.java| 2 +- .../main/org/apache/sis/coverage/Category.java | 11 +- .../main/org/apache/sis/coverage/CategoryList.java | 12 +- .../org/apache/sis/coverage/ConvertedCategory.java | 2 +- .../org/apache/sis/coverage/CoverageCombiner.java | 2 - .../org/apache/sis/coverage/SampleDimension.java | 26 +- .../sis/coverage/grid/BufferedGridCoverage.java| 7 +- .../coverage/grid/CoordinateOperationFinder.java | 5 +- .../apache/sis/coverage/grid/DefaultEvaluator.java | 6 +- .../sis/coverage/grid/DimensionalityReduction.java | 20 +- .../apache/sis/coverage/grid/DomainLinearizer.java | 22 +- .../apache/sis/coverage/grid/GridClippingMode.java | 2 +- .../sis/coverage/grid/GridCoordinatesView.java | 5 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 16 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 8 +- .../sis/coverage/grid/GridCoverageBuilder.java | 19 +- .../sis/coverage/grid/GridCoverageProcessor.java | 14 +- .../apache/sis/coverage/grid/GridDerivation.java | 15 +- .../org/apache/sis/coverage/grid/GridExtent.java | 34 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 33 +- .../apache/sis/coverage/grid/GridOrientation.java | 4 +- .../apache/sis/coverage/grid/ImageRenderer.java| 21 +- .../apache/sis/coverage/grid/PixelTranslation.java | 14 +- .../apache/sis/coverage/grid/ReshapedImage.java| 2 - .../sis/coverage/grid/j2d/ColorsForRange.java | 3 +- .../sis/coverage/grid/j2d/ImageUtilities.java | 8 +- .../sis/coverage/grid/j2d/TilePlaceholder.java | 5 +- .../org/apache/sis/coverage/grid/package-info.java | 4 +- .../sis/coverage/internal/CompoundTransform.java | 1 - .../apache/sis/feature/AbstractAssociation.java| 3 - .../org/apache/sis/feature/AbstractAttribute.java | 5 +- .../org/apache/sis/feature/AbstractFeature.java| 6 +- .../apache/sis/feature/AbstractIdentifiedType.java | 11 +- .../org/apache/sis/feature/CharacteristicMap.java | 5 - .../apache/sis/feature/CharacteristicTypeMap.java | 9 +- .../apache/sis/feature/DefaultAssociationRole.java | 10 +- .../apache/sis/feature/DefaultAttributeType.java | 8 +- .../org/apache/sis/feature/DefaultFeatureType.java | 11 +- .../main/org/apache/sis/feature/DenseFeature.java | 6 +- .../main/org/apache/sis/feature/FeatureFormat.java | 2 +- .../org/apache/sis/feature/FeatureOperations.java | 4 +- .../main/org/apache/sis/feature/Field.java | 2 - .../sis/feature/FoliationRepresentation.java | 4 +- .../main/org/apache/sis/feature/LinkOperation.java | 2 - .../apache/sis/feature/MultiValuedAssociation.java | 2 +- .../org/apache/sis/feature/OperationResult.java| 3 +- .../main/org/apache/sis/feature/SparseFeature.java | 6 +- .../apache/sis/feature/StringJoinOperation.java| 5 +- .../main/org/apache/sis/feature/package-info.java | 12 +- .../main/org/apache/sis/filter/BinaryFunction.java | 8 +- .../apache/sis/filter/BinaryGeometryFilter.java| 10 +- .../org/apache/sis/filter/BinarySpatialFilter.java | 11 +- .../main/org/apache/sis/filter/Capabilities.java | 12 +- .../org/apache/sis/filter/ComparisonFilter.java| 5 +- .../org/apache/sis/filter/DefaultSortProperty.java | 8 +- .../main/org/apache/sis/filter/DistanceFilter.java | 11 +- .../main/org/apache/sis/filter/LikeFilter.java | 7 +- .../main/org/apache/sis/filter/LogicalFilter.java | 6 +- .../main/org/apache/sis/filter/UnaryFunction.java | 7 +- .../apache/sis/filter/internal/CopyVisitor.java| 10 +- .../sis/filter/internal/GeometryConverter.java | 8 +- .../main/org/apache/sis/filter/package-info.java | 2 +- .../sis/geometry/wrapper/GeometryWrapper.java | 6 +- .../geometry/wrapper/SpatialOperationContext.java | 4 +- .../org/apache/sis/geometry/wrapper/jts/JTS.java | 7 +- .../sis/geometry/wrapper/jts/ShapeAdapter.java | 3 +- .../apache/sis/image/BandedSampleConverter.java| 2 +- .../main/org/apache/sis/image/ComputedImage.java | 7 +- .../main/org/apache/sis/image/ComputedTiles.java | 1 - .../main/org/apache/sis/image/DataType.java| 2 - .../main/org/apache/sis/image/ImageAdapter.java| 7 +- .../main/org/apache/sis/image/ImageCombiner.java | 8 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: - Post-merge import reorganization.
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 fadb6e856b3ecf819f703f473ac7ae3228d97292 Merge: 9f95c712fa 1a7a2aac78 Author: Martin Desruisseaux AuthorDate: Sat Feb 3 12:05:31 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: - Post-merge import reorganization. .../org/apache/sis/console/OperationParser.java| 2 +- .../sis/geometry/wrapper/GeometryWrapper.java | 2 +- .../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +- .../main/org/apache/sis/xml/util/URISource.java| 2 +- .../apache/sis/map/service/GraphicsPortrayer.java | 1 + .../apache/sis/map/service/RenderingException.java | 1 + .../main/org/apache/sis/map/service/Scene2D.java | 1 + .../org/apache/sis/map/service/StylePainter.java | 1 + .../apache/sis/map/service/se1/LineToScene2D.java | 23 +++--- .../apache/sis/map/service/se1/PointToScene2D.java | 3 ++- .../sis/map/service/se1/PolygonToScene2D.java | 3 ++- .../sis/map/service/se1/PresentationToScene2D.java | 12 +-- .../sis/map/service/se1/RasterToScene2D.java | 11 ++- .../apache/sis/map/service/se1/RenderedShape.java | 1 + .../org/apache/sis/map/service/se1/SEPainter.java | 1 + .../sis/map/service/se1/SymbolizerCache.java | 1 + .../sis/map/service/se1/SymbolizerToScene2D.java | 7 --- .../apache/sis/map/service/se1/TextToScene2D.java | 3 ++- .../sis/map/service/GraphicsPortrayerTest.java | 17 +--- 19 files changed, 55 insertions(+), 39 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java index 882fa1e96d,7771d235e7..7df811b0ea --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java @@@ -28,7 -28,8 +28,8 @@@ import org.opengis.geometry.Geometry import org.opengis.geometry.DirectPosition; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.CoordinateOperation; -import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.TransformException; ++import org.opengis.referencing.operation.MathTransform; import org.opengis.util.FactoryException; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.filter.sqlmm.SQLMM; diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java index aeede8b8a3,695fe65cd1..afa8873d61 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java @@@ -45,7 -45,8 +45,8 @@@ import org.opengis.util.FactoryExceptio import org.opengis.geometry.DirectPosition; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.CoordinateOperation; -import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.TransformException; ++import org.opengis.referencing.operation.MathTransform; import org.apache.sis.referencing.util.ReferencingUtilities; import org.apache.sis.geometry.DirectPosition2D; import org.apache.sis.geometry.GeneralDirectPosition;
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: - Bug fixes in warning logs during XML unmarshalling. - Bug fixes in WKT formatting with ANSI colors. - Fix a few cases where "xlink:href" were
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 9f95c712faae439766c707855363ba37affcf31f Merge: 24e0c1b0b0 05930cba1e Author: Martin Desruisseaux AuthorDate: Sat Feb 3 11:39:34 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: - Bug fixes in warning logs during XML unmarshalling. - Bug fixes in WKT formatting with ANSI colors. - Fix a few cases where "xlink:href" were still not handled. - Fix a few cases where fragments in URL were not handled. - Grammatical fixes in comments. .../org/apache/sis/buildtools/book/Assembler.java | 2 +- .../sis/buildtools/coding/ReorganizeImports.java | 46 +- .../main/org/apache/sis/console/AboutCommand.java | 8 +- .../main/org/apache/sis/console/CommandRunner.java | 19 +- .../apache/sis/console/FormattedOutputCommand.java | 4 +- .../main/org/apache/sis/console/HelpCommand.java | 2 +- .../org/apache/sis/console/IdentifierCommand.java | 2 +- .../main/org/apache/sis/console/InfoCommand.java | 8 +- .../org/apache/sis/console/OperationParser.java| 66 +++ .../main/org/apache/sis/console/Option.java| 12 + .../main/org/apache/sis/console/Options.properties | 2 + .../org/apache/sis/console/Options_fr.properties | 2 + .../main/org/apache/sis/console/SIS.java | 35 +- .../org/apache/sis/console/TransformCommand.java | 184 +- .../org.apache.sis.feature/main/module-info.java | 2 + .../org/apache/sis/coverage/BandedCoverage.java| 2 +- .../org/apache/sis/coverage/SampleDimension.java | 2 +- .../org/apache/sis/coverage/SampleRangeFormat.java | 2 +- .../apache/sis/coverage/grid/DefaultEvaluator.java | 4 +- .../sis/coverage/grid/DerivedGridCoverage.java | 2 +- .../sis/coverage/grid/DimensionalityReduction.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 6 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 8 +- .../apache/sis/coverage/grid/GridDerivation.java | 10 +- .../org/apache/sis/coverage/grid/GridExtent.java | 31 +- .../apache/sis/coverage/grid/GridExtentCRS.java| 4 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 8 +- .../apache/sis/coverage/grid/ImageRenderer.java| 6 +- .../sis/coverage/grid/ResampledGridCoverage.java | 2 +- .../apache/sis/coverage/grid/ReshapedImage.java| 4 +- .../apache/sis/coverage/grid/SliceGeometry.java| 2 +- .../apache/sis/coverage/grid/j2d/ImageLayout.java | 8 +- .../sis/coverage/grid/j2d/ImageUtilities.java | 2 +- .../sis/coverage/grid/j2d/RasterFactory.java | 2 +- .../sis/coverage/grid/j2d/ScaledColorModel.java| 2 +- .../sis/coverage/grid/j2d/TileOpExecutor.java | 2 +- .../apache/sis/feature/AbstractAssociation.java| 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 2 +- .../org/apache/sis/feature/AbstractFeature.java| 2 +- .../apache/sis/feature/AbstractIdentifiedType.java | 4 +- .../org/apache/sis/feature/AssociationView.java| 2 +- .../main/org/apache/sis/feature/AttributeView.java | 2 +- .../apache/sis/feature/CharacteristicTypeMap.java | 2 +- .../main/org/apache/sis/feature/DenseFeature.java | 4 +- .../main/org/apache/sis/feature/FeatureFormat.java | 6 +- .../org/apache/sis/feature/FeatureOperations.java | 2 +- .../main/org/apache/sis/feature/README.md | 2 +- .../main/org/apache/sis/feature/SparseFeature.java | 4 +- .../apache/sis/feature/builder/TypeBuilder.java| 4 +- .../sis/geometry/wrapper/GeometryWrapper.java | 32 ++ .../sis/geometry/wrapper/j2d/PathBuilder.java | 2 +- .../apache/sis/geometry/wrapper/j2d/Wrapper.java | 9 + .../wrapper/jts/GeometryCoordinateTransform.java | 2 +- .../apache/sis/geometry/wrapper/jts/Wrapper.java | 27 + .../main/org/apache/sis/image/AnnotatedImage.java | 3 +- .../main/org/apache/sis/image/ComputedImage.java | 2 +- .../main/org/apache/sis/image/ImageProcessor.java | 2 +- .../main/org/apache/sis/image/MaskedImage.java | 2 +- .../org/apache/sis/image/MultiSourceLayout.java| 2 +- .../main/org/apache/sis/image/RecoloredImage.java | 2 +- .../main/org/apache/sis/image/Visualization.java | 2 +- .../sis/image/processing/isoline/Joiner.java | 2 +- .../main/org/apache/sis/index/tree/PointTree.java | 2 +- .../org/apache/sis/index/tree/PointTreeNode.java | 2 +- .../sis/coverage/grid/GridDerivationTest.java | 4 +- .../apache/sis/coverage/grid/GridExtentTest.java | 2 +- .../org/apache/sis/image/BandSelectImageTest.java | 2 +- .../org/apache/sis/image/InterpolationTest.java| 2 +- .../org/apache/sis/metadata/MetadataStandard.java | 2 +- .../org/apache/sis/metadata/internal/Merger.java | 2 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: post-merge reorganization of imports.
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 24e0c1b0b0e52814a4acae14fcf4008d3c4b43e8 Merge: f58c7f7d56 e5ffa1ff25 Author: Martin Desruisseaux AuthorDate: Mon Jan 22 15:40:48 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: post-merge reorganization of imports. .../main/org/apache/sis/filter/Capabilities.java | 1 - .../main/org/apache/sis/filter/internal/CopyVisitor.java | 1 - .../main/org/apache/sis/filter/internal/EditVisitor.java | 1 - .../main/org/apache/sis/filter/sqlmm/FunctionDescription.java | 1 - .../test/org/apache/sis/filter/CapabilitiesTest.java | 3 ++- .../test/org/apache/sis/filter/internal/CopyVisitorTest.java | 3 ++- .../test/org/apache/sis/filter/internal/FilterFactoryMock.java| 1 - .../test/org/apache/sis/filter/internal/FunctionMock.java | 1 - .../test/org/apache/sis/filter/internal/ValueReferenceMock.java | 1 - .../main/org/apache/sis/metadata/iso/OnlineResourceAdapter.java | 1 - .../main/org/apache/sis/metadata/iso/URIStringAdapter.java| 1 - .../org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java | 1 - .../org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java | 1 - .../org/apache/sis/metadata/iso/maintenance/LegacyFeatureType.java| 1 - .../main/org/apache/sis/xml/bind/metadata/MD_AssociatedResource.java | 1 - .../org/apache/sis/xml/bind/metadata/code/DQM_ValueStructure.java | 1 - .../org/apache/sis/xml/bind/metadata/code/SV_ParameterDirection.java | 1 - .../test/org/apache/sis/metadata/xml/SchemaComplianceTest.java| 3 ++- .../test/org/apache/sis/xml/RenameListGenerator.java | 1 - .../test/org/apache/sis/xml/test/PackageVerifier.java | 3 ++- .../test/org/apache/sis/xml/test/SchemaCompliance.java| 1 - .../main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java | 4 +--- .../sis/referencing/operation/transform/ConcatenatedTransform.java| 2 +- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 3 ++- .../org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java | 3 ++- .../test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java | 3 ++- .../org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java | 3 ++- .../referencing/operation/provider/ParameterNameTableGenerator.java | 3 ++- .../org/apache/sis/referencing/report/CoordinateReferenceSystems.java | 3 ++- .../test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java | 3 ++- .../test/org/apache/sis/storage/netcdf/classic/FeatureSetTest.java| 3 ++- .../main/org/apache/sis/pending/temporal/Primitive.java | 1 - incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java | 1 - .../main/org/apache/sis/cql/FilterToCQLVisitor.java | 1 - incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/Query.java | 1 - .../org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java | 1 - .../src/org.apache.sis.cql/test/org/apache/sis/cql/CQLTestCase.java | 1 - .../test/org/apache/sis/cql/ExpressionReadingTest.java| 3 ++- .../test/org/apache/sis/cql/ExpressionWritingTest.java| 3 ++- .../org.apache.sis.cql/test/org/apache/sis/cql/FilterReadingTest.java | 3 ++- .../org.apache.sis.cql/test/org/apache/sis/cql/FilterWritingTest.java | 3 ++- .../org.apache.sis.cql/test/org/apache/sis/cql/QueryReadingTest.java | 3 ++- .../org.apache.sis.cql/test/org/apache/sis/cql/QueryWritingTest.java | 3 ++- .../test/org/apache/sis/map/MapLayersTest.java| 2 ++ .../test/org/apache/sis/map/SEPortrayerTest.java | 2 ++ 45 files changed, 42 insertions(+), 45 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/OnlineResourceAdapter.java index b7bab6f312,00..a66af47713 mode 100644,00..100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/OnlineResourceAdapter.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/OnlineResourceAdapter.java @@@ -1,65 -1,0 +1,64 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: - Better handling of `AxesConvention`. - Better handling of special cases in transform concatenations. - Detech changes of coordinate system typ
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 f58c7f7d563d5ea51d480e17a24a6f0f5c4520e4 Merge: cdfb5327b5 a2cb3742f8 Author: Martin Desruisseaux AuthorDate: Mon Jan 22 14:08:06 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: - Better handling of `AxesConvention`. - Better handling of special cases in transform concatenations. - Detech changes of coordinate system types in `ConcatenatedOperation`. .../apache/sis/buildtools/gradle/Dependency.java | 1 + endorsed/build.gradle.kts | 3 - .../org/apache/sis/console/CommandRunnerTest.java | 4 +- .../org.apache.sis.feature/main/module-info.java | 3 +- .../apache/sis/coverage/grid/GridOrientation.java | 2 +- .../apache/sis/coverage/grid/SliceGeometry.java| 12 +- .../sis/coverage/internal/CompoundTransform.java | 54 ++-- .../apache/sis/coverage/grid/GridExtentTest.java | 12 +- .../sis/metadata/iso/citation/Citations.java | 64 + .../test/org/apache/sis/xml/XLinkTest.java | 6 +- .../org.apache.sis.portrayal/main/module-info.java | 7 +- .../main/org/apache/sis/portrayal/Observable.java | 14 +- .../org/apache/sis/portrayal/package-info.java | 2 +- .../main/org/apache/sis/style/Style.java | 2 + .../main/org/apache/sis/style/package-info.java| 2 + .../MultiResolutionCoverageLoaderTest.java | 2 +- .../apache/sis/style/se1/ChannelSelectionTest.java | 2 +- .../sis/style/se1/ContrastEnhancementTest.java | 2 +- .../apache/sis/style/se1/ExternalGraphicTest.java | 2 +- .../apache/sis/style/se1/FeatureTypeStyleTest.java | 2 +- .../test/org/apache/sis/style/se1/FontTest.java| 2 +- .../test/org/apache/sis/style/se1/GraphicTest.java | 2 +- .../test/org/apache/sis/style/se1/HaloTest.java| 2 +- .../apache/sis/style/se1/LineSymbolizerTest.java | 2 +- .../test/org/apache/sis/style/se1/MarkTest.java| 2 +- .../apache/sis/style/se1/PointPlacementTest.java | 2 +- .../apache/sis/style/se1/PointSymbolizerTest.java | 2 +- .../sis/style/se1/PolygonSymbolizerTest.java | 2 +- .../apache/sis/style/se1/RasterSymbolizerTest.java | 2 +- .../test/org/apache/sis/style/se1/RuleTest.java| 2 +- .../apache/sis/style/se1/SelectedChannelTest.java | 2 +- .../org/apache/sis/style/se1/ShadedReliefTest.java | 2 +- .../test/org/apache/sis/style/se1/StrokeTest.java | 2 +- .../org/apache/sis/style/se1/StyleTestCase.java| 5 +- .../org/apache/sis/style/se1/SymbolizerTest.java | 5 +- .../org/apache/sis/style/se1/SymbologyTest.java| 2 +- .../apache/sis/style/se1/TextSymbolizerTest.java | 2 +- .../main/org/apache/sis/referencing/CommonCRS.java | 13 +- .../apache/sis/referencing/crs/AbstractCRS.java| 149 ++- .../sis/referencing/crs/AbstractDerivedCRS.java| 28 +- .../sis/referencing/crs/DefaultCompoundCRS.java| 129 - .../sis/referencing/crs/DefaultDerivedCRS.java | 73 -- .../sis/referencing/crs/DefaultEngineeringCRS.java | 26 +- .../sis/referencing/crs/DefaultGeocentricCRS.java | 33 +-- .../sis/referencing/crs/DefaultGeodeticCRS.java| 20 +- .../sis/referencing/crs/DefaultGeographicCRS.java | 25 +- .../sis/referencing/crs/DefaultImageCRS.java | 26 +- .../sis/referencing/crs/DefaultParametricCRS.java | 27 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 19 +- .../sis/referencing/crs/DefaultTemporalCRS.java| 26 +- .../sis/referencing/crs/DefaultVerticalCRS.java| 21 +- .../apache/sis/referencing/crs/package-info.java | 2 +- .../org/apache/sis/referencing/cs/AbstractCS.java | 222 +++- .../apache/sis/referencing/cs/AxesConvention.java | 22 +- .../apache/sis/referencing/cs/DefaultAffineCS.java | 31 +-- .../sis/referencing/cs/DefaultCartesianCS.java | 69 +++-- .../sis/referencing/cs/DefaultCompoundCS.java | 57 +++- .../sis/referencing/cs/DefaultCylindricalCS.java | 34 +-- .../sis/referencing/cs/DefaultEllipsoidalCS.java | 41 ++- .../apache/sis/referencing/cs/DefaultLinearCS.java | 32 +-- .../sis/referencing/cs/DefaultParametricCS.java| 32 +-- .../apache/sis/referencing/cs/DefaultPolarCS.java | 32 +-- .../sis/referencing/cs/DefaultSphericalCS.java | 39 +-- .../apache/sis/referencing/cs/DefaultTimeCS.java | 32 +-- .../sis/referencing/cs/DefaultUserDefinedCS.java | 32 +-- .../sis/referencing/cs/DefaultVerticalCS.java | 32 +-- .../org/apache/sis/referencing/cs/Normalizer.java | 11 +- .../org/apache/sis/referencing/cs/SubTypes.java| 31 +++ .../apache/sis/referencing/cs/package-info.java| 2 +- .../factory/GeodeticAuthorityFactory.java | 8 +- .../factory/MultiAuthoritiesFactory.java | 2 +- .../sis/referencing/factory/package-info.java
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. The most numerous changes are typo fixes.
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 cdfb5327b5e07f45554a7f1a43826d869cc32fb5 Merge: 84d2ffda54 0ce17f2e31 Author: Martin Desruisseaux AuthorDate: Sun Jan 14 20:55:52 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. The most numerous changes are typo fixes. .../sis/buildtools/gradle/ModularCompilation.java | 2 +- .../sis/buildtools/gradle/ModularJavadoc.java | 2 +- .../resources/IndexedResourceCompiler.java | 2 +- .../apache/sis/cloud/aws/internal/Resources.java | 4 +- .../sis/cloud/aws/internal/Resources_en.java | 2 +- .../sis/cloud/aws/internal/Resources_fr.java | 2 +- .../org/apache/sis/cloud/aws/s3/FileService.java | 2 +- .../main/org/apache/sis/cloud/aws/s3/KeyPath.java | 8 +- .../org/apache/sis/cloud/aws/s3/PathIterator.java | 2 +- .../org/apache/sis/cloud/aws/s3/package-info.java | 2 +- .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../main/org/apache/sis/console/HelpCommand.java | 2 +- .../main/org/apache/sis/console/SIS.java | 4 +- .../org/apache/sis/console/AboutCommandTest.java | 2 +- .../apache/sis/console/MetadataCommandTest.java| 2 +- .../main/org/apache/sis/coverage/Category.java | 2 +- .../org/apache/sis/coverage/SampleDimension.java | 6 +- .../org/apache/sis/coverage/SampleRangeFormat.java | 2 +- .../main/org/apache/sis/coverage/ToNaN.java| 2 +- .../sis/coverage/grid/BufferedGridCoverage.java| 2 +- .../sis/coverage/grid/ConvertedGridCoverage.java | 4 +- .../coverage/grid/CoordinateOperationFinder.java | 2 +- .../apache/sis/coverage/grid/DefaultEvaluator.java | 6 +- .../sis/coverage/grid/DerivedGridCoverage.java | 6 +- .../sis/coverage/grid/DimensionalityReduction.java | 16 +- .../coverage/grid/FractionalGridCoordinates.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 6 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 10 +- .../sis/coverage/grid/GridCoverageBuilder.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 10 +- .../apache/sis/coverage/grid/GridDerivation.java | 12 +- .../org/apache/sis/coverage/grid/GridExtent.java | 12 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 18 +-- .../apache/sis/coverage/grid/GridOrientation.java | 2 +- .../apache/sis/coverage/grid/ReshapedImage.java| 4 +- .../apache/sis/coverage/grid/SliceGeometry.java| 8 +- .../sis/coverage/grid/TranslatedGridCoverage.java | 10 +- .../sis/coverage/grid/j2d/ColorModelBuilder.java | 6 +- .../sis/coverage/grid/j2d/ColorModelFactory.java | 4 +- .../apache/sis/coverage/grid/j2d/FillValues.java | 2 +- .../apache/sis/coverage/grid/j2d/ImageLayout.java | 2 +- .../grid/j2d/MultiBandsIndexColorModel.java| 4 +- .../sis/coverage/grid/j2d/ScaledColorModel.java| 2 +- .../sis/coverage/grid/j2d/TileOpExecutor.java | 12 +- .../sis/coverage/internal/CommonDomainFinder.java | 2 +- .../sis/coverage/internal/MultiSourceArgument.java | 4 +- .../sis/coverage/internal/RangeArgument.java | 4 +- .../org/apache/sis/feature/AbstractFeature.java| 4 +- .../org/apache/sis/feature/FeatureOperations.java | 8 +- .../main/org/apache/sis/feature/Features.java | 2 +- .../org/apache/sis/feature/PropertySingleton.java | 4 +- .../sis/feature/builder/FeatureTypeBuilder.java| 2 +- .../sis/feature/internal/MovingFeatures.java | 2 +- .../org/apache/sis/feature/internal/Resources.java | 4 +- .../apache/sis/feature/internal/Resources_en.java | 2 +- .../apache/sis/feature/internal/Resources_fr.java | 2 +- .../org/apache/sis/filter/AssociationValue.java| 2 +- .../org/apache/sis/filter/ComparisonFilter.java| 2 +- .../org/apache/sis/filter/ConvertFunction.java | 4 +- .../main/org/apache/sis/filter/LeafExpression.java | 2 +- .../main/org/apache/sis/filter/LogicalFilter.java | 6 +- .../main/org/apache/sis/filter/Optimization.java | 4 +- .../apache/sis/filter/internal/CopyVisitor.java| 4 +- .../sis/filter/internal/GeometryConverter.java | 2 +- .../org/apache/sis/filter/internal/Visitor.java| 2 +- .../sis/filter/sqlmm/FunctionDescription.java | 4 +- .../sis/filter/sqlmm/GeometryConstructor.java | 2 +- .../apache/sis/filter/sqlmm/GeometryParser.java| 2 +- .../org/apache/sis/filter/sqlmm/OneGeometry.java | 4 +- .../org/apache/sis/filter/sqlmm/ST_FromBinary.java | 2 +- .../org/apache/sis/filter/sqlmm/ST_FromText.java | 2 +- .../main/org/apache/sis/filter/sqlmm/ST_Point.java | 2 +- .../org/apache/sis/filter/sqlmm/ST_Transform.java | 2 +- .../org/apache/sis/filter/sqlmm/TwoGeometries.java | 4 +- .../apache/sis/geometry/wrapper/Geometries.java| 2 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains initial version of shapefile writer and improvement in JShell environment.
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 eb20f53e20d2f678e87ac4aa4481d4db2628708e Merge: b6af5d3997 409c3a3234 Author: Martin Desruisseaux AuthorDate: Sun Dec 17 10:59:41 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains initial version of shapefile writer and improvement in JShell environment. .../main/org/apache/sis/console/AboutCommand.java | 10 +- .../main/org/apache/sis/console/Command.java | 26 +- .../main/org/apache/sis/console/CommandRunner.java | 127 +- .../apache/sis/console/FormattedOutputCommand.java | 25 +- .../org/apache/sis/console/IdentifierCommand.java | 12 +- .../main/org/apache/sis/console/InfoCommand.java |2 +- .../org/apache/sis/console/MetadataCommand.java|5 +- .../main/org/apache/sis/console/Option.java|5 + .../main/org/apache/sis/console/Options.properties |7 +- .../org/apache/sis/console/Options_fr.properties |7 +- .../apache/sis/console/ResourcesDownloader.java|3 +- .../main/org/apache/sis/console/SIS.java | 69 +- .../org/apache/sis/console/TransformCommand.java | 49 +- .../org/apache/sis/console/TranslateCommand.java |4 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 14 +- .../org/apache/sis/feature/FeatureOperations.java |3 +- .../apache/sis/metadata/internal/Identifiers.java | 27 + .../apache/sis/metadata/internal/NameMeaning.java |4 +- .../sis/metadata/internal/ReferencingServices.java | 35 +- .../apache/sis/metadata/internal/Resources.java|9 +- .../sis/metadata/internal/Resources.properties |2 +- .../sis/metadata/internal/Resources_fr.properties |2 +- .../sis/metadata/iso/extent/DefaultExtent.java |4 +- .../iso/extent/DefaultGeographicBoundingBox.java |4 +- .../iso/extent/DefaultSpatialTemporalExtent.java |4 +- .../metadata/iso/extent/DefaultTemporalExtent.java |4 +- .../metadata/iso/extent/DefaultVerticalExtent.java |4 +- .../iso/extent/NotSpatioTemporalException.java | 86 ++ .../sis/metadata/iso/extent/package-info.java |2 +- .../apache/sis/xml/bind/IdentifierMapAdapter.java |2 +- .../sis/xml/bind/ModifiableIdentifierMap.java |2 +- .../sis/xml/bind/NonMarshalledAuthority.java |2 +- .../sis/xml/CharSequenceSubstitutionTest.java | 19 +- .../test/org/apache/sis/xml/LegacyCodesTest.java | 98 +- .../org/apache/sis/xml/MarshallerPoolTest.java |2 +- .../test/org/apache/sis/xml/NamespacesTest.java| 15 +- .../apache/sis/xml/NilReasonMarshallingTest.java | 41 +- .../test/org/apache/sis/xml/TransformerTest.java | 28 +- .../apache/sis/xml/TransformingNamespacesTest.java |4 +- .../org/apache/sis/xml/UUIDMarshallingTest.java| 35 +- .../org/apache/sis/xml/ValueConverterTest.java |2 +- .../org/apache/sis/xml/XLinkMarshallingTest.java |9 +- .../test/org/apache/sis/xml/XLinkTest.java | 96 +- .../test/org/apache/sis/xml/XPointerTest.java |2 +- .../org/apache/sis/geometry/EnvelopeReducer.java |2 + .../apache/sis/geometry/WraparoundAdjustment.java |4 +- .../main/org/apache/sis/io/wkt/AbstractParser.java |3 +- .../org/apache/sis/io/wkt/FormattableObject.java | 17 +- .../main/org/apache/sis/io/wkt/Formatter.java | 60 +- .../main/org/apache/sis/io/wkt/WKTDictionary.java |2 +- .../main/org/apache/sis/io/wkt/WKTFormat.java | 12 +- .../main/org/apache/sis/io/wkt/package-info.java |2 +- .../sis/parameter/DefaultParameterValue.java |1 + .../org/apache/sis/parameter/ParameterFormat.java | 11 +- .../main/org/apache/sis/parameter/Parameters.java |6 +- .../main/org/apache/sis/referencing/CRS.java | 31 +- .../apache/sis/referencing/IdentifiedObjects.java |4 +- .../sis/referencing/ImmutableIdentifier.java |2 +- .../sis/referencing/crs/DefaultCompoundCRS.java|4 + .../sis/referencing/crs/DefaultGeodeticCRS.java|1 + .../cs/DefaultCoordinateSystemAxis.java|6 +- .../sis/referencing/datum/DefaultEllipsoid.java|1 + .../sis/referencing/factory/CacheRecord.java |5 +- .../referencing/factory/CommonAuthorityCode.java |3 +- .../factory/ConcurrentAuthorityFactory.java| 24 +- .../referencing/factory/sql/EPSGDataAccess.java|2 +- .../sis/referencing/factory/sql/SQLTranslator.java | 14 +- .../apache/sis/referencing/internal/Resources.java | 33 +- .../sis/referencing/internal/Resources.properties |5 +- .../referencing/internal/Resources_fr.properties |5 +- .../referencing/internal/ServicesForMetadata.java | 85 +- .../operation/transform/MathTransformProvider.java | 35 +- .../sis/referencing/util/ReferencingUtilities.java | 18 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains JShell and fix in applications.
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 b6af5d3997da6c980f3031f3e0538140c64d183c
Merge: 7f124c7bc5 a3767ac21e
Author: Martin Desruisseaux
AuthorDate: Mon Dec 4 16:35:16 2023 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
Contains JShell and fix in applications.
.../main/org/apache/sis/console/AboutCommand.java | 14 +-
.../main/org/apache/sis/console/CRSCommand.java| 11 +-
.../main/org/apache/sis/console/Command.java | 185 +++--
.../main/org/apache/sis/console/CommandRunner.java | 117 +++-
.../org/apache/sis/console/Commands.properties | 3 +-
.../org/apache/sis/console/Commands_fr.properties | 3 +-
.../apache/sis/console/FormattedOutputCommand.java | 35 +-
.../main/org/apache/sis/console/HelpCommand.java | 3 +-
.../org/apache/sis/console/IdentifierCommand.java | 14 +-
.../main/org/apache/sis/console/InfoCommand.java | 151 +
.../org/apache/sis/console/MetadataCommand.java| 12 +-
.../org/apache/sis/console/MimeTypeCommand.java| 27 +-
.../main/org/apache/sis/console/Option.java| 14 +-
.../apache/sis/console/ResourcesDownloader.java| 44 +-
.../main/org/apache/sis/console/SIS.java | 754 +
.../org/apache/sis/console/TransformCommand.java | 61 +-
.../org/apache/sis/console/TranslateCommand.java | 13 +-
.../org/apache/sis/console/AboutCommandTest.java | 20 +-
.../org/apache/sis/console/CRSCommandTest.java | 20 +-
.../org/apache/sis/console/CommandRunnerTest.java | 55 +-
.../org/apache/sis/console/HelpCommandTest.java| 54 +-
.../apache/sis/console/MetadataCommandTest.java| 14 +-
.../apache/sis/console/MimeTypeCommandTest.java| 14 +-
.../sis/storage/geotiff/ImageFileDirectory.java| 22 +-
.../org/apache/sis/storage/gpx/StoreProvider.java | 2 +-
.../org.apache.sis.storage/main/module-info.java | 1 +
.../main/org/apache/sis/io/stream/IOUtilities.java | 22 +-
.../src/org.apache.sis.util/main/module-info.java | 3 +-
.../main/org/apache/sis/io/LineAppender.java | 59 +-
.../main/org/apache/sis/io/package-info.java | 2 +-
.../main/org/apache/sis/pending/jdk/JDK17.java | 26 +-
.../main/org/apache/sis/setup/About.java | 118 ++--
.../org/apache/sis/util/collection/TreeTables.java | 26 +-
.../org/apache/sis/util/logging/Initializer.java | 70 +-
.../apache/sis/util/logging/MonolineFormatter.java | 83 ++-
.../org/apache/sis/util/resources/Vocabulary.java | 10 +-
.../sis/util/resources/Vocabulary.properties | 2 +-
.../sis/util/resources/Vocabulary_fr.properties| 2 +-
.../sis/storage/shapefile/ShapefileStore.java | 433 +---
.../shapefile/shp/ShapeGeometryEncoder.java| 241 ++-
.../sis/storage/shapefile/shp/ShapeRecord.java | 4 +
.../sis/storage/shapefile/shp/ShapeWriter.java | 14 +-
.../sis/storage/shapefile/ShapefileStoreTest.java | 122 +++-
.../test/module-info.java | 3 +
optional/src/org.apache.sis.gui/bundle/bin/sis | 4 +
.../bundle/bin/{sis => sis_shell} | 19 +-
.../bundle/bin/{sisfx.bat => sis_shell.bat}| 22 +-
optional/src/org.apache.sis.gui/bundle/bin/sisfx | 44 +-
.../src/org.apache.sis.gui/bundle/bin/sisfx.bat| 2 +-
.../src/org.apache.sis.gui/bundle/conf/imports.jsh | 299
.../bundle/conf/logging.properties | 6 +-
.../main/org/apache/sis/gui/setup/Wizard.java | 4 +-
52 files changed, 2732 insertions(+), 571 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 7f124c7bc55bc45c9a5f46a7cdca3c1e9683f790 Merge: e55d695764 516dfb985f Author: Martin Desruisseaux AuthorDate: Tue Nov 28 18:18:48 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 buildSrc/build.gradle.kts | 1 - .../main/kotlin/sis.library-conventions.gradle.kts | 68 -- endorsed/build.gradle.kts | 15 - .../sis/storage/AbstractGridCoverageResource.java | 15 + gradle.properties | 13 + incubator/build.gradle.kts | 16 - optional/build.gradle.kts | 15 - 7 files changed, 70 insertions(+), 73 deletions(-) diff --cc gradle.properties index 00,df07faace3..e9b032a650 mode 00,100644..100644 --- a/gradle.properties +++ b/gradle.properties @@@ -1,0 -1,13 +1,13 @@@ + # + # Branch-specific or tag-specific properties of Apache SIS. + # This file provides a single location where version number + # and deployment URL can be changed before new tags. + # -version=2.0-SNAPSHOT ++version=1.x-SNAPSHOT + + # Following identifiers should match elements in the Maven settings.xml file. + # They are used for fetching the credentials for publishing binaries in a repository. + snapshotsId = apache.snapshots.https + releasesId = apache.releases.https + snapshotsURL = https://repository.apache.org/content/repositories/snapshots + releasesURL = https://repository.apache.org/service/local/staging/deploy/maven2
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 e55d695764715ef39ff8f89b04eeea21d4060464 Merge: bc9edad990 af3440719f Author: Martin Desruisseaux AuthorDate: Mon Nov 27 18:54:19 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 buildSrc/build.gradle.kts | 24 +- .../org/apache/sis/buildtools/book/Assembler.java | 0 .../apache/sis/buildtools/book/BookException.java | 0 .../org/apache/sis/buildtools/book/Characters.java | 0 .../apache/sis/buildtools/book/CodeColorizer.java | 0 .../apache/sis/buildtools/book/package-info.java | 0 .../sis/buildtools/coding/ReorganizeImports.java | 78 +++ .../buildtools/coding/VerifyVersionInJavadoc.java | 0 .../apache/sis/buildtools/coding/package-info.java | 0 .../org/apache/sis/buildtools/doclet/Doclet.java | 0 .../org/apache/sis/buildtools/doclet/Include.java | 0 .../org/apache/sis/buildtools/doclet/Rewriter.java | 0 .../org/apache/sis/buildtools/doclet/Taglet.java | 0 .../apache/sis/buildtools/doclet/package-info.java | 0 .../apache/sis/buildtools/gradle/Assembler.java| 0 .../apache/sis/buildtools/gradle/BuildHelper.java | 0 .../apache/sis/buildtools/gradle/Conventions.java | 0 .../apache/sis/buildtools/gradle/Dependency.java | 0 .../apache/sis/buildtools/gradle/JavaMaker.java| 0 .../sis/buildtools/gradle/ModularCompilation.java | 0 .../apache/sis/buildtools/gradle/ModularJAR.java | 0 .../sis/buildtools/gradle/ModularJavadoc.java | 0 .../sis/buildtools/gradle/ModularPublishing.java | 0 .../sis/buildtools/gradle/ModularSources.java | 0 .../apache/sis/buildtools/gradle/ModularTest.java | 0 .../sis/buildtools/gradle/SISBuildException.java | 0 .../org/apache/sis/buildtools/gradle/UnoPkg.java | 0 .../apache/sis/buildtools/gradle/ZipWriter.java| 0 .../apache/sis/buildtools/gradle/package-info.java | 0 .../org/apache/sis/buildtools/maven/Element.java | 0 .../org/apache/sis/buildtools/maven/Generator.java | 0 .../apache/sis/buildtools/maven/package-info.java | 0 .../sis/buildtools/maven/workaround/Argument.java | 0 .../maven/workaround/ProxyGenerator.java | 0 .../buildtools/maven/workaround/package-info.java | 0 .../resources/IndexedResourceCompiler.java | 0 .../sis/buildtools/resources/package-info.java | 0 .../main/kotlin/sis.library-conventions.gradle.kts | 68 ++ .../org/apache/sis/buildtools/book/GEOAPI.lst | 0 .../org/apache/sis/buildtools/book/OGC.lst | 0 .../org/apache/sis/buildtools/book/SIS.lst | 0 .../org/apache/sis/buildtools/book/XML_PREFIX.lst | 0 .../resources/IndexedResourceCompilerTest.java | 0 endorsed/build.gradle.kts | 27 +-- .../main/org/apache/sis/console/package-info.java | 2 +- .../sis/coverage/grid/DimensionAppender.java | 184 .../sis/coverage/grid/DimensionalityReduction.java | 15 +- .../sis/coverage/grid/GridCoverageProcessor.java | 87 +++- .../org/apache/sis/coverage/grid/GridExtent.java | 69 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 63 +- .../sis/coverage/grid/j2d/SampleModelFactory.java | 4 +- .../org/apache/sis/feature/internal/Resources.java | 10 + .../sis/feature/internal/Resources.properties | 2 + .../sis/feature/internal/Resources_fr.properties | 2 + .../org/apache/sis/filter/AssociationValue.java| 7 +- .../org/apache/sis/filter/ComparisonFilter.java| 2 +- .../main/org/apache/sis/filter/PropertyValue.java | 18 +- .../apache/sis/filter/internal/FunctionNames.java | 2 +- .../main/org/apache/sis/filter/internal/XPath.java | 74 +-- .../main/org/apache/sis/filter/sqlmm/Registry.java | 4 +- .../apache/sis/geometry/wrapper/j2d/Polyline.java | 4 +- .../main/org/apache/sis/image/MaskedImage.java | 2 +- .../main/org/apache/sis/image/PixelIterator.java | 2 +- .../main/org/apache/sis/image/PlanarImage.java | 6 +- .../apache/sis/image/processing/TiledProcess.java | 6 +- .../sis/coverage/grid/DimensionAppenderTest.java | 131 +++ .../coverage/grid/DimensionalityReductionTest.java | 4 +- .../apache/sis/coverage/grid/GridExtentTest.java | 115 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 140 +++- .../test/org/apache/sis/filter/XPathTest.java | 20 ++ .../test/org/apache/sis/image/TiledImageMock.java | 6 +- .../gazetteer/GeohashReferenceSystem.java | 6 +- .../main/org/apache/sis/referencing/CommonCRS.java | 68 -- .../factory/CommonAuthorityFactory.java| 4 +- .../org/apache/sis/referencing/package-info.java | 2 +- .../org/apache/sis/referencing/util/Formulas.java | 2 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This merge is only about imports order.
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 bc9edad9902fc0d385714f6f20aa2f4180010dce Merge: fb00d38fa4 d2d5ef87ea Author: Martin Desruisseaux AuthorDate: Thu Nov 23 19:48:35 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge is only about imports order. .../org/apache/sis/buildtools/book/Assembler.java | 1 - .../resources/IndexedResourceCompilerTest.java | 1 - .../sis/cloud/aws/s3/ClientFileSystemTest.java | 3 +-- .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 3 +-- .../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 3 +-- .../org/apache/sis/console/TransformCommand.java | 3 +-- .../org/apache/sis/console/TranslateCommand.java | 2 +- .../org/apache/sis/console/AboutCommandTest.java | 3 +-- .../org/apache/sis/console/CRSCommandTest.java | 3 +-- .../org/apache/sis/console/CommandRunnerTest.java | 3 +-- .../org/apache/sis/console/HelpCommandTest.java| 3 +-- .../apache/sis/console/MetadataCommandTest.java| 3 +-- .../apache/sis/console/MimeTypeCommandTest.java| 3 +-- .../main/org/apache/sis/coverage/Category.java | 3 +-- .../main/org/apache/sis/coverage/CategoryList.java | 5 ++--- .../org/apache/sis/coverage/CoverageCombiner.java | 3 +-- .../apache/sis/coverage/grid/GridCoverage2D.java | 9 .../org/apache/sis/coverage/grid/GridGeometry.java | 1 - .../apache/sis/coverage/grid/ImageRenderer.java| 11 + .../apache/sis/coverage/grid/PixelTranslation.java | 3 +-- .../apache/sis/coverage/grid/ReshapedImage.java| 5 ++--- .../sis/coverage/grid/j2d/ImageUtilities.java | 11 + .../sis/coverage/grid/j2d/TileOpExecutor.java | 15 ++--- .../apache/sis/feature/AbstractIdentifiedType.java | 1 - .../apache/sis/feature/CharacteristicTypeMap.java | 1 - .../apache/sis/feature/DefaultAssociationRole.java | 1 - .../apache/sis/feature/DefaultAttributeType.java | 1 - .../org/apache/sis/feature/PropertySingleton.java | 1 - .../main/org/apache/sis/filter/internal/XPath.java | 1 - .../main/org/apache/sis/filter/sqlmm/SQLMM.java| 1 - .../main/org/apache/sis/filter/sqlmm/ST_Point.java | 3 +-- .../org/apache/sis/geometry/wrapper/jts/JTS.java | 1 - .../apache/sis/image/BandedSampleConverter.java| 1 - .../main/org/apache/sis/image/DataType.java| 1 - .../main/org/apache/sis/image/MaskImage.java | 1 - .../main/org/apache/sis/image/MaskedImage.java | 1 - .../main/org/apache/sis/image/PixelIterator.java | 3 +-- .../main/org/apache/sis/image/PlanarImage.java | 3 +-- .../main/org/apache/sis/image/ResampledImage.java | 1 - .../main/org/apache/sis/image/ResamplingGrid.java | 3 +-- .../sis/image/processing/isoline/Isolines.java | 1 - .../org/apache/sis/coverage/CategoryListTest.java | 3 +-- .../test/org/apache/sis/coverage/CategoryTest.java | 5 ++--- .../apache/sis/coverage/CoverageCombinerTest.java | 3 +-- .../apache/sis/coverage/SampleDimensionTest.java | 3 +-- .../apache/sis/coverage/SampleRangeFormatTest.java | 1 - .../grid/BandAggregateGridCoverageTest.java| 5 ++--- .../coverage/grid/BufferedGridCoverageTest.java| 1 - .../coverage/grid/ConvertedGridCoverageTest.java | 7 +++--- .../coverage/grid/DimensionalityReductionTest.java | 3 +-- .../grid/FractionalGridCoordinatesTest.java| 3 +-- .../sis/coverage/grid/GridCoverage2DTest.java | 5 ++--- .../sis/coverage/grid/GridCoverageBuilderTest.java | 3 +-- .../sis/coverage/grid/GridDerivationTest.java | 7 +++--- .../apache/sis/coverage/grid/GridExtentTest.java | 4 +--- .../apache/sis/coverage/grid/GridGeometryTest.java | 3 +-- .../sis/coverage/grid/GridOrientationTest.java | 3 +-- .../sis/coverage/grid/PixelTranslationTest.java| 3 +-- .../coverage/grid/ResampledGridCoverageTest.java | 7 +++--- .../sis/coverage/grid/ReshapedImageTest.java | 3 +-- .../coverage/grid/TranslatedGridCoverageTest.java | 3 +-- .../coverage/grid/j2d/ColorModelBuilderTest.java | 3 +-- .../sis/coverage/grid/j2d/ImageLayoutTest.java | 3 +-- .../sis/coverage/grid/j2d/ImageUtilitiesTest.java | 5 ++--- .../coverage/grid/j2d/SampleModelFactoryTest.java | 3 +-- .../coverage/grid/j2d/ScaledColorSpaceTest.java| 7 +++--- .../sis/coverage/internal/RangeArgumentTest.java | 3 +-- .../apache/sis/feature/AbstractFeatureTest.java| 3 +-- .../apache/sis/feature/AbstractOperationTest.java | 3 +-- .../test/org/apache/sis/feature/Assertions.java| 1 + .../apache/sis/feature/CharacteristicMapTest.java | 3 +-- .../sis/feature/CharacteristicTypeMapTest.java | 5 ++--- .../sis/feature/DefaultAssociationRoleTest.java| 5 ++--- .../sis/feature/DefaultAttributeTypeTest.java | 5 ++---
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. The main work are on Shapefile, GeoTIFF and metadata "nil reasons".
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 fb00d38fa4e4f23700e93f9906e9a04687204ace Merge: 2bffeac5a6 3adfcd615c Author: Martin Desruisseaux AuthorDate: Thu Nov 23 14:40:46 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. The main work are on Shapefile, GeoTIFF and metadata "nil reasons". .../org/apache/sis/buildtools/book/Assembler.java | 14 +- .../apache/sis/buildtools/book/CodeColorizer.java | 2 +- .../apache/sis/buildtools/book/package-info.java | 2 +- .../org.apache.sis.console/main/module-info.java | 3 +- .../main/org/apache/sis/console/Command.java | 4 +- .../main/org/apache/sis/console/CommandRunner.java | 26 + .../org/apache/sis/console/Commands.properties | 1 + .../org/apache/sis/console/Commands_fr.properties | 17 +- .../main/org/apache/sis/console/HelpCommand.java | 3 +- .../main/org/apache/sis/console/Option.java| 8 +- .../main/org/apache/sis/console/Options.properties | 3 +- .../org/apache/sis/console/Options_fr.properties | 23 +- .../org/apache/sis/console/TransformCommand.java | 6 +- .../org/apache/sis/console/TranslateCommand.java | 105 .../main/org/apache/sis/console/package-info.java | 11 +- .../org.apache.sis.feature/main/module-info.java | 2 + .../org/apache/sis/coverage/CoverageCombiner.java | 8 +- .../org/apache/sis/coverage/RegionOfInterest.java | 2 +- .../sis/coverage/grid/GridCoverageProcessor.java | 21 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../org/apache/sis/filter/AssociationValue.java| 12 +- .../apache/sis/filter/DefaultFilterFactory.java| 14 +- .../main/org/apache/sis/filter/PropertyValue.java | 36 +- .../main/org/apache/sis/filter/internal/XPath.java | 193 +-- .../main/org/apache/sis/filter/package-info.java | 2 +- .../test/org/apache/sis/filter/XPathTest.java | 40 +- .../org.apache.sis.metadata/main/module-info.java | 1 + .../org/apache/sis/metadata/AbstractMetadata.java | 122 - .../main/org/apache/sis/metadata/IndexMap.java | 33 +- .../org/apache/sis/metadata/InformationMap.java| 31 +- .../org/apache/sis/metadata/MetadataColumn.java| 67 +++ .../org/apache/sis/metadata/MetadataStandard.java | 78 ++- .../apache/sis/metadata/ModifiableMetadata.java| 21 +- .../main/org/apache/sis/metadata/NameMap.java | 34 +- .../main/org/apache/sis/metadata/NilReasonMap.java | 209 .../org/apache/sis/metadata/PropertyAccessor.java | 43 +- .../main/org/apache/sis/metadata/PropertyMap.java | 265 +++--- .../main/org/apache/sis/metadata/TreeNode.java | 228 ++-- .../org/apache/sis/metadata/TreeNodeChildren.java | 64 ++- .../org/apache/sis/metadata/TreeTableView.java | 47 +- .../main/org/apache/sis/metadata/TypeMap.java | 33 +- .../apache/sis/metadata/ValueExistencePolicy.java | 12 + .../main/org/apache/sis/metadata/ValueMap.java | 228 +--- .../apache/sis/metadata/internal/Resources.java| 2 +- .../sis/metadata/internal/Resources.properties | 2 +- .../sis/metadata/internal/Resources_fr.properties | 2 +- .../iso/DefaultExtendedElementInformation.java | 22 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 22 +- .../org/apache/sis/metadata/iso/ISOMetadata.java | 27 +- .../sis/metadata/iso/citation/DefaultCitation.java | 22 +- .../sis/metadata/iso/citation/DefaultContact.java | 22 +- .../iso/citation/DefaultResponsibility.java| 22 +- .../iso/constraint/DefaultConstraints.java | 22 +- .../iso/content/DefaultCoverageDescription.java| 22 +- .../DefaultFeatureCatalogueDescription.java| 22 +- .../iso/content/DefaultImageDescription.java | 22 +- .../iso/content/DefaultRangeDimension.java | 22 +- .../DefaultDigitalTransferOptions.java | 22 +- .../metadata/iso/distribution/DefaultMedium.java | 22 +- .../iso/identification/AbstractIdentification.java | 22 +- .../DefaultAggregateInformation.java | 22 +- .../iso/identification/DefaultBrowseGraphic.java | 22 +- .../iso/identification/DefaultCoupledResource.java | 22 +- .../identification/DefaultDataIdentification.java | 22 +- .../DefaultRepresentativeFraction.java | 22 +- .../DefaultServiceIdentification.java | 22 +- .../metadata/iso/identification/DefaultUsage.java | 22 +- .../sis/metadata/iso/lineage/DefaultLineage.java | 22 +- .../metadata/iso/lineage/DefaultProcessStep.java | 22 +- .../sis/metadata/iso/lineage/DefaultSource.java| 22 +- .../maintenance/DefaultMaintenanceInformation.java | 22 +- .../sis/metadata/iso/quality/AbstractElement.java | 22 +- .../iso/quality/DefaultConformanceResult.java | 48 +- .../sis/metadata/iso/quality/package-info.java | 3 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 2bffeac5a64482570ce95dc5ef42d0392bf06f4a Merge: 0a72e06db9 df8c4d966c Author: Martin Desruisseaux AuthorDate: Mon Nov 6 11:59:38 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 endorsed/build.gradle.kts | 3 +- .../org.apache.sis.feature/main/module-info.java | 1 + .../grid/BandAggregateGridCoverageTest.java| 4 +- .../coverage/grid/ConvertedGridCoverageTest.java | 6 +- .../coverage/grid/DimensionalityReductionTest.java | 2 +- .../sis/coverage/grid/GridCoverage2DTest.java | 4 +- .../sis/coverage/grid/GridCoverageBuilderTest.java | 2 +- .../sis/coverage/grid/GridDerivationTest.java | 8 +- .../apache/sis/coverage/grid/GridExtentTest.java | 2 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 8 +- .../coverage/grid/ResampledGridCoverageTest.java | 8 +- .../sis/coverage/grid/ReshapedImageTest.java | 6 +- .../coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../apache/sis/feature/EnvelopeOperationTest.java | 2 +- .../apache/sis/feature/FeatureOperationsTest.java | 6 +- .../feature/builder/FeatureTypeBuilderTest.java| 8 +- .../feature/internal/AttributeConventionTest.java | 2 +- .../sis/filter/BinarySpatialFilterTestCase.java| 4 +- .../apache/sis/filter/sqlmm/RegistryTestCase.java | 4 +- .../org/apache/sis/filter/sqlmm/SQLMMTest.java | 2 +- .../sis/geometry/wrapper/GeometriesTestCase.java | 4 +- .../org/apache/sis/image/ResamplingGridTest.java | 4 +- .../apache/sis/metadata/MetadataCopierTest.java| 4 +- .../apache/sis/metadata/MetadataStandardTest.java | 6 +- .../apache/sis/metadata/PropertyAccessorTest.java | 14 +- .../sis/metadata/PropertyInformationTest.java | 2 +- .../org/apache/sis/metadata/SpecialCasesTest.java | 6 +- .../sis/metadata/sql/IdentifierGeneratorTest.java | 1 - .../sis/metadata/sql/MetadataWriterTest.java | 4 +- .../xml/bind/fra/DirectReferenceSystemTest.java| 4 +- .../apache/sis/geometry/AbstractEnvelopeTest.java | 6 +- .../org/apache/sis/geometry/ArrayEnvelopeTest.java | 4 +- .../apache/sis/geometry/CoordinateFormatTest.java | 6 +- .../org/apache/sis/geometry/Envelope2DTest.java| 2 +- .../org/apache/sis/geometry/EnvelopesTest.java | 2 +- .../sis/geometry/GeneralDirectPositionTest.java| 2 +- .../apache/sis/geometry/GeneralEnvelopeTest.java | 4 +- .../apache/sis/geometry/ImmutableEnvelopeTest.java | 2 +- .../org/apache/sis/geometry/SubEnvelopeTest.java | 2 +- .../org/apache/sis/geometry/TransformTestCase.java | 8 +- .../sis/geometry/WraparoundAdjustmentTest.java | 4 +- .../sis/referencing/AuthorityFactoriesTest.java| 4 +- .../test/org/apache/sis/referencing/CRSTest.java | 6 +- .../sis/referencing/GeodesicsOnEllipsoidTest.java | 2 +- .../sis/referencing/GeodeticCalculatorTest.java| 2 +- .../sis/referencing/IdentifiedObjectsTest.java | 2 +- .../sis/referencing/StandardDefinitionsTest.java | 10 +- .../sis/referencing/crs/AbstractCRSTest.java | 4 +- .../referencing/crs/DefaultCompoundCRSTest.java| 4 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 4 +- .../referencing/crs/DefaultEngineeringCRSTest.java | 2 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 4 +- .../referencing/crs/DefaultProjectedCRSTest.java | 2 +- .../referencing/crs/DefaultTemporalCRSTest.java| 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +- .../sis/referencing/crs/HardCodedCRSTest.java | 2 +- .../datum/DefaultTemporalDatumTest.java| 2 +- .../sis/referencing/datum/HardCodedDatum.java | 4 +- .../referencing/factory/AuthorityFactoryMock.java | 2 + .../factory/MultiAuthoritiesFactoryTest.java | 6 +- .../internal/ServicesForMetadataTest.java | 2 +- .../operation/CoordinateOperationFinderTest.java | 4 +- .../DefaultConcatenatedOperationTest.java | 4 +- .../operation/DefaultConversionTest.java | 12 +- .../operation/DefaultTransformationTest.java | 8 +- .../operation/HardCodedConversions.java| 2 + .../builder/LinearTransformBuilderTest.java| 6 +- .../operation/builder/LinearizerTest.java | 4 +- .../operation/provider/GeographicOffsetsTest.java | 2 +- .../transform/AbridgedMolodenskyTransformTest.java | 4 +- .../transform/CoordinateSystemTransformTest.java | 2 +- .../transform/DefaultMathTransformFactoryTest.java | 8 +- .../InterpolatedGeocentricTransformTest.java | 2 +- .../transform/MathTransformFactoryBase.java| 2 + .../transform/MolodenskyTransformTest.java | 4 +- .../transform/TransformSeparatorTest.java |
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 0a72e06db91f4d8b115f1a5f2d1e76fc32136242 Merge: e0f5cfa3ec 3afc7a15bf Author: Martin Desruisseaux AuthorDate: Sun Oct 29 18:42:14 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../sis/buildtools/coding/ReorganizeImports.java | 31 +- endorsed/build.gradle.kts | 2 +- .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../org.apache.sis.feature/main/module-info.java | 2 +- .../main/org/apache/sis/coverage/Category.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 7 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 2 +- .../apache/sis/feature/AbstractIdentifiedType.java | 8 +- .../apache/sis/feature/DefaultAssociationRole.java | 2 +- .../apache/sis/feature/DefaultAttributeType.java | 4 +- .../sis/feature/builder/AttributeTypeBuilder.java | 4 +- .../apache/sis/feature/builder/TypeBuilder.java| 13 +- .../apache/sis/feature/builder/package-info.java | 2 +- .../sis/geometry/wrapper/GeometryWrapper.java | 5 +- .../main/org/apache/sis/image/Colorizer.java | 4 +- .../main/org/apache/sis/image/ImageProcessor.java | 151 +-- .../main/org/apache/sis/image/Visualization.java | 12 - .../main/org/apache/sis/image/package-info.java| 2 +- .../org.apache.sis.metadata/main/module-info.java | 4 +- .../apache/sis/metadata/internal/AxisNames.java| 48 +- .../apache/sis/metadata/internal/NameMeaning.java | 2 +- .../sis/metadata/internal/ReferencingServices.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 88 +--- .../sis/metadata/iso/citation/Citations.java | 12 +- .../iso/constraint/DefaultConstraints.java | 6 +- .../metadata/iso/distribution/DefaultFormat.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 4 +- .../iso/extent/DefaultGeographicDescription.java | 6 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../apache/sis/util/iso/DefaultRecordSchema.java | 5 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 57 +-- .../main/org/apache/sis/util/iso/Types.java| 2 +- .../main/org/apache/sis/util/iso/package-info.java | 2 +- .../main/org/apache/sis/xml/bind/Context.java | 2 +- .../test/org/apache/sis/metadata/TreeNodeTest.java | 6 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../org/apache/sis/openoffice/XReferencing.java| 4 +- .../referencing/gazetteer/FinalLocationType.java | 12 +- .../gazetteer/ModifiableLocationType.java | 12 +- .../main/module-info.java | 2 +- .../main/org/apache/sis/io/wkt/Convention.java | 2 +- .../main/org/apache/sis/io/wkt/Formatter.java | 4 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 4 +- .../main/org/apache/sis/io/wkt/StoredTree.java | 4 +- .../main/org/apache/sis/io/wkt/Transliterator.java | 30 +- .../main/org/apache/sis/io/wkt/package-info.java | 4 +- .../parameter/DefaultParameterDescriptorGroup.java | 4 +- .../sis/parameter/DefaultParameterValue.java | 4 +- .../org/apache/sis/parameter/ParameterBuilder.java | 10 +- .../org/apache/sis/parameter/TensorParameters.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 12 +- .../main/org/apache/sis/referencing/Builder.java | 10 +- .../main/org/apache/sis/referencing/CRS.java | 6 +- .../main/org/apache/sis/referencing/CommonCRS.java | 6 +- .../apache/sis/referencing/IdentifiedObjects.java | 4 +- .../apache/sis/referencing/NamedIdentifier.java| 2 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 2 +- .../apache/sis/referencing/cs/AxesConvention.java | 2 +- .../org/apache/sis/referencing/cs/AxisFilter.java | 4 +- .../sis/referencing/cs/CoordinateSystems.java | 12 +- .../cs/DefaultCoordinateSystemAxis.java| 16 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 8 +- .../sis/referencing/datum/DatumShiftGrid.java | 2 +- .../referencing/datum/DefaultGeodeticDatum.java| 4 +- .../factory/CommonAuthorityFactory.java| 4 +- .../factory/IdentifiedObjectFinder.java| 2 +- .../referencing/factory/IdentifiedObjectSet.java | 2 +- .../referencing/factory/sql/EPSGDataAccess.java| 6 +- .../sis/referencing/factory/sql/package-info.java | 4 +- .../sis/referencing/internal/DeprecatedCode.java | 2 +- .../sis/referencing/internal/DeprecatedName.java | 2 +- .../operation/CoordinateOperationContext.java | 6 +- .../operation/CoordinateOperationRegistry.java | 2 +-
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 e0f5cfa3ec8216015164da158bfe05792714fe77 Merge: b81aa21f91 53ac462e63 Author: Martin Desruisseaux AuthorDate: Sat Oct 28 16:57:33 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +- .../sis/metadata/PropertyConsistencyCheck.java | 2 +- .../sis/metadata/xml/SchemaComplianceTest.java | 2 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +- .../org/apache/sis/storage/geotiff/Writer.java | 4 ++-- .../sis/storage/geotiff/writer/GeoEncoder.java | 9 + .../storage/geotiff/writer/ReformattedImage.java | 3 ++- .../org/apache/sis/storage/geotiff/WriterTest.java | 7 --- .../apache/sis/storage/base/MetadataFetcher.java | 8 +--- .../sis/io/stream/HyperRectangleWriterTest.java| 6 -- .../apache/sis/io/stream/UpdatableWriteTest.java | 6 -- .../storage/coveragejson/CoverageJsonStore.java| 22 +++--- .../coveragejson/CoverageJsonStoreProvider.java| 8 .../sis/storage/coveragejson/CoverageResource.java | 22 -- .../sis/storage/coveragejson/binding/Axe.java | 4 ++-- .../sis/storage/coveragejson/binding/Axes.java | 2 +- .../sis/storage/coveragejson/binding/Category.java | 2 +- .../coveragejson/binding/CategoryEncoding.java | 4 ++-- .../sis/storage/coveragejson/binding/Coverage.java | 6 +++--- .../coveragejson/binding/CoverageCollection.java | 4 ++-- .../storage/coveragejson/binding/Dictionary.java | 4 ++-- .../sis/storage/coveragejson/binding/Domain.java | 4 ++-- .../coveragejson/binding/GeographicCRS.java| 2 +- .../sis/storage/coveragejson/binding/I18N.java | 8 .../storage/coveragejson/binding/IdentifierRS.java | 2 +- .../sis/storage/coveragejson/binding/NdArray.java | 4 ++-- .../coveragejson/binding/ObservedProperty.java | 4 ++-- .../storage/coveragejson/binding/Parameter.java| 2 +- .../coveragejson/binding/ParameterGroup.java | 4 ++-- .../storage/coveragejson/binding/Parameters.java | 4 ++-- .../storage/coveragejson/binding/ProjectedCRS.java | 2 +- .../sis/storage/coveragejson/binding/Ranges.java | 4 ++-- .../binding/ReferenceSystemConnection.java | 4 ++-- .../sis/storage/coveragejson/binding/Symbol.java | 2 +- .../coveragejson/binding/TargetConcept.java| 2 +- .../storage/coveragejson/binding/TemporalRS.java | 2 +- .../sis/storage/coveragejson/binding/TileSet.java | 6 +++--- .../storage/coveragejson/binding/TiledNdArray.java | 4 ++-- .../sis/storage/coveragejson/binding/Unit.java | 2 +- .../storage/coveragejson/binding/VerticalCRS.java | 2 +- .../coveragejson/CoverageJsonStoreTest.java| 13 - .../storage/coveragejson/binding/BindingTest.java | 13 - 42 files changed, 118 insertions(+), 101 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains the addition of a "coveragejson" module and a first draft of GeoTIFF writer.
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
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 +
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 d4fc457a24f10d906d2ef8f34267730d895e60e7 Merge: 2730c89d63 a24a7b212f Author: Martin Desruisseaux AuthorDate: Fri Oct 6 02:04:50 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../org/apache/sis/buildtools/gradle/BuildHelper.java | 1 + .../org/apache/sis/buildtools/gradle/Conventions.java | 5 + .../apache/sis/buildtools/gradle/ModularJavadoc.java| 1 + .../apache/sis/buildtools/gradle/ModularSources.java| 7 +-- endorsed/build.gradle.kts | 17 + .../src/org.apache.sis.metadata/main/module-info.java | 3 ++- endorsed/src/org.apache.sis.util/main/module-info.java | 11 --- incubator/build.gradle.kts | 17 + optional/build.gradle.kts | 17 + settings.gradle.kts | 1 + 10 files changed, 70 insertions(+), 10 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 2730c89d637c575eb52f75fa51b067a47fa40355 Merge: fba1ecf3f7 24b12731b9 Author: Martin Desruisseaux AuthorDate: Thu Oct 5 15:33:25 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/buildtools/gradle/BuildHelper.java | 1 + .../apache/sis/buildtools/gradle/Dependency.java | 2 +- .../apache/sis/buildtools/gradle/ModularJAR.java | 9 +- .../sis/buildtools/gradle/ModularSources.java | 147 + .../apache/sis/buildtools/gradle/ZipWriter.java| 2 +- endorsed/build.gradle.kts | 109 --- .../org/apache/sis/filter/sqlmm/OneGeometry.java | 2 + .../org/apache/sis/filter/sqlmm/ST_Transform.java | 2 + .../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 + .../main/org/apache/sis/util/iso/Types.java| 5 +- .../bind/metadata/replace/QualityParameter.java| 6 +- .../sis/referencing/AbstractIdentifiedObject.java | 4 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../org/apache/sis/storage/gpx/WritableStore.java | 1 - .../org/apache/sis/storage/StorageConnector.java | 2 + .../org/apache/sis/storage/WritableFeatureSet.java | 1 - .../org/apache/sis/converter/NumberConverter.java | 2 + .../org/apache/sis/converter/ObjectToString.java | 4 + .../org/apache/sis/converter/StringConverter.java | 4 + .../sis/util/collection/WeakValueHashMap.java | 2 +- .../apache/sis/util/internal/MetadataServices.java | 2 - incubator/build.gradle.kts | 15 ++- optional/build.gradle.kts | 13 +- .../org/apache/sis/gui/map/ValuesFormatter.java| 2 +- 24 files changed, 302 insertions(+), 41 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 fba1ecf3f7a4fd0c4138d7646f62bf16ef5035f3 Merge: 18a06d459c 0a25115dc9 Author: Martin Desruisseaux AuthorDate: Tue Oct 3 17:49:19 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 NOTICE | 10 +- README.md | 9 + .../buildtools/coding/VerifyVersionInJavadoc.java | 293 + .../apache/sis/buildtools/gradle/BuildHelper.java | 1 + .../apache/sis/buildtools/gradle/ZipWriter.java| 7 +- endorsed/README.md | 15 ++ endorsed/build.gradle.kts | 2 + .../org.apache.sis.console/main/module-info.java | 18 +- .../apache/sis/metadata/sql/MetadataSource.java| 2 +- .../apache/sis/metadata/sql/util/Initializer.java | 6 +- .../sis/metadata/sql/util/LocalDataSource.java | 2 +- .../src/org.apache.sis.openoffice/bundle/README.md | 2 +- .../referencing/factory/FactoryDataException.java | 5 +- .../factory/MissingFactoryResourceException.java | 1 + .../sis/referencing/factory/sql/EPSGFactory.java | 4 +- .../sis/referencing/factory/sql/EPSG_README.md | 2 +- .../sis/referencing/factory/sql/package-info.java | 2 +- .../operation/provider/DatumShiftGridLoader.java | 3 +- .../sis/referencing/factory/sql/epsg/README.md | 4 +- .../sis/referencing/report/HTMLGenerator.java | 2 +- .../src/org.apache.sis.util/main/module-info.java | 2 +- .../main/org/apache/sis/setup/Configuration.java | 2 +- .../apache/sis/setup/InstallationResources.java| 4 +- .../apache/sis/setup/OptionalInstallations.java| 4 +- incubator/README.md| 10 + optional/README.md | 29 ++ optional/build.gradle.kts | 5 + optional/src/org.apache.sis.gui/bundle/README | 7 +- optional/src/org.apache.sis.gui/bundle/lib/README | 1 + .../src/org.apache.sis.gui/main/module-info.java | 26 +- 30 files changed, 433 insertions(+), 47 deletions(-) diff --cc endorsed/src/org.apache.sis.openoffice/bundle/README.md index 39993eeb62,acc06e2ae7..e21a6980b6 --- a/endorsed/src/org.apache.sis.openoffice/bundle/README.md +++ b/endorsed/src/org.apache.sis.openoffice/bundle/README.md @@@ -83,7 -83,7 +83,7 @@@ Launch ``` cd target - unopkg add apache-sis-1.1-SNAPSHOT.oxt --log-file log.txt -unopkg add apache-sis-2.0-SNAPSHOT.oxt --log-file log.txt ++unopkg add apache-sis-1.x-SNAPSHOT.oxt --log-file log.txt scalc -env:RTL_LOGFILE=log.txt ``` diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/README.md index 73d583a49e,42f030d594..6a90fc4e0b --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/README.md +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/README.md @@@ -98,7 -98,7 +98,7 @@@ cd _ mvn clean install export CLASSPATH=~/.m2/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar export CLASSPATH=$PWD/core/sis-metadata/target/test-classes:$CLASSPATH --export CLASSPATH=$PWD/target/binaries/sis-referencing-2.0-SNAPSHOT.jar:$CLASSPATH ++export CLASSPATH=$PWD/target/binaries/sis-referencing-1.x-SNAPSHOT.jar:$CLASSPATH export CLASSPATH=$PWD/core/sis-metadata/target/test-classes:$CLASSPATH export CLASSPATH=$PWD/core/sis-referencing/target/test-classes:$CLASSPATH cd http://svn.apache.org/repos/asf/sis/data/non-free/>
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 a1f4b15161f53dcde29d134f04a3175b0502e679
Merge: 80a27652f1 66ca33f853
Author: Martin Desruisseaux
AuthorDate: Fri Sep 29 17:20:44 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
.../sis/buildtools/coding/ReorganizeImports.java | 105 -
.../apache/sis/buildtools/gradle/Assembler.java| 2 +-
.../apache/sis/buildtools/gradle/Conventions.java | 17 ++-
.../apache/sis/buildtools/gradle/JavaMaker.java| 3 +-
.../sis/buildtools/gradle/ModularCompilation.java | 26 +---
.../apache/sis/buildtools/gradle/ModularJAR.java | 4 +-
.../org/apache/sis/buildtools/gradle/UnoPkg.java | 4 +-
endorsed/build.gradle.kts | 8 +-
.../main/org/apache/sis/feature/README.md | 77 ++
.../main/org/apache/sis/feature/benchmarks.html| 114 --
.../test}/FeatureComparator.java | 2 +-
.../feature => feature/test}/package-info.java | 2 +-
.../main/org/apache/sis/xml/README.md | 78 ++
.../sis/xml/bind/gco/ObjectIdentification.html | 59
.../sis/xml/bind/gco/ObjectIdentification.md | 31
.../main/org/apache/sis/xml/readme.html| 98
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/internal/AxisDirectionsTest.md| 3 +
.../sis/metadata/internal/AxisDirectionsTest.txt | 3 -
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java| 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java| 2 +-
.../constraint/DefaultLegalConstraintsTest.java| 2 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java| 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 1 -
.../sis/metadata/sql/MetadataSourceTest.java | 1 -
.../sis/metadata/sql/MetadataWriterTest.java | 1 -
.../sis/{test => metadata}/sql/TestDatabase.java | 2 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java| 2 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../test/org/apache/sis/test/sql/package-info.java | 29
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java| 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +-
.../metadata/replace/QualityParameterTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../test}/AnnotationConsistencyCheck.java | 2 +-
.../{test/xml => xml/test}/DocumentComparator.java | 2 +-
.../sis/{test/xml => xml/test}/InfiniteSet.java| 2 +-
.../{test/xml => xml/test}/PackageVerifier.java| 2 +-
.../{test/xml => xml/test}/SchemaCompliance.java | 2 +-
.../sis/{test/xml => xml/test}/TestCase.java | 2 +-
.../sis/{test/xml => xml/test}/package-info.java | 8 +-
.../sis/xml/util/DocumentComparatorTest.java | 2 +-
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 2 +-
.../src/org.apache.sis.openoffice/bundle/README.md | 100
.../bundle/build-instruction.html | 119 ---
.../sis/xml/bind/fra/DataIdentificationTest.java | 2 +-
.../xml/bind/fra/DirectReferenceSystemTest.java| 2 +-
.../apache/sis/parameter/AbstractParameterValue.md | 5 +
.../sis/parameter/AbstractParameterValue.txt | 5 -
.../sis/referencing/factory/sql/EPSG_README.md | 7 +
.../sis/referencing/factory/sql/EPSG_README.txt| 7 -
.../sis/referencing/operation/builder/README.md| 33
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1 (imports reordering).
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 80a27652f17105e29998567389fc45343cac04bb Merge: 611ffb816d 0158ef9590 Author: Martin Desruisseaux AuthorDate: Thu Sep 28 16:05:54 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 (imports reordering). .../org/apache/sis/buildtools/doclet/Doclet.java | 2 +- .../org/apache/sis/buildtools/doclet/Include.java | 4 +-- .../apache/sis/buildtools/gradle/ModularJAR.java | 4 +-- .../sis/buildtools/gradle/ModularJavadoc.java | 4 +-- .../resources/IndexedResourceCompilerTest.java | 2 ++ .../apache/sis/cloud/aws/s3/CachedByteChannel.java | 2 +- .../apache/sis/cloud/aws/s3/ClientFileSystem.java | 4 +-- .../org/apache/sis/cloud/aws/s3/FileService.java | 10 +++--- .../main/org/apache/sis/cloud/aws/s3/KeyPath.java | 6 ++-- .../apache/sis/cloud/aws/s3/ObjectAttributes.java | 6 ++-- .../sis/cloud/aws/s3/ClientFileSystemTest.java | 1 + .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 1 + .../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 4 ++- .../org/apache/sis/console/AboutCommandTest.java | 4 ++- .../org/apache/sis/console/CRSCommandTest.java | 4 ++- .../org/apache/sis/console/CommandRunnerTest.java | 4 ++- .../org/apache/sis/console/HelpCommandTest.java| 4 ++- .../apache/sis/console/MetadataCommandTest.java| 4 ++- .../apache/sis/console/MimeTypeCommandTest.java| 4 ++- .../apache/sis/coverage/grid/PixelTranslation.java | 5 ++- .../sis/feature/FeatureOperationException.java | 2 +- .../main/org/apache/sis/filter/Capabilities.java | 4 +-- .../apache/sis/filter/DefaultFilterFactory.java| 2 +- .../apache/sis/filter/internal/CopyVisitor.java| 2 +- .../sis/filter/sqlmm/FunctionDescription.java | 2 +- .../main/org/apache/sis/filter/sqlmm/SQLMM.java| 2 +- .../geometry/wrapper/SpatialOperationContext.java | 8 ++--- .../apache/sis/geometry/wrapper/jts/Factory.java | 16 - .../sis/geometry/wrapper/jts/FilteringContext.java | 4 +-- .../org/apache/sis/geometry/wrapper/jts/JTS.java | 6 ++-- .../wrapper/jts/PackedCoordinateSequence.java | 2 +- .../geometry/wrapper/jts/PathIteratorAdapter.java | 4 +-- .../sis/geometry/wrapper/jts/ShapeAdapter.java | 6 ++-- .../sis/geometry/wrapper/jts/ShapeConverter.java | 2 +- .../apache/sis/geometry/wrapper/jts/Wrapper.java | 38 ++-- .../main/org/apache/sis/image/ImageProcessor.java | 6 ++-- .../main/org/apache/sis/image/TransferType.java| 4 +-- .../sis/image/processing/isoline/Joiner.java | 2 +- .../org/apache/sis/coverage/CategoryListTest.java | 4 ++- .../test/org/apache/sis/coverage/CategoryTest.java | 4 ++- .../apache/sis/coverage/CoverageCombinerTest.java | 4 ++- .../apache/sis/coverage/SampleDimensionTest.java | 4 ++- .../apache/sis/coverage/SampleRangeFormatTest.java | 4 ++- .../grid/BandAggregateGridCoverageTest.java| 4 ++- .../coverage/grid/BufferedGridCoverageTest.java| 2 ++ .../coverage/grid/ConvertedGridCoverageTest.java | 6 ++-- .../coverage/grid/DimensionalityReductionTest.java | 4 ++- .../grid/FractionalGridCoordinatesTest.java| 3 +- .../sis/coverage/grid/GridCoverage2DTest.java | 4 ++- .../sis/coverage/grid/GridCoverageBuilderTest.java | 4 ++- .../sis/coverage/grid/GridDerivationTest.java | 4 ++- .../apache/sis/coverage/grid/GridExtentTest.java | 4 ++- .../apache/sis/coverage/grid/GridGeometryTest.java | 4 ++- .../sis/coverage/grid/GridOrientationTest.java | 4 ++- .../sis/coverage/grid/PixelTranslationTest.java| 4 ++- .../coverage/grid/ResampledGridCoverageTest.java | 6 ++-- .../sis/coverage/grid/ReshapedImageTest.java | 4 ++- .../coverage/grid/TranslatedGridCoverageTest.java | 4 ++- .../coverage/grid/j2d/ColorModelBuilderTest.java | 4 ++- .../sis/coverage/grid/j2d/ImageLayoutTest.java | 4 ++- .../sis/coverage/grid/j2d/ImageUtilitiesTest.java | 6 ++-- .../coverage/grid/j2d/SampleModelFactoryTest.java | 4 ++- .../coverage/grid/j2d/ScaledColorSpaceTest.java| 6 ++-- .../sis/coverage/internal/RangeArgumentTest.java | 4 ++- .../apache/sis/feature/AbstractFeatureTest.java| 2 ++ .../apache/sis/feature/AbstractOperationTest.java | 4 ++- .../apache/sis/feature/CharacteristicMapTest.java | 4 ++- .../sis/feature/CharacteristicTypeMapTest.java | 9 ++--- .../sis/feature/DefaultAssociationRoleTest.java| 6 ++-- .../sis/feature/DefaultAttributeTypeTest.java | 4 ++- .../apache/sis/feature/DefaultFeatureTypeTest.java | 4 ++- .../org/apache/sis/feature/DenseFeatureTest.java | 1 + .../apache/sis/feature/EnvelopeOperationTest.java | 4 ++- .../org/apache/sis/feature/FeatureFormatTest.java | 4 ++- .../apache/sis/feature/FeatureOperationsTest.java | 4 ++-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This is minor adjustments in preparation for a release proposal.
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 611ffb816db174bc1ea84a4b468b77fa44436e0d Merge: c2bcdb964f 4ad7739f09 Author: Martin Desruisseaux AuthorDate: Thu Sep 28 12:22:16 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. This is minor adjustments in preparation for a release proposal. README.md | 24 ++- endorsed/build.gradle.kts | 34 ++-- .../apache/sis/metadata/iso/extent/Extents.java| 57 +++--- .../main/module-info.java | 1 - .../main/org/apache/sis/io/wkt/Convention.java | 2 - .../main/org/apache/sis/referencing/CRS.java | 13 +- .../apache/sis/referencing/GeodeticCalculator.java | 1 - .../sis/referencing/cs/CoordinateSystems.java | 6 +- .../referencing/factory/AuthorityFactoryProxy.java | 32 ++- .../factory/ConcurrentAuthorityFactory.java| 75 +++ .../apache/sis/referencing/internal/Legacy.java| 6 +- .../sis/referencing/operation/package-info.java| 9 +- .../operation/projection/AlbersEqualArea.java | 2 +- .../operation/projection/CassiniSoldner.java | 2 +- .../operation/projection/CylindricalEqualArea.java | 2 +- .../projection/LambertConicConformal.java | 2 +- .../referencing/operation/projection/Mercator.java | 2 +- .../projection/ModifiedAzimuthalEquidistant.java | 2 +- .../operation/projection/ObliqueStereographic.java | 2 +- .../operation/projection/PolarStereographic.java | 2 +- .../operation/projection/Polyconic.java| 2 +- .../operation/projection/Sinusoidal.java | 2 +- .../operation/projection/TransverseMercator.java | 2 +- .../operation/projection/package-info.java | 7 +- .../operation/transform/ContextualParameters.java | 47 ++--- .../operation/transform/package-info.java | 2 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +- .../main/org/apache/sis/storage/geotiff/Type.java | 25 +-- .../org/apache/sis/storage/DataStoreRegistry.java | 6 +- .../apache/sis/storage/image/DataStoreFilter.java | 29 ++- .../main/org/apache/sis/measure/Scalar.java| 4 +- .../org/apache/sis/measure/UnitNames.properties| 2 + .../main/org/apache/sis/measure/UnitRegistry.java | 3 +- .../main/org/apache/sis/measure/Units.java | 221 - .../main/org/apache/sis/util/ComparisonMode.java | 9 +- .../org/apache/sis/measure/UnitFormatTest.java | 2 + .../test/org/apache/sis/measure/UnitsTest.java | 8 +- geoapi/README.md | 10 +- incubator/build.gradle.kts | 6 +- netbeans-project/ivy.xml | 8 +- optional/build.gradle.kts | 2 +- .../gui/referencing/PositionableProjection.java| 8 - settings.gradle.kts| 10 +- 43 files changed, 422 insertions(+), 271 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains the beginning of a migration to JUnit 5, the beginning of an ISO 19111 upgrade, documentation fixes and some deprecations in preparatio
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 c2bcdb964f0ef8343b5df422e2ac03acb612a3c5 Merge: 4b753152a6 b03b235825 Author: Martin Desruisseaux AuthorDate: Mon Sep 25 18:15:54 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains the beginning of a migration to JUnit 5, the beginning of an ISO 19111 upgrade, documentation fixes and some deprecations in preparation for SIS 1.4 release proposal. endorsed/build.gradle.kts | 3 +- .../org.apache.sis.console/main/module-info.java | 2 + .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../org/apache/sis/console/TransformCommand.java | 17 +- .../sis/coverage/grid/GridCoverageBuilder.java | 2 +- .../apache/sis/coverage/grid/ImageRenderer.java| 7 +- .../apache/sis/feature/builder/TypeBuilder.java| 4 +- .../apache/sis/geometry/wrapper/Geometries.java| 2 +- .../apache/sis/image/BandedSampleConverter.java| 12 +- .../main/org/apache/sis/image/ComputedImage.java | 2 +- .../test/org/apache/sis/filter/PeriodLiteral.java | 2 +- .../org.apache.sis.metadata/main/module-info.java | 2 +- .../metadata/internal/ImplementationHelper.java| 25 +- .../iso/DefaultApplicationSchemaInformation.java | 2 +- .../apache/sis/metadata/iso/DefaultIdentifier.java | 2 +- .../apache/sis/metadata/iso/extent/Extents.java| 47 +++- .../metadata/simple/SimpleIdentifiedObject.java| 6 + .../org/apache/sis/xml/TransformingWriter.java | 2 +- .../main/org/apache/sis/xml/XML.java | 6 +- .../metadata/replace/ReferenceSystemMetadata.java | 3 +- .../sis/metadata/iso/citation/CitationsTest.java | 2 +- .../metadata/iso/citation/DefaultCitationTest.java | 2 +- .../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +- .../sis/test/xml/AnnotationConsistencyCheck.java | 2 +- .../apache/sis/util/iso/DefaultLocalNameTest.java | 2 +- .../main/module-info.java | 3 +- .../main/org/apache/sis/openoffice/CalcAddins.java | 2 +- .../sis/openoffice/ReferencingFunctions.java | 37 +-- .../org/apache/sis/portrayal/CanvasFollower.java | 3 +- .../main/org/apache/sis/style/se1/Graphic.java | 2 +- .../org/apache/sis/style/se1/PointPlacement.java | 2 +- .../gazetteer/GeohashReferenceSystem.java | 8 +- .../gazetteer/MilitaryGridReferenceSystem.java | 6 +- .../main/org/apache/sis/geometry/Envelopes.java| 2 +- .../main/org/apache/sis/geometry/Shapes2D.java | 2 +- .../main/org/apache/sis/io/wkt/Formatter.java | 65 +++-- .../apache/sis/io/wkt/GeodeticObjectParser.java| 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 238 + .../sis/referencing/AbstractReferenceSystem.java | 183 + .../main/org/apache/sis/referencing/CRS.java | 44 +-- .../main/org/apache/sis/referencing/CommonCRS.java | 2 +- .../sis/referencing/DefaultObjectDomain.java | 297 + .../apache/sis/referencing/IdentifiedObjects.java | 13 +- .../org/apache/sis/referencing/NameIterator.java | 32 ++- .../org/apache/sis/referencing/Properties.java | 89 +++--- .../apache/sis/referencing/crs/AbstractCRS.java| 31 +-- .../sis/referencing/crs/DefaultCompoundCRS.java| 26 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 41 +-- .../sis/referencing/crs/DefaultEngineeringCRS.java | 26 +- .../sis/referencing/crs/DefaultGeocentricCRS.java | 26 +- .../sis/referencing/crs/DefaultGeographicCRS.java | 26 +- .../sis/referencing/crs/DefaultImageCRS.java | 26 +- .../sis/referencing/crs/DefaultParametricCRS.java | 26 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 26 +- .../sis/referencing/crs/DefaultTemporalCRS.java| 26 +- .../sis/referencing/crs/DefaultVerticalCRS.java| 26 +- .../org/apache/sis/referencing/cs/AbstractCS.java | 86 +++--- .../apache/sis/referencing/cs/AxesConvention.java | 12 +- .../sis/referencing/cs/CoordinateSystems.java | 3 +- .../apache/sis/referencing/cs/DefaultAffineCS.java | 12 +- .../sis/referencing/cs/DefaultCartesianCS.java | 38 +-- .../sis/referencing/cs/DefaultCompoundCS.java | 12 +- .../cs/DefaultCoordinateSystemAxis.java| 24 +- .../sis/referencing/cs/DefaultCylindricalCS.java | 12 +- .../sis/referencing/cs/DefaultEllipsoidalCS.java | 12 +- .../apache/sis/referencing/cs/DefaultLinearCS.java | 12 +- .../sis/referencing/cs/DefaultParametricCS.java| 12 +- .../apache/sis/referencing/cs/DefaultPolarCS.java | 12 +- .../sis/referencing/cs/DefaultSphericalCS.java | 12 +- .../apache/sis/referencing/cs/DefaultTimeCS.java | 12 +- .../sis/referencing/cs/DefaultUserDefinedCS.java | 12 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 4b753152a6aba3fcb9488398d66fa51b63981b6b
Merge: b0713f3f6e 84cb229fe7
Author: Martin Desruisseaux
AuthorDate: Mon Aug 28 16:16:25 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
.../sis/buildtools/coding/ReorganizeImports.java | 521 +
.../apache/sis/buildtools/coding/package-info.java | 10 +-
.../main/org/apache/sis/feature/PropertyView.java | 2 +-
.../metadata/simple/SimpleIdentifiedObject.java| 4 +-
.../org/apache/sis/xml/bind/gco/package-info.java | 2 +-
.../org/apache/sis/xml/bind/lan/LanguageCode.java | 4 +-
.../main/org/apache/sis/openoffice/CalcAddins.java | 2 +-
.../main/org/apache/sis/parameter/Verifier.java| 2 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 16 +-
.../referencing/factory/CommonAuthorityCode.java | 2 +-
.../operation/matrix/AffineTransforms2D.java | 2 +-
.../operation/transform/ConcatenatedTransform.java | 2 +-
.../apache/sis/storage/netcdf/AttributeNames.java | 8 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 30 +-
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 16 +-
.../org/apache/sis/storage/netcdf/base/Axis.java | 14 +-
.../apache/sis/storage/netcdf/base/AxisType.java | 2 +-
.../apache/sis/storage/netcdf/base/Convention.java | 6 +-
.../apache/sis/storage/netcdf/base/Decoder.java| 6 +-
.../apache/sis/storage/netcdf/base/FeatureSet.java | 14 +-
.../sis/storage/netcdf/base/GridMapping.java | 4 +-
.../apache/sis/storage/netcdf/base/Variable.java | 8 +-
.../sis/storage/netcdf/classic/GridInfo.java | 2 +-
.../sis/storage/netcdf/classic/VariableInfo.java | 4 +-
.../test/module-info.java | 1 +
.../apache/sis/util/collection/CacheEntries.java | 4 +-
.../apache/sis/util/internal/CollectionsExt.java | 12 +-
geoapi/build.gradle.kts| 4 +-
netbeans-project/README.md | 3 +-
netbeans-project/build.xml | 6 +-
netbeans-project/nbproject/build-impl.xml | 38 +-
netbeans-project/nbproject/genfiles.properties | 4 +-
netbeans-project/nbproject/project.properties | 39 +-
netbeans-project/nbproject/project.xml | 1 -
netbeans-project/src-local/.gitignore | 5 -
.../test/module-info.java | 32 --
.../apache/sis/test/uncommitted/package-info.java | 6 -
37 files changed, 646 insertions(+), 192 deletions(-)
diff --cc geoapi/build.gradle.kts
index 5b12e748b8,5b12e748b8..3ce4abe6c7
--- a/geoapi/build.gradle.kts
+++ b/geoapi/build.gradle.kts
@@@ -26,6 -26,6 +26,6 @@@ tasks.register("rebuild")
inputs.dir("snapshot/geoapi-pending/src/main")
inputs.dir("snapshot/geoapi-conformance/src/main")
--
outputs.file("snapshot/geoapi-pending/target/geoapi-pending-4.0-SNAPSHOT.jar")
--
outputs.file("snapshot/geoapi-conformance/target/geoapi-conformance-4.0-SNAPSHOT.jar")
++
outputs.file("snapshot/geoapi-pending/target/geoapi-pending-3.1-SNAPSHOT.jar")
++
outputs.file("snapshot/geoapi-conformance/target/geoapi-conformance-3.1-SNAPSHOT.jar")
}
diff --cc netbeans-project/build.xml
index 4ce2b57b9e,af190283ca..8407dd5b74
--- a/netbeans-project/build.xml
+++ b/netbeans-project/build.xml
@@@ -28,9 -28,13 +28,13 @@@
+
++
resource="../../../geoapi/snapshot/geoapi-pending/target/geoapi-pending-3.1-SNAPSHOT.jar"/>
+
++
resource="../../../geoapi/snapshot/geoapi-conformance/target/geoapi-conformance-3.1-SNAPSHOT.jar"/>
diff --cc netbeans-project/nbproject/build-impl.xml
index 6e5cd08b10,c3ef739c6d..c68a938d25
--- a/netbeans-project/nbproject/build-impl.xml
+++ b/netbeans-project/nbproject/build-impl.xml
@@@ -795,12 -776,9 +776,9 @@@ public class ModuleInfoSelector extend
-
-
-
-
+
diff --cc netbeans-project/nbproject/genfiles.properties
index 78b6aa9139,c6592afb58..b5d9e58bb5
--- a/netbeans-project/nbproject/genfiles.properties
+++ b/netbeans-project/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
build.xml.data.CRC32=d82237a1
build.xml.script.CRC32=9a509f0a
build.xml.stylesheet.CRC32=32069288@1.22
- nbproject/build-impl.xml.data.CRC32=32292526
- nbproject/build-impl.xml.script.CRC32=41798b68
-nbproject/build-impl.xml.data.CRC32=a5c28f79
-nbproject/build-impl.xml.script.CRC32=9782532a
++nbproject/build-impl.xml.data.CRC32=e365e8d0
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: add a git submodule for GeoAPI 3.1-SNAPSHOT.
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 408f69aa9a734f2556335f28714a75353b818be9 Merge: b099abbec0 3211e0c7a9 Author: Martin Desruisseaux AuthorDate: Sat Aug 19 13:02:53 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1: add a git submodule for GeoAPI 3.1-SNAPSHOT. .gitmodules | 5 + endorsed/build.gradle.kts | 1 + geoapi/README.md | 32 geoapi/build.gradle.kts | 31 +++ geoapi/snapshot | 1 + settings.gradle.kts | 1 + 6 files changed, 71 insertions(+) diff --cc .gitmodules index 00,4cc4938738..da7128d0c9 mode 00,100644..100644 --- a/.gitmodules +++ b/.gitmodules @@@ -1,0 -1,4 +1,5 @@@ + [submodule "geoapi/snapshot"] + path = geoapi/snapshot + url = https://github.com/opengeospatial/geoapi + shallow = true ++ branch = 3.1.x diff --cc geoapi/snapshot index 00,87d87af22a..f4f450ec84 mode 00,16..16 --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,0 -1,1 +1,1 @@@ -Subproject commit 87d87af22af0c8e8d9e386e841deab7a4a4b4c30 ++Subproject commit f4f450ec84551b7a1acff2ab437f8698625eb158
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This is for NetBeans project configuration.
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 b099abbec0a2ebd6d25ef6da4c1a8074cdb66cf6
Merge: 8474e339bc 08f37c2d72
Author: Martin Desruisseaux
AuthorDate: Sat Aug 19 10:59:26 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
This is for NetBeans project configuration.
.gitignore |3 +-
netbeans-project/README.md | 55 +
netbeans-project/build.xml | 53 +
netbeans-project/ivy-settings.xml | 21 +
netbeans-project/ivy.xml | 40 +
netbeans-project/nbproject/build-impl.xml | 1989
netbeans-project/nbproject/genfiles.properties |8 +
netbeans-project/nbproject/project.properties | 189 ++
netbeans-project/nbproject/project.xml | 32 +
netbeans-project/src-local/.gitignore |5 +
.../test/module-info.java | 32 +
.../apache/sis/test/uncommitted/package-info.java |6 +
12 files changed, 2432 insertions(+), 1 deletion(-)
diff --cc netbeans-project/nbproject/build-impl.xml
index 00,3086eda037..6e5cd08b10
mode 00,100644..100644
--- a/netbeans-project/nbproject/build-impl.xml
+++ b/netbeans-project/nbproject/build-impl.xml
@@@ -1,0 -1,1989 +1,1989 @@@
+
+
-
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ package netbeans;
+
+ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.regex.Pattern;
+ import java.util.stream.Collectors;
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Task;
+
+ public class CoalesceKeyvalue extends Task {
+ private String property;
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ private String value;
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ private String valueSep;
+
+ public void setValueSep(String valueSep) {
+ this.valueSep = valueSep;
+ }
+
+ private String entrySep;
+
+ public void setEntrySep(String entrySep) {
+ this.entrySep = entrySep;
+ }
+
+ private String multiSep;
+
+ public void setMultiSep(String multiSep) {
+ this.multiSep = multiSep;
+ }
+
+ private String outSep;
+
+ public void setOutSep(String outSep) {
+ this.outSep = outSep;
+ }
+
+ @Override
+ public void execute() throws BuildException {
+ ListString result = new ArrayList();
+ MapString, ListString module2Paths = new
HashMap();
+
+ for (String entry : value.split(Pattern.quote(entrySep))) {
+ String[] keyValue = entry.split(Pattern.quote(valueSep), 2);
+ if (keyValue.length == 1) {
+ result.add(keyValue[0]);
+ } else {
+ module2Paths.computeIfAbsent(keyValue[0], s - new
ArrayList())
+ .add(keyValue[1].trim());
+ }
+ }
+ module2Paths.entrySet()
+ .stream()
+ .forEach(e - result.add(e.getKey() + valueSep +
e.getValue().stream().collect(Collectors.joining(multiSep;
+ getProject().setProperty(property,
result.stream().collect(Collectors.joining(" " + entrySep)));
+ }
+
+ }
+
+
+
+
+ package netbeans;
+
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Objects;
+ import java.util.stream.Collectors;
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Task;
+
+ public class ModsourceRegexp extends Task {
+ private String property;
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ private String filePattern;
+
+ public void setFilePattern(String filePattern) {
+ this.filePattern = filePattern;
+ }
+
+ private String modsource;
+
+ public void setModsource(String modsource) {
+ this.modsource = modsource;
+ }
+
+ private ListString expandGroup(String grp) {
+ ListString exp = new ArrayList();
+ String item = "";
+ int depth = 0;
+
+ for (int i = 0; i grp.length(); i++) {
+ char c = grp.charAt(i);
+ switch (c) {
+ case '{':
+ if (depth++ == 0) {
+ continue;
+ }
+
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 e46d2afe80cb602c9dafafe1122c41b3bda19224 Merge: f64017ade8 3a6befffbd Author: Martin Desruisseaux AuthorDate: Mon Aug 14 18:18:19 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../sis/coverage/grid/BufferedGridCoverage.java | 2 +- .../org/apache/sis/internal/util/DefinitionURI.java | 2 +- .../apache/sis/internal/sql/feature/Database.java | 21 +++-- .../apache/sis/internal/storage/io/IOUtilities.java | 2 +- .../java/org/apache/sis/storage/ProbeResult.java| 2 +- 5 files changed, 15 insertions(+), 14 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This merge is mostly about compiler warning resolutions.
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 41cf5d33992591b6eaa7c2c9039edfd69c4f27aa Merge: 230b6bceb6 3725429e48 Author: Martin Desruisseaux AuthorDate: Tue Jul 18 19:27:18 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge is mostly about compiler warning resolutions. .../apache/sis/console/FormattedOutputCommand.java | 2 +- .../org/apache/sis/console/AboutCommandTest.java | 6 + .../org/apache/sis/console/CommandRunnerTest.java | 6 + .../org/apache/sis/console/HelpCommandTest.java| 6 + .../apache/sis/console/MetadataCommandTest.java| 6 + .../apache/sis/console/MimeTypeCommandTest.java| 6 + .../apache/sis/gui/coverage/CoverageCanvasApp.java | 5 + .../sis/gui/coverage/CoverageStylingApp.java | 6 + .../sis/gui/coverage/GridSliceSelectorApp.java | 6 + .../org/apache/sis/gui/coverage/GridViewApp.java | 6 + .../apache/sis/gui/referencing/CRSChooserApp.java | 6 + .../apache/sis/internal/gui/GUIUtilitiesTest.java | 6 + .../internal/gui/control/ValueColorMapperApp.java | 6 + .../sis/openoffice/ReferencingFunctionsTest.java | 6 + .../org/apache/sis/openoffice/TransformerTest.java | 6 + .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 6 + .../org/apache/sis/cql/ExpressionReadingTest.java | 7 +- .../org/apache/sis/cql/ExpressionWritingTest.java | 6 + .../java/org/apache/sis/cql/FilterReadingTest.java | 16 +- .../java/org/apache/sis/cql/FilterWritingTest.java | 12 +- .../java/org/apache/sis/cql/QueryReadingTest.java | 5 + .../java/org/apache/sis/cql/QueryWritingTest.java | 5 + .../sis/coverage/grid/GridCoverageProcessor.java | 2 +- .../java/org/apache/sis/feature/Validator.java | 1 + .../sis/feature/builder/AttributeTypeBuilder.java | 1 + .../java/org/apache/sis/image/ImageProcessor.java | 3 + .../sis/internal/coverage/MultiSourceArgument.java | 13 +- .../internal/feature/jts/GeometryTransform.java| 4 +- .../org/apache/sis/coverage/CategoryListTest.java | 6 + .../java/org/apache/sis/coverage/CategoryTest.java | 6 + .../apache/sis/coverage/CoverageCombinerTest.java | 6 + .../apache/sis/coverage/SampleDimensionTest.java | 6 + .../apache/sis/coverage/SampleRangeFormatTest.java | 6 + .../coverage/grid/BufferedGridCoverageTest.java| 6 + .../coverage/grid/ConvertedGridCoverageTest.java | 6 + .../coverage/grid/DimensionalityReductionTest.java | 6 + .../grid/FractionalGridCoordinatesTest.java| 6 + .../sis/coverage/grid/GridCoverage2DTest.java | 6 + .../sis/coverage/grid/GridCoverageBuilderTest.java | 6 + .../sis/coverage/grid/GridDerivationTest.java | 6 + .../apache/sis/coverage/grid/GridExtentTest.java | 6 + .../apache/sis/coverage/grid/GridGeometryTest.java | 6 + .../sis/coverage/grid/GridOrientationTest.java | 6 + .../sis/coverage/grid/PixelTranslationTest.java| 6 + .../coverage/grid/ResampledGridCoverageTest.java | 6 + .../sis/coverage/grid/ReshapedImageTest.java | 6 + .../coverage/grid/TranslatedGridCoverageTest.java | 6 + .../apache/sis/feature/AbstractFeatureTest.java| 6 + .../apache/sis/feature/AbstractOperationTest.java | 6 + .../apache/sis/feature/CharacteristicMapTest.java | 6 + .../sis/feature/CharacteristicTypeMapTest.java | 6 + .../org/apache/sis/feature/CustomAttribute.java| 3 +- .../sis/feature/DefaultAssociationRoleTest.java| 6 + .../sis/feature/DefaultAttributeTypeTest.java | 6 + .../apache/sis/feature/DefaultFeatureTypeTest.java | 6 + .../org/apache/sis/feature/DenseFeatureTest.java | 6 + .../apache/sis/feature/EnvelopeOperationTest.java | 6 + .../org/apache/sis/feature/FeatureFormatTest.java | 6 + .../apache/sis/feature/FeatureOperationsTest.java | 6 + .../org/apache/sis/feature/FeatureTestCase.java| 14 +- .../java/org/apache/sis/feature/FeaturesTest.java | 6 + .../sis/feature/GroupAsPolylineOperationTest.java | 6 + .../org/apache/sis/feature/LinkOperationTest.java | 6 + .../sis/feature/MultiValuedAttributeTest.java | 6 + .../sis/feature/SingletonAssociationTest.java | 6 + .../apache/sis/feature/SingletonAttributeTest.java | 7 + .../org/apache/sis/feature/SparseFeatureTest.java | 6 + .../sis/feature/StringJoinOperationTest.java | 6 + .../builder/AssociationRoleBuilderTest.java| 6 + .../feature/builder/AttributeTypeBuilderTest.java | 6 + .../builder/CharacteristicTypeBuilderTest.java | 6 + .../feature/builder/FeatureTypeBuilderTest.java| 6 + .../java/org/apache/sis/filter/LikeFilterTest.java | 6 + .../java/org/apache/sis/filter/PeriodLiteral.java | 6 + .../test/java/org/apache/sis/filter/XPathTest.java | 6 + .../org/apache/sis/image/BandSelectImageTest.java
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This merge contains more preparation for JPMS (Jigsaw) modularisation, mostly in ensuring that resources are loaded inside the boundaries of the
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 230b6bceb613af544c6f1e162c28bca2ab7ed708 Merge: 4afa8fd56a 7c87ae6e32 Author: Martin Desruisseaux AuthorDate: Sat Jul 15 14:35:06 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge contains more preparation for JPMS (Jigsaw) modularisation, mostly in ensuring that resources are loaded inside the boundaries of the module that contains them. .gitattributes | 43 -- .../apache/sis/console/MimeTypeCommandTest.java| 14 +- .../gui/referencing/PositionableProjection.java| 10 ++ application/sis-webapp/pom.xml | 10 +- .../org/apache/sis/services/ServletListener.java | 6 +- .../test/java/org/apache/sis/cql/CQLTestCase.java | 3 +- .../org/apache/sis/coverage/SampleDimension.java | 16 +- .../apache/sis/feature/DefaultAttributeType.java | 5 +- .../sis/feature/GroupAsPolylineOperation.java | 4 +- .../sis/feature/builder/FeatureTypeBuilder.java| 2 +- .../apache/sis/filter/BinaryGeometryFilter.java| 30 ++-- .../org/apache/sis/filter/BinarySpatialFilter.java | 15 +- .../apache/sis/filter/DefaultFilterFactory.java| 4 +- .../java/org/apache/sis/filter/DistanceFilter.java | 23 ++- .../apache/sis/internal/feature/Geometries.java| 99 .../sis/internal/feature/GeometryFactories.java| 26 +++- .../sis/internal/feature/GeometryWithCRS.java | 13 +- .../sis/internal/feature/GeometryWrapper.java | 72 + .../org/apache/sis/internal/feature/Resources.java | 5 + .../sis/internal/feature/Resources.properties | 1 + .../sis/internal/feature/Resources_fr.properties | 1 + .../internal/feature/SpatialOperationContext.java | 12 +- .../sis/internal/feature/StandardGeometries.java | 170 + .../apache/sis/internal/feature/esri/Factory.java | 44 -- .../apache/sis/internal/feature/esri/Wrapper.java | 13 +- .../sis/internal/feature/esri/package-info.java| 2 +- .../apache/sis/internal/feature/j2d/Factory.java | 22 +-- .../sis/internal/feature/j2d/PointWrapper.java | 14 +- .../apache/sis/internal/feature/j2d/Wrapper.java | 12 +- .../sis/internal/feature/j2d/package-info.java | 2 +- .../apache/sis/internal/feature/jts/Factory.java | 57 --- .../apache/sis/internal/feature/jts/Wrapper.java | 53 +-- .../sis/internal/filter/GeometryConverter.java | 8 +- .../java/org/apache/sis/internal/filter/Node.java | 12 +- .../internal/filter/sqlmm/GeometryConstructor.java | 9 +- .../sis/internal/filter/sqlmm/GeometryParser.java | 11 +- .../sis/internal/filter/sqlmm/OneGeometry.java | 15 +- .../apache/sis/internal/filter/sqlmm/SQLMM.java| 2 +- .../sis/internal/filter/sqlmm/ST_FromBinary.java | 2 +- .../sis/internal/filter/sqlmm/ST_FromText.java | 2 +- .../apache/sis/internal/filter/sqlmm/ST_Point.java | 21 ++- .../sis/internal/filter/sqlmm/ST_Transform.java| 10 +- .../sis/internal/filter/sqlmm/SpatialFunction.java | 2 +- .../sis/internal/filter/sqlmm/TwoGeometries.java | 23 ++- .../apache/sis/feature/EnvelopeOperationTest.java | 6 +- .../sis/filter/BinarySpatialFilterTestCase.java| 4 +- .../sis/internal/feature/GeometriesTestCase.java | 14 +- .../internal/feature/StandardGeometriesTest.java | 59 +++ .../sis/internal/feature/esri/FactoryTest.java | 22 ++- .../apache/sis/internal/feature/jts/JTSTest.java | 14 +- .../internal/filter/sqlmm/RegistryTestCase.java| 8 +- .../sis/internal/jaxb/code/MD_ObligationCode.java | 2 +- .../internal/jaxb/code/SV_ParameterDirection.java | 2 +- .../sis/internal/jaxb/gco/GO_CharacterString.java | 20 ++- .../apache/sis/internal/jaxb/gco/GO_DateTime.java | 4 +- .../apache/sis/internal/jaxb/gco/GO_Distance.java | 2 +- .../apache/sis/internal/jaxb/gco/GO_Integer.java | 2 +- .../apache/sis/internal/jaxb/gco/GO_Measure.java | 2 +- .../internal/jaxb/gco/GO_MultiplicityRange.java| 8 +- .../org/apache/sis/internal/jaxb/gco/GO_Real.java | 2 +- .../apache/sis/internal/jaxb/gco/GO_Record.java| 2 +- .../sis/internal/jaxb/gco/GO_RecordType.java | 2 +- .../apache/sis/internal/jaxb/gco/GO_Temporal.java | 4 +- .../org/apache/sis/internal/jaxb/gco/GO_URL.java | 6 +- .../sis/internal/jaxb/gco/GO_UnlimitedInteger.java | 4 +- .../jaxb/gco/InternationalStringAdapter.java | 2 +- .../apache/sis/internal/jaxb/gco/Multiplicity.java | 2 +- .../sis/internal/jaxb/gco/MultiplicityRange.java | 8 +- .../sis/internal/jaxb/gco/StringAdapter.java | 2 +- .../sis/internal/jaxb/gco/UnlimitedInteger.java| 16 +- .../org/apache/sis/internal/jaxb/gcx/Anchor.java | 2 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. They are the commits from pull request #34.
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 4afa8fd56aede4066b289a7f8777bd7fc8e6bedb Merge: 27cab0a6de 0d157264f6 Author: Martin Desruisseaux AuthorDate: Mon Jul 3 12:42:12 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. They are the commits from pull request #34. .../org/apache/sis/internal/gui/Resources.java | 39 ++- .../org/apache/sis/internal/gui/Resources_en.java | 18 +- .../org/apache/sis/internal/gui/Resources_fr.java | 18 +- .../apache/sis/cloud/aws/internal/Resources.java | 35 ++- .../sis/cloud/aws/internal/Resources_en.java | 18 +- .../sis/cloud/aws/internal/Resources_fr.java | 18 +- .../sis/coverage/grid/DimensionalityReduction.java | 10 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 6 +- .../sis/coverage/grid/GridCoverageProcessor.java | 13 +- .../org/apache/sis/coverage/grid/GridExtent.java | 2 +- .../apache/sis/coverage/grid/GridExtentCRS.java| 8 +- .../apache/sis/feature/AbstractIdentifiedType.java | 4 +- .../org/apache/sis/feature/CharacteristicMap.java | 5 +- .../java/org/apache/sis/feature/DenseFeature.java | 5 +- .../apache/sis/feature/ExpressionOperation.java| 2 +- .../apache/sis/feature/MultiValuedAttribute.java | 5 +- .../org/apache/sis/feature/SingletonAttribute.java | 5 +- .../java/org/apache/sis/feature/SparseFeature.java | 5 +- .../sis/feature/builder/FeatureTypeBuilder.java| 6 +- .../org/apache/sis/filter/ConvertFunction.java | 2 +- .../java/org/apache/sis/image/ImageProcessor.java | 4 +- .../sis/internal/coverage/j2d/ObservableImage.java | 2 +- .../org/apache/sis/internal/feature/Resources.java | 35 ++- .../apache/sis/internal/feature/Resources_en.java} | 18 +- .../apache/sis/internal/feature/Resources_fr.java} | 18 +- .../sis/feature/DefaultAssociationRoleTest.java| 8 +- .../apache/sis/feature/DefaultFeatureTypeTest.java | 8 +- .../sis/internal/jaxb/SpecializedIdentifier.java | 5 +- .../apache/sis/internal/jaxb/TypeRegistration.java | 59 +++-- .../apache/sis/internal/jaxb/cat/CodeListUID.java | 5 +- .../apache/sis/internal/jaxb/cat/package-info.java | 2 +- .../apache/sis/internal/jaxb/gml/TM_Primitive.java | 2 +- .../sis/internal/jaxb/gts/TM_PeriodDuration.java | 2 +- .../sis/internal/metadata/ReferencingServices.java | 10 +- .../apache/sis/internal/metadata/Resources.java| 35 ++- .../Resources_en.java} | 18 +- .../Resources_fr.java} | 18 +- .../sis/internal/metadata}/TemporalUtilities.java | 47 +++- .../apache/sis/internal/metadata/package-info.java | 2 +- .../sis/internal/metadata/sql/Initializer.java | 18 +- .../sis/internal/metadata/sql/LocalDataSource.java | 6 +- .../org/apache/sis/metadata/MetadataStandard.java | 25 +- .../sis/metadata/StandardImplementation.java | 6 +- .../metadata/iso/extent/DefaultTemporalExtent.java | 2 +- .../metadata/iso/lineage/DefaultProcessStep.java | 2 +- .../iso/quality/DefaultEvaluationMethod.java | 3 +- .../java/org/apache/sis/util/iso/AbstractName.java | 7 +- .../apache/sis/util/iso/DefaultNameFactory.java| 25 +- .../apache/sis/util/iso/DefaultRecordSchema.java | 5 +- .../main/java/org/apache/sis/util/iso/Names.java | 19 +- .../main/java/org/apache/sis/util/iso/Types.java | 54 +++-- .../main/java/org/apache/sis/xml/LegacyCodes.java | 2 +- .../java/org/apache/sis/xml/MarshalContext.java| 2 +- .../java/org/apache/sis/xml/MarshallerPool.java| 4 +- .../main/java/org/apache/sis/xml/Transformer.java | 16 +- .../sis/internal/jaxb/gml/TimePeriodTest.java | 2 +- .../sis/metadata/iso/CustomMetadataTest.java | 4 +- .../identification/DefaultCoupledResourceTest.java | 6 +- .../DefaultServiceIdentificationTest.java | 4 +- .../apache/sis/util/iso/NameMarshallingTest.java | 11 +- .../java/org/apache/sis/util/iso/NamesTest.java| 8 +- .../org/apache/sis/util/iso/TypeNamesTest.java | 7 +- .../java/org/apache/sis/util/iso/TypesTest.java| 8 +- .../apache/sis/internal/map/SymbologyVisitor.java | 2 +- .../sis/internal/map/coverage/RenderingData.java | 3 +- .../main/java/org/apache/sis/portrayal/Canvas.java | 3 +- .../java/org/apache/sis/portrayal/MapLayers.java | 6 +- .../main/java/org/apache/sis/style/se1/Rule.java | 4 +- .../org/apache/sis/style/se1/StyleElement.java | 2 +- .../java/org/apache/sis/style/se1/Symbolizer.java | 2 + .../org/apache/sis/style/se1/StyleTestCase.java| 2 +- .../apache/sis/internal/gazetteer/Resources.java | 35 ++- .../sis/internal/gazetteer/Resources_en.java} | 18 +- .../sis/internal/gazetteer/Resources_fr.java} | 18 +- .../java/org/apache/sis/geometry/Envelopes.java
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 0987be2363ca563801aa01dcdd796d888527a9b4 Merge: 4a2e1aefb5 b8ec6bbb3c Author: Martin Desruisseaux AuthorDate: Mon Jun 5 11:31:43 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../apache/sis/console/FormattedOutputCommand.java | 6 +-- .../sis/internal/jaxb/AdapterReplacement.java | 12 ++--- .../apache/sis/internal/jaxb/TypeRegistration.java | 6 +-- .../sis/internal/jaxb/cat/CodeListAdapter.java | 4 +- .../apache/sis/internal/jaxb/cat/CodeListUID.java | 8 ++-- .../apache/sis/internal/jaxb/cat/EnumAdapter.java | 4 +- .../sis/internal/jaxb/code/CI_DateTypeCode.java| 4 +- .../internal/jaxb/code/CI_OnLineFunctionCode.java | 4 +- .../jaxb/code/CI_PresentationFormCode.java | 4 +- .../apache/sis/internal/jaxb/code/CI_RoleCode.java | 4 +- .../internal/jaxb/code/CI_TelephoneTypeCode.java | 4 +- .../org/apache/sis/internal/jaxb/code/DCPList.java | 4 +- .../sis/internal/jaxb/code/DQM_ValueStructure.java | 4 +- .../jaxb/code/DQ_EvaluationMethodTypeCode.java | 4 +- .../internal/jaxb/code/DS_AssociationTypeCode.java | 4 +- .../internal/jaxb/code/DS_InitiativeTypeCode.java | 4 +- .../internal/jaxb/code/MD_CellGeometryCode.java| 4 +- .../internal/jaxb/code/MD_CharacterSetCode.java| 6 +-- .../internal/jaxb/code/MD_ClassificationCode.java | 4 +- .../jaxb/code/MD_CoverageContentTypeCode.java | 4 +- .../sis/internal/jaxb/code/MD_DatatypeCode.java| 4 +- .../jaxb/code/MD_DimensionNameTypeCode.java| 4 +- .../jaxb/code/MD_GeometricObjectTypeCode.java | 4 +- .../jaxb/code/MD_ImagingConditionCode.java | 4 +- .../sis/internal/jaxb/code/MD_KeywordTypeCode.java | 4 +- .../jaxb/code/MD_MaintenanceFrequencyCode.java | 4 +- .../internal/jaxb/code/MD_MediumFormatCode.java| 4 +- .../sis/internal/jaxb/code/MD_MediumNameCode.java | 4 +- .../sis/internal/jaxb/code/MD_ObligationCode.java | 4 +- .../jaxb/code/MD_PixelOrientationCode.java | 4 +- .../sis/internal/jaxb/code/MD_ProgressCode.java| 4 +- .../sis/internal/jaxb/code/MD_RestrictionCode.java | 4 +- .../sis/internal/jaxb/code/MD_ScopeCode.java | 4 +- .../code/MD_SpatialRepresentationTypeCode.java | 4 +- .../internal/jaxb/code/MD_TopicCategoryCode.java | 4 +- .../internal/jaxb/code/MD_TopologyLevelCode.java | 4 +- .../sis/internal/jaxb/code/MI_BandDefinition.java | 4 +- .../sis/internal/jaxb/code/MI_ContextCode.java | 4 +- .../internal/jaxb/code/MI_GeometryTypeCode.java| 4 +- .../internal/jaxb/code/MI_ObjectiveTypeCode.java | 4 +- .../internal/jaxb/code/MI_OperationTypeCode.java | 4 +- .../jaxb/code/MI_PolarisationOrientationCode.java | 4 +- .../sis/internal/jaxb/code/MI_PriorityCode.java| 4 +- .../sis/internal/jaxb/code/MI_SequenceCode.java| 4 +- .../jaxb/code/MI_TransferFunctionTypeCode.java | 4 +- .../sis/internal/jaxb/code/MI_TriggerCode.java | 4 +- .../sis/internal/jaxb/code/SV_CouplingType.java| 4 +- .../internal/jaxb/code/SV_ParameterDirection.java | 4 +- .../sis/internal/jaxb/code/package-info.java | 10 ++--- .../sis/internal/jaxb/gco/CharSequenceAdapter.java | 4 +- .../apache/sis/internal/jaxb/gco/GO_Boolean.java | 8 ++-- .../sis/internal/jaxb/gco/GO_CharacterString.java | 16 +++ .../apache/sis/internal/jaxb/gco/GO_DateTime.java | 10 ++--- .../apache/sis/internal/jaxb/gco/GO_Decimal.java | 8 ++-- .../apache/sis/internal/jaxb/gco/GO_Distance.java | 8 ++-- .../sis/internal/jaxb/gco/GO_GenericName.java | 6 +-- .../apache/sis/internal/jaxb/gco/GO_Integer.java | 8 ++-- .../apache/sis/internal/jaxb/gco/GO_Integer64.java | 6 +-- .../apache/sis/internal/jaxb/gco/GO_Measure.java | 8 ++-- .../internal/jaxb/gco/GO_MultiplicityRange.java| 4 +- .../org/apache/sis/internal/jaxb/gco/GO_Real.java | 8 ++-- .../apache/sis/internal/jaxb/gco/GO_Record.java| 4 +- .../sis/internal/jaxb/gco/GO_RecordType.java | 4 +- .../apache/sis/internal/jaxb/gco/GO_Temporal.java | 10 ++--- .../org/apache/sis/internal/jaxb/gco/GO_URL.java | 4 +- .../sis/internal/jaxb/gco/GO_UnlimitedInteger.java | 6 +-- .../jaxb/gco/InternationalStringAdapter.java | 4 +- .../jaxb/gco/InternationalStringConverter.java | 4 +- .../apache/sis/internal/jaxb/gco/Multiplicity.java | 10 ++--- .../sis/internal/jaxb/gco/MultiplicityRange.java | 8 ++-- .../apache/sis/internal/jaxb/gco/NameValue.java| 12 ++--- .../apache/sis/internal/jaxb/gco/PropertyType.java | 8 ++-- .../sis/internal/jaxb/gco/StringAdapter.java | 4 +- .../apache/sis/internal/jaxb/gco/URIAdapter.java | 4 +- .../apache/sis/internal/jaxb/gco/UnitAdapter.java | 4 +- .../sis/internal/jaxb/gco/UnlimitedInteger.java| 12 ++---
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 4a2e1aefb5c223e3d9dbc66debfdf0f91e4f3b6e
Merge: 4b35a0fd74 91cd9c2583
Author: Martin Desruisseaux
AuthorDate: Mon Jun 5 10:36:23 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../org/apache/sis/coverage/SampleDimension.java | 7 +
.../sis/internal/coverage/SampleDimensions.java| 6 ++--
.../java/org/apache/sis/coverage/CategoryTest.java | 3 +-
.../apache/sis/coverage/SampleDimensionTest.java | 3 +-
.../coverage/grid/DimensionalityReductionTest.java | 3 +-
.../sis/coverage/grid/PixelTranslationTest.java| 3 +-
.../org/apache/sis/image/ResamplingGridTest.java | 3 +-
.../sis/internal/feature/j2d/FactoryTest.java | 2 +-
.../internal/feature/jts/ShapeConverterTest.java | 3 +-
.../sis/internal/filter/sqlmm/SQLMMTest.java | 3 +-
.../apache/sis/test/feature/FeatureComparator.java | 3 +-
.../{test => xml}/DocumentComparatorTest.java | 2 +-
.../java/org/apache/sis/metadata/ValueMapTest.java | 3 +-
.../iso/lineage/DefaultProcessStepTest.java| 3 +-
.../quality/AbstractPositionalAccuracyTest.java| 3 +-
.../apache/sis/test/xml/DocumentComparator.java| 3 +-
.../java/org/apache/sis/util/iso/TypesTest.java| 3 +-
.../org/apache/sis/geometry/AbstractEnvelope.java | 21 -
.../apache/sis/io/wkt/GeodeticObjectParser.java| 14 +
.../sis/referencing/cs/CoordinateSystems.java | 4 +--
.../sis/referencing/cs/DefaultSphericalCS.java | 32 ++--
.../referencing/factory/GeodeticObjectFactory.java | 35 ++
.../referencing/factory/sql/EPSGDataAccess.java| 1 +
.../operation/projection/AzimuthalEquidistant.java | 2 +-
.../operation/projection/Initializer.java | 6 ++--
.../referencing/operation/projection/Mercator.java | 7 +++--
.../operation/projection/NormalizedProjection.java | 11 ---
.../operation/projection/ProjectionVariant.java| 6
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 15 --
.../referencing/j2d/AbstractShapeTest.java | 2 +-
.../referencing/j2d/ShapeUtilitiesTest.java| 3 +-
.../provider/DatumShiftGridCompressedTest.java | 2 +-
.../FranceGeocentricInterpolationTest.java | 3 +-
.../provider/GeocentricTranslationTest.java| 3 +-
.../referencing/provider/Geographic3Dto2DTest.java | 4 ++-
.../internal/referencing/provider/NADCONTest.java | 4 ++-
.../internal/referencing/provider/NTv2Test.java| 4 ++-
.../apache/sis/io/wkt/MathTransformParserTest.java | 3 +-
.../sis/referencing/GeodeticCalculatorTest.java| 5 +++-
.../sis/referencing/StandardDefinitionsTest.java | 3 +-
.../referencing/cs/DefaultCylindricalCSTest.java | 3 +-
.../sis/referencing/cs/DefaultPolarCSTest.java | 3 +-
.../sis/referencing/cs/DefaultSphericalCSTest.java | 3 +-
.../sis/referencing/factory/TestFactorySource.java | 3 +-
.../geoapi/ParameterizedTransformTest.java | 2 +-
.../operation/DefaultPassThroughOperationTest.java | 4 ++-
.../operation/builder/ResidualGridTest.java| 3 +-
.../referencing/operation/matrix/Matrix4Test.java | 3 +-
.../operation/matrix/NonSquareMatrixTest.java | 3 +-
.../operation/projection/InitializerTest.java | 2 +-
.../operation/projection/MercatorTest.java | 3 +-
.../transform/ConcatenatedTransformTest.java | 3 +-
.../transform/ContextualParametersTest.java| 3 +-
.../transform/DefaultMathTransformFactoryTest.java | 4 ++-
.../transform/LinearInterpolator1DTest.java| 3 +-
.../operation/transform/LinearTransformTest.java | 2 +-
.../operation/transform/MathTransformTestCase.java | 3 +-
.../operation/transform/MathTransformsTest.java| 4 ++-
.../transform/ProjectiveTransformTest.java | 3 +-
.../operation/transform/ScaleTransformTest.java| 3 +-
.../operation/transform/TransferFunctionTest.java | 4 ++-
.../transform/TransformResultComparator.java | 3 +-
.../transform/TransformSeparatorTest.java | 4 ++-
.../transform/TranslationTransformTest.java| 2 +-
.../transform/WraparoundTransformTest.java | 3 +-
.../integration/CoordinateReferenceSystemTest.java | 3 +-
.../java/org/apache/sis/measure/NumberRange.java | 4 +--
.../test/java/org/apache/sis/math/VectorTest.java | 3 +-
.../org/apache/sis/measure/QuantitiesTest.java | 3 +-
.../sis/profile/france/FrenchProfileTest.java | 3 +-
.../sis/internal/geotiff/SchemaModifier.java | 2 +-
.../org/apache/sis/storage/geotiff/CRSBuilder.java | 16 +-
.../sis/storage/geotiff/CompressedSubset.java | 4 +--
.../org/apache/sis/storage/geotiff/DataCube.java | 18 +++
.../org/apache/sis/storage/geotiff/DataSubset.java | 33
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 4b35a0fd74158be3e6225b65a4c17756357fd69b Merge: b486f990bc 0277839ccb Author: Martin Desruisseaux AuthorDate: Mon May 8 18:14:01 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../apache/sis/test/suite/ConsoleTestSuite.java| 49 .../org/apache/sis/test/suite/package-info.txt | 3 - .../sis/test/suite/ApplicationTestSuite.java | 44 --- .../org/apache/sis/test/suite/package-info.txt | 3 - .../apache/sis/test/suite/OpenOfficeTestSuite.java | 45 .../org/apache/sis/test/suite/package-info.txt | 3 - .../org/apache/sis/test/suite/AWSTestSuite.java| 41 --- .../org/apache/sis/test/suite/package-info.txt | 3 - .../test/java/org/apache/sis/cql/CQLTestSuite.java | 49 .../apache/sis/coverage/SampleRangeFormatTest.java | 2 +- .../coverage/grid/BufferedGridCoverageTest.java| 2 +- .../coverage/grid/ConvertedGridCoverageTest.java | 4 +- .../sis/coverage/grid/GridCoverage2DTest.java | 4 +- .../sis/coverage/grid/GridDerivationTest.java | 5 +- .../apache/sis/coverage/grid/GridExtentTest.java | 7 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 4 +- .../coverage/grid/ResampledGridCoverageTest.java | 7 +- .../sis/coverage/grid/ReshapedImageTest.java | 2 +- .../apache/sis/feature/AbstractFeatureTest.java| 2 +- .../apache/sis/feature/AbstractOperationTest.java | 3 +- .../FeatureAssert.java => feature/Assertions.java} | 9 +- .../apache/sis/feature/CharacteristicMapTest.java | 3 +- .../sis/feature/CharacteristicTypeMapTest.java | 3 +- .../sis/feature/DefaultAssociationRoleTest.java| 3 +- .../sis/feature/DefaultAttributeTypeTest.java | 4 +- .../apache/sis/feature/DefaultFeatureTypeTest.java | 3 +- .../apache/sis/feature/EnvelopeOperationTest.java | 4 +- .../org/apache/sis/feature/FeatureFormatTest.java | 2 +- .../apache/sis/feature/FeatureOperationsTest.java | 5 +- .../org/apache/sis/feature/FeatureTestCase.java| 4 +- .../sis/feature/MultiValuedAttributeTest.java | 3 +- .../sis/feature/SingletonAssociationTest.java | 3 +- .../apache/sis/feature/SingletonAttributeTest.java | 3 +- .../feature/builder/AttributeTypeBuilderTest.java | 4 +- .../builder/CharacteristicTypeBuilderTest.java | 3 +- .../apache/sis/filter/ArithmeticFunctionTest.java | 3 +- .../sis/filter/BinarySpatialFilterTestCase.java| 2 +- .../apache/sis/filter/ComparisonFilterTest.java| 4 +- .../apache/sis/filter/IdentifierFilterTest.java| 3 +- .../org/apache/sis/filter/LeafExpressionTest.java | 3 +- .../org/apache/sis/filter/LogicalFilterTest.java | 4 +- .../org/apache/sis/filter/TemporalFilterTest.java | 4 +- .../org/apache/sis/image/BandSelectImageTest.java | 4 +- .../sis/image/BandedSampleConverterTest.java | 2 +- .../org/apache/sis/image/ComputedImageTest.java| 2 +- .../org/apache/sis/image/ImageCombinerTest.java| 3 +- .../java/org/apache/sis/image/MaskedImageTest.java | 3 +- .../java/org/apache/sis/image/PlanarImageTest.java | 2 +- .../org/apache/sis/index/tree/PointTreeTest.java | 2 +- .../sis/internal/feature/j2d/FlatShapeTest.java| 2 +- .../internal/filter/sqlmm/RegistryTestCase.java| 3 +- .../test/java/org/apache/sis/test/package-info.txt | 3 - .../apache/sis/test/suite/FeatureTestSuite.java| 145 -- .../org/apache/sis/test/suite/package-info.txt | 3 - .../internal/jaxb/IdentifierMapAdapterTest.java| 3 +- .../internal/jaxb/ModifiableIdentifierMapTest.java | 2 +- .../internal/jaxb/cat/CodeListMarshallingTest.java | 3 +- .../sis/internal/jaxb/cat/EnumAdapterTest.java | 2 +- .../sis/internal/jaxb/cat/EnumMarshallingTest.java | 4 +- .../sis/internal/jaxb/gml/TimePeriodTest.java | 3 +- .../internal/jaxb/lan/FreeTextMarshallingTest.java | 3 +- .../sis/internal/jaxb/lan/LanguageCodeTest.java| 3 +- .../sis/internal/jaxb/lan/PT_LocaleTest.java | 2 +- .../metadata/replace/QualityParameterTest.java | 3 +- .../metadata/replace/ServiceParameterTest.java | 3 +- .../apache/sis/internal/metadata/MergerTest.java | 3 +- .../Assertions.java} | 17 +- .../apache/sis/metadata/MetadataStandardTest.java | 3 +- .../sis/metadata/ModifiableMetadataTest.java | 4 +- .../apache/sis/metadata/PropertyAccessorTest.java | 4 +- .../sis/metadata/PropertyInformationTest.java | 5 +- .../org/apache/sis/metadata/SpecialCasesTest.java | 3 +- .../java/org/apache/sis/metadata/TreeNodeTest.java | 3 +- .../apache/sis/metadata/TreeTableFormatTest.java | 2 +- .../org/apache/sis/metadata/TreeTableViewTest.java | 3 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 b486f990bcf7a1d08694ba74d91320ed3fa56c9e
Merge: 7d712579ff 6ad64f5ffa
Author: Martin Desruisseaux
AuthorDate: Sat May 6 16:20:20 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../org/apache/sis/feature/AbstractFeature.java| 12 +-
.../apache/sis/feature/DefaultAssociationRole.java | 8 +-
.../java/org/apache/sis/feature/DenseFeature.java | 1 +
.../org/apache/sis/feature/EnvelopeOperation.java | 21 +-
.../apache/sis/feature/ExpressionOperation.java| 67 --
.../org/apache/sis/feature/FeatureOperations.java | 74 --
.../main/java/org/apache/sis/feature/Features.java | 39 +++-
.../sis/feature/GroupAsPolylineOperation.java | 250 +
.../java/org/apache/sis/feature/LinkOperation.java | 2 +-
.../org/apache/sis/feature/OperationResult.java| 71 ++
.../java/org/apache/sis/feature/SparseFeature.java | 1 +
.../apache/sis/feature/StringJoinOperation.java| 13 +-
.../org/apache/sis/filter/AssociationValue.java| 12 +
.../org/apache/sis/filter/ConvertFunction.java | 12 +
.../java/org/apache/sis/filter/LeafExpression.java | 26 +++
.../java/org/apache/sis/filter/Optimization.java | 48 +++-
.../java/org/apache/sis/filter/PropertyValue.java | 1 +
.../sis/internal/coverage/j2d/ObservableImage.java | 2 +-
.../sis/internal/feature/FeatureExpression.java| 15 +-
.../apache/sis/internal/feature/Geometries.java| 33 ---
.../sis/internal/feature/GeometryWrapper.java | 6 +-
.../apache/sis/internal/feature/esri/Wrapper.java | 4 +-
.../sis/internal/feature/j2d/PointWrapper.java | 2 +-
.../apache/sis/internal/feature/j2d/Wrapper.java | 2 +-
.../apache/sis/internal/feature/jts/Wrapper.java | 2 +-
.../java/org/apache/sis/internal/filter/Node.java | 87 +++
.../apache/sis/{ => internal}/filter/XPath.java| 8 +-
.../apache/sis/feature/FeatureOperationsTest.java | 2 +-
.../sis/feature/GroupAsPolylineOperationTest.java | 71 ++
.../org/apache/sis/filter/LogicalFilterTest.java | 26 +++
.../test/java/org/apache/sis/filter/XPathTest.java | 1 +
.../sis/internal/feature/GeometriesTestCase.java | 2 +-
.../apache/sis/test/suite/FeatureTestSuite.java| 1 +
.../org/apache/sis/internal/map/SEPortrayer.java | 5 +-
.../java/org/apache/sis/math/FunctionProperty.java | 85 ++-
.../org/apache/sis/math/FunctionPropertyTest.java} | 30 ++-
.../apache/sis/test/suite/UtilityTestSuite.java| 3 +-
.../java/org/apache/sis/storage/FeatureQuery.java | 112 ++---
.../java/org/apache/sis/storage/FeatureSubset.java | 6 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 8 +-
.../storage/gpx/GroupAsPolylineOperation.java | 211 -
.../org/apache/sis/internal/storage/gpx/Types.java | 31 ++-
42 files changed, 1027 insertions(+), 386 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains parameterized type change in Filter and Expression for more type safety.
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 7d712579ff48ecd753ff5907a38c3f3239b71bc4 Merge: 8d1d6522c4 cb0796b495 Author: Martin Desruisseaux AuthorDate: Mon May 1 15:20:07 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains parameterized type change in Filter and Expression for more type safety. .../src/main/java/org/apache/sis/cql/CQL.java | 34 ++--- .../org/apache/sis/cql/FilterToCQLVisitor.java | 30 ++-- .../apache/sis/feature/ExpressionOperation.java| 26 ++-- .../org/apache/sis/feature/FeatureOperations.java | 6 +- .../org/apache/sis/filter/ArithmeticFunction.java | 30 ++-- .../org/apache/sis/filter/AssociationValue.java| 10 +- .../java/org/apache/sis/filter/BinaryFunction.java | 25 ++- .../apache/sis/filter/BinaryGeometryFilter.java| 71 + .../org/apache/sis/filter/BinarySpatialFilter.java | 16 +- .../org/apache/sis/filter/ComparisonFilter.java| 83 +- .../org/apache/sis/filter/ConvertFunction.java | 10 +- .../apache/sis/filter/DefaultFilterFactory.java| 170 ++--- .../org/apache/sis/filter/DefaultSortProperty.java | 8 +- .../java/org/apache/sis/filter/DistanceFilter.java | 18 +-- .../java/org/apache/sis/filter/FilterNode.java | 89 --- .../org/apache/sis/filter/IdentifierFilter.java| 32 +++- .../java/org/apache/sis/filter/LeafExpression.java | 6 +- .../java/org/apache/sis/filter/LikeFilter.java | 23 ++- .../java/org/apache/sis/filter/LogicalFilter.java | 78 ++ .../java/org/apache/sis/filter/Optimization.java | 99 ++-- .../java/org/apache/sis/filter/PropertyValue.java | 12 +- .../java/org/apache/sis/filter/TemporalFilter.java | 90 +-- .../java/org/apache/sis/filter/UnaryFunction.java | 28 ++-- .../java/org/apache/sis/filter/package-info.java | 2 +- .../java/org/apache/sis/image/ImageCombiner.java | 11 +- .../java/org/apache/sis/image/ImageProcessor.java | 6 +- .../sis/internal/coverage/j2d/ObservableImage.java | 5 +- .../apache/sis/internal/filter/CopyVisitor.java| 44 +++--- .../sis/internal/filter/FunctionRegister.java | 4 +- .../sis/internal/filter/GeometryConverter.java | 18 ++- .../java/org/apache/sis/internal/filter/Node.java | 24 ++- .../sis/internal/filter/SortByComparator.java | 8 +- .../org/apache/sis/internal/filter/Visitor.java| 21 +-- .../internal/filter/sqlmm/FunctionWithSRID.java| 15 +- .../internal/filter/sqlmm/GeometryConstructor.java | 18 ++- .../sis/internal/filter/sqlmm/GeometryParser.java | 6 +- .../sis/internal/filter/sqlmm/OneGeometry.java | 36 +++-- .../apache/sis/internal/filter/sqlmm/Registry.java | 4 +- .../sis/internal/filter/sqlmm/ST_FromBinary.java | 6 +- .../sis/internal/filter/sqlmm/ST_FromText.java | 6 +- .../apache/sis/internal/filter/sqlmm/ST_Point.java | 22 ++- .../sis/internal/filter/sqlmm/ST_Transform.java| 18 ++- .../sis/internal/filter/sqlmm/SpatialFunction.java | 2 +- .../sis/internal/filter/sqlmm/TwoGeometries.java | 40 +++-- .../sis/internal/filter/sqlmm/package-info.java| 2 +- .../sis/filter/BinarySpatialFilterTestCase.java| 6 +- .../apache/sis/filter/IdentifierFilterTest.java| 4 +- .../org/apache/sis/filter/LeafExpressionTest.java | 3 +- .../org/apache/sis/filter/LogicalFilterTest.java | 27 +++- .../org/apache/sis/filter/TemporalFilterTest.java | 4 +- .../sis/internal/filter/FilterFactoryMock.java | 160 +-- .../apache/sis/internal/filter/FunctionMock.java | 14 +- .../sis/internal/filter/FunctionNamesTest.java | 2 + .../sis/internal/filter/ValueReferenceMock.java| 8 + .../internal/filter/sqlmm/RegistryTestCase.java| 4 +- .../org/apache/sis/internal/map/SEPortrayer.java | 8 +- .../sis/internal/sql/feature/FeatureStream.java| 2 +- .../sql/feature/SelectionClauseWriter.java | 17 +-- .../sql/feature/SelectionClauseWriterTest.java | 4 +- .../java/org/apache/sis/storage/FeatureQuery.java | 24 +-- .../java/org/apache/sis/storage/FeatureSubset.java | 4 +- .../sis/storage/aggregate/JoinFeatureSet.java | 8 +- .../org/apache/sis/storage/FeatureQueryTest.java | 25 +-- 63 files changed, 893 insertions(+), 743 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 8d1d6522c4a1b8b19488a7089a9866ab004d6b36
Merge: 8f68fc28fa 94ed08156b
Author: Martin Desruisseaux
AuthorDate: Sat Apr 29 14:42:55 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../{internal => }/coverage/CoverageCombiner.java | 168 +++
.../sis/coverage/grid/GridCoverageBuilder.java | 5 +
.../org/apache/sis/coverage/grid/GridExtent.java | 82 +++-
.../apache/sis/feature/ExpressionOperation.java| 227 +
.../org/apache/sis/feature/FeatureOperations.java | 51 -
.../java/org/apache/sis/feature/LinkOperation.java | 2 +-
.../sis/feature/builder/AttributeTypeBuilder.java | 1 +
.../java/org/apache/sis/image/ComputedImage.java | 20 +-
.../java/org/apache/sis/image/ImageCombiner.java | 72 +++
.../java/org/apache/sis/image/ImageProcessor.java | 8 +-
.../java/org/apache/sis/image/Visualization.java | 2 +-
.../sis/internal/coverage/SampleDimensions.java| 36
.../sis/internal/coverage/j2d/ImageLayout.java | 62 +-
.../sis/internal/feature/FeatureExpression.java| 14 ++
.../apache/sis/coverage/CoverageCombinerTest.java | 70 +++
.../apache/sis/coverage/grid/GridExtentTest.java | 22 +-
.../apache/sis/test/suite/FeatureTestSuite.java| 1 +
.../org/apache/sis/portrayal/CanvasFollower.java | 2 +-
.../sis/referencing/operation/matrix/Matrices.java | 8 +-
.../operation/transform/MathTransforms.java| 209 +--
.../operation/transform/UnitConversion.java| 145 +
.../operation/transform/MathTransformsTest.java| 71 +++
.../operation/transform/UnitConversionTest.java| 59 ++
.../sis/test/suite/ReferencingTestSuite.java | 1 +
.../org/apache/sis/measure/RangeFormatTest.java| 4 +-
.../java/org/apache/sis/measure/RangeTest.java | 2 +-
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml| 16 +-
.../apache/sis/internal/sql/feature/Column.java| 2 +-
.../internal/storage/WritableResourceSupport.java | 11 +-
.../java/org/apache/sis/storage/FeatureQuery.java | 135 ++--
.../org/apache/sis/storage/FeatureQueryTest.java | 63 +-
32 files changed, 1262 insertions(+), 311 deletions(-)
diff --cc pom.xml
index bd6f1f4426,3f9ab52507..4d4f351707
--- a/pom.xml
+++ b/pom.xml
@@@ -546,8 -546,8 +546,8 @@@
11
${project.version}
1.3
- 19
+ 20.0.1
-4.0-SNAPSHOT
+3.1-SNAPSHOT
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1 This merge contains mostly javadoc formatting.
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 8f68fc28fae40bcb60d579e62f119fba8c95fb3d Merge: 33688738c6 81046a2097 Author: Martin Desruisseaux AuthorDate: Wed Apr 19 15:52:26 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 This merge contains mostly javadoc formatting. .../org/apache/sis/gui/coverage/GridRowSkin.java | 9 +- .../java/org/apache/sis/gui/coverage/GridView.java | 25 +-- .../sis/gui/coverage/ImagePropertyExplorer.java| 8 +- .../org/apache/sis/gui/dataset/ExpandableList.java | 5 +- .../org/apache/sis/gui/map/GestureFollower.java| 4 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 2 +- .../java/org/apache/sis/gui/map/StatusBar.java | 12 +- .../gui/referencing/RecentReferenceSystems.java| 19 ++- .../org/apache/sis/internal/setup/Inflater.java| 6 +- .../org/apache/sis/coverage/BandedCoverage.java| 5 +- .../apache/sis/coverage/grid/DomainLinearizer.java | 6 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 5 +- .../sis/coverage/grid/GridCoverageBuilder.java | 14 +- .../apache/sis/coverage/grid/GridDerivation.java | 33 ++-- .../org/apache/sis/coverage/grid/GridExtent.java | 14 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 39 - .../apache/sis/coverage/grid/GridRoundingMode.java | 8 +- .../apache/sis/coverage/grid/PixelTranslation.java | 24 +-- .../sis/coverage/grid/ResampledGridCoverage.java | 6 +- .../org/apache/sis/feature/AbstractAttribute.java | 4 +- .../org/apache/sis/feature/AbstractFeature.java| 12 +- .../apache/sis/feature/AbstractIdentifiedType.java | 5 +- .../apache/sis/feature/DefaultAttributeType.java | 15 +- .../org/apache/sis/feature/DefaultFeatureType.java | 8 +- .../sis/feature/FoliationRepresentation.java | 10 +- .../sis/feature/InvalidFeatureException.java | 6 +- .../java/org/apache/sis/feature/Validator.java | 6 +- .../sis/feature/builder/FeatureTypeBuilder.java| 12 +- .../apache/sis/feature/builder/TypeBuilder.java| 6 +- .../java/org/apache/sis/filter/DistanceFilter.java | 6 +- .../java/org/apache/sis/filter/Optimization.java | 5 +- .../java/org/apache/sis/image/ComputedImage.java | 2 +- .../java/org/apache/sis/image/ImageProcessor.java | 11 +- .../org/apache/sis/image/LanczosInterpolation.java | 5 +- .../java/org/apache/sis/image/PixelIterator.java | 21 ++- .../java/org/apache/sis/image/PlanarImage.java | 6 +- .../java/org/apache/sis/image/TransferType.java| 6 +- .../main/java/org/apache/sis/image/Transferer.java | 6 +- .../java/org/apache/sis/image/Visualization.java | 2 +- .../internal/coverage/j2d/ScaledColorModel.java| 6 +- .../sis/internal/feature/GeometryWithCRS.java | 2 +- .../sis/internal/feature/j2d/PointWrapper.java | 4 +- .../sis/internal/feature/j2d/ShapeWrapper.java | 12 +- .../apache/sis/internal/feature/j2d/Wrapper.java | 6 +- .../sis/internal/feature/jts/FilteringContext.java | 2 +- .../org/apache/sis/internal/feature/jts/JTS.java | 4 +- .../java/org/apache/sis/internal/filter/Node.java | 6 +- .../org/apache/sis/internal/filter/Visitor.java| 4 +- .../sis/coverage/grid/GridDerivationTest.java | 6 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 5 + .../org/apache/sis/feature/FeatureTestCase.java| 7 +- .../sis/internal/jaxb/gco/GO_CharacterString.java | 10 +- .../apache/sis/internal/jaxb/gco/PropertyType.java | 4 +- .../org/apache/sis/internal/jaxb/gcx/FileName.java | 4 +- .../apache/sis/internal/jaxb/gcx/MimeFileType.java | 4 +- .../apache/sis/internal/jaxb/gml/GMLAdapter.java | 4 +- .../org/apache/sis/internal/jaxb/gml/Measure.java | 4 +- .../apache/sis/internal/metadata/AxisNames.java| 4 +- .../org/apache/sis/internal/metadata/Merger.java | 6 +- .../sis/internal/metadata/sql/Initializer.java | 4 +- .../sis/internal/metadata/sql/LocalDataSource.java | 4 +- .../sis/internal/metadata/sql/SQLUtilities.java| 5 +- .../sis/internal/metadata/sql/ScriptRunner.java| 6 +- .../apache/sis/internal/simple/SimpleCitation.java | 6 +- .../org/apache/sis/metadata/MetadataStandard.java | 5 +- .../apache/sis/metadata/ModifiableMetadata.java| 6 +- .../java/org/apache/sis/metadata/TreeNode.java | 6 +- .../org/apache/sis/metadata/TreeNodeChildren.java | 8 +- .../iso/DefaultExtendedElementInformation.java | 3 +- .../apache/sis/metadata/iso/DefaultIdentifier.java | 12 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 4 +- .../acquisition/DefaultEnvironmentalRecord.java| 3 +- .../metadata/iso/acquisition/DefaultObjective.java | 4 +- .../sis/metadata/iso/citation/AbstractParty.java | 4 +- .../sis/metadata/iso/citation/Citations.java
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. The main work since previous merge is the integration of the "feat/resource-processor" branch. It brings "band aggregation" operations on images
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 33688738c620102d6ce5fdb5a36e3d0d91f95261
Merge: 1437fa191c 175b9f0ced
Author: Martin Desruisseaux
AuthorDate: Sun Apr 16 19:12:56 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
The main work since previous merge is the integration of the
"feat/resource-processor" branch.
It brings "band aggregation" operations on images, grid coverages and grid
resources.
.../apache/sis/gui/coverage/CoverageCanvas.java| 59 +-
.../apache/sis/gui/coverage/CoverageControls.java | 5 +-
.../apache/sis/gui/coverage/CoverageStyling.java | 120 ++-
.../org/apache/sis/gui/map/ValuesFormatter.java| 7 +-
.../apache/sis/internal/gui/ImageConverter.java| 13 +-
.../apache/sis/internal/gui/control/ColorCell.java | 33 +-
.../internal/gui/control/ColorColumnHandler.java | 31 +-
.../apache/sis/internal/gui/control/ColorRamp.java | 51 +-
.../sis/internal/gui/control/ValueColorMapper.java | 12 -
.../sis/internal/gui/control/package-info.java | 2 +-
.../sis/gui/coverage/CoverageStylingApp.java | 5 +-
.../apache/sis/cloud/aws/s3/CachedByteChannel.java | 2 +-
.../org/apache/sis/coverage/BandedCoverage.java| 9 +-
.../java/org/apache/sis/coverage/Category.java | 4 +-
.../org/apache/sis/coverage/SampleDimension.java | 109 ++-
.../coverage/grid/BandAggregateGridCoverage.java | 323 +++
.../sis/coverage/grid/BufferedGridCoverage.java| 22 +-
.../sis/coverage/grid/ConvertedGridCoverage.java | 2 +-
.../coverage/grid/CoordinateOperationFinder.java | 5 +-
.../apache/sis/coverage/grid/DefaultEvaluator.java | 12 +-
.../sis/coverage/grid/DerivedGridCoverage.java | 27 +-
.../apache/sis/coverage/grid/DimensionReducer.java | 5 +-
.../sis/coverage/grid/DimensionalityReduction.java | 989 +
.../sis/coverage/grid/DisjointExtentException.java | 9 +-
.../coverage/grid/FractionalGridCoordinates.java | 6 +-
.../org/apache/sis/coverage/grid/GridCoverage.java | 84 +-
.../apache/sis/coverage/grid/GridCoverage2D.java | 2 +
.../sis/coverage/grid/GridCoverageBuilder.java | 26 +-
.../sis/coverage/grid/GridCoverageProcessor.java | 451 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 261 +++---
.../org/apache/sis/coverage/grid/GridGeometry.java | 10 +-
.../apache/sis/coverage/grid/GridOrientation.java | 2 +-
.../apache/sis/coverage/grid/ImageRenderer.java| 103 ++-
.../sis/coverage/grid/ReducedGridCoverage.java | 160
.../sis/coverage/grid/ResampledGridCoverage.java | 3 +-
.../apache/sis/coverage/grid/SliceGeometry.java| 25 +-
.../java/org/apache/sis/filter/LogicalFilter.java | 5 +-
.../java/org/apache/sis/image/AnnotatedImage.java | 12 +-
.../org/apache/sis/image/BandAggregateImage.java | 338 +++
.../java/org/apache/sis/image/BandSelectImage.java | 152 +++-
.../org/apache/sis/image/BandSharedRaster.java | 181
.../java/org/apache/sis/image/BandSharing.java | 377
.../apache/sis/image/BandedSampleConverter.java| 180 ++--
.../main/java/org/apache/sis/image/Colorizer.java | 348
.../java/org/apache/sis/image/ComputedImage.java | 88 +-
.../java/org/apache/sis/image/ImageAdapter.java| 6 +-
.../java/org/apache/sis/image/ImageProcessor.java | 408 -
.../java/org/apache/sis/image/Interpolation.java | 6 +-
.../main/java/org/apache/sis/image/MaskImage.java | 2 +-
.../org/apache/sis/image/MultiSourceImage.java | 148 +++
.../org/apache/sis/image/MultiSourceLayout.java| 414 +
.../org/apache/sis/image/MultiSourcePrefetch.java | 178
.../java/org/apache/sis/image/PlanarImage.java | 95 +-
.../java/org/apache/sis/image/RecoloredImage.java | 47 +-
.../java/org/apache/sis/image/ResampledImage.java | 10 +-
.../org/apache/sis/image/SourceAlignedImage.java | 8 +-
.../main/java/org/apache/sis/image/Transferer.java | 55 +-
.../java/org/apache/sis/image/UserProperties.java | 124 +++
.../java/org/apache/sis/image/Visualization.java | 244 +++--
.../apache/sis/image/WritableComputedImage.java| 177
.../java/org/apache/sis/index/tree/PointTree.java | 2 +-
.../sis/internal/coverage/CommonDomainFinder.java | 376
.../sis/internal/coverage/MultiSourceArgument.java | 623 +
.../sis/internal/coverage}/RangeArgument.java | 46 +-
.../sis/internal/coverage/SampleDimensions.java| 56 +-
.../j2d/{Colorizer.java => ColorModelBuilder.java} | 256 --
.../internal/coverage/j2d/ColorModelFactory.java | 336 ---
.../sis/internal/coverage/j2d/ColorModelType.java | 2 +-
.../sis/internal/coverage/j2d/ColorsForRange.java | 166 +++-
.../sis/internal/coverage/j2d/ImageLayout.java | 34 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 1437fa191c2a13fc2bfffcb010a511b852479a1f Merge: 0a621ef6cf 2639c21ad3 Author: Martin Desruisseaux AuthorDate: Sun Feb 26 16:24:59 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../org/apache/sis/console/MimeTypeCommand.java| 4 +- .../apache/sis/gui/coverage/CoverageCanvas.java| 2 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 55 +++- .../java/org/apache/sis/gui/map/MapCanvasAWT.java | 9 +- .../map/RenderingTask.java}| 29 +- .../apache/sis/internal/gui/BackgroundThreads.java | 13 +- .../apache/sis/internal/gui/DataStoreOpener.java | 62 ++-- .../apache/sis/internal/gui/io/FileAccessItem.java | 365 + .../apache/sis/internal/gui/io/FileAccessView.java | 41 ++- .../apache/sis/internal/gui/io/package-info.java | 2 +- .../org/apache/sis/internal/setup/FXFinder.java| 5 +- .../apache/sis/cloud/aws/s3/CachedByteChannel.java | 20 +- core/sis-build-helper/pom.xml | 1 + .../apache/sis/internal/book/CodeColorizer.java| 16 +- .../org/apache/sis/internal/doclet/Doclet.java | 3 +- .../org/apache/sis/internal/doclet/Rewriter.java | 4 +- .../org/apache/sis/internal/doclet/Taglet.java | 3 +- .../org/apache/sis/internal/unopkg/JavaMaker.java | 5 +- .../sis/coverage/grid/BufferedGridCoverage.java| 17 +- .../org/apache/sis/coverage/grid/GridExtent.java | 2 +- .../java/org/apache/sis/image/MaskedImage.java | 2 +- .../java/org/apache/sis/image/PlanarImage.java | 2 +- .../org/apache/sis/image/PixelIteratorTest.java| 4 +- .../sis/internal/metadata/sql/LocalDataSource.java | 7 +- .../org/apache/sis/metadata/sql/Citations.sql | 2 +- .../sis/metadata/iso/citation/CitationsTest.java | 2 +- .../sis/metadata/sql/MetadataSourceTest.java | 2 +- .../org/apache/sis/xml/RenameListGenerator.java| 6 +- .../sis/internal/map/coverage/RenderingData.java | 31 +- .../org/apache/sis/geometry/AbstractEnvelope.java | 16 +- .../org/apache/sis/geometry/GeneralEnvelope.java | 10 +- .../referencing/PositionalAccuracyConstant.java| 2 +- .../apache/sis/internal/referencing/Resources.java | 5 + .../sis/internal/referencing/Resources.properties | 1 + .../internal/referencing/Resources_fr.properties | 1 + .../apache/sis/internal/referencing/j2d/Tile.java | 5 +- .../internal/referencing/j2d/TileOrganizer.java| 5 +- .../referencing/provider/DatumShiftGridFile.java | 16 +- .../referencing/provider/DatumShiftGridLoader.java | 26 +- .../provider/FranceGeocentricInterpolation.java| 25 +- .../sis/internal/referencing/provider/NADCON.java | 25 +- .../sis/internal/referencing/provider/NTv2.java| 16 +- .../referencing/provider/PolarStereographicA.java | 21 +- .../referencing/provider/PolarStereographicB.java | 26 +- .../main/java/org/apache/sis/io/wkt/Colors.java| 2 +- .../java/org/apache/sis/io/wkt/WKTDictionary.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 1 + .../java/org/apache/sis/referencing/Builder.java | 2 + .../apache/sis/referencing/GeodeticCalculator.java | 4 - .../operation/transform/AbstractMathTransform.java | 1 + .../FranceGeocentricInterpolationTest.java | 6 +- .../internal/referencing/provider/NADCONTest.java | 17 +- .../internal/referencing/provider/NTv2Test.java| 27 +- .../factory/sql/epsg/DataScriptFormatter.java | 3 +- .../sis/test/integration/DatumShiftTest.java | 15 +- .../sis/internal/converter/PathConverter.java | 5 +- .../sis/internal/converter/StringConverter.java| 2 +- .../apache/sis/internal/system/CommonExecutor.java | 2 +- .../apache/sis/internal/system/DataDirectory.java | 3 +- .../internal/util/ArgumentCheckByAssertion.java| 30 +- .../org/apache/sis/internal/util/DoubleDouble.java | 2 +- .../src/main/java/org/apache/sis/io/IO.java| 2 +- .../main/java/org/apache/sis/measure/Range.java| 43 +-- .../src/main/java/org/apache/sis/util/Static.java | 100 +++--- .../java/org/apache/sis/util/collection/Cache.java | 2 +- .../org/apache/sis/util/collection/RangeSet.java | 45 ++- .../org/apache/sis/util/logging/Initializer.java | 3 +- .../apache/sis/util/logging/MonolineFormatter.java | 18 +- .../internal/converter/StringConverterTest.java| 3 +- .../org/apache/sis/test/ProjectDirectories.java| 3 +- .../apache/sis/util/collection/RangeSetTest.java | 51 ++- ide-project/NetBeans/README.txt| 31 -- pom.xml| 5 - .../java/org/apache/sis/storage/landsat/Band.java | 3 +- .../apache/sis/storage/landsat/LandsatStore.java | 56 ++--
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 f76afb0622d096d61bbe2ac13bba467da871e0f9 Merge: c7d4b3ede7 faa3997687 Author: Martin Desruisseaux AuthorDate: Wed Jan 11 12:06:36 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../org/apache/sis/coverage/grid/GridExtent.java | 27 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 17 +- .../sis/coverage/grid/ResampledGridCoverage.java | 25 +- .../org/apache/sis/filter/ArithmeticFunction.java | 6 +- .../sis/internal/coverage/CoverageCombiner.java| 4 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 34 +- .../main/java/org/apache/sis/portrayal/Canvas.java | 18 +- .../org/apache/sis/portrayal/package-info.java | 2 +- .../sis/internal/referencing/Arithmetic.java | 291 ++ .../referencing/ExtendedPrecisionMatrix.java | 92 +- .../sis/internal/referencing/j2d/AffineMatrix.java | 224 ++--- .../referencing/j2d/AffineTransform2D.java | 59 +- .../referencing/provider/Equirectangular.java | 8 +- .../sis/referencing/crs/DefaultTemporalCRS.java| 2 +- .../sis/referencing/cs/CoordinateSystems.java | 15 +- .../apache/sis/referencing/cs/package-info.java| 2 +- .../sis/referencing/datum/BursaWolfParameters.java | 82 +- .../sis/referencing/datum/DatumShiftGrid.java | 6 +- .../sis/referencing/datum/DefaultEllipsoid.java| 41 +- .../sis/referencing/datum/TimeDependentBWP.java| 34 +- .../apache/sis/referencing/datum/package-info.java | 2 +- .../operation/CoordinateOperationFinder.java | 11 +- .../operation/builder/LinearTransformBuilder.java | 2 +- .../operation/matrix/GeneralMatrix.java| 490 +++ .../sis/referencing/operation/matrix/Matrices.java | 199 +++-- .../sis/referencing/operation/matrix/Matrix1.java | 15 +- .../sis/referencing/operation/matrix/Matrix2.java | 19 +- .../sis/referencing/operation/matrix/Matrix3.java | 21 +- .../sis/referencing/operation/matrix/Matrix4.java | 23 +- .../referencing/operation/matrix/MatrixSIS.java| 293 +++--- .../operation/matrix/NonSquareMatrix.java | 83 +- .../sis/referencing/operation/matrix/Solver.java | 176 ++-- .../operation/matrix/UnmodifiableMatrix.java | 36 +- .../referencing/operation/matrix/package-info.java | 14 +- .../operation/projection/AlbersEqualArea.java | 32 +- .../operation/projection/CylindricalEqualArea.java | 35 +- .../operation/projection/Initializer.java | 197 ++--- .../projection/LambertConicConformal.java | 38 +- .../operation/projection/LongitudeWraparound.java | 6 +- .../referencing/operation/projection/Mercator.java | 15 +- .../operation/projection/MeridianArcBased.java | 9 +- .../projection/ModifiedAzimuthalEquidistant.java | 10 +- .../operation/projection/ObliqueStereographic.java | 4 +- .../operation/projection/Orthographic.java | 6 +- .../operation/projection/PolarStereographic.java | 20 +- .../operation/projection/TransverseMercator.java | 26 +- .../transform/AbstractLinearTransform.java | 17 + .../operation/transform/CartesianToPolar.java | 4 +- .../operation/transform/ConstantTransform1D.java | 11 +- .../operation/transform/ContextualParameters.java | 16 +- .../transform/EllipsoidToCentricTransform.java | 7 +- .../transform/ExponentialTransform1D.java | 4 +- .../operation/transform/IdentityTransform1D.java | 2 +- .../operation/transform/LinearTransform1D.java | 139 ++- .../operation/transform/MathTransforms.java| 16 +- .../operation/transform/PolarToCartesian.java | 4 +- .../operation/transform/ProjectiveTransform.java | 79 +- .../operation/transform/ScaleTransform.java| 118 ++- .../operation/transform/TransferFunction.java | 2 +- .../operation/transform/TranslationTransform.java | 114 +-- .../referencing/datum/DefaultEllipsoidTest.java| 22 +- .../operation/matrix/GeneralMatrixTest.java| 91 +- .../referencing/operation/matrix/MatricesTest.java | 44 +- .../referencing/operation/matrix/Matrix1Test.java | 8 +- .../referencing/operation/matrix/Matrix2Test.java | 28 +- .../referencing/operation/matrix/Matrix3Test.java | 20 +- .../referencing/operation/matrix/Matrix4Test.java | 28 +- .../operation/matrix/MatrixTestCase.java | 61 +- .../operation/matrix/NonSquareMatrixTest.java | 14 +- .../referencing/operation/matrix/SolverTest.java | 12 +- .../projection/ConformalProjectionTest.java| 5 +- .../operation/projection/InitializerTest.java | 4 +- .../projection/LambertConicConformalTest.java | 8 +- .../operation/transform/MathTransformTestCase.java | 2 + .../transform/ProjectiveTransformTest.java | 85 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1 Mostly use of Math.fma(…) and resolution of some compiler warnings.
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 c7d4b3ede731f8467ff2c08d2f26cee36982c27f Merge: 1cb46836e6 a2eed4d0f8 Author: Martin Desruisseaux AuthorDate: Mon Jan 2 14:20:05 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 Mostly use of Math.fma(…) and resolution of some compiler warnings. .../java/org/apache/sis/console/CommandRunner.java | 2 +- .../org/apache/sis/gui/coverage/GridTileCache.java | 2 +- .../org/apache/sis/gui/dataset/ResourceEvent.java | 3 + .../java/org/apache/sis/coverage/Category.java | 2 + .../org/apache/sis/coverage/RegionOfInterest.java | 6 +- .../org/apache/sis/coverage/SampleDimension.java | 2 + .../org/apache/sis/coverage/SampleRangeFormat.java | 2 +- .../main/java/org/apache/sis/coverage/ToNaN.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 5 +- .../java/org/apache/sis/coverage/package-info.java | 2 +- .../apache/sis/feature/AbstractAssociation.java| 1 + .../org/apache/sis/feature/AbstractAttribute.java | 1 + .../org/apache/sis/feature/AbstractFeature.java| 3 +- .../apache/sis/feature/AbstractIdentifiedType.java | 4 + .../org/apache/sis/feature/AssociationView.java| 1 + .../java/org/apache/sis/feature/AttributeView.java | 2 +- .../apache/sis/feature/DefaultAssociationRole.java | 14 +- .../apache/sis/feature/DefaultAttributeType.java | 1 + .../org/apache/sis/feature/DefaultFeatureType.java | 5 + .../java/org/apache/sis/feature/DenseFeature.java | 2 + .../org/apache/sis/feature/EnvelopeOperation.java | 4 + .../java/org/apache/sis/feature/FeatureFormat.java | 5 +- .../sis/feature/FeatureOperationException.java | 1 + .../sis/feature/InvalidFeatureException.java | 1 + .../java/org/apache/sis/feature/LinkOperation.java | 1 + .../org/apache/sis/feature/NamedFeatureType.java | 2 + .../java/org/apache/sis/feature/PropertyView.java | 2 +- .../apache/sis/feature/SingletonAssociation.java | 1 + .../org/apache/sis/feature/SingletonAttribute.java | 1 + .../java/org/apache/sis/feature/SparseFeature.java | 1 + .../apache/sis/feature/StringJoinOperation.java| 4 + .../apache/sis/feature/builder/TypeBuilder.java| 1 - .../java/org/apache/sis/filter/BinaryFunction.java | 4 +- .../apache/sis/filter/BinaryGeometryFilter.java| 5 +- .../org/apache/sis/filter/ComparisonFilter.java| 1 - .../org/apache/sis/filter/ConvertFunction.java | 2 +- .../org/apache/sis/filter/DefaultSortProperty.java | 2 +- .../java/org/apache/sis/filter/DistanceFilter.java | 2 +- .../java/org/apache/sis/filter/LeafExpression.java | 2 +- .../java/org/apache/sis/filter/LikeFilter.java | 2 +- .../java/org/apache/sis/filter/LogicalFilter.java | 4 +- .../java/org/apache/sis/filter/PropertyValue.java | 3 +- .../java/org/apache/sis/filter/UnaryFunction.java | 2 +- .../org/apache/sis/index/tree/NodeIterator.java| 1 + .../java/org/apache/sis/index/tree/PointTree.java | 15 +- .../org/apache/sis/index/tree/PointTreeNode.java | 15 +- .../org/apache/sis/index/tree/QuadTreeNode.java| 7 +- .../org/apache/sis/internal/feature/Resources.java | 1 - .../internal/feature/SpatialOperationContext.java | 8 +- .../sis/internal/feature/j2d/ShapeWrapper.java | 1 + .../feature/jts/PackedCoordinateSequence.java | 5 + .../sis/internal/filter/GeometryConverter.java | 2 +- .../sis/internal/filter/SortByComparator.java | 1 + .../internal/filter/sqlmm/FunctionWithSRID.java| 1 + .../internal/filter/sqlmm/GeometryConstructor.java | 1 + .../sis/internal/filter/sqlmm/OneGeometry.java | 3 +- .../apache/sis/internal/filter/sqlmm/ST_Point.java | 1 + .../sis/internal/filter/sqlmm/ST_Transform.java| 1 + .../sis/internal/filter/sqlmm/TwoGeometries.java | 2 + .../sis/internal/processing/isoline/Fragments.java | 2 +- .../sis/internal/jaxb/IdentifierMapAdapter.java| 2 +- .../sis/internal/jaxb/NonMarshalledAuthority.java | 1 - .../sis/internal/jaxb/SpecializedIdentifier.java | 2 +- .../sis/internal/jaxb/lan/LocaleAndCharset.java| 4 +- .../apache/sis/internal/metadata/Resources.java| 1 - .../sis/internal/simple/SimpleAttributeType.java | 1 + .../internal/simple/SimpleIdentifiedObject.java| 1 + .../sis/internal/simple/SimpleIdentifier.java | 1 + .../org/apache/sis/metadata/MetadataFormat.java| 2 +- .../org/apache/sis/metadata/MetadataStandard.java | 2 +- .../org/apache/sis/metadata/iso/ISOMetadata.java | 2 +- .../apache/sis/metadata/sql/MetadataWriter.java| 6 +- .../org/apache/sis/util/iso/DefaultRecord.java | 2 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 2 +- .../org/apache/sis/util/iso/DefaultTypeName.java | 2 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: upgrade from JSR-363 to JSR-385.
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 5cf53d65d2ec35c6125dc79af2b2c5e490a31a40
Merge: c89fcb2b94 6b2e63471f
Author: Martin Desruisseaux
AuthorDate: Mon Dec 26 17:52:25 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1: upgrade from JSR-363 to JSR-385.
NOTICE | 4 +-
README | 2 +-
.../java/org/apache/sis/xml/ValueConverter.java| 4 +-
.../java/org/apache/sis/io/wkt/AbstractParser.java | 4 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java| 4 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 4 +-
.../referencing/factory/sql/EPSGDataAccess.java| 4 +-
.../sis/internal/converter/StringConverter.java| 4 +-
.../java/org/apache/sis/io/CompoundFormat.java | 2 +-
.../org/apache/sis/measure/AbstractConverter.java | 8 +-
.../java/org/apache/sis/measure/AbstractUnit.java | 86 +++-
.../org/apache/sis/measure/ConventionalUnit.java | 10 +-
.../apache/sis/measure/DefaultQuantityFactory.java | 75 ++
.../org/apache/sis/measure/LinearConverter.java| 8 +-
.../java/org/apache/sis/measure/Quantities.java| 4 +-
.../org/apache/sis/measure/QuantityFormat.java | 110 -
.../main/java/org/apache/sis/measure/Scalar.java | 53 +-
.../java/org/apache/sis/measure/SystemUnit.java| 18 +++-
.../java/org/apache/sis/measure/UnitFormat.java| 44 +
.../java/org/apache/sis/measure/UnitRegistry.java | 25 -
.../java/org/apache/sis/measure/UnitServices.java | 83 +++-
.../main/java/org/apache/sis/measure/Units.java| 8 +-
.../java/org/apache/sis/measure/package-info.java | 2 +-
.../org/apache/sis/measure/QuantitiesTest.java | 5 +-
.../org/apache/sis/measure/SystemUnitTest.java | 4 +-
.../org/apache/sis/measure/UnitDimensionTest.java | 4 +-
.../org/apache/sis/measure/UnitFormatTest.java | 12 +--
.../org/apache/sis/measure/UnitServicesTest.java | 13 +--
ide-project/NetBeans/nbproject/project.properties | 4 +-
.../apache/sis/internal/earth/netcdf/GCOM_C.java | 6 +-
.../apache/sis/internal/earth/netcdf/GCOM_W.java | 6 +-
.../org/apache/sis/internal/netcdf/Convention.java | 6 +-
.../org/apache/sis/internal/netcdf/Variable.java | 4 +-
.../sis/internal/netcdf/impl/ChannelDecoder.java | 4 +-
.../sis/internal/netcdf/impl/VariableInfo.java | 6 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 6 +-
36 files changed, 518 insertions(+), 128 deletions(-)
diff --cc ide-project/NetBeans/nbproject/project.properties
index fbd73f1c14,7a129754dd..bad85c7086
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -91,8 -98,7 +91,8 @@@ test.jpn-profile.dir = ${project.root}/
# Those dependencies must exist in the local Maven repository.
# Those numbers should match the ones declared in the pom.xml files.
#
+geoapi.version = 3.1-SNAPSHOT
- jsr363.version = 1.0
+ jsr385.version = 2.1.3
jaxb.version = 2.3.3
jaxb.runtime = 2.3.7
istack.version = 3.0.12
@@@ -124,8 -130,8 +124,8 @@@ postgresql.version = 42.5.
maven.repository = ${user.home}/.m2/repository
endorsed.classpath =
javac.classpath=\
-${project.GeoAPI}/dist/geoapi.jar:\
+
${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${geoapi.version}.jar:\
-
${maven.repository}/javax/measure/unit-api/${jsr363.version}/unit-api-${jsr363.version}.jar:\
+
${maven.repository}/javax/measure/unit-api/${jsr385.version}/unit-api-${jsr385.version}.jar:\
${maven.repository}/jakarta/xml/bind/jakarta.xml.bind-api/${jaxb.version}/jakarta.xml.bind-api-${jaxb.version}.jar:\
${maven.repository}/com/esri/geometry/esri-geometry-api/${esri.api.version}/esri-geometry-api-${esri.api.version}.jar:\
${maven.repository}/org/locationtech/jts/jts-core/${jts.version}/jts-core-${jts.version}.jar:\
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 c89fcb2b94739229f6e1903f5d3171ce9c58c168 Merge: f5bc633ac3 0ea485eff4 Author: Martin Desruisseaux AuthorDate: Mon Dec 26 14:13:31 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/gui/dataset/ExpandedFeature.java| 2 + .../apache/sis/internal/gui/DataStoreOpener.java | 7 +- .../apache/sis/internal/gui/ExceptionReporter.java | 6 +- cloud/pom.xml | 4 +- cloud/sis-cloud-aws/pom.xml| 2 +- .../apache/sis/cloud/aws/internal/Resources.java | 5 + .../sis/cloud/aws/internal/Resources.properties| 1 + .../sis/cloud/aws/internal/Resources_fr.properties | 1 + .../apache/sis/cloud/aws/s3/CachedByteChannel.java | 288 ++-- .../org/apache/sis/cloud/aws/s3/FileService.java | 50 +- .../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 6 +- .../org/apache/sis/cloud/aws/s3/package-info.java | 2 +- .../sis/internal/jaxb/gco/CharSequenceAdapter.java | 24 +- .../org/apache/sis/internal/jaxb/lan/Country.java | 6 +- .../apache/sis/internal/metadata/Identifiers.java | 33 +- .../internal/metadata/ImplementationHelper.java| 5 +- .../org/apache/sis/metadata/PropertyAccessor.java | 3 +- .../apache/sis/metadata/PropertyInformation.java | 7 +- .../sis/metadata/iso/citation/Citations.java | 2 +- .../main/java/org/apache/sis/xml/NilReason.java| 2 +- .../java/org/apache/sis/xml/ValueConverter.java| 27 +- .../apache/sis/test/xml/DocumentComparator.java| 8 +- .../gazetteer/MilitaryGridReferenceSystem.java | 5 +- .../org/apache/sis/geometry/CoordinateFormat.java | 4 +- .../apache/sis/internal/jaxb/referencing/Code.java | 2 +- .../sis/internal/referencing/AxisDirections.java | 2 +- .../main/java/org/apache/sis/io/wkt/Formatter.java | 4 +- .../apache/sis/io/wkt/GeodeticObjectParser.java| 5 +- .../main/java/org/apache/sis/io/wkt/Symbols.java | 6 +- .../org/apache/sis/parameter/TensorValues.java | 7 +- .../sis/referencing/ImmutableIdentifier.java | 15 +- .../sis/referencing/cs/CoordinateSystems.java | 5 +- .../cs/DefaultCoordinateSystemAxis.java| 28 +- .../factory/GeodeticAuthorityFactory.java | 2 +- .../DefaultCoordinateOperationFactory.java | 4 +- .../transform/DefaultMathTransformFactory.java | 4 +- .../java/org/apache/sis/referencing/CRSTest.java | 21 +- .../apache/sis/referencing/factory/GIGS2001.java | 73 -- .../apache/sis/referencing/factory/GIGS2002.java | 121 .../apache/sis/referencing/factory/GIGS2003.java | 77 --- .../apache/sis/referencing/factory/GIGS2004.java | 166 - .../apache/sis/referencing/factory/GIGS2005.java | 123 .../apache/sis/referencing/factory/GIGS2006.java | 118 .../apache/sis/referencing/factory/GIGS2007.java | 77 --- .../apache/sis/referencing/factory/GIGS2008.java | 77 --- .../apache/sis/referencing/factory/GIGS2009.java | 77 --- .../apache/sis/referencing/factory/GIGS3002.java | 49 -- .../apache/sis/referencing/factory/GIGS3003.java | 49 -- .../apache/sis/referencing/factory/GIGS3004.java | 56 -- .../apache/sis/referencing/factory/GIGS3005.java | 49 -- .../referencing/factory/sql/EPSGFactoryTest.java | 2 - .../DefaultCoordinateOperationFactoryTest.java | 19 +- .../apache/sis/test/integration/MetadataTest.java | 5 +- .../sis/test/suite/ReferencingTestSuite.java | 17 +- .../sis/internal/converter/StringConverter.java| 6 +- .../java/org/apache/sis/internal/jdk17/JDK17.java | 19 + .../java/org/apache/sis/internal/jdk17/Record.java | 22 +- .../sis/internal/system/DelayedExecutor.java | 2 +- .../org/apache/sis/internal/util/CodeLists.java| 8 +- .../org/apache/sis/internal/util/Constants.java| 6 +- .../apache/sis/internal/util/DefinitionURI.java| 6 +- .../org/apache/sis/internal/util/Numerics.java | 20 + .../java/org/apache/sis/internal/util/Strings.java | 8 +- .../java/org/apache/sis/internal/util/X364.java| 3 +- .../main/java/org/apache/sis/io/DefaultFormat.java | 2 +- .../java/org/apache/sis/measure/UnitFormat.java| 5 +- .../java/org/apache/sis/util/CharSequences.java| 3 +- .../main/java/org/apache/sis/util/Exceptions.java | 4 +- .../src/main/java/org/apache/sis/util/Numbers.java | 4 +- .../src/main/java/org/apache/sis/util/Version.java | 2 +- .../sis/util/collection/DefaultTreeTable.java | 5 +- .../org/apache/sis/util/collection/RangeSet.java | 61 +- .../apache/sis/util/collection/package-info.java | 2 +- .../apache/sis/util/logging/MonolineFormatter.java | 2 +- .../sis/util/resources/IndexedResourceBundle.java | 3 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This is the upgrade from Java 8 to Java 11.
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 f5bc633ac346e45db8e2cbab901c15cd7eb6e09e Merge: fee1fa85b1 9c4a34851d Author: Martin Desruisseaux AuthorDate: Tue Dec 13 11:33:53 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. This is the upgrade from Java 8 to Java 11. https://issues.apache.org/jira/browse/SIS-561 README | 2 +- application/sis-console/pom.xml| 5 + .../org/apache/sis/console/IdentifierCommand.java | 1 + .../org/apache/sis/console/MetadataCommand.java| 4 +- .../apache/sis/console/ResourcesDownloader.java| 3 +- .../org/apache/sis/console/TransformCommand.java | 3 +- application/sis-javafx/pom.xml | 5 + application/sis-javafx/src/main/artifact/README| 6 +- application/sis-javafx/src/main/artifact/bin/sis | 2 +- .../sis-javafx/src/main/artifact/bin/sis.bat | 2 +- application/sis-javafx/src/main/artifact/bin/sisfx | 2 +- .../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +- .../main/java/org/apache/sis/gui/DataViewer.java | 3 +- .../main/java/org/apache/sis/gui/RecentFiles.java | 4 +- .../apache/sis/gui/coverage/CoverageControls.java | 4 +- .../apache/sis/gui/coverage/CoverageExplorer.java | 24 +- .../apache/sis/gui/coverage/CoverageStyling.java | 2 +- .../org/apache/sis/gui/coverage/package-info.java | 2 +- .../apache/sis/gui/dataset/ExpandedFeature.java| 6 +- .../org/apache/sis/gui/dataset/PathAction.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 63 +--- .../java/org/apache/sis/gui/map/package-info.java | 2 +- .../sis/gui/metadata/StandardMetadataTree.java | 6 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 3 +- .../gui/referencing/PositionableProjection.java| 2 +- .../gui/referencing/RecentReferenceSystems.java| 20 +- .../apache/sis/gui/referencing/package-info.java | 2 +- .../org/apache/sis/internal/gui/GUIUtilities.java | 4 +- .../apache/sis/internal/gui/ImageConverter.java| 5 +- .../org/apache/sis/internal/gui/RecentChoices.java | 4 +- .../apache/sis/internal/gui/GUIUtilitiesTest.java | 7 +- application/sis-openoffice/pom.xml | 5 + application/sis-webapp/pom.xml | 10 + .../org/apache/sis/services}/OSGiActivator.java| 7 +- .../org/apache/sis/services}/ServletListener.java | 8 +- .../org/apache/sis/internal/book/Assembler.java| 10 +- .../apache/sis/internal/book/CodeColorizer.java| 7 +- .../org/apache/sis/internal/book/package-info.java | 4 +- .../org/apache/sis/coverage/SampleDimension.java | 4 +- .../sis/coverage/grid/BufferedGridCoverage.java| 3 +- .../sis/coverage/grid/GridCoordinatesView.java | 5 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 3 +- .../apache/sis/coverage/grid/GridDerivation.java | 3 +- .../org/apache/sis/coverage/grid/GridExtent.java | 42 +-- .../apache/sis/coverage/grid/GridExtentCRS.java| 3 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 31 +- .../apache/sis/coverage/grid/ImageRenderer.java| 3 +- .../apache/sis/coverage/grid/PixelTranslation.java | 23 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/AbstractAttribute.java | 4 +- .../org/apache/sis/feature/AbstractFeature.java| 7 +- .../org/apache/sis/feature/DefaultFeatureType.java | 2 +- .../org/apache/sis/feature/FeatureOperations.java | 2 +- .../java/org/apache/sis/feature/LinkOperation.java | 3 +- .../sis/feature/builder/FeatureTypeBuilder.java| 9 +- .../org/apache/sis/filter/AssociationValue.java| 6 +- .../java/org/apache/sis/filter/BinaryFunction.java | 3 +- .../apache/sis/filter/BinaryGeometryFilter.java| 3 +- .../java/org/apache/sis/filter/Capabilities.java | 3 +- .../org/apache/sis/filter/ComparisonFilter.java| 3 +- .../org/apache/sis/filter/ConvertFunction.java | 4 +- .../java/org/apache/sis/filter/DistanceFilter.java | 7 +- .../org/apache/sis/filter/IdentifierFilter.java| 5 +- .../java/org/apache/sis/filter/LeafExpression.java | 3 +- .../java/org/apache/sis/filter/LikeFilter.java | 7 +- .../java/org/apache/sis/filter/LogicalFilter.java | 5 +- .../java/org/apache/sis/filter/Optimization.java | 5 +- .../java/org/apache/sis/filter/PropertyValue.java | 4 +- .../java/org/apache/sis/filter/UnaryFunction.java | 3 +- .../java/org/apache/sis/image/BandSelectImage.java | 3 +- .../java/org/apache/sis/image/ComputedImage.java | 2 +- .../java/org/apache/sis/image/ImageCombiner.java | 5 +- .../java/org/apache/sis/image/PlanarImage.java | 15 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains only bug fixes.
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 20ae4b58a97ac5f40016de23651a6dac13bf1b9b Merge: 05a9bb3b01 e2c3b3af00 Author: Martin Desruisseaux AuthorDate: Wed Dec 7 18:44:54 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains only bug fixes. .../sis/gui/metadata/StandardMetadataTree.java | 2 +- .../org/apache/sis/metadata/MetadataStandard.java | 10 +- .../report/CoordinateOperationMethods.java | 4 ++-- .../internal/sql/feature/GeometryGetterTest.java| 19 ++- .../sis/internal/sql/postgis/PostgresTest.java | 21 - .../sis/internal/storage/esri/RasterStore.java | 2 +- .../sis/internal/storage/esri/RawRasterStore.java | 12 .../apache/sis/internal/storage/io/ChannelData.java | 16 .../sis/internal/storage/io/ChannelDataInput.java | 12 .../storage/io/ChannelImageInputStream.java | 6 +++--- 10 files changed, 82 insertions(+), 22 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 05a9bb3b0121e65ac852b50d40363862324dee34 Merge: 92a8dad131 d438a0d1b6 Author: Martin Desruisseaux AuthorDate: Tue Dec 6 19:28:16 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/console/FormattedOutputCommand.java | 2 +- .../org/apache/sis/console/CRSCommandTest.java | 14 +- .../org/apache/sis/internal/doclet/Preformat.java | 2 +- .../org/apache/sis/internal/maven/Filenames.java | 2 +- .../coverage/j2d/MultiBandsIndexColorModel.java| 2 +- .../org/apache/sis/internal/feature/Resources.java | 2 +- .../internal/jaxb/metadata/DQM_Description.java| 8 +- .../sis/internal/jaxb/metadata/DQM_Measure.java| 8 +- .../DQ_StandaloneQualityReportInformation.java | 8 +- .../jaxb/metadata/replace/QualityParameter.java| 4 +- .../sis/internal/simple/CitationConstant.java | 12 +- .../org/apache/sis/metadata/PropertyAccessor.java | 4 +- .../org/apache/sis/metadata/TreeNodeChildren.java | 2 +- .../sis/metadata/iso/quality/AbstractElement.java | 12 +- ...ava => DefaultEvaluationReportInformation.java} | 18 +- ...ription.java => DefaultMeasureDescription.java} | 22 +- ...aultMeasure.java => DefaultQualityMeasure.java} | 20 +- .../sis/metadata/iso/quality/DefaultUsability.java | 4 +- .../iso/quality/DefaultUsabilityElement.java | 106 .../apache/sis/util/iso/DefaultNameFactory.java| 2 +- .../org/apache/sis/util/iso/DefaultNameSpace.java | 2 +- .../java/org/apache/sis/xml/NilObjectHandler.java | 7 +- .../java/org/apache/sis/xml/ValueConverter.java| 2 +- .../metadata/replace/QualityParameterTest.java | 4 +- .../apache/sis/metadata/iso/AllMetadataTest.java | 7 +- .../java/org/apache/sis/test/MetadataAssert.java | 4 +- .../apache/sis/test/xml/DocumentComparator.java| 7 +- .../java/org/apache/sis/test/xml/package-info.java | 2 +- .../test/java/org/apache/sis/xml/XLinkTest.java| 2 +- .../apache/sis/internal/gazetteer/Resources.java | 4 +- .../org/apache/sis/geometry/AbstractEnvelope.java | 2 +- .../java/org/apache/sis/geometry/Envelope2D.java | 2 +- .../apache/sis/internal/referencing/Resources.java | 4 +- .../operation/CoordinateOperationFinder.java | 2 +- .../operation/matrix/AffineTransforms2D.java | 4 +- .../operation/transform/AbstractMathTransform.java | 2 +- .../operation/transform/ConcatenatedTransform.java | 2 +- .../transform/ConcatenatedTransform2D.java | 2 +- .../transform/ConcatenatedTransformDirect2D.java | 2 +- .../operation/transform/LinearTransform1D.java | 2 +- .../sis/referencing/GeodeticObjectVerifier.java| 6 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 6 +- .../factory/CommonAuthorityFactoryTest.java| 27 +- .../transform/ConcatenatedTransformTest.java | 4 +- .../operation/transform/MathTransformWrapper.java | 2 +- .../java/org/apache/sis/internal/jdk9/JDK9.java| 13 + .../apache/sis/util/logging/MonolineFormatter.java | 2 +- .../java/org/apache/sis/util/resources/Errors.java | 2 +- .../sis/util/resources/IndexedResourceBundle.java | 2 +- .../org/apache/sis/util/resources/Messages.java| 2 +- .../org/apache/sis/util/resources/Vocabulary.java | 2 +- pom.xml| 2 +- .../apache/sis/storage/netcdf/AttributeNames.java | 4 +- .../shapefile/jdbc/sql/ClauseResolver.java | 2 +- .../sis/internal/storage/image/FormatFinder.java | 2 +- .../sis/internal/storage/io/IOUtilities.java | 2 +- .../sis/storage/IllegalFeatureTypeException.java | 2 +- .../org/apache/sis/storage/StorageConnector.java | 2 +- .../org/apache/sis/storage/WritableFeatureSet.java | 10 + .../apache/sis/internal/storage/gpx/Reader.java| 2 +- .../org/apache/sis/internal/storage/gpx/Store.java | 63 ++--- .../sis/internal/storage/gpx/StoreProvider.java| 10 +- .../apache/sis/internal/storage/gpx/Updater.java | 89 +++ .../sis/internal/storage/gpx/WritableStore.java| 182 + .../apache/sis/internal/storage/gpx/Writer.java| 14 +- .../storage/xml/stream/RewriteOnUpdate.java| 283 + .../internal/storage/xml/stream/StaxDataStore.java | 83 +++--- .../storage/xml/stream/StaxStreamWriter.java | 12 +- .../internal/storage/xml/stream/package-info.java | 2 +- .../sis/internal/storage/gpx/UpdaterTest.java | 182 + .../sis/internal/storage/gpx/WriterTest.java | 14 +- .../org/apache/sis/test/suite/GPXTestSuite.java| 3 +- 72 files changed, 1008 insertions(+), 344 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains mostly minor documentation fixes, but repeated in a lot of files.
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 29bfa755d5f191347336983df8c506bdc076b5ca Merge: 2afe9dfcf6 854d9b68cf Author: Martin Desruisseaux AuthorDate: Mon Nov 21 15:27:03 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains mostly minor documentation fixes, but repeated in a lot of files. .../src/main/artifact/conf/logging.properties | 2 +- .../main/java/org/apache/sis/console/Command.java | 2 +- .../org/apache/sis/console/CRSCommandTest.java | 2 +- .../main/java/org/apache/sis/gui/DataViewer.java | 2 +- .../apache/sis/gui/coverage/CoverageExplorer.java | 2 +- .../org/apache/sis/gui/coverage/GridRowSkin.java | 4 +- .../sis/gui/coverage/ImagePropertyExplorer.java| 6 +- .../org/apache/sis/gui/dataset/ExpandableList.java | 2 +- .../org/apache/sis/gui/dataset/FeatureLoader.java | 2 +- .../org/apache/sis/gui/dataset/ResourceCell.java | 2 +- .../org/apache/sis/gui/dataset/ResourceTree.java | 2 +- .../org/apache/sis/gui/dataset/WindowHandler.java | 2 +- .../org/apache/sis/gui/map/OperationFinder.java| 2 +- .../java/org/apache/sis/gui/map/StatusBar.java | 8 +-- .../org/apache/sis/gui/map/ValuesFormatter.java| 2 +- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 2 +- .../java/org/apache/sis/gui/referencing/Utils.java | 2 +- .../apache/sis/internal/gui/DataStoreOpener.java | 6 +- .../org/apache/sis/internal/setup/Inflater.java| 2 +- .../java/org/apache/sis/openoffice/CalcAddins.java | 2 +- .../src/main/unopkg/build-instruction.html | 2 +- .../apache/sis/cloud/aws/s3/CachedByteChannel.java | 2 +- .../org/apache/sis/cloud/aws/s3/DerivedList.java | 2 +- .../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 8 +-- .../apache/sis/internal/maven/JarCollector.java| 2 +- .../util/resources/IndexedResourceCompiler.java| 6 +- .../org/apache/sis/coverage/BandedCoverage.java| 6 +- .../java/org/apache/sis/coverage/CategoryList.java | 2 +- .../org/apache/sis/coverage/SampleDimension.java | 6 +- .../sis/coverage/grid/BufferedGridCoverage.java| 2 +- .../coverage/grid/CoordinateOperationFinder.java | 2 +- .../apache/sis/coverage/grid/DefaultEvaluator.java | 2 +- .../coverage/grid/FractionalGridCoordinates.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 6 +- .../sis/coverage/grid/GridCoverageBuilder.java | 8 +-- .../sis/coverage/grid/GridCoverageProcessor.java | 2 +- .../apache/sis/coverage/grid/GridDerivation.java | 14 ++-- .../org/apache/sis/coverage/grid/GridExtent.java | 8 +-- .../org/apache/sis/coverage/grid/GridGeometry.java | 8 +-- .../apache/sis/coverage/grid/GridOrientation.java | 10 +-- .../apache/sis/coverage/grid/GridRoundingMode.java | 2 +- .../apache/sis/coverage/grid/ImageRenderer.java| 2 +- .../grid/IncompleteGridGeometryException.java | 2 +- .../sis/coverage/grid/ResampledGridCoverage.java | 6 +- .../apache/sis/coverage/grid/ReshapedImage.java| 2 +- .../apache/sis/feature/AbstractAssociation.java| 4 +- .../org/apache/sis/feature/AbstractAttribute.java | 8 +-- .../apache/sis/feature/AbstractIdentifiedType.java | 2 +- .../apache/sis/feature/CharacteristicTypeMap.java | 2 +- .../apache/sis/feature/DefaultAssociationRole.java | 2 +- .../apache/sis/feature/DefaultAttributeType.java | 6 +- .../org/apache/sis/feature/DefaultFeatureType.java | 10 +-- .../java/org/apache/sis/feature/DenseFeature.java | 10 +-- .../org/apache/sis/feature/EnvelopeOperation.java | 2 +- .../java/org/apache/sis/feature/FeatureFormat.java | 4 +- .../org/apache/sis/feature/FeatureOperations.java | 2 +- .../main/java/org/apache/sis/feature/Features.java | 2 +- .../java/org/apache/sis/feature/SparseFeature.java | 10 +-- .../java/org/apache/sis/feature/Validator.java | 6 +- .../java/org/apache/sis/feature/benchmarks.html| 2 +- .../sis/feature/builder/AttributeTypeBuilder.java | 2 +- .../feature/builder/CharacteristicTypeBuilder.java | 2 +- .../sis/feature/builder/FeatureTypeBuilder.java| 6 +- .../apache/sis/feature/builder/TypeBuilder.java| 2 +- .../java/org/apache/sis/feature/package-info.java | 2 +- .../org/apache/sis/filter/ComparisonFilter.java| 2 +- .../java/org/apache/sis/filter/Optimization.java | 2 +- .../src/main/java/org/apache/sis/filter/XPath.java | 2 +- .../java/org/apache/sis/image/AnnotatedImage.java | 6 +- .../java/org/apache/sis/image/BandSelectImage.java | 2 +- .../java/org/apache/sis/image/ComputedImage.java | 6 +- .../java/org/apache/sis/image/ComputedTiles.java | 4 +- .../java/org/apache/sis/image/ErrorHandler.java| 4 +- .../java/org/apache/sis/image/ImageCombiner.java | 2 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains bug fix in parsing of GML documents.
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 2afe9dfcf6ce881df024e7b98b8500ccb33b80d5
Merge: 34b68d4160 ec0eaa68d9
Author: Martin Desruisseaux
AuthorDate: Sat Nov 19 17:27:49 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
Contains bug fix in parsing of GML documents.
.../sis/internal/jaxb/IdentifierMapAdapter.java| 30 +-
.../sis/internal/jaxb/SpecializedIdentifier.java | 2 +
.../org/apache/sis/internal/jaxb/package-info.java | 2 +-
.../org/apache/sis/internal/metadata/Merger.java | 6 +-
.../java/org/apache/sis/xml/NilObjectHandler.java | 2 +-
.../java/org/apache/sis/xml/ReferenceResolver.java | 8 +-
.../referencing/CC_GeneralOperationParameter.java | 39 +--
.../jaxb/referencing/CC_GeneralParameterValue.java | 11 +-
.../jaxb/referencing/CC_OperationMethod.java | 11 +-
.../jaxb/referencing/CC_OperationParameter.java| 54 +++---
.../internal/jaxb/referencing/package-info.java| 2 +-
.../sis/internal/referencing/AxisDirections.java | 57 +--
.../sis/parameter/AbstractParameterDescriptor.java | 4 +-
.../sis/parameter/DefaultParameterDescriptor.java | 70 ++---
.../sis/parameter/DefaultParameterValue.java | 13 ++-
.../sis/parameter/DefaultParameterValueGroup.java | 8 +-
.../org/apache/sis/parameter/ParameterFormat.java | 3 +-
.../java/org/apache/sis/parameter/Parameters.java | 9 +-
.../sis/parameter/UnmodifiableParameterValue.java | 13 ++-
.../sis/referencing/crs/AbstractDerivedCRS.java| 13 +--
.../sis/referencing/cs/CoordinateSystems.java | 7 ++
.../org/apache/sis/referencing/cs/Normalizer.java | 26 +++--
.../operation/AbstractCoordinateOperation.java | 20 +---
.../operation/AbstractSingleOperation.java | 9 +-
.../operation/DefaultConcatenatedOperation.java| 2 +-
.../referencing/operation/DefaultConversion.java | 16 +--
.../operation/DefaultOperationMethod.java | 26 +++--
.../operation/DefaultPassThroughOperation.java | 112 +++--
.../apache/sis/referencing/operation/SubTypes.java | 2 +-
.../java/org/apache/sis/io/wkt/WKTParserTest.java | 1 +
.../storage/csv/MovingFeatureIterator.java | 3 +-
.../org/apache/sis/internal/storage/csv/Store.java | 2 +-
32 files changed, 406 insertions(+), 177 deletions(-)
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
index deb48c7238,c67f5b7249..0126b5ce17
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
@@@ -260,9 -286,9 +287,9 @@@ public final class CC_GeneralOperationP
* be invoked recursively for each parameter in the group.
*/
final Map merged = new HashMap<>(expected);
- merged.putAll(actual); // May overwrite predefined properties.
- mergeArrays(GeneralParameterDescriptor.ALIAS_KEY,
GenericName.class, provided.getAlias(), merged, complete.getName());
+ merged.putAll(actual); // May
overwrite predefined properties.
+ mergeArrays(GeneralParameterDescriptor.ALIAS_KEY,
GenericName.class, provided.getAlias(), merged, complete.getName());
-mergeArrays(GeneralParameterDescriptor.IDENTIFIERS_KEY,
Identifier.class, provided.getIdentifiers(), merged, null);
+mergeArrays(GeneralParameterDescriptor.IDENTIFIERS_KEY,
ReferenceIdentifier.class, provided.getIdentifiers(), merged, null);
if (isGroup) {
final List descriptors =
((ParameterDescriptorGroup) provided).descriptors();
return merge(DefaultParameterValueGroup.class, merged, merged,
minimumOccurs, maximumOccurs,
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
index 5020acd1bb,1d3b09fc96..7499f5c35f
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
@@@ -22,8 -23,9 +23,10 @@@ import javax.xml.bind.Unmarshaller
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.opengis.parameter.ParameterValueGroup;
+ import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.MathTransform;
+ import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.PassThroughOperation;
import
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This is the upgrade of metadata quality package from ISO 19115 to ISO 19157.
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 86bb5bbf6b5b3c94e23e76b0c712818533d85fdd Merge: a143312778 0d58e3a7b4 Author: Martin Desruisseaux AuthorDate: Thu Nov 17 12:00:37 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. This is the upgrade of metadata quality package from ISO 19115 to ISO 19157. https://issues.apache.org/jira/browse/SIS-394 .../org/apache/sis/feature/AbstractAttribute.java | 3 +- .../apache/sis/feature/DefaultAttributeType.java | 3 +- .../main/java/org/apache/sis/feature/Features.java | 6 +- .../apache/sis/internal/jaxb/FilterByVersion.java | 4 +- .../apache/sis/internal/jaxb/cat/CodeListUID.java | 10 +- .../sis/internal/jaxb/code/DQM_ValueStructure.java | 89 .../sis/internal/jaxb/code/package-info.java | 3 +- .../apache/sis/internal/jaxb/gco/GO_DateTime.java | 26 +- .../apache/sis/internal/jaxb/gco/package-info.java | 2 +- .../internal/jaxb/metadata/DQM_BasicMeasure.java | 92 .../internal/jaxb/metadata/DQM_Description.java| 92 .../sis/internal/jaxb/metadata/DQM_Measure.java| 92 .../sis/internal/jaxb/metadata/DQM_Parameter.java | 93 .../jaxb/metadata/DQM_SourceReference.java | 92 .../jaxb/metadata/DQ_EvaluationMethod.java | 97 .../jaxb/metadata/DQ_MeasureReference.java | 97 .../DQ_StandaloneQualityReportInformation.java | 99 .../sis/internal/jaxb/metadata/package-info.java | 3 +- .../internal/jaxb/metadata/replace/Parameter.java | 173 ++ .../jaxb/metadata/replace/QualityParameter.java| 246 + .../jaxb/metadata/replace/ServiceParameter.java| 234 .../jaxb/metadata/replace/package-info.java| 21 +- .../sis/internal/metadata/ReferencingServices.java | 5 +- .../org/apache/sis/metadata/MetadataStandard.java | 63 ++- .../org/apache/sis/metadata/PropertyAccessor.java | 4 +- .../java/org/apache/sis/metadata/SpecialCases.java | 19 +- .../sis/metadata/StandardImplementation.java | 6 +- .../sis/metadata/iso/acquisition/package-info.java | 2 +- .../sis/metadata/iso/citation/package-info.java| 2 +- .../sis/metadata/iso/constraint/package-info.java | 2 +- .../sis/metadata/iso/content/package-info.java | 2 +- .../metadata/iso/distribution/package-info.java| 2 +- .../sis/metadata/iso/extent/package-info.java | 2 +- .../metadata/iso/identification/package-info.java | 2 +- .../sis/metadata/iso/lineage/package-info.java | 2 +- .../sis/metadata/iso/maintenance/package-info.java | 2 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../metadata/iso/quality/AbstractCompleteness.java | 2 +- ...ractResult.java => AbstractDataEvaluation.java} | 77 ++- .../sis/metadata/iso/quality/AbstractElement.java | 589 +++-- .../iso/quality/AbstractLogicalConsistency.java| 2 +- ...bstractResult.java => AbstractMetaquality.java} | 82 +-- .../iso/quality/AbstractPositionalAccuracy.java| 12 +- .../sis/metadata/iso/quality/AbstractResult.java | 105 +++- .../iso/quality/AbstractTemporalAccuracy.java | 42 +- ...lAccuracy.java => AbstractTemporalQuality.java} | 52 +- .../iso/quality/AbstractThematicAccuracy.java | 17 +- .../DefaultAbsoluteExternalPositionalAccuracy.java | 5 +- .../quality/DefaultAccuracyOfATimeMeasurement.java | 10 +- ...lity.java => DefaultAggregationDerivation.java} | 49 +- .../metadata/iso/quality/DefaultBasicMeasure.java | 225 .../iso/quality/DefaultCompletenessCommission.java | 3 +- .../iso/quality/DefaultCompletenessOmission.java | 3 +- .../iso/quality/DefaultConceptualConsistency.java | 7 +- ...efaultUsability.java => DefaultConfidence.java} | 53 +- .../iso/quality/DefaultConformanceResult.java | 7 +- .../iso/quality/DefaultCoverageResult.java | 67 ++- .../metadata/iso/quality/DefaultDataQuality.java | 84 ++- .../metadata/iso/quality/DefaultDescription.java | 172 ++ .../iso/quality/DefaultDescriptiveResult.java | 142 + .../iso/quality/DefaultDomainConsistency.java | 3 +- ...ctElement.java => DefaultEvaluationMethod.java} | 311 +++ .../iso/quality/DefaultFormatConsistency.java | 5 +- ...ltUsability.java => DefaultFullInspection.java} | 51 +- .../DefaultGriddedDataPositionalAccuracy.java | 3 +- ...faultUsability.java => DefaultHomogeneity.java} | 53 +- .../iso/quality/DefaultIndirectEvaluation.java | 142 + .../sis/metadata/iso/quality/DefaultMeasure.java | 469 .../iso/quality/DefaultMeasureReference.java | 201 +++ .../DefaultNonQuantitativeAttributeAccuracy.java | 22 +- ...efaultNonQuantitativeAttributeCorrectness.java} | 56 +- .../DefaultQuantitativeAttributeAccuracy.java
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 a14331277874c5a79e91828f591fb8831c3e9bb1 Merge: e8bfb5ea7b 09ed02f631 Author: Martin Desruisseaux AuthorDate: Thu Oct 13 21:49:19 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/gui/coverage/CoverageCanvas.java| 2 +- .../org/apache/sis/gui/dataset/FeatureList.java| 3 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 2 +- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 4 +- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 32 - .../apache/sis/coverage/grid/GridDerivation.java | 12 +- .../org/apache/sis/coverage/grid/GridExtent.java | 31 +++-- .../org/apache/sis/coverage/grid/GridGeometry.java | 49 ++-- .../sis/coverage/grid/ResampledGridCoverage.java | 7 +- .../apache/sis/coverage/grid/SliceGeometry.java| 8 +- .../sis/coverage/grid/TranslatedGridCoverage.java | 2 +- .../internal/coverage/j2d/ColorModelFactory.java | 53 ++-- .../sis/internal/coverage/j2d/ColorModelType.java | 17 ++- .../sis/internal/coverage/j2d/ColorsForRange.java | 31 - .../internal/coverage/j2d/DeferredProperty.java| 2 +- .../sis/internal/coverage/j2d/package-info.java| 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 8 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 22 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 2 +- .../coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 2 +- .../org/apache/sis/metadata/sql/Citations.sql | 6 +- .../main/java/org/apache/sis/portrayal/Canvas.java | 2 +- .../referencing/GeodeticObjectBuilder.java | 137 + .../referencing/provider/AlbersEqualArea.java | 2 +- .../referencing/provider/CassiniSoldner.java | 2 +- .../sis/internal/referencing/provider/ESRI.java| 13 +- .../provider/HyperbolicCassiniSoldner.java | 2 +- .../provider/LambertAzimuthalEqualArea.java| 2 +- .../LambertAzimuthalEqualAreaSpherical.java| 2 +- .../internal/referencing/provider/Mollweide.java | 3 + .../internal/referencing/provider/Molodensky.java | 2 +- .../provider/ObliqueMercatorTwoPoints.java | 2 +- .../provider/ObliqueMercatorTwoPointsCenter.java | 2 +- .../internal/referencing/provider/Polyconic.java | 2 +- .../referencing/provider/SatelliteTracking.java| 4 + .../internal/referencing/provider/Sinusoidal.java | 3 + .../main/java/org/apache/sis/referencing/CRS.java | 26 +++- .../factory/CommonAuthorityFactory.java| 2 +- .../factory/GeodeticAuthorityFactory.java | 4 +- .../operation/transform/InterpolatedTransform.java | 8 +- .../referencing/GeodeticObjectBuilderTest.java | 61 + .../java/org/apache/sis/referencing/CRSTest.java | 36 +++--- .../report/CoordinateReferenceSystems.java | 2 +- .../sis/test/suite/ReferencingTestSuite.java | 1 + .../org/apache/sis/internal/util/AbstractMap.java | 2 +- .../main/java/org/apache/sis/util/Exceptions.java | 24 ++-- .../sis/util/collection/BackingStoreException.java | 3 +- ide-project/NetBeans/nbproject/project.properties | 2 +- pom.xml| 8 +- .../apache/sis/internal/earth/netcdf/GCOM_C.java | 68 +++--- .../apache/sis/internal/earth/netcdf/GCOM_W.java | 4 +- .../apache/sis/storage/landsat/MetadataReader.java | 2 +- .../org/apache/sis/internal/netcdf/Convention.java | 6 +- .../java/org/apache/sis/internal/netcdf/Node.java | 29 +++-- .../apache/sis/internal/netcdf/RasterResource.java | 25 ++-- .../org/apache/sis/internal/netcdf/Variable.java | 6 +- .../apache/sis/storage/netcdf/MetadataReader.java | 4 +- .../sis/storage/netcdf/NetcdfStoreProvider.java| 20 ++- .../apache/sis/internal/netcdf/VariableTest.java | 4 +- .../sis/internal/storage/StoreUtilities.java | 6 + .../sis/internal/storage/image/WritableStore.java | 2 +- .../aggregate/ConcatenatedGridCoverage.java| 2 +- 66 files changed, 636 insertions(+), 209 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 e8bfb5ea7b9fa64d52e99ad26447dce21520d607 Merge: 371e65c59f 7e3132901f Author: Martin Desruisseaux AuthorDate: Wed Sep 21 11:23:58 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../apache/sis/gui/coverage/CoverageExplorer.java | 4 +- .../apache/sis/gui/coverage/GridSliceSelector.java | 1 + .../org/apache/sis/gui/coverage/ImageRequest.java | 4 +- .../apache/sis/gui/coverage/ViewAndControls.java | 2 +- .../org/apache/sis/gui/dataset/ResourceCell.java | 208 ++ .../org/apache/sis/gui/dataset/ResourceItem.java | 418 .../org/apache/sis/gui/dataset/ResourceTree.java | 528 ++-- .../org/apache/sis/gui/dataset/RootResource.java | 135 .../org/apache/sis/gui/dataset/TreeViewType.java | 24 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 18 +- .../java/org/apache/sis/gui/map/StatusBar.java | 68 +- .../org/apache/sis/gui/map/ValuesFormatter.java| 522 +++ .../org/apache/sis/gui/map/ValuesFromCoverage.java | 264 .../org/apache/sis/gui/map/ValuesUnderCursor.java | 699 +++-- .../apache/sis/internal/gui/DataStoreOpener.java | 1 + .../org/apache/sis/internal/gui/LogHandler.java| 51 +- .../org/apache/sis/internal/gui/Resources.java | 29 +- .../apache/sis/internal/gui/Resources.properties | 2 + .../sis/internal/gui/Resources_fr.properties | 2 + .../sis/coverage/grid/ConvertedGridCoverage.java | 8 + .../sis/coverage/grid/DisjointExtentException.java | 6 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 67 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 16 +- .../apache/sis/coverage/grid/GridDerivation.java | 3 +- .../org/apache/sis/coverage/grid/GridExtent.java | 130 +++- .../org/apache/sis/coverage/grid/GridGeometry.java | 105 +++- .../sis/coverage/grid/TranslatedGridCoverage.java | 15 +- .../org/apache/sis/feature/AbstractAttribute.java | 3 +- .../main/java/org/apache/sis/image/TileCache.java | 31 +- .../apache/sis/coverage/grid/GridExtentTest.java | 40 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 32 + ...ataUtilities.java => ImplementationHelper.java} | 13 +- .../apache/sis/internal/metadata/package-info.java | 2 +- .../org/apache/sis/metadata/MetadataStandard.java | 1 + .../apache/sis/metadata/ModifiableMetadata.java| 2 +- .../apache/sis/metadata/PropertyInformation.java | 1 + .../iso/DefaultApplicationSchemaInformation.java | 4 + .../iso/DefaultExtendedElementInformation.java | 9 +- .../apache/sis/metadata/iso/DefaultIdentifier.java | 2 + .../apache/sis/metadata/iso/DefaultMetadata.java | 39 +- .../iso/DefaultMetadataExtensionInformation.java | 2 + .../sis/metadata/iso/DefaultMetadataScope.java | 1 + .../iso/DefaultPortrayalCatalogueReference.java| 1 + .../org/apache/sis/metadata/iso/ISOMetadata.java | 9 +- .../sis/metadata/iso/MetadataScopeAdapter.java | 6 +- .../acquisition/DefaultAcquisitionInformation.java | 7 + .../acquisition/DefaultEnvironmentalRecord.java| 3 +- .../sis/metadata/iso/acquisition/DefaultEvent.java | 7 +- .../iso/acquisition/DefaultInstrument.java | 4 + .../metadata/iso/acquisition/DefaultObjective.java | 7 + .../metadata/iso/acquisition/DefaultOperation.java | 10 + .../sis/metadata/iso/acquisition/DefaultPlan.java | 3 + .../metadata/iso/acquisition/DefaultPlatform.java | 4 + .../iso/acquisition/DefaultPlatformPass.java | 2 + .../iso/acquisition/DefaultRequestedDate.java | 4 +- .../iso/acquisition/DefaultRequirement.java| 9 +- .../sis/metadata/iso/citation/AbstractParty.java | 2 + .../sis/metadata/iso/citation/DefaultAddress.java | 5 + .../sis/metadata/iso/citation/DefaultCitation.java | 15 +- .../metadata/iso/citation/DefaultCitationDate.java | 4 +- .../sis/metadata/iso/citation/DefaultContact.java | 10 +- .../metadata/iso/citation/DefaultIndividual.java | 1 + .../iso/citation/DefaultOnlineResource.java| 2 + .../metadata/iso/citation/DefaultOrganisation.java | 2 + .../iso/citation/DefaultResponsibility.java| 2 + .../iso/citation/DefaultResponsibleParty.java | 2 +- .../sis/metadata/iso/citation/DefaultSeries.java | 3 + .../metadata/iso/citation/DefaultTelephone.java| 1 + .../iso/constraint/DefaultConstraints.java | 6 + .../iso/constraint/DefaultLegalConstraints.java| 3 + .../iso/constraint/DefaultReleasability.java | 3 + .../iso/constraint/DefaultSecurityConstraints.java | 3 + .../iso/content/DefaultAttributeGroup.java | 2 + .../sis/metadata/iso/content/DefaultBand.java | 3 +- .../iso/content/DefaultCoverageDescription.java| 6 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 371e65c59fa0c614a0070c9fb221f26ae0ec1e5b
Merge: 947dfd9042 cc19c1f3d5
Author: Martin Desruisseaux
AuthorDate: Sun Aug 21 19:15:08 2022 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../sis/gui/metadata/IdentificationInfo.java | 86 +++--
.../apache/sis/gui/metadata/MetadataSummary.java | 44 ++-
.../sis/gui/metadata/RepresentationInfo.java | 12 +-
.../java/org/apache/sis/gui/metadata/Section.java | 4 +-
.../apache/sis/gui/metadata/VerboseFormats.java| 68
.../org/apache/sis/gui/metadata/package-info.java | 2 +-
...{TextFormats.java => PropertyValueFormats.java} | 19 +-
.../sis/internal/gui/PropertyValueFormatter.java | 4 +-
.../org/apache/sis/internal/gui/PropertyView.java | 4 +-
.../org/apache/sis/coverage/BandedCoverage.java| 2 +-
.../sis/coverage/grid/ConvertedGridCoverage.java | 2 +-
.../apache/sis/coverage/grid/DefaultEvaluator.java | 2 +-
.../apache/sis/coverage/grid/EvaluatorWrapper.java | 2 +-
.../sis/coverage/grid/GridCoverageProcessor.java | 6 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 37 ++-
.../sis/coverage/grid/ResampledGridCoverage.java | 36 ++-
.../sis/coverage/grid/TranslatedGridCoverage.java | 9 +-
.../internal/coverage/CompoundTransformOf1D.java | 10 +-
.../sis/internal/coverage/RepeatedTransform.java | 10 +-
.../apache/sis/internal/feature/Geometries.java| 137 ++--
.../internal/feature/SpatialOperationContext.java | 23 +-
.../apache/sis/internal/feature/esri/Factory.java | 2 +-
.../apache/sis/internal/feature/j2d/Factory.java | 2 +-
.../sis/internal/feature/j2d/ShapeProperties.java | 10 +-
.../apache/sis/internal/feature/jts/Factory.java | 2 +-
.../apache/sis/internal/feature/jts/Wrapper.java | 2 +-
.../apache/sis/internal/feature/package-info.java | 2 +-
.../sis/internal/filter/GeometryConverter.java | 13 +-
.../apache/sis/internal/filter/package-info.java | 2 +-
.../sis/filter/BinarySpatialFilterTestCase.java| 34 +-
.../filter/BinarySpatialFilterUsingESRI_Test.java | 11 +-
.../BinarySpatialFilterUsingJava2D_Test.java | 11 +-
.../sis/internal/feature/GeometriesTestCase.java | 21 +-
.../apache/sis/metadata/iso/extent/Extents.java| 9 +-
.../main/java/org/apache/sis/util/iso/Types.java | 5 +
.../org/apache/sis/metadata/sql/Citations.sql | 22 +-
.../sis/metadata/iso/citation/CitationsTest.java | 29 +-
.../org/apache/sis/geometry/GeneralEnvelope.java | 4 +-
.../java/org/apache/sis/geometry/Shapes2D.java | 2 +-
.../referencing/j2d/AffineTransform2D.java | 2 +-
.../main/java/org/apache/sis/referencing/CRS.java | 10 +
.../operation/builder/LocalizationGridBuilder.java | 2 +-
.../operation/matrix/GeneralMatrix.java| 28 +-
.../referencing/operation/matrix/MatrixSIS.java| 17 +-
.../referencing/operation/matrix/package-info.java | 2 +-
.../operation/projection/AlbersEqualArea.java | 33 +-
.../operation/projection/AuthalicConversion.java | 2 +-
.../operation/projection/AuthalicMercator.java | 21 +-
.../operation/projection/AzimuthalEquidistant.java | 14 +-
.../operation/projection/CassiniSoldner.java | 18 +-
.../operation/projection/ConformalProjection.java | 4 +-
.../operation/projection/CylindricalEqualArea.java | 4 +-
.../operation/projection/Initializer.java | 37 +--
.../referencing/operation/projection/Inverter.java | 6 +-
.../projection/LambertAzimuthalEqualArea.java | 2 +-
.../projection/LambertConicConformal.java | 29 +-
.../operation/projection/LongitudeWraparound.java | 351 +
.../referencing/operation/projection/Mercator.java | 94 +++---
.../projection/ModifiedAzimuthalEquidistant.java | 8 +-
.../operation/projection/Mollweide.java| 8 +-
.../operation/projection/NormalizedProjection.java | 158 ++
.../operation/projection/ObliqueMercator.java | 2 +-
.../operation/projection/ObliqueStereographic.java | 43 +--
.../operation/projection/Orthographic.java | 2 +-
.../operation/projection/PolarStereographic.java | 2 +-
.../operation/projection/Polyconic.java| 2 +-
.../operation/projection/ProjectionException.java | 2 +-
.../operation/projection/SatelliteTracking.java| 40 ++-
.../operation/projection/Sinusoidal.java | 4 +-
.../operation/projection/TransverseMercator.java | 12 +-
.../operation/projection/ZonedGridSystem.java | 4 +-
.../operation/transform/AbstractMathTransform.java | 50 +--
.../transform/AbstractMathTransform1D.java | 4 +-
.../transform/AbstractMathTransform2D.java | 24 +-
.../operation/transform/ConcatenatedTransform.java | 4 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 1beb63780c4e9ebc849d79bc156aa09e1a3acf39
Merge: 43debe04f2 1a2bc02b6f
Author: Martin Desruisseaux
AuthorDate: Wed Aug 10 16:55:47 2022 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
.../org/apache/sis/gui/map/ValuesUnderCursor.java | 6 +-
.../apache/sis/internal/gui/DataStoreOpener.java | 14 +-
.../sis/internal/gui/control/SyncWindowList.java | 34 +--
.../sis/internal/gui/control/ValueColorMapper.java | 2 +-
.../org/apache/sis/openoffice/TransformerTest.java | 2 +-
.../util/resources/IndexedResourceCompiler.java| 2 +-
.../org/apache/sis/coverage/BandedCoverage.java| 32 ++-
.../java/org/apache/sis/coverage/Category.java | 2 +-
.../org/apache/sis/coverage/SampleDimension.java | 2 +-
.../sis/coverage/grid/BufferedGridCoverage.java| 8 +-
.../sis/coverage/grid/ConvertedGridCoverage.java | 87 ++--
.../{GridEvaluator.java => DefaultEvaluator.java} | 75 ---
.../sis/coverage/grid/DerivedGridCoverage.java | 9 +-
.../apache/sis/coverage/grid/EvaluatorWrapper.java | 126 +++
.../coverage/grid/FractionalGridCoordinates.java | 6 +-
.../org/apache/sis/coverage/grid/GridCoverage.java | 86 +++-
.../apache/sis/coverage/grid/GridCoverage2D.java | 8 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 10 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 6 +-
.../apache/sis/coverage/grid/ImageRenderer.java| 2 +-
.../apache/sis/feature/AbstractIdentifiedType.java | 2 +-
.../org/apache/sis/filter/BinarySpatialFilter.java | 2 +-
.../apache/sis/filter/DefaultFilterFactory.java| 2 +-
.../java/org/apache/sis/filter/PropertyValue.java | 5 +-
.../src/main/java/org/apache/sis/filter/XPath.java | 86
.../sis/coverage/grid/GridCoverage2DTest.java | 13 +-
.../sis/coverage/grid/GridDerivationTest.java | 2 +-
.../org/apache/sis/feature/FeatureTestCase.java| 2 +-
.../java/org/apache/sis/filter/XPathTest.java} | 22 +-
.../org/apache/sis/image/InterpolationTest.java| 2 +-
.../org/apache/sis/image/PixelIteratorTest.java| 2 +-
.../apache/sis/test/suite/FeatureTestSuite.java| 1 +
.../java/org/apache/sis/internal/jaxb/Context.java | 4 +-
.../sis/internal/jaxb/lan/LocaleAndCharset.java| 2 +-
.../java/org/apache/sis/metadata/TreeNode.java | 2 +-
.../DefaultRepresentativeFraction.java | 4 +-
.../apache/sis/metadata/sql/MetadataWriter.java| 2 +-
.../java/org/apache/sis/util/iso/AbstractName.java | 15 +-
.../apache/sis/util/iso/DefaultNameFactory.java| 9 +-
.../org/apache/sis/util/iso/DefaultNameSpace.java | 33 ++-
.../org/apache/sis/util/iso/DefaultRecordType.java | 6 +-
.../java/org/apache/sis/util/iso/package-info.java | 2 +-
.../java/org/apache/sis/xml/ValueConverter.java| 47 -
.../main/java/org/apache/sis/xml}/XPointer.java| 52 -
.../main/java/org/apache/sis/xml/package-info.java | 2 +-
.../internal/jaxb/ModifiableIdentifierMapTest.java | 2 +-
.../org/apache/sis/metadata/SpecialCasesTest.java | 8 +-
.../extent/DefaultGeographicBoundingBoxTest.java | 2 +-
.../sis/metadata/iso/extent/ExtentsTest.java | 2 +-
.../java/org/apache/sis/test/MetadataAssert.java | 4 +-
.../apache/sis/test/suite/MetadataTestSuite.java | 3 +-
.../sis/test/xml/AnnotationConsistencyCheck.java | 2 +-
.../apache/sis/test/xml/DocumentComparator.java| 2 +-
.../java/org/apache/sis/test/xml/TestCase.java | 6 +-
.../org/apache/sis/xml/ValueConverterTest.java | 18 +-
.../java/org/apache/sis/xml}/XPointerTest.java | 18 +-
.../sis/geometry/AbstractDirectPosition.java | 2 +-
.../org/apache/sis/geometry/AbstractEnvelope.java | 18 +-
.../org/apache/sis/geometry/CoordinateFormat.java | 2 +-
.../java/org/apache/sis/geometry/Envelopes.java| 2 +-
.../referencing/GeodeticObjectBuilder.java | 18 +-
.../internal/referencing/ReferencingUtilities.java | 39 ++--
.../referencing/provider/AbridgedMolodensky.java | 12 +-
.../referencing/provider/AbstractLambert.java | 14 +-
.../referencing/provider/AbstractMercator.java | 14 +-
.../referencing/provider/AbstractProvider.java | 113 ++
.../provider/AbstractStereographic.java| 14 +-
.../referencing/provider/AlbersEqualArea.java | 14 +-
.../referencing/provider/AxisOrderReversal.java| 23 +-
.../referencing/provider/AxisOrderReversal3D.java | 4 +-
.../provider/AzimuthalEquidistantSpherical.java| 12 +-
.../referencing/provider/CassiniSoldner.java | 7 +-
.../provider/CoordinateFrameRotation.java | 12 +-
.../provider/CoordinateFrameRotation2D.java| 12 +-
.../provider/CoordinateFrameRotation3D.java| 12
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 43debe04f2a7b35ff34f65f19a3d9fe8f18baab4 Merge: b2d141b5e9 edabd5aee9 Author: Martin Desruisseaux AuthorDate: Mon Jul 11 11:28:20 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../java/org/apache/sis/gui/map/MapCanvasAWT.java | 26 +- .../sis/coverage/grid/ConvertedGridCoverage.java | 62 ++-- .../sis/coverage/grid/DerivedGridCoverage.java | 146 + .../coverage/grid/FractionalGridCoordinates.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 151 - .../apache/sis/coverage/grid/GridEvaluator.java| 6 + .../org/apache/sis/coverage/grid/GridExtent.java | 10 +- .../sis/coverage/grid/ResampledGridCoverage.java | 69 ++-- .../sis/coverage/grid/TranslatedGridCoverage.java | 127 .../internal/processing/image/IsolineTracer.java | 5 +- .../coverage/grid/ResampledGridCoverageTest.java | 35 +- .../coverage/grid/TranslatedGridCoverageTest.java | 85 + .../apache/sis/test/suite/FeatureTestSuite.java| 3 +- .../sis/metadata/iso/citation/Citations.java | 7 +- .../apache/sis/metadata/sql/MetadataFallback.java | 10 +- .../org/apache/sis/metadata/sql/Citations.sql | 6 +- .../sis/metadata/iso/citation/CitationsTest.java | 2 +- .../sis/metadata/sql/MetadataSourceTest.java | 2 +- .../sis/internal/map/coverage/RenderingData.java | 14 +- .../java/org/apache/sis/geometry/Shapes2D.java | 22 +- .../internal/referencing/WraparoundApplicator.java | 27 +- .../main/java/org/apache/sis/referencing/CRS.java | 4 +- .../sis/referencing/operation/matrix/Matrices.java | 4 +- .../projection/LambertConicConformal.java | 21 +- .../referencing/operation/projection/Mercator.java | 17 + .../operation/projection/NormalizedProjection.java | 6 +- .../operation/projection/PolarStereographic.java | 19 +- .../operation/projection/TransverseMercator.java | 27 +- .../operation/projection/ZonedGridSystem.java | 21 +- .../operation/projection/package-info.java | 3 +- .../operation/transform/AbstractMathTransform.java | 71 +++- .../operation/transform/ConcatenatedTransform.java | 22 +- .../operation/transform/DomainDefinition.java | 284 .../operation/transform/MathTransforms.java| 29 +- .../operation/transform/WraparoundTransform.java | 13 +- .../operation/projection/AlbersEqualAreaTest.java | 4 +- .../projection/CylindricalEqualAreaTest.java | 2 +- .../operation/projection/SinusoidalTest.java | 4 +- .../operation/transform/DomainDefinitionTest.java | 52 +++ .../operation/transform/PseudoTransform.java | 67 +++- .../report/CoordinateReferenceSystems.java | 4 +- .../sis/test/integration/ConsistencyTest.java | 4 +- .../sis/test/suite/ReferencingTestSuite.java | 3 +- .../org/apache/sis/internal/util/Constants.java| 2 + .../org/apache/sis/internal/util/Numerics.java | 19 +- .../org/apache/sis/math/LinearlyDerivedVector.java | 3 +- .../src/main/java/org/apache/sis/math/Vector.java | 4 +- .../apache/sis/internal/storage/inflater/LZW.java | 360 - .../org/apache/sis/internal/netcdf/AxisType.java | 48 ++- .../org/apache/sis/internal/netcdf/Variable.java | 5 + .../storage/io/ChannelImageInputStream.java| 2 +- 51 files changed, 1702 insertions(+), 241 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 b2d141b5e948e7cd0f65e3720ca2e5b1f143d88a
Merge: 1eaa4fa82c db22d5470c
Author: Martin Desruisseaux
AuthorDate: Thu Jun 30 11:22:59 2022 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
application/sis-console/src/main/artifact/README | 6 +-
.../org/apache/sis/console/TransformCommand.java | 4 +-
application/sis-javafx/pom.xml | 5 +
application/sis-javafx/src/main/artifact/README| 4 +-
.../main/java/org/apache/sis/gui/DataViewer.java | 13 +-
.../apache/sis/gui/coverage/CoverageCanvas.java| 286 ---
.../apache/sis/gui/coverage/CoverageControls.java | 107 +--
.../apache/sis/gui/coverage/CoverageExplorer.java | 128 ++-
.../apache/sis/gui/coverage/CoverageStyling.java | 12 +-
.../org/apache/sis/gui/coverage/GridControls.java | 45 +-
.../apache/sis/gui/coverage/GridSliceSelector.java | 638 +++
.../java/org/apache/sis/gui/coverage/GridView.java | 95 ++-
.../org/apache/sis/gui/coverage/GridViewSkin.java | 19 +-
.../org/apache/sis/gui/coverage/ImageRequest.java | 181 ++---
.../gui/coverage/MultiResolutionImageLoader.java | 74 +-
.../apache/sis/gui/coverage/ViewAndControls.java | 188 +++--
.../org/apache/sis/gui/coverage/package-info.java | 2 +-
.../org/apache/sis/gui/dataset/DataWindow.java | 116 ---
.../org/apache/sis/gui/dataset/FeatureTable.java | 6 +-
.../java/org/apache/sis/gui/dataset/LoadEvent.java | 47 --
.../java/org/apache/sis/gui/dataset/LogViewer.java | 2 +-
.../org/apache/sis/gui/dataset/ResourceEvent.java | 2 +-
.../apache/sis/gui/dataset/ResourceExplorer.java | 170 ++--
.../org/apache/sis/gui/dataset/ResourceTree.java | 113 +--
.../org/apache/sis/gui/dataset/SelectedData.java | 91 ---
.../org/apache/sis/gui/dataset/WindowHandler.java | 474 +++
.../org/apache/sis/gui/dataset/WindowManager.java | 246 ++
.../org/apache/sis/gui/dataset/package-info.java | 2 +-
.../org/apache/sis/gui/map/GestureFollower.java| 293 +++
.../java/org/apache/sis/gui/map/MapCanvas.java | 339 +++-
.../java/org/apache/sis/gui/map/MapCanvasAWT.java | 16 +-
.../main/java/org/apache/sis/gui/map/MapMenu.java | 4 +-
.../org/apache/sis/gui/map/OperationFinder.java| 8 +-
.../java/org/apache/sis/gui/map/StatusBar.java | 863 -
.../org/apache/sis/gui/map/ValuesUnderCursor.java | 74 +-
.../java/org/apache/sis/gui/map/package-info.java | 2 +-
.../org/apache/sis/gui/metadata/MetadataTree.java | 4 +-
.../main/java/org/apache/sis/gui/package-info.java | 2 +-
.../apache/sis/gui/referencing/AuthorityCodes.java | 4 +-
.../org/apache/sis/gui/referencing/MenuSync.java | 291 +--
.../sis/gui/referencing/ObjectStringConverter.java | 14 +-
.../gui/referencing/PositionableProjection.java| 4 +-
.../gui/referencing/RecentReferenceSystems.java| 391 +++---
.../java/org/apache/sis/gui/referencing/Utils.java | 4 +-
.../apache/sis/internal/gui/BackgroundThreads.java | 28 +-
.../apache/sis/internal/gui/DataStoreOpener.java | 106 ++-
.../apache/sis/internal/gui/ExceptionReporter.java | 62 +-
.../org/apache/sis/internal/gui/GUIUtilities.java | 54 +-
.../apache/sis/internal/gui/ImageConverter.java| 4 +-
.../sis/internal/gui/OptionalDataDownloader.java | 2 +-
.../org/apache/sis/internal/gui/PrivateAccess.java | 54 ++
.../org/apache/sis/internal/gui/Resources.java | 15 +
.../apache/sis/internal/gui/Resources.properties | 3 +
.../sis/internal/gui/Resources_fr.properties | 3 +
.../java/org/apache/sis/internal/gui/Styles.java | 13 +-
.../org/apache/sis/internal/gui/ToolbarButton.java | 8 +-
.../internal/gui/control/ColorColumnHandler.java | 5 +-
.../sis/internal/gui/control/SyncWindowList.java | 252 ++
.../sis/internal/gui/control/TabularWidget.java| 99 +++
.../sis/internal/gui/control/ValueColorMapper.java | 26 +-
.../sis/internal/gui/control/package-info.java | 2 +-
.../org/apache/sis/internal/gui/package-info.java | 2 +-
.../apache/sis/gui/coverage/CoverageCanvasApp.java | 4 +-
.../sis/gui/coverage/GridSliceSelectorApp.java | 80 ++
.../java/org/apache/sis/openoffice/CalcAddins.java | 3 +-
.../org/apache/sis/internal/book/Assembler.java| 111 +--
.../book/{Resources.java => Characters.java} | 37 +-
.../apache/sis/internal/book/CodeColorizer.java| 37 +-
.../org/apache/sis/internal/book/Resources_en.java | 33 -
.../org/apache/sis/internal/book/Resources_fr.java | 47 --
.../org/apache/sis/internal/book/package-info.java | 8 +-
.../org/apache/sis/internal/doclet/Rewriter.java | 3 +-
.../sis/coverage/grid/BufferedGridCoverage.java| 82 +-
.../sis/coverage/grid/ConvertedGridCoverage.java | 66 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1 for getting last fixes before release.
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 1eaa4fa82c95fe62a62569aa51f26cc9927912aa Merge: 2b32e74c22 d2eca32ddb Author: Martin Desruisseaux AuthorDate: Mon May 9 16:52:06 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 for getting last fixes before release. .../main/antlr4/org/apache/sis/internal/cql/CQL.g4 | 2 +- .../src/main/java/org/apache/sis/cql/CQL.java | 6 + .../org/apache/sis/cql/ExpressionReadingTest.java | 29 ++ .../referencing/provider/NorthPoleRotation.java| 12 + .../referencing/provider/SouthPoleRotation.java| 16 +++- 5 files changed, 53 insertions(+), 12 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 2b32e74c22061ecf0a3bed5a7208d5be5f935914
Merge: c654790fde fda2336cee
Author: Martin Desruisseaux
AuthorDate: Mon May 9 15:06:01 2022 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
NOTICE | 12 ++
README | 18 +++---
application/sis-console/src/main/artifact/README | 28 +++---
application/sis-javafx/src/main/artifact/README| 14 +--
cloud/pom.xml | 2 +-
cloud/{sis-cloud-S3 => sis-cloud-aws}/pom.xml | 0
.../apache/sis/cloud/aws/internal/Resources.java | 0
.../sis/cloud/aws/internal/Resources.properties| 0
.../sis/cloud/aws/internal/Resources_fr.properties | 0
.../sis/cloud/aws/internal/package-info.java | 0
.../org/apache/sis/cloud/aws/s3/BucketStore.java | 0
.../apache/sis/cloud/aws/s3/CachedByteChannel.java | 0
.../apache/sis/cloud/aws/s3/ClientFileSystem.java | 0
.../org/apache/sis/cloud/aws/s3/DerivedList.java | 0
.../org/apache/sis/cloud/aws/s3/FileService.java | 0
.../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 0
.../apache/sis/cloud/aws/s3/KeyPathMatcher.java| 0
.../apache/sis/cloud/aws/s3/ObjectAttributes.java | 0
.../org/apache/sis/cloud/aws/s3/PathIterator.java | 0
.../org/apache/sis/cloud/aws/s3/package-info.java | 0
.../services/java.nio.file.spi.FileSystemProvider | 0
.../sis/cloud/aws/s3/ClientFileSystemTest.java | 0
.../sis/cloud/aws/s3/KeyPathMatcherTest.java | 0
.../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 0
.../org/apache/sis/test/suite/AWSTestSuite.java| 0
.../org/apache/sis/test/suite/package-info.txt | 0
.../sis/metadata/sql/MetadataWriterTest.java | 6 ++---
.../apache/sis/setup/OptionalInstallations.java| 2 +-
pom.xml| 2 +-
29 files changed, 45 insertions(+), 39 deletions(-)
diff --cc pom.xml
index 11c6246f79,1ebecd20a9..5a4e7e17e1
--- a/pom.xml
+++ b/pom.xml
@@@ -556,9 -556,9 +556,9 @@@
8
8
${project.version}
- 1.1
+ 1.2
17
-4.0-SNAPSHOT
+3.1-SNAPSHOT
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 c654790fded63e2b5bfcdf2d4cbf1399e5722a12 Merge: 8f4b197bc6 0666ddb3dd Author: Martin Desruisseaux AuthorDate: Mon May 9 13:59:20 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 application/sis-console/pom.xml| 1 - .../java/org/apache/sis/console/package-info.java | 2 +- application/sis-javafx/pom.xml | 3 + application/sis-javafx/src/main/artifact/bin/sisfx | 2 +- .../main/java/org/apache/sis/gui/package-info.java | 8 ++ application/sis-openoffice/pom.xml | 2 +- cloud/sis-cloud-S3/pom.xml | 2 +- .../apache/sis/cloud/aws/s3/ClientFileSystem.java | 40 +-- .../org/apache/sis/cloud/aws/s3/FileService.java | 14 ++- .../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 118 ++--- .../apache/sis/cloud/aws/s3/KeyPathMatcher.java| 22 +++- .../apache/sis/cloud/aws/s3/ObjectAttributes.java | 2 +- .../org/apache/sis/cloud/aws/s3/PathIterator.java | 12 ++- .../org/apache/sis/cloud/aws/s3/package-info.java | 2 +- .../sis/cloud/aws/s3/ClientFileSystemTest.java | 4 +- .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 2 +- .../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 24 ++--- core/sis-build-helper/pom.xml | 8 +- core/sis-cql/pom.xml | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 4 +- .../java/org/apache/sis/image/MaskedImage.java | 2 +- .../internal/coverage/j2d/ColorModelFactory.java | 3 +- .../apache/sis/internal/jaxb/gml/TimeInstant.java | 2 +- .../metadata/legacy/LegacyPropertyAdapter.java | 2 +- .../sis/internal/metadata/sql/Initializer.java | 21 +--- .../sis/internal/metadata/sql/LocalDataSource.java | 12 +-- .../org/apache/sis/metadata/MetadataStandard.java | 5 +- .../org/apache/sis/metadata/PropertyAccessor.java | 2 +- .../iso/acquisition/DefaultRequirement.java| 2 + .../iso/citation/DefaultResponsibleParty.java | 2 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../sis/metadata/iso/quality/DefaultScope.java | 2 +- .../apache/sis/metadata/sql/MetadataWriter.java| 2 +- .../metadata/iso/citation/HardCodedCitations.java | 5 +- .../sis/metadata/sql/MetadataWriterTest.java | 3 +- .../java/org/apache/sis/test/sql/TestDatabase.java | 2 +- .../java/org/apache/sis/test/xml/InfiniteSet.java | 2 +- .../apache/sis/geometry/GeneralDirectPosition.java | 9 +- .../sis/internal/referencing/AxisDirections.java | 4 +- .../referencing/j2d/AffineTransform2D.java | 2 +- .../apache/sis/internal/referencing/j2d/Tile.java | 2 +- .../parameter/DefaultParameterDescriptorGroup.java | 2 +- .../sis/parameter/DefaultParameterValue.java | 2 +- .../org/apache/sis/parameter/TensorParameters.java | 7 +- .../sis/referencing/AbstractIdentifiedObject.java | 2 +- .../main/java/org/apache/sis/referencing/CRS.java | 4 +- .../sis/referencing/EPSGFactoryFallback.java | 46 +++- .../sis/referencing/datum/BursaWolfParameters.java | 2 +- .../referencing/datum/DefaultVerticalDatum.java| 2 +- .../sis/referencing/datum/TimeDependentBWP.java| 2 +- .../factory/GeodeticAuthorityFactory.java | 6 +- .../referencing/factory/GeodeticObjectFactory.java | 8 +- .../referencing/factory/sql/EPSGCodeFinder.java| 2 +- .../referencing/factory/sql/EPSGDataAccess.java| 7 +- .../sis/referencing/factory/sql/EPSGFactory.java | 4 +- .../sis/referencing/factory/sql/package-info.java | 2 +- .../DefaultCoordinateOperationFactory.java | 2 +- .../referencing/operation/projection/Mercator.java | 13 +-- .../operation/projection/package-info.java | 2 +- .../transform/DefaultMathTransformFactory.java | 12 +-- .../operation/transform/TransferFunction.java | 2 +- .../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +- .../factory/AuthorityFactoryProxyTest.java | 2 +- .../referencing/factory/sql/EPSGInstallerTest.java | 2 +- .../factory/sql/epsg/DataScriptFormatter.java | 3 +- .../sis/referencing/factory/sql/epsg/package.html | 4 +- .../operation/DefaultConversionTest.java | 2 +- .../operation/DefaultTransformationTest.java | 2 +- .../projection/ProjectionResultComparator.java | 2 +- .../report/CoordinateOperationMethods.java | 9 +- .../report/CoordinateReferenceSystems.java | 6 +- .../sis/referencing/report/HTMLGenerator.java | 2 +- .../apache/sis/internal/system/DataDirectory.java | 4 +- .../org/apache/sis/internal/util/Constants.java| 2 +- .../apache/sis/internal/util/DefinitionURI.java| 2 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 15f1d671c92622e6a68d64a94a5fb63c48ce457f Merge: d44f96d192 57164cfbe3 Author: Martin Desruisseaux AuthorDate: Tue Apr 26 17:37:08 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../java/org/apache/sis/console/AboutCommand.java | 2 +- application/sis-javafx/pom.xml | 5 + .../main/java/org/apache/sis/gui/DataViewer.java | 64 +- .../main/java/org/apache/sis/gui/RecentFiles.java | 2 +- .../apache/sis/gui/coverage/BandRangeTable.java| 5 +- .../apache/sis/gui/coverage/CoverageCanvas.java| 35 +- .../apache/sis/gui/coverage/CoverageExplorer.java | 2 +- .../org/apache/sis/gui/coverage/GridViewSkin.java | 127 +++- .../org/apache/sis/gui/coverage/ImageRequest.java | 2 +- .../apache/sis/gui/coverage/IsolineRenderer.java | 4 +- .../sis/gui/coverage/StyledRenderingData.java | 2 +- .../org/apache/sis/gui/dataset/DataWindow.java | 8 +- .../org/apache/sis/gui/dataset/ExpandableList.java | 2 +- .../org/apache/sis/gui/dataset/FeatureList.java| 2 +- .../org/apache/sis/gui/dataset/ResourceTree.java | 4 +- .../org/apache/sis/gui/dataset/SelectedData.java | 11 +- .../org/apache/sis/gui/dataset/WindowManager.java | 13 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 7 +- .../java/org/apache/sis/gui/map/MapCanvasAWT.java | 2 +- .../org/apache/sis/gui/map/OperationFinder.java| 2 +- .../java/org/apache/sis/gui/map/StatusBar.java | 3 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 2 +- .../org/apache/sis/internal/gui/MouseDrags.java| 55 ++ .../org/apache/sis/internal/gui/RecentChoices.java | 30 +- .../org/apache/sis/internal/gui/Resources.java | 12 +- .../apache/sis/internal/gui/Resources.properties | 2 + .../sis/internal/gui/Resources_fr.properties | 2 + .../apache/sis/internal/gui/control/ColorCell.java | 2 +- .../apache/sis/internal/gui/io/FileAccessView.java | 20 +- .../org/apache/sis/internal/doclet/Rewriter.java | 2 +- .../sis/util/resources/ResourceCompilerMojo.java | 4 +- .../java/org/apache/sis/coverage/CategoryList.java | 2 +- .../org/apache/sis/coverage/SampleDimension.java | 50 +- .../main/java/org/apache/sis/coverage/ToNaN.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 4 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 7 +- .../sis/coverage/grid/GridCoverageBuilder.java | 8 +- .../apache/sis/coverage/grid/GridDerivation.java | 6 +- .../org/apache/sis/coverage/grid/GridExtent.java | 41 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 10 +- .../apache/sis/coverage/grid/ImageRenderer.java| 3 +- .../apache/sis/feature/CharacteristicTypeMap.java | 2 +- .../apache/sis/feature/DefaultAssociationRole.java | 4 +- .../org/apache/sis/feature/DefaultFeatureType.java | 4 +- .../java/org/apache/sis/feature/FeatureFormat.java | 2 +- .../main/java/org/apache/sis/feature/Features.java | 4 +- .../org/apache/sis/feature/NamedFeatureType.java | 2 +- .../apache/sis/feature/StringJoinOperation.java| 2 +- .../java/org/apache/sis/image/BandSelectImage.java | 10 +- .../java/org/apache/sis/image/ComputedImage.java | 4 +- .../java/org/apache/sis/image/ComputedTiles.java | 2 +- .../main/java/org/apache/sis/image/DataType.java | 55 +- .../java/org/apache/sis/image/ImageCombiner.java | 51 +- .../java/org/apache/sis/image/ImageProcessor.java | 23 +- .../java/org/apache/sis/image/PixelIterator.java | 18 +- .../java/org/apache/sis/image/RecoloredImage.java | 97 ++- .../org/apache/sis/image/StatisticsCalculator.java | 2 +- .../main/java/org/apache/sis/image/Transferer.java | 2 +- .../java/org/apache/sis/image/Visualization.java | 20 +- .../org/apache/sis/index/tree/NodeIterator.java| 4 +- .../sis/internal/coverage/CoverageCombiner.java| 307 .../internal/coverage/j2d/ColorModelFactory.java | 110 ++- .../sis/internal/coverage/j2d/Colorizer.java | 86 ++- .../sis/internal/coverage/j2d/ColorsForRange.java | 61 +- .../sis/internal/coverage/j2d/ImageUtilities.java | 17 +- .../sis/internal/coverage/j2d/TileOpExecutor.java | 4 +- .../apache/sis/internal/feature/GeometryType.java | 2 +- .../sis/internal/feature/GeometryWrapper.java | 2 +- .../org/apache/sis/internal/feature/Resources.java | 7 +- .../sis/internal/feature/Resources.properties | 1 + .../sis/internal/feature/Resources_fr.properties | 1 + .../internal/feature/SpatialOperationContext.java | 2 +- .../sis/internal/feature/j2d/PathBuilder.java | 2 +- .../apache/sis/internal/feature/j2d/Polyline.java | 2 +- .../internal/feature/jts/PathIteratorAdapter.java | 4 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 bd18a3dc33985cd02baa591d3ae6769613562d62 Merge: 07ebe0c 2d89458 Author: Martin Desruisseaux AuthorDate: Tue Mar 8 10:48:49 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../org/apache/sis/cloud/aws/s3/FileService.java | 2 ++ .../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 20 .../org/apache/sis/cloud/aws/s3/PathIterator.java | 22 -- .../sis/internal/metadata/sql/LocalDataSource.java | 4 ++-- .../sis/internal/metadata/sql/package-info.java| 2 +- .../sis/internal/system/DefaultFactories.java | 6 +++--- 6 files changed, 40 insertions(+), 16 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Contains a first version of cloud module for S3.
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 07ebe0c95ed312101364e1f8d9b3fe8379355119 Merge: 83156f2 2f74561 Author: Martin Desruisseaux AuthorDate: Sun Mar 6 20:29:49 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains a first version of cloud module for S3. cloud/pom.xml | 122 +++ cloud/sis-cloud-S3/pom.xml | 97 +++ .../apache/sis/cloud/aws/internal/Resources.java | 168 .../sis/cloud/aws/internal/Resources.properties| 28 + .../sis/cloud/aws/internal/Resources_fr.properties | 33 + .../sis/cloud/aws/internal/package-info.java | 32 + .../org/apache/sis/cloud/aws/s3/BucketStore.java | 170 .../apache/sis/cloud/aws/s3/CachedByteChannel.java | 287 +++ .../apache/sis/cloud/aws/s3/ClientFileSystem.java | 246 ++ .../org/apache/sis/cloud/aws/s3/DerivedList.java | 122 +++ .../org/apache/sis/cloud/aws/s3/FileService.java | 576 + .../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 900 + .../apache/sis/cloud/aws/s3/KeyPathMatcher.java| 120 +++ .../apache/sis/cloud/aws/s3/ObjectAttributes.java | 304 +++ .../org/apache/sis/cloud/aws/s3/PathIterator.java | 203 + .../org/apache/sis/cloud/aws/s3/package-info.java | 59 ++ .../services/java.nio.file.spi.FileSystemProvider | 1 + .../sis/cloud/aws/s3/ClientFileSystemTest.java | 62 ++ .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 44 + .../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 259 ++ .../org/apache/sis/test/suite/AWSTestSuite.java| 41 + .../org/apache/sis/test/suite/package-info.txt | 3 + .../org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../org/apache/sis/feature/AbstractFeature.java| 2 +- .../sis/internal/referencing/EPSGFactoryProxy.java | 92 +-- .../internal/referencing/EPSGFactoryProxyCOP.java | 59 ++ ...GFactoryProxy.java => EPSGFactoryProxyCRS.java} | 43 +- .../internal/referencing/EPSGFactoryProxyCS.java | 107 +++ .../referencing/EPSGFactoryProxyDatum.java | 95 +++ .../sis/internal/referencing/ExtentSelector.java | 2 +- ...org.opengis.referencing.crs.CRSAuthorityFactory | 2 +- ... org.opengis.referencing.cs.CSAuthorityFactory} | 3 +- ...pengis.referencing.datum.DatumAuthorityFactory} | 3 +- operation.CoordinateOperationAuthorityFactory} | 3 +- .../org/apache/sis/internal/util/EmptyQueue.java | 2 +- .../main/java/org/apache/sis/math/ArrayVector.java | 24 +- .../src/main/java/org/apache/sis/math/Vector.java | 12 +- .../test/java/org/apache/sis/math/VectorTest.java | 69 +- ide-project/NetBeans/build.xml | 21 + pom.xml| 1 + .../sis/storage/geotiff/MultiResolutionImage.java | 62 +- .../org/apache/sis/internal/netcdf/CRSBuilder.java | 102 ++- .../org/apache/sis/internal/netcdf/Convention.java | 10 +- .../org/apache/sis/internal/netcdf/Decoder.java| 16 +- .../org/apache/sis/internal/netcdf/Dimension.java | 2 +- .../org/apache/sis/internal/netcdf/FeatureSet.java | 2 +- .../java/org/apache/sis/internal/netcdf/Grid.java | 6 +- .../apache/sis/internal/netcdf/GridAdjustment.java | 8 +- .../org/apache/sis/internal/netcdf/Variable.java | 25 +- .../apache/sis/internal/netcdf/VariableRole.java | 2 +- .../sis/internal/netcdf/impl/ChannelDecoder.java | 4 +- .../apache/sis/internal/netcdf/impl/GridInfo.java | 6 +- .../sis/internal/netcdf/impl/VariableInfo.java | 30 +- .../sis/internal/netcdf/ucar/DecoderWrapper.java | 43 +- .../sis/internal/netcdf/ucar/GridWrapper.java | 5 +- .../sis/internal/netcdf/ucar/VariableWrapper.java | 33 +- .../apache/sis/storage/netcdf/MetadataReader.java | 84 +- .../apache/sis/storage/netcdf/package-info.java| 2 +- .../org/apache/sis/internal/netcdf/GridTest.java | 8 +- .../org/apache/sis/internal/sql/feature/Table.java | 4 +- .../sis/internal/storage/MetadataBuilder.java | 51 +- .../sis/internal/storage/MetadataBuilderTest.java | 18 +- 62 files changed, 4590 insertions(+), 352 deletions(-) diff --cc storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java index 993e461,405b518..a4e8567 --- a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java +++ b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java @@@ -461,10 -467,10 +467,10 @@@ split: while ((start = CharSequences.s role = isPointOfContact ? Role.POINT_OF_CONTACT : keys.DEFAULT_ROLE; } /* - * Verify if we can share the existing 'pointOfContact' instance. This is often the case in practice. + * Verify if we can share the existing `pointOfContact` instance. This is
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 83156f2cc164fd158eb4537501bdf476c3a1fb55 Merge: 4f07986 59c2142 Author: Martin Desruisseaux AuthorDate: Thu Feb 24 11:31:16 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../sis/internal/referencing/WKTKeywords.java | 5 +- .../provider/CoordinateFrameRotation2D.java| 4 +- .../provider/GeocentricTranslation2D.java | 4 +- .../provider/PositionVector7Param2D.java | 4 +- .../apache/sis/io/wkt/GeodeticObjectParser.java| 79 ++ .../operation/AbstractCoordinateOperation.java | 53 +-- .../sis/io/wkt/GeodeticObjectParserTest.java | 41 ++- .../java/org/apache/sis/io/wkt/WKTFormatTest.java | 55 +-- .../apache/sis/storage/geotiff/GeoTiffStore.java | 3 + .../sis/storage/geotiff/GeoTiffStoreProvider.java | 2 +- .../org/apache/sis/storage/netcdf/NetcdfStore.java | 40 --- 11 files changed, 247 insertions(+), 43 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 4f0798606aa9324e036a4a6e6c4a1aeaa3e6a7fb Merge: db2fc14 b718383 Author: Martin Desruisseaux AuthorDate: Mon Feb 21 12:49:12 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../coverage/grid/FractionalGridCoordinates.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 6 +- .../apache/sis/coverage/grid/GridDerivation.java | 65 ++-- .../apache/sis/coverage/grid/GridEvaluator.java| 215 ++- .../apache/sis/coverage/grid/ReshapedImage.java| 77 ++-- .../java/org/apache/sis/filter/LeafExpression.java | 15 +- .../sis/internal/coverage/j2d/TilePlaceholder.java | 3 - .../sis/internal/coverage/j2d/TiledImage.java | 23 +- .../sis/coverage/grid/GridCoverage2DTest.java | 37 +- .../sis/coverage/grid/GridDerivationTest.java | 2 +- .../coverage/grid/ResampledGridCoverageTest.java | 2 +- .../apache/sis/test/suite/FeatureTestSuite.java| 1 - .../apache/sis/geometry}/WraparoundAdjustment.java | 409 ++--- .../apache/sis/internal/referencing/RTreeNode.java | 26 +- .../internal/referencing/WraparoundApplicator.java | 2 +- .../internal/referencing/WraparoundAxesFinder.java | 86 + .../operation/projection/ObliqueStereographic.java | 9 +- .../transform/SpecializableTransform.java | 11 +- .../sis/geometry}/WraparoundAdjustmentTest.java| 80 ++-- .../projection/ObliqueStereographicTest.java | 38 +- .../sis/test/suite/ReferencingTestSuite.java | 1 + .../sis/util/collection/WeakValueHashMap.java | 140 ++- .../sis/internal/converter/AngleConverterTest.java | 4 +- .../test/java/org/apache/sis/util/NumbersTest.java | 5 +- .../org/apache/sis/util/collection/CacheTest.java | 18 +- .../org/apache/sis/util/collection/IntObject.java | 65 .../sis/util/collection/WeakHashSetTest.java | 14 +- .../sis/util/collection/WeakValueHashMapTest.java | 96 +++-- pom.xml| 4 +- .../org/apache/sis/storage/geotiff/DataCube.java | 2 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 4 +- .../apache/sis/internal/netcdf/RasterResource.java | 39 +- .../sis/internal/storage/AbstractGridResource.java | 60 ++- .../sis/internal/storage/AbstractResource.java | 58 +++ .../org/apache/sis/internal/storage/Resources.java | 5 + .../sis/internal/storage/Resources.properties | 1 + .../sis/internal/storage/Resources_fr.properties | 1 + .../sis/internal/storage/TiledGridCoverage.java| 55 ++- .../org/apache/sis/storage/CoverageSubset.java | 6 +- .../apache/sis/test/storage/SubsampledImage.java | 7 +- 40 files changed, 1297 insertions(+), 397 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 eb9ad08e4a2c062c54d01a04b061da1a3852ddf3 Merge: 9812159 281a020 Author: Martin Desruisseaux AuthorDate: Fri Jan 28 10:10:30 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. .../org/apache/sis/coverage/BandedCoverage.java| 22 -- .../org/apache/sis/coverage/grid/GridCoverage.java | 9 +--- .../org/apache/sis/metadata/MetadataCopier.java| 19 --- .../java/org/apache/sis/metadata/ValueMap.java | 20 +++- .../java/org/apache/sis/metadata/package-info.java | 2 +- .../apache/sis/metadata/MetadataCopierTest.java| 27 +- .../java/org/apache/sis/metadata/ValueMapTest.java | 15 +++- .../sis/parameter/DefaultParameterValueGroup.java | 11 + ide-project/NetBeans/nbproject/project.properties | 2 +- pom.xml| 2 +- .../sis/storage/geotiff/MultiResolutionImage.java | 11 +++-- 11 files changed, 114 insertions(+), 26 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1 for fixing a test failure.
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 98121592ae06830fab6b47bb4b01dd26befc394b Merge: c2534df b5d59ec Author: Martin Desruisseaux AuthorDate: Wed Jan 26 10:26:41 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 for fixing a test failure. .../org/apache/sis/storage/geotiff/XMLMetadataTest.java | 16 1 file changed, 8 insertions(+), 8 deletions(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 c2534df1525571e39710a7a0399e4c544694f851 Merge: 171730a 6b413e8 Author: Martin Desruisseaux AuthorDate: Thu Jan 20 19:03:57 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 application/sis-javafx/pom.xml | 4 +- .../src/main/artifact/conf/logging.properties | 12 +- .../java/org/apache/sis/gui/dataset/LogViewer.java | 158 +--- .../apache/sis/gui/dataset/ResourceExplorer.java | 2 +- .../org/apache/sis/gui/metadata/MetadataTree.java | 4 +- .../org/apache/sis/internal/gui/GUIUtilities.java | 64 + .../org/apache/sis/internal/gui/LogHandler.java| 177 +++--- .../sis/internal/gui/PropertyValueFormatter.java | 16 +- .../org/apache/sis/internal/gui/PropertyView.java | 114 +++-- .../org/apache/sis/internal/gui/Resources.java | 5 + .../apache/sis/internal/gui/Resources.properties | 1 + .../sis/internal/gui/Resources_fr.properties | 1 + .../org/apache/sis/internal/gui/TextFormats.java | 132 ++ .../apache/sis/internal/gui/GUIUtilitiesTest.java | 81 +- core/sis-build-helper/pom.xml | 10 +- core/sis-cql/pom.xml | 4 +- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 2 + .../org/apache/sis/coverage/grid/GridGeometry.java | 66 - .../sis/coverage/grid/GridDerivationTest.java | 27 ++ .../apache/sis/coverage/grid/GridGeometryTest.java | 36 ++- .../org/apache/sis/metadata/MetadataStandard.java | 4 +- .../org/apache/sis/metadata/MetadataVisitor.java | 4 +- .../org/apache/sis/metadata/TreeTableView.java | 4 +- .../org/apache/sis/metadata/sql/Dispatcher.java| 4 +- .../java/org/apache/sis/geometry/Envelopes.java| 13 +- .../sis/internal/referencing/AxesMapper.java | 160 .../sis/internal/referencing/AxisDirections.java | 59 ++--- .../apache/sis/internal/referencing/Resources.java | 19 +- .../sis/internal/referencing/Resources.properties | 5 +- .../internal/referencing/Resources_fr.properties | 5 +- .../sis/referencing/cs/CoordinateSystems.java | 26 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 15 +- .../apache/sis/referencing/cs/package-info.java| 2 +- .../factory/ConcurrentAuthorityFactory.java| 13 +- .../referencing/factory/FactoryDataException.java | 13 +- .../referencing/factory/GeodeticObjectFactory.java | 30 ++- .../factory/IdentifiedObjectFinder.java| 28 ++- .../sis/referencing/factory/package-info.java | 2 +- .../referencing/factory/sql/EPSGCodeFinder.java| 9 +- .../referencing/factory/sql/EPSGDataAccess.java| 10 +- .../operation/AbstractCoordinateOperation.java | 2 +- .../operation/CoordinateOperationRegistry.java | 4 +- .../operation/DefaultConcatenatedOperation.java| 12 +- .../operation/builder/LinearTransformBuilder.java | 12 +- .../operation/builder/LocalizationGridBuilder.java | 2 +- .../builder/LocalizationGridException.java | 114 + .../operation/builder/ProjectedTransformTry.java | 2 +- .../operation/projection/ConformalProjection.java | 2 +- .../operation/projection/ObliqueMercator.java | 12 +- .../sis/internal/referencing/AxesMapperTest.java | 97 .../internal/referencing/AxisDirectionsTest.java | 27 +- .../operation/projection/ObliqueMercatorTest.java | 32 ++- .../sis/test/suite/ReferencingTestSuite.java | 1 + .../org/apache/sis/internal/system/Semaphores.java | 26 +- .../apache/sis/internal/system/package-info.java | 2 +- .../apache/sis/internal/util/PropertyFormat.java | 4 +- .../main/java/org/apache/sis/util/Exceptions.java | 5 +- .../apache/sis/util/logging/PerformanceLevel.java | 25 +- .../apache/sis/util/resources/KeyConstants.java| 2 +- .../org/apache/sis/util/resources/Vocabulary.java | 10 + .../sis/util/resources/Vocabulary.properties | 2 + .../sis/util/resources/Vocabulary_fr.properties| 2 + ide-project/NetBeans/nbproject/genfiles.properties | 4 +- ide-project/NetBeans/nbproject/project.xml | 4 + pom.xml| 8 +- .../apache/sis/internal/earth/netcdf/GCOM_C.java | 2 +- .../apache/sis/internal/earth/netcdf/GCOM_W.java | 2 +- src/main/config/logging.properties | 8 +- .../java/org/apache/sis/internal/netcdf/Axis.java | 16 ++ .../org/apache/sis/internal/netcdf/Dimension.java | 16 +- .../java/org/apache/sis/internal/netcdf/Grid.java | 18 +- .../apache/sis/internal/netcdf/GridCacheValue.java | 22 +- .../org/apache/sis/internal/netcdf/Linearizer.java | 139 +--
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 c6991bf27754890ffa04d55c77e2c1fd062324dc
Merge: a63fa19 434ffd0
Author: Martin Desruisseaux
AuthorDate: Sun Jan 2 01:34:55 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1
.../sis/gui/coverage/ImagePropertyExplorer.java| 54 +--
.../dataset/{CopyAction.java => PathAction.java} | 38 +-
.../org/apache/sis/gui/dataset/ResourceTree.java | 8 +-
.../org/apache/sis/gui/metadata/MetadataTree.java | 159 ++--
.../sis/gui/metadata/StandardMetadataTree.java | 73 ++--
.../apache/sis/internal/gui/ExceptionReporter.java | 3 +-
.../sis/internal/gui/PropertyValueFormatter.java | 85
.../org/apache/sis/internal/gui/PropertyView.java | 55 ++-
.../org/apache/sis/internal/gui/Resources.java | 15 +
.../apache/sis/internal/gui/Resources.properties | 3 +
.../sis/internal/gui/Resources_fr.properties | 3 +
.../org/apache/sis/coverage/SampleDimension.java | 75 ++--
.../org/apache/sis/feature/DefaultFeatureType.java | 12 +-
.../sis/feature/builder/FeatureTypeBuilder.java| 13 +-
.../org/apache/sis/filter/ArithmeticFunction.java | 8 +-
.../org/apache/sis/filter/AssociationValue.java| 234 +++
.../org/apache/sis/filter/ConvertFunction.java | 26 +-
.../apache/sis/filter/DefaultFilterFactory.java| 4 +-
.../java/org/apache/sis/filter/LeafExpression.java | 14 +-
.../java/org/apache/sis/filter/Optimization.java | 2 +-
.../java/org/apache/sis/filter/PropertyValue.java | 205 ++
.../sis/internal/coverage/SampleDimensions.java| 41 --
.../sis/internal/coverage/j2d/Colorizer.java | 20 +-
.../sis/internal/feature/FeatureExpression.java| 49 +--
.../apache/sis/internal/feature/package-info.java | 2 +-
.../sis/internal/filter/GeometryConverter.java | 8 +-
.../sis/internal/filter/sqlmm/SpatialFunction.java | 25 +-
.../sis/internal/filter/sqlmm/package-info.java| 2 +-
.../org/apache/sis/filter/LogicalFilterTest.java | 4 +-
.../java/org/apache/sis/filter/PeriodLiteral.java | 2 +-
.../sis/internal/filter/FunctionNamesTest.java | 4 +-
.../org/apache/sis/util/iso/DefaultLocalName.java | 8 +-
.../org/apache/sis/util/iso/DefaultMemberName.java | 2 +-
.../apache/sis/util/iso/DefaultNameFactory.java| 4 +-
.../org/apache/sis/util/iso/DefaultScopedName.java | 4 +-
.../org/apache/sis/util/iso/DefaultTypeName.java | 4 +-
.../java/org/apache/sis/util/iso/TypeNames.java| 2 +-
.../apache/sis/metadata/TreeTableFormatTest.java | 2 +-
.../org/apache/sis/metadata/TreeTableViewTest.java | 2 +-
.../extent/DefaultGeographicBoundingBoxTest.java | 5 +-
.../DefaultDataIdentificationTest.java | 2 +-
.../sis/internal/map/coverage/RenderingData.java | 17 +-
.../internal/referencing/WraparoundApplicator.java | 57 +--
.../sis/internal/referencing/package-info.java | 2 +-
.../apache/sis/internal/util/PropertyFormat.java | 37 +-
.../java/org/apache/sis/internal/util/Strings.java | 28 +-
.../java/org/apache/sis/internal/util/XPaths.java | 58 ++-
.../org/apache/sis/internal/util/XPointer.java | 113 ++
.../org/apache/sis/internal/util/package-info.java | 2 +-
.../java/org/apache/sis/measure/UnitFormat.java| 3 +-
.../sis/util/collection/TreeTableFormat.java | 2 +-
.../java/org/apache/sis/util/resources/Errors.java | 5 +
.../apache/sis/util/resources/Errors.properties| 1 +
.../apache/sis/util/resources/Errors_fr.properties | 1 +
.../org/apache/sis/util/resources/Vocabulary.java | 15 +
.../sis/util/resources/Vocabulary.properties | 3 +
.../sis/util/resources/Vocabulary_fr.properties| 3 +
.../org/apache/sis/internal/util/XPathsTest.java | 16 +-
.../util/{XPathsTest.java => XPointerTest.java}| 36 +-
.../java/org/apache/sis/measure/UnitsTest.java | 2 +-
.../apache/sis/test/suite/UtilityTestSuite.java| 3 +-
.../java/org/apache/sis/storage/landsat/Band.java | 2 +-
.../sis/internal/geotiff/SchemaModifier.java | 16 +-
.../sis/internal/storage/inflater/CCITTRLE.java| 8 +-
.../storage/inflater/CompressionChannel.java | 6 +-
.../storage/inflater/HorizontalPredictor.java | 443 +++--
.../sis/internal/storage/inflater/Inflater.java| 12 +-
.../apache/sis/internal/storage/inflater/LZW.java | 8 +-
.../sis/internal/storage/inflater/PackBits.java| 8 +-
.../internal/storage/inflater/PixelChannel.java| 4 +-
.../storage/inflater/PredictorChannel.java | 11 +-
.../apache/sis/internal/storage/inflater/ZIP.java | 8 +-
.../internal/storage/inflater/package-info.java| 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../sis/storage/geotiff/ImageFileDirectory.java| 9 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 a63fa19b9130271fb7d0a456553d733c509e0f8d Merge: c248954 d1b7ace Author: Martin Desruisseaux AuthorDate: Mon Dec 27 20:54:24 2021 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../main/java/org/apache/sis/console/Command.java | 4 +- .../main/java/org/apache/sis/console/Option.java | 4 +- .../apache/sis/gui/coverage/CoverageCanvas.java| 4 +- .../org/apache/sis/gui/coverage/GridViewSkin.java | 2 +- .../src/main/java/org/apache/sis/cql/CQL.java | 2 +- .../test/java/org/apache/sis/cql/CQLTestCase.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 5 +- .../java/org/apache/sis/filter/PropertyValue.java | 65 ++- .../apache/sis/image/BandedSampleConverter.java| 20 +- .../java/org/apache/sis/image/ComputedImage.java | 22 + .../java/org/apache/sis/image/ImageAdapter.java| 21 +- .../java/org/apache/sis/image/Interpolation.java | 50 ++- .../org/apache/sis/image/LanczosInterpolation.java | 4 +- .../java/org/apache/sis/image/PlanarImage.java | 13 + .../java/org/apache/sis/image/PrefetchedImage.java | 22 +- .../java/org/apache/sis/image/ResampledImage.java | 40 +- .../org/apache/sis/image/SourceAlignedImage.java | 21 + .../java/org/apache/sis/image/Visualization.java | 22 +- .../sis/internal/coverage/SampleDimensions.java| 41 ++ .../internal/coverage/j2d/BatchComputedImage.java | 218 + .../sis/internal/coverage/j2d/ImageUtilities.java | 73 +++- .../apache/sis/internal/feature/Geometries.java| 5 +- .../feature/j2d/DecimatedPathIterator.java | 166 +++ .../sis/internal/feature/j2d/DecimatedShape.java | 85 .../sis/internal/feature/j2d/EmptyShape.java | 25 +- .../apache/sis/internal/feature/j2d/Factory.java | 5 +- .../sis/internal/feature/j2d/ShapeProperties.java | 4 +- .../sis/internal/feature/j2d/ShapeWrapper.java | 189 .../apache/sis/internal/feature/j2d/Wrapper.java | 5 +- .../sis/internal/feature/j2d/package-info.java | 2 +- .../apache/sis/internal/feature/jts/Factory.java | 221 -- .../feature/jts/GeometryCoordinateTransform.java | 4 +- .../org/apache/sis/internal/feature/jts/JTS.java | 40 +- .../feature/jts/PackedCoordinateSequence.java | 485 + .../jts/PackedCoordinateSequenceFactory.java | 146 +++ .../internal/feature/jts/PathIteratorAdapter.java | 269 .../sis/internal/feature/jts/ShapeAdapter.java | 209 + .../sis/internal/feature/jts/ShapeConverter.java | 327 ++ .../apache/sis/internal/feature/jts/Wrapper.java | 61 ++- .../sis/internal/feature/jts/package-info.java | 2 +- .../sis/internal/feature/jts/FactoryTest.java | 32 +- .../apache/sis/internal/feature/jts/JTSTest.java | 129 +- .../sis/internal/feature/jts/ShapeAdapterTest.java | 221 ++ .../internal/feature/jts/ShapeConverterTest.java | 200 + .../internal/filter/sqlmm/RegistryTestCase.java| 4 +- .../apache/sis/test/suite/FeatureTestSuite.java| 2 + core/sis-metadata/pom.xml | 5 + .../org/apache/sis/metadata/PropertyAccessor.java | 4 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 2 +- .../metadata/iso/citation/DefaultTelephone.java| 2 +- .../main/java/org/apache/sis/xml/Transformer.java | 2 +- .../java/org/apache/sis/test/sql/TestDatabase.java | 38 +- .../java/org/apache/sis/test/sql/package-info.java | 2 +- .../apache/sis/test/xml/DocumentComparator.java| 4 +- .../test/java/org/apache/sis/xml/XLinkTest.java| 4 +- .../coverage/MultiResolutionCoverageLoader.java| 10 +- .../sis/internal/map/coverage/RenderingData.java | 6 +- .../apache/sis/internal/map/SEPortrayerTest.java | 16 +- .../MultiResolutionCoverageLoaderTest.java | 6 +- core/sis-referencing/pom.xml | 5 + .../org/apache/sis/geometry/GeneralEnvelope.java | 2 +- .../internal/referencing/j2d/AbstractShape.java| 82 .../internal/referencing/j2d/ShapeUtilities.java | 16 +- .../sis/internal/referencing/j2d/package-info.java | 2 +- .../referencing/provider/MillerCylindrical.java| 2 +- .../sis/parameter/DefaultParameterDescriptor.java | 2 +- .../sis/parameter/DefaultParameterValue.java | 4 +- .../org/apache/sis/parameter/TensorParameters.java | 2 +- .../operation/CoordinateOperationRegistry.java | 2 +- .../operation/DefaultConcatenatedOperation.java| 4 +- .../DefaultCoordinateOperationFactory.java | 2 +- .../sis/referencing/operation/matrix/Matrices.java | 4 +- .../referencing/operation/matrix/MatrixSIS.java| 2 +- .../operation/matrix/NonSquareMatrix.java | 2 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 c248954b1a0792796ab062a8974a8505ef9b2193
Merge: 5a19a70 78d9505
Author: Martin Desruisseaux
AuthorDate: Thu Dec 2 18:48:43 2021 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1
.../main/java/org/apache/sis/gui/DataViewer.java | 45 +-
.../main/java/org/apache/sis/gui/RecentFiles.java | 67 +--
.../java/org/apache/sis/gui/SystemMonitor.java | 8 +-
.../src/main/java/org/apache/sis/gui/Widget.java | 20 +-
.../sis/gui/coverage/BandSelectionListener.java| 16 +-
.../org/apache/sis/gui/coverage/CellFormat.java| 6 +-
.../apache/sis/gui/coverage/CoverageCanvas.java| 339 ++
.../apache/sis/gui/coverage/CoverageControls.java | 245 --
.../apache/sis/gui/coverage/CoverageExplorer.java | 514 ++---
.../apache/sis/gui/coverage/CoverageStyling.java | 29 +-
.../org/apache/sis/gui/coverage/GridControls.java | 91 ++--
.../java/org/apache/sis/gui/coverage/GridView.java | 138 +++---
.../org/apache/sis/gui/coverage/GridViewSkin.java | 28 +-
.../sis/gui/coverage/ImagePropertyExplorer.java| 22 +-
.../org/apache/sis/gui/coverage/ImageRequest.java | 154 +++---
.../sis/gui/coverage/InterpolationConverter.java | 112 +
.../gui/coverage/MultiResolutionImageLoader.java | 156 +++
.../sis/gui/coverage/PropertyPaneCreator.java | 65 +++
.../sis/gui/coverage/StyledRenderingData.java | 104 +
.../{Controls.java => ViewAndControls.java}| 87 +++-
.../java/org/apache/sis/gui/dataset/LogViewer.java | 16 +-
.../apache/sis/gui/dataset/ResourceExplorer.java | 278 +--
.../org/apache/sis/gui/dataset/ResourceTree.java | 128 +++--
.../org/apache/sis/gui/dataset/SelectedData.java | 42 +-
.../org/apache/sis/gui/dataset/WindowManager.java | 13 +-
.../java/org/apache/sis/gui/map/MapCanvas.java | 6 +-
.../java/org/apache/sis/gui/map/MapCanvasAWT.java | 2 +-
.../java/org/apache/sis/gui/map/StatusBar.java | 19 +-
.../org/apache/sis/gui/map/ValuesUnderCursor.java | 29 +-
.../apache/sis/gui/metadata/MetadataSummary.java | 1 -
.../sis/gui/referencing/ObjectStringConverter.java | 2 +-
.../gui/referencing/RecentReferenceSystems.java| 2 +-
.../apache/sis/internal/gui/BackgroundThreads.java | 2 +-
.../{ResourceLoader.java => DataStoreOpener.java} | 21 +-
.../apache/sis/internal/gui/ExceptionReporter.java | 4 +-
.../apache/sis/internal/gui/ImageConverter.java| 140 --
.../org/apache/sis/internal/gui/LogHandler.java| 14 +-
.../org/apache/sis/internal/gui/PropertyView.java | 127 +++--
.../org/apache/sis/internal/gui/Resources.java | 2 +-
.../apache/sis/internal/gui/Resources.properties | 2 +-
.../sis/internal/gui/Resources_fr.properties | 2 +-
.../org/apache/sis/internal/gui/ToolbarButton.java | 24 +-
.../internal/gui/control/ColorColumnHandler.java | 4 +-
.../apache/sis/internal/gui/control/ColorRamp.java | 4 +-
.../apache/sis/internal/gui/io/package-info.java | 3 +
.../java/org/apache/sis/internal/setup/Wizard.java | 2 +-
.../org/apache/sis/internal/setup/WizardPage.java | 4 +-
.../sis/gui/coverage/CoverageStylingApp.java | 6 +-
core/sis-build-helper/pom.xml | 10 +-
.../org/apache/sis/internal/doclet/Doclet.java | 36 +-
.../org/apache/sis/internal/doclet/Taglet.java | 6 +-
.../apache/sis/internal/doclet/package-info.java | 2 +-
.../main/antlr4/org/apache/sis/internal/cql/CQL.g4 | 26 +-
.../src/main/java/org/apache/sis/cql/CQL.java | 116 +
.../src/main/java/org/apache/sis/cql/Query.java| 125 +
.../java/org/apache/sis/internal/cql/AntlrCQL.java | 16 +
.../test/java/org/apache/sis/cql/CQLTestSuite.java | 2 +
.../java/org/apache/sis/cql/QueryReadingTest.java | 100
.../java/org/apache/sis/cql/QueryWritingTest.java | 44 ++
.../java/org/apache/sis/coverage/Category.java | 8 +-
.../org/apache/sis/coverage/SampleDimension.java | 10 +-
.../coverage/grid/CoordinateOperationFinder.java | 65 ++-
.../apache/sis/coverage/grid/GridDerivation.java | 19 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 3 +-
.../apache/sis/coverage/grid/ImageRenderer.java| 69 ++-
.../sis/coverage/grid/ResampledGridCoverage.java | 18 +-
.../apache/sis/coverage/grid/ReshapedImage.java| 16 +-
.../java/org/apache/sis/image/AnnotatedImage.java | 50 +-
.../java/org/apache/sis/image/ComputedImage.java | 25 +-
.../java/org/apache/sis/image/ImageAdapter.java| 4 +
.../java/org/apache/sis/image/ImageProcessor.java | 114 -
.../java/org/apache/sis/image/MaskedImage.java | 39 +-
.../java/org/apache/sis/image/PlanarImage.java | 44 +-
.../java/org/apache/sis/image/RecoloredImage.java | 52 ++-
