(sis) 01/01: Merge branch 'geoapi-3.1': automatic imports reorganization.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit dadfde5d17da6cb0d59969bc9633e1b4bb71f61e
Merge: 428919e44a 12371196a0
Author: Martin Desruisseaux 
AuthorDate: Mon Apr 22 16:17:21 2024 +0200

Merge branch 'geoapi-3.1': automatic imports reorganization.

 .../apache/sis/geometry/wrapper/SpatialOperationContext.java |  4 +++-
 .../main/org/apache/sis/metadata/iso/extent/Extents.java |  2 +-
 .../apache/sis/metadata/simple/SimpleIdentifiedObject.java   |  2 +-
 .../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java |  6 +++---
 .../test/org/apache/sis/test/mock/VerticalCRSMock.java   |  2 +-
 .../main/org/apache/sis/referencing/CRS.java |  4 +++-
 .../main/org/apache/sis/referencing/CommonCRS.java   |  6 --
 .../main/org/apache/sis/referencing/EPSGFactoryFallback.java |  4 +++-
 .../apache/sis/referencing/EllipsoidalHeightSeparator.java   |  4 +++-
 .../main/org/apache/sis/referencing/crs/AbstractCRS.java |  4 +++-
 .../org/apache/sis/referencing/crs/AbstractDerivedCRS.java   |  4 +++-
 .../org/apache/sis/referencing/crs/DefaultGeocentricCRS.java |  4 +++-
 .../org/apache/sis/referencing/crs/DefaultProjectedCRS.java  |  6 --
 .../apache/sis/referencing/datum/DefaultPrimeMeridian.java   |  4 +++-
 .../apache/sis/referencing/datum/DefaultVerticalDatum.java   |  4 +++-
 .../sis/referencing/factory/sql/CoordinateOperationSet.java  |  4 +++-
 .../apache/sis/referencing/factory/sql/EPSGCodeFinder.java   |  4 +++-
 .../org/apache/sis/referencing/factory/sql/TableInfo.java|  2 +-
 .../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java |  2 +-
 .../apache/sis/referencing/internal/VerticalDatumTypes.java  | 12 
 .../referencing/operation/AbstractCoordinateOperation.java   |  4 +++-
 .../referencing/operation/CoordinateOperationRegistry.java   |  4 +++-
 .../apache/sis/referencing/operation/DefaultConversion.java  |  4 ++--
 .../operation/DefaultCoordinateOperationFactory.java |  6 --
 .../sis/referencing/operation/DefaultOperationMethod.java|  6 --
 .../apache/sis/referencing/privy/CoordinateOperations.java   |  4 +++-
 .../org/apache/sis/referencing/privy/DefinitionVerifier.java |  4 +++-
 .../apache/sis/referencing/privy/NilReferencingObject.java   |  2 +-
 .../test/org/apache/sis/io/wkt/TransliteratorTest.java   |  4 +++-
 .../test/org/apache/sis/referencing/CommonCRSTest.java   |  2 +-
 .../sis/referencing/datum/DefaultVerticalDatumTest.java  |  6 --
 .../org/apache/sis/referencing/datum/HardCodedDatum.java |  2 +-
 .../sis/referencing/internal/VerticalDatumTypesTest.java |  4 +++-
 .../operation/transform/OperationMethodSetTest.java  |  4 +++-
 .../sis/referencing/report/CoordinateOperationMethods.java   |  2 +-
 .../sis/test/integration/CoordinateReferenceSystemTest.java  |  8 ++--
 .../apache/sis/test/integration/MetadataVerticalTest.java|  2 +-
 .../main/org/apache/sis/gui/referencing/CRSChooser.java  |  4 +++-
 38 files changed, 106 insertions(+), 50 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index e74b1642b4,0ef3b23ce2..2f47a1cadf
--- 
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,9 -46,12 +46,12 @@@ 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;
 +// Specific to the main branch:
 +import org.apache.sis.pending.geoapi.filter.SpatialOperatorName;
 +import org.apache.sis.pending.geoapi.filter.DistanceOperatorName;
  
  
  /**
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
index b4ec7fc882,14478406e7..56feed4b21
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
@@@ -70,9 -69,9 +69,10 @@@ import static org.apache.sis.util.colle
  import static org.apache.sis.util.privy.CollectionsExt.nonNull;
  import static 
org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.geometry.MismatchedReferenceSystemException;
 -import org.opengis.referencing.datum.RealizationMethod;
 +// Specific to the main branch:
 +import 

(sis) 01/01: Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and `VerticalDatumType`.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 428919e44a91cd9c40080b2d1630132d0ad322d4
Merge: 1483fcf71b ff6542a3f7
Author: Martin Desruisseaux 
AuthorDate: Mon Apr 22 15:55:59 2024 +0200

Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and 
`VerticalDatumType`.

 .../apache/sis/coverage/grid/GridExtentCRS.java|   6 +-
 .../apache/sis/metadata/iso/extent/Extents.java|  62 -
 .../sis/metadata/iso/extent/ExtentsTest.java   |   9 +-
 .../apache/sis/io/wkt/GeodeticObjectParser.java|  22 +--
 .../main/org/apache/sis/referencing/CRS.java   |   4 +-
 .../main/org/apache/sis/referencing/CommonCRS.java |  24 ++--
 .../org/apache/sis/referencing/cs/AbstractCS.java  |   4 +-
 .../main/org/apache/sis/referencing/cs/Codes.java  |  24 ++--
 .../org/apache/sis/referencing/cs/Normalizer.java  |   4 +-
 .../referencing/datum/DefaultVerticalDatum.java|  14 +-
 .../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|   8 +-
 .../referencing/internal/VerticalDatumTypes.java   | 147 -
 .../operation/CoordinateOperationRegistry.java |   2 +-
 .../sis/referencing/operation/matrix/Matrices.java |   2 +-
 .../sis/referencing/privy/AxisDirections.java  |  27 ++--
 .../privy/EllipsoidalHeightCombiner.java   |   3 +-
 .../referencing/privy/ReferencingUtilities.java|   7 +-
 .../org/apache/sis/io/wkt/TransliteratorTest.java  |  13 +-
 .../org/apache/sis/referencing/CommonCRSTest.java  |  20 +--
 .../apache/sis/referencing/cs/HardCodedAxes.java   |   4 +-
 .../datum/DefaultVerticalDatumTest.java|   4 +-
 .../sis/referencing/datum/HardCodedDatum.java  |   2 +-
 .../referencing/datum/VerticalDatum (GML 3.1).xml  |   2 +-
 .../internal/VerticalDatumTypesTest.java   |  32 +++--
 .../sis/referencing/privy/AxisDirectionsTest.java  |  21 +--
 .../org/apache/sis/storage/netcdf/base/Axis.java   |   2 +-
 29 files changed, 251 insertions(+), 240 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
index ae28430fdb,95020e45e4..8d078fddfd
--- 
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
+++ 
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
@@@ -296,7 -299,7 +296,7 @@@ final class GridExtentCRS 
  abbreviation = "t"; direction = AxisDirection.FUTURE; 
hasTime = true;
  } else {
  abbreviation = abbreviation(target);
- direction = AxisDirection.OTHER;
 -direction = AxisDirection.UNSPECIFIED;
++direction = AxisDirections.UNSPECIFIED;
  hasOther = true;
  }
  /*
@@@ -308,7 -311,7 +308,7 @@@
  final CoordinateSystemAxis previous = axes[k];
  if (previous != null) {
  if 
(direction.equals(AxisDirections.absolute(previous.getDirection( {
- direction = AxisDirection.OTHER;
 -direction = AxisDirection.UNSPECIFIED;
++direction = AxisDirections.UNSPECIFIED;
  hasOther = true;
  }
  if (abbreviation.equals(previous.getAbbreviation())) {
@@@ -331,7 -334,7 +331,7 @@@
  if (axes[j] == null) {
  final String name = 
Vocabulary.forLocale(locale).getString(Vocabulary.Keys.Dimension_1, j);
  final String abbreviation = abbreviation(j);
- axes[j] = axis(csFactory, name, abbreviation, 
AxisDirection.OTHER);
 -axes[j] = axis(csFactory, name, abbreviation, 
AxisDirection.UNSPECIFIED);
++axes[j] = axis(csFactory, name, abbreviation, 
AxisDirections.UNSPECIFIED);
  }
  }
  /*
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
index 360b50cc81,2fda0bf211..b4ec7fc882
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
@@@ -371,16 -362,15 +365,15 @@@ public final class Extents extends Stat
   * performs a choice based on the vertical datum and the unit of 
measurement:
   *
   * 
-  *   Choice based on vertical datum
+  *   Choice based on realization method
 - *   Only the extents associated (indirectly, through their CRS) to the 
same non-null {@link RealizationMethod}
 + *   Only 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 1483fcf71b8c00dda660cddc38e34270f9f69fce
Merge: 66a5fa5253 74a6061f9e
Author: Martin Desruisseaux 
AuthorDate: Thu Apr 18 17:40:28 2024 +0200

Merge branch 'geoapi-3.1'

 .../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 +-
 24 files changed, 107 insertions(+), 294 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
index 66b225bebf,44cb55e6e2..91c6f7c16e
--- 
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
@@@ -219,8 -222,8 +222,7 @@@ 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.
   */
 -@SuppressWarnings("deprecation")
  DefaultConversion(final Conversion definition,
final CoordinateReferenceSystem source,
final CoordinateReferenceSystem target,
@@@ -385,12 -369,14 +368,13 @@@
   * failed.
   *
   * @see 
DefaultMathTransformFactory#createParameterizedTransform(ParameterValueGroup, 
DefaultMathTransformFactory.Context)
+  *
+  * @since 1.5
   */
- public  T specialize(final Class baseType,
- final CoordinateReferenceSystem sourceCRS, final 
CoordinateReferenceSystem targetCRS,
- MathTransformFactory factory) throws FactoryException
 -@SuppressWarnings("deprecation")
+ public Conversion specialize(final CoordinateReferenceSystem sourceCRS,
+  final CoordinateReferenceSystem targetCRS,
+  MathTransformFactory factory) throws 
FactoryException
  {
- ArgumentChecks.ensureNonNull("baseType",  baseType);
  ArgumentChecks.ensureNonNull("sourceCRS", sourceCRS);
  ArgumentChecks.ensureNonNull("targetCRS", targetCRS);
  /*

(sis) 01/01: Merge branch 'geoapi-3.1' https://issues.apache.org/jira/browse/SIS-597

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 66a5fa525339c2c97828c86046d8c7dc09fb2d46
Merge: 161a5fe3c8 883dfe7e9b
Author: Martin Desruisseaux 
AuthorDate: Thu Apr 18 12:09:12 2024 +0200

Merge branch 'geoapi-3.1'
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 ++--
 .../integration/CoordinateReferenceSystemTest.java |   6 +-
 .../sis/storage/geotiff/reader/CRSBuilder.java |   4 +-
 39 files changed, 115 insertions(+), 521 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
index 587c3a6910,b6a07c54f1..6eafbe03b1
--- 
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
+++ 
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
@@@ -21,11 -21,11 +21,11 @@@ import java.util.Map
  import java.util.Iterator;
  import java.util.NoSuchElementException;
  import org.opengis.parameter.ParameterDescriptorGroup;
- import org.opengis.referencing.operation.Projection;
- import org.opengis.referencing.operation.ConicProjection;
- import org.opengis.referencing.operation.PlanarProjection;
- import org.opengis.referencing.operation.CylindricalProjection;
+ import org.opengis.referencing.operation.Conversion;
+ import org.opengis.referencing.operation.Transformation;
  import org.opengis.referencing.operation.OperationMethod;
+ import org.opengis.referencing.operation.SingleOperation;
 -import org.opengis.referencing.operation.PointMotionOperation;
++import org.opengis.referencing.operation.PassThroughOperation;
  import org.apache.sis.referencing.operation.DefaultOperationMethod;
  import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
  import org.apache.sis.util.privy.UnmodifiableArrayList;
@@@ -143,14 -145,14 +145,14 @@@ public final class OperationMethodSetTe
  assertFalse (mercators.isEmpty());
  assertEquals(3, mercators.size());
  /*
-  * Lambert case. Test twice since the two excecutions will take 
different code paths.
+  * NADCON case. Test twice because the two excecutions will take 
different code paths.
   */
- assertEquals(Set.of(lamb), lambert);
- assertEquals(Set.of(lamb), lambert);
+ assertEquals(Set.of(nad), shifts);
+ assertEquals(Set.of(nad), shifts);
  /*
-  * Test filtering: the test should not contain any conic projection.
 - * 

(sis) 01/01: Merge branch 'geoapi-3.1': reduce usage of `GeocentricCRS`, to be deprecated in GeoAPI 3.1. This merge skips the replacement of `createGeocentricCRS(…)` by `createGeodeticCRS(…)` because

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 00b4a72d2fe4edc40cb3617e4657b181a1f9f87f
Merge: 2c90ee97ab 798a145e1e
Author: Martin Desruisseaux 
AuthorDate: Tue Apr 16 12:51:22 2024 +0200

Merge branch 'geoapi-3.1': reduce usage of `GeocentricCRS`, to be 
deprecated in GeoAPI 3.1.
This merge skips the replacement of `createGeocentricCRS(…)` by 
`createGeodeticCRS(…)`
because the GeoAPI 3.0 factory interfaces does not have the latter methods.

 .../apache/sis/io/wkt/GeodeticObjectParser.java|  3 +-
 .../main/org/apache/sis/referencing/CommonCRS.java |  8 
 .../apache/sis/referencing/crs/AbstractCRS.java| 23 ++
 .../sis/referencing/crs/DefaultDerivedCRS.java | 51 +-
 .../sis/referencing/crs/DefaultGeocentricCRS.java  | 34 ++-
 .../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 +++---
 .../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   |  2 +-
 .../org/apache/sis/referencing/CommonCRSTest.java  |  6 +--
 .../sis/referencing/EPSGFactoryFallbackTest.java   | 13 --
 .../sis/referencing/crs/DefaultDerivedCRSTest.java | 24 +-
 .../referencing/factory/AuthorityFactoryMock.java  |  4 +-
 .../factory/MultiAuthoritiesFactoryTest.java   |  2 -
 .../referencing/factory/sql/EPSGFactoryTest.java   |  2 +-
 .../operation/CoordinateOperationFinderTest.java   |  4 +-
 .../sis/referencing/privy/WKTKeywordsTest.java |  4 +-
 .../sis/storage/geotiff/reader/CRSBuilder.java | 10 ++---
 .../apache/sis/storage/netcdf/base/CRSBuilder.java |  4 +-
 .../org/apache/sis/gui/referencing/CRSChooser.java |  4 +-
 30 files changed, 189 insertions(+), 124 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
index b49766e6f0,0a436f01a3..622d9c2836
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
@@@ -741,6 -740,6 +741,10 @@@ public enum CommonCRS 
   *   WGS 84   {@link #WGS84}  
4978
   * 
   *
++ * Warning: In a future SIS version, the 
return type may be changed to the
++ * {@link GeodeticCRS} parent interface. This is because ISO 19111 does 
not defines specific interface
++ * for the geocentric case. Users should assign the return value to a 
{@code GeodeticCRS} type.
++ *
   * @return the geocentric CRS associated to this enum.
   *
   * @see CRS#forCode(String)
@@@ -793,6 -792,6 +797,10 @@@
   *   Geocentric radius in metres oriented toward {@linkplain 
AxisDirection#UP up}.
   * 
   *
++ * Warning: In a future SIS version, the 
return type may be changed to the
++ * {@link GeodeticCRS} parent interface. This is because ISO 19111 does 
not defines specific interface
++ * for the geocentric case. Users should assign the return value to a 
{@code GeodeticCRS} type.
++ *
   * @return the geocentric CRS associated to this enum.
   *
   * @see DefaultGeocentricCRS
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
index 2606e972ce,6a01107efb..9f17303c75
--- 
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
@@@ -57,10 -58,13 +58,11 @@@ import static org.apache.sis.referencin
  import org.apache.sis.io.wkt.Convention;
  import org.apache.sis.io.wkt.Formatter;
  import org.apache.sis.util.ComparisonMode;
+ import org.apache.sis.util.collection.Containers;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.referencing.datum.DatumEnsemble;
 -import org.opengis.referencing.datum.ParametricDatum;
 -import org.opengis.referencing.crs.ParametricCRS;
 -import org.opengis.referencing.cs.ParametricCS;
 +// Specific to the main branch:
 +import org.apache.sis.referencing.cs.DefaultParametricCS;
 +import org.apache.sis.referencing.datum.DefaultParametricDatum;
  
  

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 2c90ee97ab0934f0b8b58b8a7aad08e7fc8ca720
Merge: d98b7a3e07 f0d4a254e4
Author: Martin Desruisseaux 
AuthorDate: Sat Apr 13 11:19:33 2024 +0200

Merge branch '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 
 69 files changed, 1130 insertions(+), 1819 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProvidersTest.java
index dc96f66d81,37aaf8704a..5bcb0dddf9
--- 

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit d98b7a3e07c67d1fa6c8367c6cb7117c750e42c2
Merge: 65771ca1ee 9696bd8bfe
Author: Martin Desruisseaux 
AuthorDate: Tue Apr 9 17:11:48 2024 +0200

Merge branch 'geoapi-3.1'.

 .../sis/buildtools/coding/ReorganizeImports.java   | 11 +++-
 .../apache/sis/metadata/ModifiableMetadata.java| 11 ++--
 .../apache/sis/metadata/iso/extent/Extents.java|  4 +--
 .../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 ++-
 .../sis/referencing/crs/DefaultImageCRSTest.java   |  2 +-
 .../apache/sis/referencing/crs/HardCodedCRS.java   |  4 ++-
 .../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 ++---
 16 files changed, 64 insertions(+), 58 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
index 318c7d2c5e,72846865a5..f0d9e6d7bc
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
@@@ -108,8 -106,7 +108,7 @@@ public class AbstractTemporalQuality ex
   * @return a SIS implementation containing the values of the given object 
(may be the
   * given object itself), or {@code null} if the argument was null.
   */
- @SuppressWarnings("deprecation")
 -public static AbstractTemporalQuality castOrCopy(final TemporalQuality 
object) {
 +public static AbstractTemporalQuality castOrCopy(final TemporalAccuracy 
object) {
  if (object instanceof AccuracyOfATimeMeasurement) {
  return 
DefaultAccuracyOfATimeMeasurement.castOrCopy((AccuracyOfATimeMeasurement) 
object);
  }
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
index 9200bab2c5,0e880847f1..2540a74d36
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
@@@ -99,8 -98,10 +99,7 @@@ public class DefaultNonQuantitativeAttr
   * @return a SIS implementation containing the values of the given object 
(may be the
   * given object itself), or {@code null} if the argument was null.
   */
- @SuppressWarnings("deprecation")
 -public static DefaultNonQuantitativeAttributeCorrectness castOrCopy(final 
NonQuantitativeAttributeCorrectness object) {
 -if (object instanceof NonQuantitativeAttributeAccuracy) {
 -return 
DefaultNonQuantitativeAttributeAccuracy.castOrCopy((NonQuantitativeAttributeAccuracy)
 object);
 -}
 +public static DefaultNonQuantitativeAttributeCorrectness castOrCopy(final 
NonQuantitativeAttributeAccuracy object) {
  if (object == null || object instanceof 
DefaultNonQuantitativeAttributeCorrectness) {
  return (DefaultNonQuantitativeAttributeCorrectness) object;
  }
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 4c43f12d45,4ea1c59659..10281bd0bf
--- 
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
@@@ -238,9 -192,10 +239,10 @@@ public class SimpleIdentifiedObject imp
   */
  @Override
  public String toString() {
+ @SuppressWarnings("LocalVariableHidesMemberVariable")
 -final Identifier name = this.name;
++final ReferenceIdentifier name = this.name;
  final String code, codespace;
  final Citation authority;
- final ReferenceIdentifier name = this.name;
  if (name != null) {
  code  = name.getCode();
  codespace = name.getCodeSpace();
diff --cc 
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
index ae1f4b6366,0a61396e4d..966e38cdb6
--- 
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
+++ 

(sis) 01/01: Merge branch 'geoapi-3.1': automatic post-merge import reorganization.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 65771ca1eeeb0f988303fb97ba3762b74fe88509
Merge: 3403855d45 e111cc6c47
Author: Martin Desruisseaux 
AuthorDate: Tue Apr 9 14:40:11 2024 +0200

Merge branch 'geoapi-3.1': automatic post-merge import reorganization.

 .../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java |  2 +-
 .../test/org/apache/sis/test/mock/VerticalCRSMock.java |  6 --
 .../org/apache/sis/xml/test/AnnotationConsistencyCheck.java|  2 +-
 .../main/org/apache/sis/io/wkt/GeodeticObjectParser.java   |  2 +-
 .../org/apache/sis/referencing/AbstractIdentifiedObject.java   |  2 +-
 .../main/org/apache/sis/referencing/Properties.java|  4 ++--
 .../main/org/apache/sis/referencing/StandardDefinitions.java   |  2 +-
 .../main/org/apache/sis/referencing/datum/AbstractDatum.java   |  4 +++-
 .../main/org/apache/sis/referencing/internal/Legacy.java   | 10 ++
 .../sis/referencing/operation/InverseOperationMethod.java  |  2 +-
 .../org/apache/sis/referencing/privy/NilReferencingObject.java |  2 +-
 .../apache/sis/referencing/AbstractReferenceSystemTest.java|  4 +++-
 .../org/apache/sis/referencing/GeodeticObjectVerifier.java |  8 
 .../test/org/apache/sis/referencing/crs/HardCodedCRS.java  |  4 +++-
 .../test/org/apache/sis/referencing/datum/HardCodedDatum.java  |  4 +++-
 .../test/org/apache/sis/test/TestUtilities.java|  8 
 16 files changed, 39 insertions(+), 27 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 8330dc4683,d75dbdb9db..4c43f12d45
--- 
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
@@@ -30,14 -29,9 +29,15 @@@ import org.apache.sis.util.privy.Consta
  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;
  
 +// Specific to the main branch:
 +import java.util.Set;
 +import java.util.Collection;
 +import java.util.Collections;
 +import org.opengis.util.GenericName;
 +
  
  /**
   * A trivial implementation of {@link IdentifiedObject} containing only a 
primary name.
diff --cc 
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index 82e971b46f,e189a2e320..7487381abf
--- 
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
@@@ -25,11 -24,15 +24,14 @@@ import org.opengis.referencing.cs.Range
  import org.opengis.referencing.cs.VerticalCS;
  import org.opengis.referencing.datum.VerticalDatum;
  import org.opengis.referencing.datum.VerticalDatumType;
- import org.opengis.util.InternationalString;
  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;
 +// Specific to the main branch:
 +import java.util.Date;
  
  
  /**
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index bf1888bd5c,798c00d7e8..b72f380f9c
--- 
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
@@@ -88,9 -87,8 +87,10 @@@ import org.apache.sis.util.iso.Types
  // Specific to the main and geoapi-3.1 branches:
  import org.opengis.referencing.ReferenceIdentifier;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.referencing.ObjectDomain;
 +// Specific to the main branch:
++import org.opengis.referencing.ReferenceSystem;
 +import org.apache.sis.referencing.internal.ServicesForMetadata;
 +import org.apache.sis.referencing.factory.GeodeticObjectFactory;
  
  
  /**
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 47e11311f5,7c51395de5..33c3997573
--- 
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
@@@ -77,9 -76,8 +76,10 @@@ import static org.apache.sis.util.privy
  // Specific to the main and geoapi-3.1 branches:
  import org.opengis.referencing.ReferenceIdentifier;
  
 -// Specific to the 

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3403855d4538f69120d0adf2829a8187799de9d2
Merge: 129054c2fa abe39d4ffc
Author: Martin Desruisseaux 
AuthorDate: Tue Apr 9 13:22:51 2024 +0200

Merge branch 'geoapi-3.1'.

 .../sis/buildtools/coding/ReorganizeImports.java   |  1 +
 .../apache/sis/coverage/grid/GridExtentCRS.java|  2 +-
 .../sis/metadata/iso/extent/DefaultExtent.java |  3 +-
 .../apache/sis/metadata/iso/extent/Extents.java|  4 ++
 .../gazetteer/ModifiableLocationType.java  |  2 +-
 .../gazetteer/ReferencingByIdentifiers.java| 31 +
 .../gazetteer/ReferencingByIdentifiersTest.java|  2 +-
 .../main/org/apache/sis/io/wkt/ElementKind.java| 50 +
 .../main/org/apache/sis/referencing/CRS.java   | 23 +++---
 .../apache/sis/referencing/IdentifiedObjects.java  | 51 +
 .../org/apache/sis/referencing/Properties.java |  3 +-
 .../apache/sis/referencing/crs/AbstractCRS.java|  5 +--
 .../sis/referencing/crs/DefaultDerivedCRS.java |  2 +-
 .../sis/referencing/datum/BursaWolfParameters.java |  3 ++
 .../operation/AbstractCoordinateOperation.java |  5 +--
 .../operation/AbstractSingleOperation.java |  3 +-
 .../operation/CoordinateOperationFinder.java   |  3 +-
 .../operation/CoordinateOperationSorter.java   |  3 +-
 .../operation/DefaultConcatenatedOperation.java|  3 +-
 .../referencing/operation/DefaultConversion.java   |  2 +-
 .../DefaultCoordinateOperationFactory.java | 14 +++---
 .../operation/DefaultPassThroughOperation.java |  3 +-
 .../operation/DefaultTransformation.java   |  2 +-
 .../operation/InverseOperationMethod.java  |  6 ++-
 .../operation/transform/MathTransforms.java|  2 +-
 .../privy/EllipsoidalHeightCombiner.java   |  2 +-
 .../referencing/privy/NilReferencingObject.java| 22 ++---
 .../sis/xml/bind/referencing/CS_UserDefinedCS.java |  1 -
 .../referencing/AbstractReferenceSystemTest.java   | 10 +++--
 .../sis/referencing/GeodeticObjectVerifier.java| 45 ++-
 .../referencing/crs/DefaultGeodeticCRSTest.java|  3 +-
 .../referencing/crs/DefaultProjectedCRSTest.java   |  3 +-
 .../datum/DefaultGeodeticDatumTest.java| 12 +++--
 .../datum/DefaultTemporalDatumTest.java| 15 ---
 .../datum/DefaultVerticalDatumTest.java|  5 ++-
 .../sis/referencing/datum/HardCodedDatum.java  | 21 +++--
 .../operation/SingleOperationMarshallingTest.java  | 12 ++---
 .../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| 52 ++
 .../org/apache/sis/gui/referencing/CRSChooser.java | 20 +
 .../gui/referencing/RecentReferenceSystems.java|  2 +-
 .../main/org/apache/sis/gui/referencing/Utils.java | 21 +
 45 files changed, 331 insertions(+), 160 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
index e11b6372c8,cacfa9b7fa..ae28430fdb
--- 
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
+++ 
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
@@@ -178,12 -181,12 +178,12 @@@ final class GridExtentCRS 
  /*
   * Put everything together: parameters, conversion and finally the 
derived CRS.
   */
- final HashMap properties = new HashMap<>(8);
+ final var properties = new HashMap(8);
  properties.put(IdentifiedObject.NAME_KEY, METHOD.getName());
  properties.put(DefaultConversion.LOCALE_KEY, locale);
 -properties.put(ObjectDomain.SCOPE_KEY, SCOPE);
 +properties.put(Conversion.SCOPE_KEY, SCOPE);
  gg.getGeographicExtent().ifPresent((domain) -> {
 -properties.put(ObjectDomain.DOMAIN_OF_VALIDITY_KEY,
 +properties.put(Conversion.DOMAIN_OF_VALIDITY_KEY,
  new DefaultExtent(null, domain, null, null));
  });
  final ParameterValueGroup params = 
METHOD.getParameters().createValue();
diff --cc 
endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
index 7d35fb2f14,0d526a2fd7..b348bd7770
--- 
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
+++ 
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
@@@ -133,21 -120,17 +133,17 @@@ public abstract class ReferencingByIden
   * Property name
 

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit a5db7e310668372fd6e2f142f45ca56f7f6dc5cf
Merge: b35ebd489f f173cc01f5
Author: Martin Desruisseaux 
AuthorDate: Fri Apr 5 23:44:04 2024 +0200

Merge branch 'geoapi-3.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 ++--
 .../sis/referencing/crs/DefaultEngineeringCRS.java   |  4 
 .../apache/sis/referencing/crs/DefaultImageCRS.java  |  6 +++---
 .../sis/referencing/cs/DefaultUserDefinedCS.java |  4 ++--
 .../sis/referencing/datum/DefaultImageDatum.java |  6 +++---
 .../referencing/factory/GeodeticObjectFactory.java   |  2 +-
 .../apache/sis/referencing/internal/Resources.java   |  5 +
 .../sis/referencing/internal/Resources.properties|  1 +
 .../sis/referencing/internal/Resources_fr.properties |  1 +
 .../sis/referencing/AuthorityFactoriesTest.java  |  3 ++-
 .../referencing/factory/AuthorityFactoryMock.java|  3 +++
 13 files changed, 44 insertions(+), 26 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 80d33f41ed,1b9ca46297..bf1888bd5c
--- 
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
@@@ -1578,9 -1563,10 +1578,9 @@@ 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.
   */
 -@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) {
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index f2df4e7307,5a757e688a..763e9465ef
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@@ -913,9 -958,9 +913,9 @@@ public final class CRS extends Static 
  
  /**
   * Returns the epoch to which the coordinates of stations defining the 
dynamic CRS are referenced.
-  * If the CRS is associated to a dynamic reference frame, then the 
reference
-  * epoch of that datum is returned. Otherwise if the CRS is {@linkplain 
CompoundCRS compound},
-  * then the first reference epoch found in a component is returned.
 - * If the CRS is associated to a {@linkplain DynamicReferenceFrame 
dynamic datum}, then the epoch
++ * If the CRS is associated to a dynamic datum, then the epoch
+  * of that datum is returned. Otherwise if the CRS is {@linkplain 
CompoundCRS compound}, then this
+  * method requires that all dynamic components have the same epoch.
   *
   * @param  crs  the coordinate reference frame from which to get the 
epoch, or {@code null}.
   * @return epoch to which the coordinates of stations defining the 
dynamic CRS frame are referenced.
@@@ -926,13 -973,19 +928,19 @@@
  if (crs instanceof SingleCRS) {
  final Datum datum = ((SingleCRS) crs).getDatum();
  if (datum instanceof DynamicReferenceFrame) {
- return Optional.of(((DynamicReferenceFrame) 
datum).getFrameReferenceEpoch());
+ epoch = ((DynamicReferenceFrame) 
datum).getFrameReferenceEpoch();
  }
  } else if (crs instanceof CompoundCRS) {
 -for (SingleCRS component : ((CompoundCRS) 
crs).getSingleComponents()) {
 +for (SingleCRS component : getSingleComponents(crs)) {
  final Datum datum = component.getDatum();
  if (datum instanceof DynamicReferenceFrame) {
- return Optional.of(((DynamicReferenceFrame) 
datum).getFrameReferenceEpoch());
+ final Temporal t = ((DynamicReferenceFrame) 
datum).getFrameReferenceEpoch();
+ if (t != null) {
+ if (epoch == null) epoch = t;
+ else if (!epoch.equals(t)) {
+ throw new 
GeodeticException(Resources.format(Resources.Keys.InconsistentEpochs_2, epoch, 
t));
+ }
+ }
  }
  }
  }
diff --cc 

(sis) 01/01: Merge branch 'geoapi-3.1'. This is the beginning of an upgrade to ISO 19111:2019.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit b35ebd489f42d2e5a37b1a51f3ea7d7cab173df1
Merge: eaa46cbfba b86dbe8b92
Author: Martin Desruisseaux 
AuthorDate: Fri Apr 5 16:05:56 2024 +0200

Merge branch 'geoapi-3.1'.
This is the beginning of an upgrade to ISO 19111:2019.

 .../org/apache/sis/metadata/PropertyAccessor.java  |   7 +-
 .../apache/sis/metadata/PropertyComparator.java|   2 +-
 .../main/org/apache/sis/util/iso/Types.java|   2 +-
 .../apache/sis/metadata/PropertyAccessorTest.java  |  22 +--
 .../apache/sis/test/mock/GeographicCRSMock.java|  45 ++
 .../org/apache/sis/test/mock/VerticalCRSMock.java  |  34 ++---
 .../test/org/apache/sis/util/iso/TypesTest.java|   1 +
 .../sis/openoffice/ReferencingFunctions.java   |   2 +-
 .../main/module-info.java  |   1 +
 .../sis/coordinate/AbstractCoordinateSet.java  | 122 +++
 .../sis/coordinate/DefaultCoordinateMetadata.java  | 169 +
 .../org/apache/sis/coordinate/package-info.java|  28 
 .../apache/sis/geometry/WraparoundAdjustment.java  |   2 +-
 .../main/org/apache/sis/io/wkt/Convention.java |   3 +-
 .../main/org/apache/sis/io/wkt/Formatter.java  |  24 ++-
 .../main/org/apache/sis/io/wkt/VerticalInfo.java   |   4 +-
 .../main/org/apache/sis/io/wkt/WKTDictionary.java  |  20 ++-
 .../geoapi/referencing/DynamicReferenceFrame.java  |  36 +
 .../pending/geoapi/referencing/package-info.java   |  21 +++
 .../main/org/apache/sis/referencing/CRS.java   |  67 +++-
 .../org/apache/sis/referencing/DisplayName.java|  84 ++
 .../apache/sis/referencing/IdentifiedObjects.java  |  24 ++-
 .../sis/referencing/StandardDefinitions.java   |   4 +-
 .../sis/referencing/crs/DefaultCompoundCRS.java|  27 ++--
 .../sis/referencing/crs/DefaultDerivedCRS.java |  10 +-
 .../sis/referencing/crs/DefaultEngineeringCRS.java |   2 +
 .../sis/referencing/crs/DefaultImageCRS.java   |   4 +
 .../org/apache/sis/referencing/crs/SubTypes.java   |   7 +-
 .../sis/referencing/cs/DefaultUserDefinedCS.java   |   3 +
 .../org/apache/sis/referencing/cs/SubTypes.java|   1 +
 .../sis/referencing/datum/AbstractDatum.java   | 103 +
 .../referencing/datum/DefaultEngineeringDatum.java |   8 +-
 .../referencing/datum/DefaultGeodeticDatum.java|   8 +-
 .../sis/referencing/datum/DefaultImageDatum.java   |  14 +-
 .../referencing/datum/DefaultParametricDatum.java  |   9 +-
 .../referencing/datum/DefaultTemporalDatum.java|   8 +-
 .../referencing/datum/DefaultVerticalDatum.java|  17 ++-
 .../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|  19 ++-
 .../factory/GeodeticAuthorityFactory.java  |  61 +++-
 .../referencing/factory/GeodeticObjectFactory.java |  22 ++-
 .../factory/IdentifiedObjectFinder.java|   4 +-
 .../factory/MultiAuthoritiesFactory.java   |  22 ++-
 .../referencing/factory/sql/AuthorityCodes.java|   8 +-
 .../referencing/factory/sql/EPSGDataAccess.java|  37 +++--
 .../sis/referencing/factory/sql/package-info.java  |   2 +-
 .../referencing/internal/EPSGFactoryProxyCRS.java  |   1 +
 .../internal/EPSGFactoryProxyDatum.java|   1 +
 .../org/apache/sis/referencing/internal/Epoch.java |  93 
 .../apache/sis/referencing/internal/Legacy.java|  51 +++
 .../apache/sis/referencing/internal/Resources.java |   5 +
 .../sis/referencing/internal/Resources.properties  |   1 +
 .../referencing/internal/Resources_fr.properties   |   1 +
 .../operation/AbstractCoordinateOperation.java |  91 +--
 .../operation/DefaultConcatenatedOperation.java|   4 +-
 .../referencing/operation/DefaultConversion.java   |   5 +-
 .../DefaultCoordinateOperationFactory.java |   2 +-
 .../operation/TransformedCoordinateSet.java| 148 ++
 .../sis/referencing/privy/AxisDirections.java  |   8 +-
 .../apache/sis/referencing/privy/WKTKeywords.java  |   7 +-
 .../sis/xml/bind/referencing/CD_ImageDatum.java|   1 +
 .../sis/xml/bind/referencing/CS_UserDefinedCS.java |   1 +
 .../sis/io/wkt/GeodeticObjectParserTest.java   |   2 +-
 .../org/apache/sis/io/wkt/WKTDictionaryTest.java   |  20 ++-
 .../sis/parameter/DefaultParameterValueTest.java   |   6 +-
 .../sis/referencing/AuthorityFactoriesTest.java|  17 ++-
 .../sis/referencing/EPSGFactoryFallbackTest.java   |   1 +
 .../sis/referencing/crs/DefaultImageCRSTest.java   |   1 +
 .../apache/sis/referencing/crs/HardCodedCRS.java   |   1 +
 .../referencing/cs/DefaultCylindricalCSTest.java   |   2 +-
 

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit eaa46cbfba316e11a18db66adf0df6fb7f7c4243
Merge: 3990491cc6 9ca908d78d
Author: Martin Desruisseaux 
AuthorDate: Tue Apr 2 19:32:40 2024 +0200

Merge branch 'geoapi-3.1'.

 NOTICE   |  5 -
 .../sis/referencing/gazetteer/SimpleLocation.java|  4 +++-
 .../apache/sis/geometry/AbstractDirectPosition.java  |  7 ---
 .../org/apache/sis/geometry/DirectPosition1D.java|  8 +++-
 .../org/apache/sis/geometry/DirectPosition2D.java|  5 +++--
 .../apache/sis/geometry/AbstractEnvelopeTest.java| 20 ++--
 .../org/apache/sis/test/FailureDetailsReporter.java  |  4 +++-
 .../org/apache/sis/gui/coverage/CoverageCanvas.java  |  6 +++---
 8 files changed, 37 insertions(+), 22 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
index f741148698,b676c51bbb..28d89e3224
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
@@@ -193,7 -107,10 +192,9 @@@ public abstract class AbstractDirectPos
   * @throws IndexOutOfBoundsException if the given index is negative or is 
equal or greater
   * than the {@linkplain #getDimension() position dimension}.
   * @throws UnsupportedOperationException if this direct position is 
immutable.
+  *
+  * @since 1.5
   */
 -@Override
  public void setCoordinate(int dimension, double value) {
  throw new 
UnsupportedOperationException(Errors.format(Errors.Keys.UnmodifiableObject_1, 
getClass()));
  }
diff --cc 
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
index 7b9d21980e,cf7cd35615..e46a616fb7
--- 
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
+++ 
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
@@@ -194,16 -191,16 +194,16 @@@ public final class AbstractEnvelopeTes
  final Envelope envelope = create(type, 12, -4, 30, 50);
  final DirectPosition lower = envelope.getLowerCorner();
  final DirectPosition upper = envelope.getUpperCorner();
- assertEquals(  30, envelope.getMinimum (1), label);
- assertEquals(  50, envelope.getMaximum (1), label);
- assertEquals(  40, envelope.getMedian  (1), label);
- assertEquals(  20, envelope.getSpan(1), label);
- assertEquals(  12, lower   .getOrdinate(0), label);
- assertEquals(-180, envelope.getMinimum (0), label);
- assertEquals(  -4, upper   .getOrdinate(0), label);
- assertEquals(+180, envelope.getMaximum (0), label);
- assertEquals(-176, envelope.getMedian  (0), label);
- assertEquals( 344, envelope.getSpan(0), label); // 
360° - testSimpleEnvelope()
+ assertEquals(  30, envelope.getMinimum   (1), label);
+ assertEquals(  50, envelope.getMaximum   (1), label);
+ assertEquals(  40, envelope.getMedian(1), label);
+ assertEquals(  20, envelope.getSpan  (1), label);
 -assertEquals(  12, lower   .getCoordinate(0), label);
++assertEquals(  12, lower   .getOrdinate  (0), label);
+ assertEquals(-180, envelope.getMinimum   (0), label);
 -assertEquals(  -4, upper   .getCoordinate(0), label);
++assertEquals(  -4, upper   .getOrdinate  (0), label);
+ assertEquals(+180, envelope.getMaximum   (0), label);
+ assertEquals(-176, envelope.getMedian(0), label);
+ assertEquals( 344, envelope.getSpan  (0), label);   // 
360° - testSimpleEnvelope()
  switch (type) {
  default: {
  final var ext = (AbstractEnvelope) envelope;
diff --cc 
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
index ea00a17eb3,92e3e3ec6d..37916733bb
--- 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
+++ 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
@@@ -1219,9 -1219,9 +1219,9 @@@ public class CoverageCanvas extends Map
   + "Max: %, 16.4f  %, 16.4f%n"
   + "POI: %, 16.4f  %, 16.4f%n"
   + "Min: %, 16.4f  %, 16.4f%n",
-  aoi.getMaxX(),  aoi.getMaxY(),
-  poi.getOrdinate(0), poi.getOrdinate(1),
-  aoi.getMinX(),  aoi.getMinY()))
+  

(sis) 01/01: Merge branch 'geoapi-3.1': - Documentation fixes. - Rename "ordinate" as "coordinate" where possible.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3990491cc6ee92653f598d12f23cab1d1be796ff
Merge: 2466fc7ddf 969036a87b
Author: Martin Desruisseaux 
AuthorDate: Thu Mar 14 19:09:18 2024 +0100

Merge branch 'geoapi-3.1':
- Documentation fixes.
- Rename "ordinate" as "coordinate" where possible.

 .gitignore |   3 +
 .../buildtools/coding/VerifyVersionInJavadoc.java  |   2 +-
 .../coverage/grid/CoordinateOperationFinder.java   |   2 +-
 .../coverage/grid/FractionalGridCoordinates.java   |   2 +-
 .../apache/sis/coverage/grid/GridCoverage2D.java   |   4 +-
 .../apache/sis/coverage/privy/TileOpExecutor.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 +-
 .../sis/coverage/grid/GridDerivationTest.java  |   2 +-
 .../apache/sis/coverage/grid/GridExtentTest.java   |   2 +-
 .../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 +-
 .../referencing/gazetteer/AbstractLocation.java|   2 +-
 .../sis/geometry/AbstractDirectPosition.java   |  76 ++-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |  10 +-
 .../org/apache/sis/geometry/DirectPosition1D.java  |   6 +-
 .../org/apache/sis/geometry/DirectPosition2D.java  |  51 +-
 .../main/org/apache/sis/geometry/Envelopes.java|   2 +-
 .../apache/sis/geometry/GeneralDirectPosition.java |  28 +-
 .../main/org/apache/sis/io/wkt/WKTDictionary.java  |   2 +-
 .../apache/sis/referencing/GeodeticCalculator.java |   6 +-
 .../operation/builder/LinearTransformBuilder.java  |   4 +-
 .../sis/referencing/privy/DirectPositionView.java  |   6 +-
 .../apache/sis/geometry/AbstractEnvelopeTest.java  |  60 +--
 .../apache/sis/geometry/CoordinateFormatTest.java  |   1 -
 .../sis/geometry/GeneralDirectPositionTest.java|   6 +-
 .../apache/sis/geometry/GeneralEnvelopeTest.java   |  16 +-
 .../org/apache/sis/referencing/Assertions.java |   4 +-
 .../builder/LinearTransformBuilderTest.java|   6 +-
 .../transform/ProjectiveTransformTest.java |   3 +-
 .../apache/sis/storage/landsat/MetadataReader.java |   2 +-
 .../sis/storage/geotiff/ImageFileDirectory.java|   2 +-
 .../sis/storage/geotiff/reader/CRSBuilderTest.java |   2 +-
 .../org/apache/sis/storage/DataStoreException.java |   3 +-
 .../apache/sis/storage/csv/FeatureIterator.java|   2 +-
 .../apache/sis/storage/image/WorldFileStore.java   |   3 +-
 .../org/apache/sis/storage/folder/StoreTest.java   |   2 +-
 .../main/org/apache/sis/util/CharSequences.java|  42 +-
 .../org/apache/sis/util/collection/RangeSet.java   |   6 +-
 .../org/apache/sis/util/collection/TreeTable.java  |   2 +-
 .../sis/util/privy/LocalizedParseException.java|  12 +-
 .../org/apache/sis/util/CharSequencesTest.java |   4 +-
 .../shapefile/shp/ShapeGeometryEncoder.java|   6 +-
 .../sis/storage/shapefile/shp/ShapeHeader.java |   4 +-
 optional/build.gradle.kts  |  29 ++
 .../main/org/apache/sis/gui/DataViewer.java|   7 +-
 .../apache/sis/gui/coverage/CoverageExplorer.java  |  25 +-
 .../org/apache/sis/gui/coverage/package-info.java  |   2 +-
 .../org/apache/sis/gui/dataset/WindowHandler.java  |   2 +-
 .../org/apache/sis/gui/dataset/WindowManager.java  |   7 +-
 .../org/apache/sis/gui/dataset/package-info.java   |   2 +-
 .../main/org/apache/sis/gui/internal/FontGIS.java  | 517 +
 .../main/org/apache/sis/gui/internal/Styles.java   |   7 -
 .../org/apache/sis/gui/internal/ToolbarButton.java |   7 +-
 .../org/apache/sis/gui/map/ValuesFormatter.java|   2 +-
 .../sis/gui/controls/ValueColorMapperApp.java  |   3 +-
 63 files changed, 862 insertions(+), 197 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
index eda9f4a96a,5713010cd9..f741148698
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
@@@ -115,16 -116,16 +115,73 @@@ public abstract class AbstractDirectPos
   * Returns a sequence of numbers that hold the coordinate of this 
position in its reference system.
   *
   * @return the coordinates.
++ *
++ * @deprecated Renamed {@link #getCoordinates()} 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 2466fc7ddff63f720bda1af23f118cfea8585b02
Merge: f636f75504 9b511f4d6a
Author: Martin Desruisseaux 
AuthorDate: Tue Mar 12 20:17:32 2024 +0100

Merge branch 'geoapi-3.1'

 .../main/org/apache/sis/xml/bind/cat/CodeListAdapter.java   | 4 +++-
 .../main/org/apache/sis/xml/bind/metadata/replace/SensorType.java   | 6 --
 .../main/org/apache/sis/referencing/GeodeticCalculator.java | 2 +-
 .../operation/transform/DefaultMathTransformFactory.java| 2 +-
 .../main/org/apache/sis/storage/netcdf/base/RasterResource.java | 2 +-
 .../main/org/apache/sis/util/collection/CodeListSet.java| 4 +++-
 .../main/org/apache/sis/util/collection/DefaultTreeTable.java   | 2 +-
 .../main/org/apache/sis/util/privy/CodeLists.java   | 4 +++-
 .../test/org/apache/sis/util/collection/LargeCodeList.java  | 6 --
 .../main/org/apache/sis/gui/referencing/PositionableProjection.java | 6 --
 10 files changed, 25 insertions(+), 13 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/SensorType.java
index 195808a474,2c96b8d2af..7a50418449
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/SensorType.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/SensorType.java
@@@ -22,6 -20,6 +20,10 @@@ import org.opengis.annotation.UML
  import org.opengis.annotation.Specification;
  import org.opengis.util.CodeList;
  
++// Specific to the main branch:
++import java.util.List;
++import java.util.ArrayList;
++
  
  /**
   * The code list for {@code }.
diff --cc 
endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
index 95c9c2ff39,92e0be6861..432b03b807
--- 
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
+++ 
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
@@@ -27,7 -27,6 +27,9 @@@ import org.opengis.util.CodeList
  import org.apache.sis.util.privy.CheckedArrayList;
  import org.apache.sis.util.resources.Errors;
  
++// Specific to the main branch:
++import org.apache.sis.util.privy.CodeLists;
++
  
  /**
   * A specialized {@code Set} implementation for use with {@link CodeList} 
values.
diff --cc 
endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CodeLists.java
index 7843f929d2,323e2cb003..271f6bdfdc
--- 
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CodeLists.java
+++ 
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CodeLists.java
@@@ -26,6 -25,9 +25,9 @@@ import org.apache.sis.util.CharSequence
  import org.apache.sis.util.Characters.Filter;
  import org.apache.sis.util.resources.Errors;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.util.ControlledVocabulary;
++// Specific to the main branch:
++import java.lang.reflect.Array;
+ 
  
  /**
   * Implementation of some {@link org.apache.sis.util.iso.Types} methods 
needed by {@code org.apache.sis.util} module.
diff --cc 
endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java
index 08002fb18c,17954d32fb..c3841a0373
--- 
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java
+++ 
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java
@@@ -23,6 -21,6 +21,10 @@@ import org.opengis.util.CodeList
  // Test dependencies
  import static org.junit.jupiter.api.Assertions.*;
  
++// Specific to the main branch:
++import java.util.List;
++import java.util.ArrayList;
++
  
  /**
   * A code list containing more than 64 elements. This implementation can be 
used by tests
diff --cc 
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
index ab5b9b262e,0f7237ee39..16981e045b
--- 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
+++ 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
@@@ -39,6 -37,6 +37,10 @@@ import org.apache.sis.util.resources.Er
  import org.apache.sis.util.logging.Logging;
  import static org.apache.sis.gui.internal.LogHandler.LOGGER;
  
++// Specific to the main branch:
++import java.util.List;
++import java.util.ArrayList;
++
  
  /**
   * Provider of map projections centered on a point of interest.

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit f636f7550492e46c26c1897d4a2688795ad034be
Merge: 2b40ccfdc4 b8b49e9bc2
Author: Martin Desruisseaux 
AuthorDate: Tue Mar 12 20:06:26 2024 +0100

Merge branch 'geoapi-3.1'.

 .../metadata/iso/distribution/DefaultMedium.java   |  2 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  9 +-
 .../apache/sis/metadata/sql/MetadataSource.java| 12 ++-
 .../main/org/apache/sis/util/iso/Types.java| 68 +--
 .../apache/sis/xml/bind/cat/CodeListAdapter.java   |  8 +-
 .../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  |  6 +-
 .../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   | 25 ++
 .../apache/sis/storage/netcdf/MetadataReader.java  | 12 +--
 .../org/apache/sis/storage/netcdf/base/Axis.java   |  4 +-
 .../org/apache/sis/converter/StringConverter.java  | 10 +--
 .../main/org/apache/sis/util/privy/CodeLists.java  | 98 ++
 .../apache/sis/util/collection/LargeCodeList.java  |  3 +-
 .../gui/referencing/PositionableProjection.java| 24 +++---
 .../apache/sis/gui/referencing/package-info.java   |  2 +-
 20 files changed, 225 insertions(+), 123 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
index 5fb4e3cf41,f2e9856607..5a97fc34f9
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
@@@ -79,8 -80,12 +80,12 @@@ final class MetadataFallback extends Me
  ArgumentChecks.ensureNonNull("type", type);
  ArgumentChecks.ensureNonEmpty("identifier", identifier);
  Object value;
 -if (ControlledVocabulary.class.isAssignableFrom(type)) {
 +if (CodeList.class.isAssignableFrom(type)) {
- value = getCodeList(type, identifier);
+ try {
+ value = getCodeList(type, identifier);
+ } catch (IllegalArgumentException e) {
+ throw new 
MetadataStoreException(Errors.format(Errors.Keys.DatabaseError_2, type, 
identifier), e);
+ }
  } else {
  value = null;
  if (type == Citation.class) {
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
index 048e59d276,49ad8d16ea..b49468feb2
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
@@@ -877,8 -878,12 +878,12 @@@ public class MetadataSource implements 
   */
  private Object lookup(final Class type, final String identifier, 
boolean verify) throws MetadataStoreException {
  Object value;
 -if (ControlledVocabulary.class.isAssignableFrom(type)) {
 +if (CodeList.class.isAssignableFrom(type)) {
- value = getCodeList(type, identifier);
+ try {
+ value = getCodeList(type, identifier);
+ } catch (IllegalArgumentException e) {
+ throw new 
MetadataStoreException(Errors.format(Errors.Keys.DatabaseError_2, type, 
identifier), e);
+ }
  } else {
  final CacheKey key = new CacheKey(type, identifier);
  /*
@@@ -1060,10 -1065,17 +1065,13 @@@
  /**
   * Returns the code of the given type and name. This method is defined 
for avoiding the compiler warning
   * message when the actual class is unknown (it must have been checked 
dynamically by the caller however).
+  *
+  * @return the requested code, or {@code null} if the given name is null 
or empty.
+  * @throws IllegalArgumentException if there is no value for the given 
name and the code cannot be created.
   */
  @SuppressWarnings("unchecked")
 -static ControlledVocabulary getCodeList(final Class type, final String 
name) {
 -if (type.isEnum()) {
 -return (ControlledVocabulary) 
CodeLists.forEnumName(type.asSubclass(Enum.class), name);
 -} else {
 -return CodeLists.getOrCreate(type.asSubclass(CodeList.class), 
name);
 -}
 +static CodeList getCodeList(final Class type, final String name) {
- return Types.forCodeName(type.asSubclass(CodeList.class), name, true);
++return CodeLists.getOrCreate(type.asSubclass(CodeList.class), name);
  }
  
  /**
diff --cc 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 4150341710a0fa1441be228f47b2ced24c4dfa1a
Merge: 6eba4a5b2d 6cbd4e47c3
Author: Martin Desruisseaux 
AuthorDate: Thu Mar 7 11:08:48 2024 +0100

Merge branch '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 |   8 +-
 .../apache/sis/referencing/cs/AxesConvention.java  |  32 +--
 .../operation/provider/AbstractProvider.java   |   5 +-
 .../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 +
 23 files changed, 408 insertions(+), 159 deletions(-)

diff --cc 
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java
index c4b4ef9f4a,5abc18adbc..1ac9152a01
--- a/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java
+++ b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java
@@@ -70,6 -70,8 +70,7 @@@ public final class Dependency 
  Map.entry("gui",  "application:sis-javafx"),  
  // Optional.
  Map.entry("cql",  "core:sis-cql"),
  // Incubator.
  Map.entry("storage.shapefile","core:sis-shapefile"),
+ Map.entry("storage.coveragejson", "core:sis-coveragejson"),
 -Map.entry("portrayal.map","core:sis-portrayal-map"),
  Map.entry("webapp",   "application:sis-webapp")
  );
  
diff --cc 
endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
index 6e7c064136,65c9b4725f..cfd7d2dcb2
--- 
a/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
+++ 
b/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
@@@ -21,10 -22,10 +22,10 @@@ import org.apache.sis.system.Loggers
  // Test dependencies
  import org.junit.jupiter.api.Test;
  import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.TestCase;
+ import org.apache.sis.test.TestCaseWithLogs;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.test.dataset.TestData;
 +// Specific to the main branch:
 +import org.junit.jupiter.api.Disabled;
  
  
  /**
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
index b5a01707d1,69646b3a26..00789215e4
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
@@@ -110,6 -113,7 +110,7 @@@ public class DefaultRecordType extends 
   *
   * @param other  the {@code RecordType} to copy.
   */
 -@SuppressWarnings({"deprecation", "this-escape"})
++@SuppressWarnings("this-escape")
  public DefaultRecordType(final RecordType other) {
  typeName   = other.getTypeName();
  container  = other.getContainer();
diff --cc 
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
index 19e5adc7b1,540ec9a3a9..3aa4af465d
--- 
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
+++ 
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
@@@ -24,10 -25,10 +25,10 @@@ import org.apache.sis.util.Version
  // Test dependencies
  import org.junit.jupiter.api.Test;
  import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.TestCase;
+ import org.apache.sis.test.TestCaseWithLogs;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.test.dataset.TestData;
 +// Specific to the main branch:
 +import org.apache.sis.storage.netcdf.base.TestData;
  

(sis) 01/01: Merge branch 'geoapi-3.1': post-merge organization of imports.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 6eba4a5b2dca2712dc3402706aeefa2604d240fd
Merge: 15c3081113 445620db52
Author: Martin Desruisseaux 
AuthorDate: Wed Feb 21 16:58:44 2024 +0100

Merge branch 'geoapi-3.1':
post-merge organization of imports.

 .../org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java| 2 +-
 .../test/org/apache/sis/feature/Assertions.java   | 2 +-
 .../test/org/apache/sis/feature/FeatureTestCase.java  | 2 +-
 .../apache/sis/feature/builder/CharacteristicTypeBuilderTest.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 +-
 .../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java | 2 +-
 .../org/apache/sis/metadata/iso/extent/DefaultExtentTest.java | 2 +-
 .../iso/identification/DefaultServiceIdentificationTest.java  | 2 +-
 .../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/referencing/GeodeticCalculatorTest.java   | 1 +
 .../org/apache/sis/referencing/factory/TestFactorySource.java | 2 ++
 .../sis/referencing/operation/CoordinateOperationFinderTest.java  | 2 +-
 .../referencing/operation/CoordinateOperationRegistryTest.java| 2 +-
 .../operation/DefaultCoordinateOperationFactoryTest.java  | 2 +-
 .../operation/builder/LocalizationGridBuilderTest.java| 2 +-
 .../referencing/operation/projection/ConformalProjectionTest.java | 2 +-
 .../referencing/operation/projection/MapProjectionTestCase.java   | 2 +-
 .../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 +-
 .../referencing/operation/transform/MathTransformTestCase.java| 6 +++---
 .../referencing/operation/transform/ProjectiveTransformTest.java  | 8 
 .../org/apache/sis/test/integration/CoordinateOperationTest.java  | 2 +-
 .../test/org/apache/sis/storage/netcdf/MetadataReaderTest.java| 2 +-
 .../org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java| 2 +-
 .../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/GeoapiAssert.java| 3 ++-
 .../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 +-
 49 files changed, 61 insertions(+), 49 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
index 96ef2de9af,20545eff26..12a634a035
--- 
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
+++ 
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
@@@ -27,8 -26,8 +26,9 @@@ import org.apache.sis.util.Static
  // Test dependencies
  import static org.junit.jupiter.api.Assertions.*;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.coverage.grid.SequenceType;
 +// Specific to the main branch:
++import java.awt.geom.PathIterator;
 +import org.apache.sis.image.SequenceType;
  
  
  /**
diff --cc 
endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
index 08a3d95899,9cba286bda..081fee01c8
--- 
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
+++ 

(sis) 01/01: Merge branch 'geoapi-3.1'. Contains a fix needed by the CI.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 15c3081113935b77ccd696ad8056776a08c40874
Merge: b87b99f314 05dc18652a
Author: Martin Desruisseaux 
AuthorDate: Wed Feb 21 16:18:29 2024 +0100

Merge branch 'geoapi-3.1'.
Contains a fix needed by the CI.

 .../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(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
index 670cc419c2,3ab9c02293..1c87ebe57b
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
@@@ -50,10 -50,11 +50,11 @@@ import org.apache.sis.metadata.internal
  import org.apache.sis.metadata.iso.citation.Citations;
  import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
  import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
+ import org.apache.sis.referencing.factory.UnavailableFactoryException;
  import org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.referencing.ObjectDomain;
 +// Specific to the main branch:
 +import org.opengis.referencing.ReferenceIdentifier;
  
  
  /**

(sis) 01/01: Merge branch 'geoapi-3.1': last JUnit5 tuning. https://issues.apache.org/jira/browse/SIS-457

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit b87b99f314ec81477c650fc0c7602a2ea10f619c
Merge: 55d09a63e0 f4bb5471ef
Author: Martin Desruisseaux 
AuthorDate: Wed Feb 21 11:37:01 2024 +0100

Merge branch 'geoapi-3.1': last JUnit5 tuning.
https://issues.apache.org/jira/browse/SIS-457

 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 |  35 ++-
 .../test/org/apache/sis/filter/PeriodLiteral.java  |   3 +-
 .../apache/sis/filter/sqlmm/RegistryTestCase.java  |  52 ++--
 .../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 ++--
 .../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  |  31 ++-
 .../org/apache/sis/io/wkt/WKTDictionaryTest.java   |   4 +-
 .../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/MultiAuthoritiesFactoryTest.java   |  32 +--
 .../sis/referencing/factory/TestFactorySource.java |  91 +++
 .../referencing/factory/sql/EPSGFactoryTest.java   | 150 +--
 .../referencing/factory/sql/EPSGInstallerTest.java |  35 +--
 .../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 +-
 .../operation/provider/GeographicOffsetsTest.java  |   5 +-
 .../operation/provider/MapProjectionTest.java  |   4 +-
 .../referencing/operation/provider/NTv2Test.java   |   6 +-
 .../operation/transform/CartesianToPolarTest.java  |   3 +
 .../transform/CartesianToSphericalTest.java|   3 +
 

(sis) 01/01: Merge branch 'geoapi-3.1': Remove unsupported custom annotations.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 55d09a63e092adc1b0736d01b207e861a641a9af
Merge: 131b4ae055 6879e93e0e
Author: Martin Desruisseaux 
AuthorDate: Sun Feb 18 00:03:09 2024 +0100

Merge branch 'geoapi-3.1':
Remove 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  | 16 ---
 .../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  |  5 --
 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9ccb657bbbe35f1379f80736b88133ddfca0fcc2
Merge: 0af06aeeb2 df1eb4f7d0
Author: Martin Desruisseaux 
AuthorDate: Sat Feb 17 22:29:49 2024 +0100

Merge branch 'geoapi-3.1'

(sis) 01/01: Merge branch 'geoapi-3.1': Change of argument order in `Assertions` classes for consistency with JUnit 5 convention.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0af06aeeb2335011af92e60ff75cc089e4074f99
Merge: 878da1aaa3 5909d8a9de
Author: Martin Desruisseaux 
AuthorDate: Sat Feb 17 17:42:17 2024 +0100

Merge branch 'geoapi-3.1':
Change of argument order in `Assertions` classes for consistency with JUnit 
5 convention.

 .../sis/coverage/grid/DimensionAppenderTest.java   |   2 +-
 .../coverage/grid/DimensionalityReductionTest.java |   4 +-
 .../sis/coverage/grid/GridDerivationTest.java  |  62 +
 .../apache/sis/coverage/grid/GridExtentTest.java   |  32 ++---
 .../apache/sis/coverage/grid/GridGeometryTest.java | 115 
 .../sis/coverage/grid/PixelTranslationTest.java|  28 ++--
 .../coverage/grid/ResampledGridCoverageTest.java   |   6 +-
 .../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 |  28 ++--
 .../org/apache/sis/io/wkt/WKTDictionaryTest.java   |   8 +-
 .../org/apache/sis/referencing/Assertions.java |   4 +-
 .../org/apache/sis/referencing/CommonCRSTest.java  |   7 +-
 .../sis/referencing/GeodeticCalculatorTest.java|   9 +-
 .../sis/referencing/ImmutableIdentifierTest.java   |  18 +--
 .../referencing/crs/DefaultCompoundCRSTest.java|   6 +-
 .../sis/referencing/crs/DefaultDerivedCRSTest.java |  12 +-
 .../referencing/crs/DefaultEngineeringCRSTest.java |   4 +-
 .../sis/referencing/crs/DefaultImageCRSTest.java   |   2 +-
 .../referencing/crs/DefaultProjectedCRSTest.java   |   4 +-
 .../sis/referencing/cs/CoordinateSystemsTest.java  |  50 +++
 .../referencing/cs/DefaultCylindricalCSTest.java   |   6 +-
 .../sis/referencing/cs/DefaultPolarCSTest.java |   6 +-
 .../sis/referencing/cs/DefaultSphericalCSTest.java |   4 +-
 .../referencing/datum/BursaWolfParametersTest.java |  18 +--
 .../datum/DefaultGeodeticDatumTest.java|  10 +-
 .../datum/DefaultTemporalDatumTest.java|   4 +-
 .../referencing/datum/TimeDependentBWPTest.java|   4 +-
 .../factory/CommonAuthorityFactoryTest.java|  18 +--
 .../sis/referencing/factory/TestFactorySource.java |   4 +-
 .../referencing/factory/sql/EPSGFactoryTest.java   |  30 ++--
 .../operation/CoordinateOperationFinderTest.java   |  31 ++---
 .../DefaultConcatenatedOperationTest.java  |  10 +-
 .../operation/DefaultConversionTest.java   |  47 ---
 .../operation/DefaultOperationMethodTest.java  |   4 +-
 .../operation/DefaultPassThroughOperationTest.java |   8 +-
 .../operation/SingleOperationMarshallingTest.java  |  10 +-
 .../builder/LinearTransformBuilderTest.java|  37 ++---
 .../operation/builder/LinearizerTest.java  |  15 +-
 .../builder/LocalizationGridBuilderTest.java   |   6 +-
 .../operation/builder/ResidualGridTest.java|   2 +-
 .../referencing/operation/matrix/MatricesTest.java |  40 +++---
 .../referencing/operation/matrix/Matrix4Test.java  |  14 +-
 .../operation/matrix/MatrixTestCase.java   |   2 +-
 .../operation/matrix/NonSquareMatrixTest.java  |  24 ++--
 .../operation/projection/MercatorTest.java |   6 +-
 .../projection/ObliqueStereographicTest.java   |   2 +-
 .../operation/provider/Geographic3Dto2DTest.java   |  22 +--
 .../operation/provider/LongitudeRotationTest.java  |  11 +-
 .../referencing/operation/provider/NADCONTest.java |   9 +-
 .../referencing/operation/provider/NTv2Test.java   |   9 +-
 .../transform/ConcatenatedTransformTest.java   |  28 ++--
 .../transform/ContextualParametersTest.java|  24 ++--
 .../transform/DefaultMathTransformFactoryTest.java |  19 +--
 .../operation/transform/MathTransformsTest.java|  22 +--
 .../transform/PassThroughTransformTest.java|   8 +-
 .../transform/ProjectiveTransformTest.java |  10 +-
 .../operation/transform/ScaleTransformTest.java|   5 +-
 .../operation/transform/TransferFunctionTest.java  |  10 +-
 .../transform/TransformResultComparator.java   |   2 +-
 .../transform/TransformSeparatorTest.java  |  36 ++---
 .../transform/TranslationTransformTest.java|   5 +-
 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 7763c6c1a5ff64dd7f17e5175fde3061bfe03523
Merge: 51fff833a7 9adef8be22
Author: Martin Desruisseaux 
AuthorDate: Sat Feb 10 14:10:17 2024 +0100

Merge branch '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(-)

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 51fff833a7694f88ee920141e2a26acaea9b3388
Merge: 3520afc392 99f667e72b
Author: Martin Desruisseaux 
AuthorDate: Sat Feb 10 13:52:16 2024 +0100

Merge branch 'geoapi-3.1'.

 .../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   |  33 +-
 .../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 |   5 +-
 .../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 +-
 .../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 +-
 .../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 +-
 .../main/org/apache/sis/image/ImageProcessor.java  |  26 +-
 .../main/org/apache/sis/image/PixelIterator.java   |  15 +-
 .../main/org/apache/sis/image/PlanarImage.java |   5 +-
 

(sis) 01/01: Merge branch 'geoapi-3.1': - Post-merge imports reorganization.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3520afc3920fde9feef416bda0994fbca731bf60
Merge: 4cbb8b175f fadb6e856b
Author: Martin Desruisseaux 
AuthorDate: Sat Feb 3 12:07:18 2024 +0100

Merge branch 'geoapi-3.1':
- Post-merge imports reorganization.

 .../main/org/apache/sis/console/OperationParser.java| 2 +-
 .../org.apache.sis.metadata/main/org/apache/sis/xml/util/URISource.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 4cbb8b175fdfd0afb77ae92a2edcbb62ee44a440
Merge: 2a51813d48 9f95c712fa
Author: Martin Desruisseaux 
AuthorDate: Sat Feb 3 11:59:13 2024 +0100

Merge branch 'geoapi-3.1'.

 .../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/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 +-
 .../apache/sis/metadata/sql/CachedStatement.java   |   3 +-
 .../sis/metadata/sql/IdentifierGenerator.java  |   2 +-
 .../apache/sis/metadata/sql/MetadataSource.java|   4 +-
 .../apache/sis/metadata/sql/MetadataWriter.java|   2 +-
 .../apache/sis/metadata/sql/util/Initializer.java  |   6 +-
 .../apache/sis/metadata/sql/util/ScriptRunner.java |   2 +-
 

(sis) 01/01: Merge branch 'geoapi-3.1': Post-merge reorganization of import statements.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 2a51813d48e47f0a24888bb8b3fa615a55e25c4a
Merge: 9cee4111e1 24e0c1b0b0
Author: Martin Desruisseaux 
AuthorDate: Mon Jan 22 15:45:02 2024 +0100

Merge branch 'geoapi-3.1':
Post-merge reorganization of import statements.

 .../main/org/apache/sis/feature/FeatureType.java| 1 -
 .../main/org/apache/sis/feature/Property.java   | 1 -
 .../main/org/apache/sis/filter/Expression.java  | 1 -
 .../org.apache.sis.feature/main/org/apache/sis/filter/Filter.java   | 1 -
 .../main/org/apache/sis/filter/FilterLiteral.java   | 1 -
 .../apache/sis/pending/geoapi/filter/BetweenComparisonOperator.java | 1 -
 .../apache/sis/pending/geoapi/filter/BinaryComparisonOperator.java  | 1 -
 .../org/apache/sis/pending/geoapi/filter/FilterExpressions.java | 1 -
 .../main/org/apache/sis/pending/geoapi/filter/Literal.java  | 1 -
 .../main/org/apache/sis/pending/geoapi/filter/LogicalOperator.java  | 1 -
 .../main/org/apache/sis/pending/geoapi/filter/Name.java | 1 -
 .../main/org/apache/sis/pending/geoapi/filter/SortBy.java   | 1 -
 .../main/org/apache/sis/pending/geoapi/filter/SortProperty.java | 1 -
 .../main/org/apache/sis/pending/geoapi/filter/ValueReference.java   | 1 -
 .../main/org/apache/sis/metadata/iso/OnlineResourceAdapter.java | 1 -
 .../main/org/apache/sis/metadata/iso/URIStringAdapter.java  | 1 -
 .../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/pending/geoapi/evolution/Interim.java   | 1 -
 .../main/org/apache/sis/pending/geoapi/evolution/InterimType.java   | 1 -
 .../apache/sis/pending/geoapi/evolution/UnsupportedCodeList.java| 1 -
 .../sis/pending/geoapi/evolution/UnsupportedCodeListAdapter.java| 1 -
 .../sis/referencing/gazetteer/ModifiableLocationTypeAdapter.java| 1 -
 .../main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java | 6 +++---
 .../main/org/apache/sis/referencing/crs/ParametricCRS.java  | 1 -
 .../sis/referencing/operation/transform/ConcatenatedTransform.java  | 2 +-
 .../main/org/apache/sis/referencing/util/ReferencingUtilities.java  | 4 +++-
 .../operation/projection/ParameterizedTransformTestMock.java| 3 ++-
 .../sis/referencing/operation/transform/TransformTestCase.java  | 3 ++-
 .../test/org/apache/sis/storage/netcdf/base/TestData.java   | 3 ++-
 .../main/org/apache/sis/pending/geoapi/temporal/Instant.java| 1 -
 .../main/org/apache/sis/pending/geoapi/temporal/Period.java | 1 -
 .../main/org/apache/sis/pending/geoapi/temporal/PeriodDuration.java | 1 -
 .../main/org/apache/sis/pending/geoapi/temporal/Position.java   | 1 -
 .../org/apache/sis/pending/geoapi/temporal/TemporalFactory.java | 1 -
 .../test/org/apache/sis/test/ContentVerifier.java   | 3 ++-
 .../org.apache.sis.util/test/org/apache/sis/test/GeoapiAssert.java  | 3 ++-
 38 files changed, 17 insertions(+), 40 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureType.java
index f30ca5e6ea,d4b582c1b0..d559a692ef
--- 
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureType.java
+++ 
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureType.java
@@@ -14,11 -14,6 +14,10 @@@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
 +package org.apache.sis.feature;
 +
- // Specific to the main branch:
 +import java.util.Collection;
 +import org.opengis.util.GenericName;
  
  
  /**
diff --cc 
endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/Property.java
index d642c83a52,5406add651..931c1ca132
--- 
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/Property.java
+++ 
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/Property.java
@@@ -14,18 -14,15 +14,17 @@@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
 +package org.apache.sis.feature;
 +
- // Specific to the main branch:
 +import org.opengis.util.GenericName;
 +
  
  /**
 - * Utility methods for testing XML files or JAXB annotations.
 - * {@link org.apache.sis.xml.test.AnnotationConsistencyCheck} and
 - * {@link org.apache.sis.xml.test.SchemaCompliance} verifies JAXB annotations.
 - * {@link org.apache.sis.xml.test.DocumentComparator} compares an actual XML 
document with the expected one.
 + * Place-holder for an interface not available in GeoAPI 3.0.
 + * This place-holder will be removed after we upgrade to a later GeoAPI 
version.
   *
 - * Objects defined 

(sis) 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9cee4111e101b33933794af99e2adafd9a950868
Merge: 98ad705d64 f58c7f7d56
Author: Martin Desruisseaux 
AuthorDate: Mon Jan 22 15:03:32 2024 +0100

Merge branch 'geoapi-3.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 |   4 +-
 .../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|  21 +-
 .../sis/referencing/crs/DefaultGeographicCRS.java  |  25 +-
 .../sis/referencing/crs/DefaultImageCRS.java   |  26 +-
 .../sis/referencing/crs/DefaultParametricCRS.java  |  25 +-
 .../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  |   2 +-
 .../operation/DefaultConcatenatedOperation.java|  14 +-
 .../referencing/operation/matrix/MatrixSIS.java|   2 +
 .../referencing/operation/projection/Mercator.java |  63 +++--
 .../operation/projection/NormalizedProjection.java | 116 +
 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 98ad705d64463c46658b95a62689de5ea62eb170
Merge: 2330bb247d cdfb5327b5
Author: Martin Desruisseaux 
AuthorDate: Sun Jan 14 21:03:40 2024 +0100

Merge branch 'geoapi-3.1'

 .../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 +-
 .../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 +-
 .../sis/filter/internal/GeometryConverter.java |   2 +-
 .../org/apache/sis/filter/internal/Visitor.java|   2 +-
 .../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/geometry/wrapper/GeometryWithCRS.java  |   2 +-
 .../sis/geometry/wrapper/GeometryWrapper.java  |  12 +-
 .../geometry/wrapper/SpatialOperationContext.java  |   2 +-
 .../sis/geometry/wrapper/j2d/PathBuilder.java  |   4 +-
 

(sis) 01/01: Merge branch 'geoapi-3.1'. Contains: shapefile writer, JShell, bug fixes.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 47053a8ff3defb6ba75ce74d7c59f06e547cd4d2
Merge: 98bc0dfa20 eb20f53e20
Author: Martin Desruisseaux 
AuthorDate: Sun Dec 17 11:22:16 2023 +0100

Merge branch 'geoapi-3.1'.
Contains: shapefile writer, JShell, bug fixes.

 .../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  |   84 +-
 .../operation/transform/MathTransformProvider.java |   35 +-
 .../sis/referencing/util/ReferencingUtilities.java |   18 +-
 .../test/org/apache/sis/io/wkt/FormatterTest.java  |   11 -
 

(sis) 01/01: Merge branch 'geoapi-3.1'. Includes partial work on Shapefile writer and fixes in CLI and JavaFX application starters.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 98bc0dfa207c7db3e226b9d99d34a33acd1dacdf
Merge: 7a734d927a b6af5d3997
Author: Martin Desruisseaux 
AuthorDate: Mon Dec 4 16:49:28 2023 +0100

Merge branch 'geoapi-3.1'.
Includes partial work on Shapefile writer and fixes in CLI and JavaFX 
application starters.

 .../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(-)

diff --cc 
endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
index f36bd9ac8b,60ad797a9a..4255135e89
--- 
a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
+++ 
b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
@@@ -125,12 -126,17 +130,17 @@@ final class IdentifierCommand extends F
  }
  if (metadata != null) {
  final List rows;
 -if (metadata instanceof Metadata) {
 +if (metadata instanceof DefaultMetadata) {
  rows = new ArrayList<>();
 -final Identifier id = ((Metadata) 
metadata).getMetadataIdentifier();
 -if (id != null) {
 -CharSequence desc = id.getDescription();
 +final Identifier id = ((DefaultMetadata) 
metadata).getMetadataIdentifier();
 +if (id instanceof DefaultIdentifier) {
 +CharSequence desc = ((DefaultIdentifier) 
id).getDescription();
- if (desc != null && !files.isEmpty()) desc = files.get(0);
+ if (desc == null && !files.isEmpty()) {
+ final Object c = files.get(0);
+   

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 7a734d927abeac39a618e1b87d2cf0fe00284c51
Merge: 0665f030cd 7f124c7bc5
Author: Martin Desruisseaux 
AuthorDate: Tue Nov 28 18:20:00 2023 +0100

Merge branch '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,e9b032a650..2ee99b3c9c
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=1.x-SNAPSHOT
++version=1.5-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-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0665f030cdcc6f5b2bb0625ea9fc922b27ddbf02
Merge: 54a8cfd70f e55d695764
Author: Martin Desruisseaux 
AuthorDate: Mon Nov 27 19:17:10 2023 +0100

Merge branch '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   | 186 
 .../sis/coverage/grid/DimensionalityReduction.java |  15 +-
 .../sis/coverage/grid/GridCoverageProcessor.java   |  85 +++
 .../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 --
 .../org/apache/sis/referencing/package-info.java   |   2 +-
 .../org/apache/sis/referencing/util/Formulas.java  |   2 +-
 .../org/apache/sis/referencing/CommonCRSTest.java  |   1 +
 .../apache/sis/storage/landsat/LandsatStore.java   |   2 +-

(sis) 01/01: Merge branch 'geoapi-3.1'. The main works are in Shapefile, GeoTIFF and metadata "nil values".

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit b9cb14901d4f3b6ba40a7ff92174347d12ae6951
Merge: fafbe8a7b6 fb00d38fa4
Author: Martin Desruisseaux 
AuthorDate: Thu Nov 23 16:08:22 2023 +0100

Merge branch 'geoapi-3.1'.
The main works are in Shapefile, GeoTIFF and metadata "nil values".

 .../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   |   5 +-
 .../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 +-
 .../apache/sis/filter/internal/FunctionNames.java  |  12 +
 .../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) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit fafbe8a7b643a4994eb5fe2917721e380d381af2
Merge: ed9308d56c 2bffeac5a6
Author: Martin Desruisseaux 
AuthorDate: Mon Nov 6 12:37:23 2023 +0100

Merge branch '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  |   6 +-
 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit ed9308d56ca9d5a4ea42c66936d54bc6f362a4c6
Merge: 8783e66c1f 0a72e06db9
Author: Martin Desruisseaux 
AuthorDate: Sun Oct 29 18:54:28 2023 +0100

Merge branch '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 +-
 .../DefaultCoordinateOperationFactory.java |   7 +-
 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 8783e66c1f5f995a5cb2c75cebf1598f81d2cad5
Merge: 9686f9d864 e0f5cfa3ec
Author: Martin Desruisseaux 
AuthorDate: Sat Oct 28 17:08:29 2023 +0200

Merge branch 'geoapi-3.1'

 .../apache/sis/geometry/wrapper/jts/Wrapper.java   |  2 +-
 .../sis/metadata/PropertyConsistencyCheck.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   |  3 ++-
 .../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 | 21 +++--
 .../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 -
 41 files changed, 113 insertions(+), 98 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
index 531f71f93b,9fa86d38b4..7460f4a0ef
--- 
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++ 
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@@ -31,10 -31,13 +31,10 @@@ import org.apache.sis.metadata.internal
  
  // Test dependencies
  import org.junit.Test;
- import org.apache.sis.test.TestUtilities;
  import org.apache.sis.test.DependsOn;
+ import org.apache.sis.test.TestUtilities;
  import org.apache.sis.xml.test.AnnotationConsistencyCheck;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.util.ControlledVocabulary;
 -
  
  /**
   * Base class for tests done on metadata objects using reflection. This base 
class tests JAXB annotations
diff --cc 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
index 8e0f417ddb,7a60ecb1f7..f987d86fd6
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
@@@ -41,9 -40,11 +40,11 @@@ import org.opengis.metadata.spatial.Cel
  import org.opengis.metadata.spatial.Georectified;
  import org.opengis.metadata.spatial.SpatialRepresentation;
  import org.opengis.metadata.spatial.GridSpatialRepresentation;
+ import org.apache.sis.util.collection.CodeListSet;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.metadata.citation.Party;
 -import org.opengis.metadata.citation.Responsibility;
++// Specific to the main branch:
 +import org.opengis.metadata.citation.ResponsibleParty;
 +import org.apache.sis.metadata.iso.DefaultMetadata;
  
  
  /**
diff --cc 
incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageResource.java
index 

(sis) 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9686f9d864ed0cc4cb68ccfc1eb7245ab71a9e33
Merge: 7276317ed7 b81aa21f91
Author: Martin Desruisseaux 
AuthorDate: Sat Oct 28 16:16:18 2023 +0200

Merge branch 'geoapi-3.1'

 .../sis/coverage/grid/j2d/ImageUtilities.java  |  18 +
 .../test/org/apache/sis/image/TiledImageMock.java  |  38 +-
 .../apache/sis/referencing/IdentifiedObjects.java  |  25 +-
 .../referencing/operation/matrix/MatrixSIS.java|  36 +-
 .../org/apache/sis/storage/geotiff/DataCube.java   |   9 +-
 .../org/apache/sis/storage/geotiff/DataSubset.java |   5 +-
 .../apache/sis/storage/geotiff/DeferredEntry.java  |   2 +
 .../org/apache/sis/storage/geotiff/GeoKeys.java| 142 
 .../apache/sis/storage/geotiff/GeoTiffOption.java  |  60 ++
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 280 +--
 .../sis/storage/geotiff/GeoTiffStoreProvider.java  |  26 +-
 .../storage/geotiff/{GeoTIFF.java => IOBase.java}  |  60 +-
 .../sis/storage/geotiff/ImageFileDirectory.java|  40 +-
 .../apache/sis/storage/geotiff/NativeMetadata.java |  21 +-
 .../org/apache/sis/storage/geotiff/Reader.java | 107 ++-
 .../org/apache/sis/storage/geotiff/Writer.java | 826 +
 .../geotiff/{internal => base}/Compression.java|   2 +-
 .../sis/storage/geotiff/{ => base}/GeoCodes.java   |  33 +-
 .../apache/sis/storage/geotiff/base/GeoKeys.java   | 126 
 .../geotiff/{internal => base}/Predictor.java  |   2 +-
 .../geotiff/{internal => base}/Resources.java  |  22 +-
 .../{internal => base}/Resources.properties|   4 +
 .../geotiff/{internal => base}/Resources_en.java   |   2 +-
 .../geotiff/{internal => base}/Resources_fr.java   |   2 +-
 .../{internal => base}/Resources_fr.properties |   4 +
 .../sis/storage/geotiff/{ => base}/Tags.java   |   8 +-
 .../apache/sis/storage/geotiff/base/UnitKey.java   | 186 +
 .../geotiff/{internal => base}/package-info.java   |   4 +-
 .../geotiff/inflater/CompressionChannel.java   |   2 +-
 .../sis/storage/geotiff/inflater/Inflater.java |   9 +-
 .../apache/sis/storage/geotiff/inflater/LZW.java   |   2 +-
 .../storage/geotiff/inflater/PredictorChannel.java |   2 +-
 .../apache/sis/storage/geotiff/package-info.java   |   2 +-
 .../storage/geotiff/{ => reader}/CRSBuilder.java   | 317 
 .../geotiff/{ => reader}/GeoKeysLoader.java|  36 +-
 .../geotiff/{ => reader}/GridGeometryBuilder.java  |  38 +-
 .../geotiff/{ => reader}/ImageMetadataBuilder.java |  46 +-
 .../storage/geotiff/{ => reader}/Localization.java |   2 +-
 .../geotiff/{ => reader}/ReversedBitsChannel.java  |  26 +-
 .../sis/storage/geotiff/{ => reader}/Type.java |   8 +-
 .../storage/geotiff/{ => reader}/XMLMetadata.java  |  39 +-
 .../geotiff/{internal => reader}/package-info.java |  10 +-
 .../sis/storage/geotiff/writer/GeoEncoder.java | 800 
 .../storage/geotiff/writer/ReformattedImage.java   | 158 
 .../sis/storage/geotiff/writer/TagValue.java   | 105 +++
 .../sis/storage/geotiff/writer/TileMatrix.java | 212 ++
 .../geotiff/{internal => writer}/package-info.java |  10 +-
 .../org/apache/sis/storage/geotiff/WriterTest.java | 479 
 .../{internal => base}/CompressionTest.java|   2 +-
 .../storage/geotiff/{ => base}/GeoCodesTest.java   |   2 +-
 .../storage/geotiff/{ => base}/GeoIdentifiers.java |   2 +-
 .../storage/geotiff/{ => base}/GeoKeysTest.java|  14 +-
 .../sis/storage/geotiff/{ => base}/TagsTest.java   |   2 +-
 .../geotiff/{ => reader}/CRSBuilderTest.java   |   2 +-
 .../sis/storage/geotiff/{ => reader}/TypeTest.java |   2 +-
 .../geotiff/{ => reader}/XMLMetadataTest.java  |   2 +-
 .../org/apache/sis/storage/gpx/StoreProvider.java  |   2 +-
 .../org.apache.sis.storage/main/module-info.java   |   4 +-
 .../main/org/apache/sis/io/stream/ChannelData.java | 285 ---
 .../org/apache/sis/io/stream/ChannelDataInput.java | 298 ++--
 .../apache/sis/io/stream/ChannelDataOutput.java| 407 +++---
 .../sis/io/stream/ChannelImageInputStream.java | 115 +--
 .../sis/io/stream/ChannelImageOutputStream.java| 223 +++---
 .../apache/sis/io/stream/HyperRectangleReader.java |   2 +-
 .../apache/sis/io/stream/HyperRectangleWriter.java | 301 
 .../main/org/apache/sis/io/stream/IOUtilities.java |  75 +-
 .../apache/sis/io/stream/InputStreamAdapter.java   |  58 +-
 .../main/org/apache/sis/io/stream/Markable.java|   2 +-
 .../apache/sis/io/stream/OutputStreamAdapter.java  |  11 +-
 .../main/org/apache/sis/io/stream/Region.java  |  38 +-
 .../org/apache/sis/io/stream/UpdatableWrite.java   | 352 +
 .../sis/storage/ReadOnlyStorageException.java  |   1 +
 .../org/apache/sis/storage/StorageConnector.java   | 138 ++--
 ...ception.java => WriteOnlyStorageException.java} |  30 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 2596723a0ba2b246587bfacfc93cd9cc8997a8f5
Merge: 2ce512f85a d4fc457a24
Author: Martin Desruisseaux 
AuthorDate: Fri Oct 6 02:10:17 2023 +0200

Merge branch '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(-)

diff --cc 
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJavadoc.java
index 6d2f01949d,1e89ccf257..24e358113c
--- 
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJavadoc.java
+++ 
b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJavadoc.java
@@@ -69,7 -69,8 +69,8 @@@ final class ModularJavadoc extends Conv
   "todo:a:\"TODO:\"");
  options.links(
  "https://docs.oracle.com/en/java/javase/11/docs/api;,
 -"http://www.geoapi.org/snapshot/javadoc;,
 +"http://www.geoapi.org/3.0/javadoc;,
+ "https://openjfx.io/javadoc/21/;,
  "http://unitsofmeasurement.github.io/unit-api/site/apidocs;);
  /*
   * Taglet defined in this `buildSrc` sub-project.
diff --cc settings.gradle.kts
index f5dd152e4a,71a8d48fc6..b35086ca0c
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@@ -38,7 -39,9 +38,8 @@@ dependencyResolutionManagement 
   */
  repositories {
  mavenCentral()
 -mavenLocal()// For GeoAPI SNAPSHOT only, which are built 
locally.
  maven {
+ name = "UCAR"
  url = 
uri("https://artifacts.unidata.ucar.edu/repository/unidata-releases;)
  content {
  includeGroup("edu.ucar")// Restrict usage to those 
dependencies.

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9a6f339273ceaf48ae1c6431e7c1eaa4b9219fd2
Merge: 01f8dc22a9 a1f4b15161
Author: Martin Desruisseaux 
AuthorDate: Fri Sep 29 17:29:50 2023 +0200

Merge branch '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 +-
 .../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 +-
 .../sis/{test/xml => xml/test}/TestCase.java   |   2 +-
 .../sis/{test/xml => xml/test}/package-info.java   |   7 +-
 .../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/referencing/operation/builder/readme.html  |  50 --
 ...c3DtoVertical.txt => Geographic3DtoVertical.md} |   6 +-
 .../transform/SpecializableTransform1D.md  |   3 +
 .../transform/SpecializableTransform1D.txt

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 01f8dc22a908357a77f4999572bacd75f1bb3a9e
Merge: 6affdaa155 80a27652f1
Author: Martin Desruisseaux 
AuthorDate: Thu Sep 28 18:21:13 2023 +0200

Merge branch 'geoapi-3.1'.

 .../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/TransformCommand.java   |  3 +-
 .../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 +-
 .../org/apache/sis/filter/AssociationValue.java|  2 +-
 .../main/org/apache/sis/filter/PropertyValue.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/pending/geoapi/filter/Name.java |  4 +--
 .../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 ++-
 .../org/apache/sis/feature/FeatureTestCase.java|  4 ++-
 

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 6affdaa1555349f11ab16db0c38c342ff8ee8366
Merge: 6eac04b166 611ffb816d
Author: Martin Desruisseaux 
AuthorDate: Thu Sep 28 12:37:07 2023 +0200

Merge branch 'geoapi-3.1'.

 README.md  |  24 ++-
 endorsed/build.gradle.kts  |  34 ++--
 .../main/module-info.java  |   1 -
 .../main/org/apache/sis/io/wkt/Convention.java |   2 -
 .../main/org/apache/sis/referencing/CRS.java   |  23 ++-
 .../apache/sis/referencing/GeodeticCalculator.java |   1 -
 .../sis/referencing/cs/CoordinateSystems.java  |   6 +-
 .../referencing/factory/AuthorityFactoryProxy.java |   2 +-
 .../apache/sis/referencing/internal/Legacy.java|   4 -
 .../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 +-
 incubator/build.gradle.kts |   4 +-
 netbeans-project/ivy.xml   |   8 +-
 optional/build.gradle.kts  |   2 +-
 .../gui/referencing/PositionableProjection.java|   8 -
 settings.gradle.kts|  10 +-
 40 files changed, 294 insertions(+), 233 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index 45e78ca27b,c0316a3cfd..6fda530af2
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@@ -86,6 -87,12 +87,9 @@@ import org.apache.sis.metadata.iso.exte
  import org.apache.sis.util.resources.Errors;
  import org.apache.sis.util.logging.Logging;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.geometry.Geometry;
 -import org.opengis.referencing.ObjectDomain;
 -import org.opengis.metadata.extent.BoundingPolygon;
 -import org.opengis.metadata.extent.GeographicExtent;
++// Specific to the main branch:
++import org.apache.sis.referencing.internal.Legacy;
+ 
  
  /**
   * Static methods working on {@linkplain CoordinateReferenceSystem Coordinate 
Reference Systems}.
@@@ -794,7 -798,15 +795,15 @@@ public final class CRS extends Static 
   */
  @OptionalCandidate
  public static GeographicBoundingBox getGeographicBoundingBox(final 
CoordinateReferenceSystem crs) {
- return (crs != null) ? 
Extents.getGeographicBoundingBox(crs.getDomainOfValidity()) : null;
+ return (crs != null) ? getDomains(crs).orElse(null) : null;
+ }
+ 
+ /**
+  * Returns the geographic bounding box computed from the domain of the 
given object. This method may be renamed and
+  * refactored as a replacement of {@link 
#getGeographicBoundingBox(CoordinateReferenceSystem)} in a future version.
+  */
+ private static Optional getDomains(final 
IdentifiedObject object) {
 -return 
Extents.getGeographicBoundingBox(object.getDomains().stream().map(ObjectDomain::getDomainOfValidity));
++return 
Extents.getGeographicBoundingBox(Legacy.getDomains(object).stream().map(DefaultObjectDomain::getDomainOfValidity));
  }
  
  /**
diff --cc netbeans-project/ivy.xml
index 65fa430d8a,a0b405974e..d89626bbf0
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@@ -11,10 -11,8 +11,10 @@@
  
  
  
 +

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 30ee87be8857801971910b82e64fb48b009671ec
Merge: 2b68043fb0 4b753152a6
Author: Martin Desruisseaux 
AuthorDate: Mon Aug 28 16:29:41 2023 +0200

Merge branch '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  |  18 +-
 .../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 +-
 netbeans-project/README.md |   3 +-
 netbeans-project/build.xml |   2 +-
 netbeans-project/nbproject/build-impl.xml  |  38 +-
 netbeans-project/nbproject/genfiles.properties |   4 +-
 netbeans-project/nbproject/project.properties  |  36 +-
 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 -
 36 files changed, 635 insertions(+), 180 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
index 03f4b625e5,2b0a369054..fbe424244d
--- 
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
+++ 
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
@@@ -44,11 -45,13 +45,10 @@@ import org.apache.sis.util.logging.Logg
  import org.apache.sis.util.logging.PerformanceLevel;
  import org.apache.sis.util.collection.TreeTable;
  import org.apache.sis.util.internal.StandardDateFormat;
- import org.apache.sis.system.Modules;
- import org.apache.sis.referencing.util.ReferencingFactoryContainer;
  import org.apache.sis.util.iso.DefaultNameFactory;
- import ucar.nc2.constants.CF;
+ import org.apache.sis.referencing.util.ReferencingFactoryContainer;
+ import ucar.nc2.constants.CF;   // String constants are copied by the 
compiler with no UCAR reference left.
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.util.NameFactory;
 -
  
  /**
   * The API used internally by Apache SIS for fetching variables and attribute 
values from a netCDF file.
diff --cc 
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
index afdf9be320,9a214554b2..f0779b20c3
--- 
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
+++ 
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
@@@ -42,19 -41,20 +41,20 @@@ import org.apache.sis.feature.internal.
  import org.apache.sis.feature.builder.AttributeRole;
  import org.apache.sis.feature.builder.FeatureTypeBuilder;
  import org.apache.sis.feature.builder.AttributeTypeBuilder;
+ import org.apache.sis.coverage.grid.GridExtent;
+ import org.apache.sis.storage.DataStore;
+ import org.apache.sis.storage.DataStoreException;
  import org.apache.sis.storage.netcdf.internal.Resources;
+ import org.apache.sis.util.Characters;
+ import org.apache.sis.util.internal.Strings;
  import org.apache.sis.util.collection.BackingStoreException;
  import org.apache.sis.math.Vector;
- import ucar.nc2.constants.CF;
+ import ucar.nc2.constants.CF;   // String constants are copied by the 
compiler with no UCAR reference left.
  
 -// Specific to the geoapi-3.1 and 

[sis] 01/01: Merge branch 'geoapi-3.1' (NetBeans project configuration).

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 35bab47d62afebc34f059cfd534bdcaa09dea7b2
Merge: d7ebbea200 b099abbec0
Author: Martin Desruisseaux 
AuthorDate: Sat Aug 19 11:22:30 2023 +0200

Merge branch 'geoapi-3.1' (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   |   42 +
 netbeans-project/nbproject/build-impl.xml  | 1989 
 netbeans-project/nbproject/genfiles.properties |8 +
 netbeans-project/nbproject/project.properties  |  186 ++
 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, 2431 insertions(+), 1 deletion(-)

diff --cc netbeans-project/ivy.xml
index 00,6aaa72c5d8..b7ed65a546
mode 00,100644..100644
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@@ -1,0 -1,40 +1,42 @@@
+ 
+ 
+ 
+ 
+ 
++
++
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
diff --cc netbeans-project/nbproject/build-impl.xml
index 00,6e5cd08b10..18fd96e267
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 

[sis] 01/01: Merge branch 'geoapi-3.1'. This merge upgrades and completes the parent POM, makes identification of unsigned types in SQLStore a little bit more robust, and makes information provided by

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 2297254f1ea7abd1f2632cb8ccc52e754194c328
Merge: 50e75f0247 f64017ade8
Author: Martin Desruisseaux 
AuthorDate: Fri Aug 4 11:57:55 2023 +0200

Merge branch 'geoapi-3.1'. This merge upgrades and completes the parent POM,
makes identification of unsigned types in SQLStore a little bit more robust,
and makes information provided by `GeometryType` a little bit more accurate.

 .../org/apache/sis/internal/gui/Resources.java |   2 +-
 .../apache/sis/cloud/aws/internal/Resources.java   |   2 +-
 .../apache/sis/feature/ExpressionOperation.java|   5 +-
 .../apache/sis/filter/DefaultFilterFactory.java|  43 +---
 .../java/org/apache/sis/image/ImageProcessor.java  |   7 +-
 .../internal/coverage/j2d/ColorModelBuilder.java   |   4 +-
 .../sis/internal/coverage/j2d/FillValues.java  |   1 +
 .../sis/internal/coverage/j2d/TilePlaceholder.java |   6 +-
 .../sis/internal/coverage/j2d/TiledImage.java  |   2 +-
 .../apache/sis/internal/feature/Geometries.java|   4 +-
 .../apache/sis/internal/feature/GeometryType.java  | 113 -
 .../sis/internal/feature/GeometryWrapper.java  |   2 +-
 .../org/apache/sis/internal/feature/Resources.java |   2 +-
 .../apache/sis/internal/feature/esri/Factory.java  |   8 +-
 .../sis/internal/feature/esri/package-info.java|   5 +-
 .../sis/internal/feature/j2d/package-info.java |   5 +-
 .../apache/sis/internal/feature/jts/Factory.java   |  20 ++--
 .../org/apache/sis/internal/feature/jts/JTS.java   |   5 +-
 .../apache/sis/internal/feature/jts/Wrapper.java   |  22 ++--
 .../sis/internal/filter/FunctionRegister.java  |   6 +-
 .../java/org/apache/sis/internal/filter/Node.java  |   2 +-
 .../org/apache/sis/internal/filter/Visitor.java|   4 +-
 .../java/org/apache/sis/internal/filter/XPath.java |   2 +-
 .../apache/sis/internal/filter/sqlmm/SQLMM.java|  46 -
 .../sis/internal/filter/sqlmm/SpatialFunction.java |   3 +-
 .../sis/internal/feature/GeometryTypeTest.java |  34 ++-
 .../jaxb/metadata/replace/ServiceParameter.java|   4 +-
 .../apache/sis/internal/metadata/Resources.java|   2 +-
 .../internal/simple/SimpleIdentifiedObject.java|   4 +-
 .../org/apache/sis/util/iso/DefaultTypeName.java   |   5 +
 .../java/org/apache/sis/util/iso/TypeNames.java|   6 +-
 .../META-INF/services/org.opengis.util.NameFactory |   0
 .../apache/sis/test/xml/DocumentComparator.java|   2 +-
 .../org/apache/sis/util/iso/TypeNamesTest.java |  17 +++-
 .../sis/internal/map/coverage/RenderingData.java   |   2 +-
 .../java/org/apache/sis/style/package-info.java|   2 +-
 .../main/java/org/apache/sis/style/se1/Fill.java   |   2 +-
 .../org/apache/sis/style/se1/LinePlacement.java|   2 +-
 .../main/java/org/apache/sis/style/se1/Stroke.java |   2 +-
 .../org/apache/sis/style/se1/package-info.java |   2 +-
 .../apache/sis/internal/gazetteer/Resources.java   |   2 +-
 .../referencing/CC_GeneralOperationParameter.java  |   2 +-
 .../referencing/CC_OperationParameterGroup.java|   2 +-
 .../internal/jaxb/referencing/RS_Identifier.java   |   2 +-
 .../sis/internal/referencing/Arithmetic.java   |   9 +-
 .../internal/referencing/DefinitionVerifier.java   |   4 +-
 .../apache/sis/internal/referencing/LazySet.java   |   3 +-
 .../apache/sis/internal/referencing/Resources.java |   2 +-
 .../internal/referencing/j2d/AbstractShape.java|   2 +-
 .../sis/internal/referencing/j2d/package-info.java |   5 +-
 .../referencing/provider/DatumShiftGridFile.java   |  12 ++-
 .../referencing/provider/DatumShiftGridGroup.java  |   6 +-
 .../DefaultCoordinateOperationFactory.java |   2 +-
 .../operation/DefaultOperationMethod.java  |   2 +-
 .../operation/projection/AlbersEqualArea.java  |   2 +-
 .../operation/transform/ScaleTransform.java|   2 +-
 .../operation/transform/SphericalToCartesian.java  |   2 +-
 .../operation/DefaultOperationMethodTest.java  |   3 +-
 .../sis/internal/converter/ArrayConverter.java |   6 +-
 .../internal/converter/CharSequenceConverter.java  |   5 +-
 .../internal/converter/CollectionConverter.java|   5 +-
 .../sis/internal/converter/DateConverter.java  |   5 +-
 .../sis/internal/converter/PathConverter.java  |   6 +-
 .../sis/internal/converter/StringConverter.java|   5 +-
 .../apache/sis/internal/util/CollectionsExt.java   |   2 -
 .../sis/util/ResourceInternationalString.java  |   4 +-
 .../java/org/apache/sis/util/collection/Cache.java |   2 -
 pom.xml|  57 ---
 .../apache/sis/internal/earth/netcdf/GCOM_C.java   |   2 +-
 .../apache/sis/internal/earth/netcdf/GCOM_W.java   |   2 +-
 .../apache/sis/internal/geotiff/Compression.java   |   2 +-
 .../org/apache/sis/internal/geotiff/Predictor.java |  

[sis] 01/01: Merge branch 'geoapi-3.1'. This merge completes the preparation for JPMS (Jigsaw) and prepares the upgrade from JUnit 4 to JUnit 5.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3c78638b96e1e5cb3bacabc80a125f752148478f
Merge: f1ea236300 230b6bceb6
Author: Martin Desruisseaux 
AuthorDate: Sat Jul 15 15:55:53 2023 +0200

Merge branch 'geoapi-3.1'.
This merge completes the preparation for JPMS (Jigsaw)
and prepares the upgrade from JUnit 4 to JUnit 5.

https://github.com/apache/sis/pull/34

 .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 +-
 .../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 |  12 +-
 .../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 +-
 .../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 +-
 .../org/apache/sis/internal/jaxb/gcx/FileName.java |   4 +-
 .../apache/sis/internal/jaxb/gcx/MimeFileType.java |   4 +-
 .../sis/internal/jaxb/geometry/GM_Object.java  |   2 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'. This merge prepares Apache SIS to JPMS (Jigsaw) modularisation.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit f1ea2363008539e55a199db0529b053c98b3f850
Merge: 2f048bc7a0 4afa8fd56a
Author: Martin Desruisseaux 
AuthorDate: Mon Jul 3 15:20:20 2023 +0200

Merge branch 'geoapi-3.1'.
This merge prepares Apache SIS to JPMS (Jigsaw) modularisation.

https://github.com/apache/sis/pull/34
https://issues.apache.org/jira/browse/SIS-584
https://issues.apache.org/jira/browse/SIS-585

 .../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  |   6 +-
 .../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  |  49 ++--
 .../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   |  23 +-
 .../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 +-
 .../apache/sis/metadata/iso/CodeLists.properties   |  18 ++
 .../sis/metadata/iso/CodeLists_en.properties   |   1 +
 .../sis/metadata/iso/CodeLists_fr.properties   |  18 ++
 .../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 +-
 .../sis/internal/map/coverage/RenderingData.java   |   3 +-
 .../main/java/org/apache/sis/portrayal/Canvas.java |   3 +-
 .../main/java/org/apache/sis/style/se1/Rule.java   |   4 +-
 .../org/apache/sis/style/se1/StyleElement.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] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit fc71c638d0fbda405e220c6e6161187224b8315a
Merge: 7cb56fed2e 4a2e1aefb5
Author: Martin Desruisseaux 
AuthorDate: Mon Jun 5 11:03:19 2023 +0200

Merge branch '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 +-
 .../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| 18 
 .../sis/referencing/cs/CoordinateSystems.java  |  4 +--
 .../sis/referencing/cs/DefaultSphericalCS.java | 32 ++--
 .../referencing/factory/GeodeticObjectFactory.java | 34 ++
 .../referencing/factory/sql/EPSGDataAccess.java|  5 
 .../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 +-
 .../sis/referencing/GeodeticCalculatorTest.java|  4 ++-
 .../sis/referencing/StandardDefinitionsTest.java   |  3 +-
 .../sis/referencing/factory/TestFactorySource.java |  3 +-
 .../operation/projection/InitializerTest.java  |  2 +-
 .../operation/projection/MercatorTest.java |  3 +-
 .../transform/LinearInterpolator1DTest.java|  3 +-
 .../operation/transform/LinearTransformTest.java   |  2 +-
 .../operation/transform/MathTransformTestCase.java |  3 +-
 .../operation/transform/ScaleTransformTest.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/storage/geotiff/ImageFileDirectory.java| 13 +++--
 .../org/apache/sis/internal/netcdf/CRSBuilder.java | 13 +++--
 .../apache/sis/internal/netcdf/VariableTest.java   |  2 +-
 .../storage/netcdf/NetcdfStoreProviderTest.java|  3 +-
 .../apache/sis/storage/netcdf/NetcdfStoreTest.java |  2 +-
 .../sis/internal/sql/postgis/PostgresTest.java |  3 +-
 .../sis/internal/storage/esri/RasterStore.java |  5 ++--
 .../apache/sis/internal/storage/xml/StoreTest.java |  3 +-
 .../apache/sis/storage/StorageConnectorTest.java   |  3 +-
 60 files changed, 303 insertions(+), 83 deletions(-)

diff --cc 
core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
index 8c7e96b2f4,91d36f196c..4ab04c2ab7
--- 
a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
+++ 
b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
@@@ -29,11 -28,14 +29,12 @@@ import org.apache.sis.referencing.Commo
  import org.apache.sis.test.TestCase;
  import org.junit.Test;
  
- import static org.opengis.test.Assert.*;
+ import static org.junit.Assert.*;
+ import static org.opengis.test.Assert.assertInstanceOf;
  
  // Branch-dependent imports
 -import org.opengis.filter.Literal;
 -import org.opengis.feature.Feature;
 -import org.opengis.filter.Expression;
 -import org.opengis.filter.FilterFactory;
 +import org.apache.sis.feature.AbstractFeature;
 +import 

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 7cb56fed2ea1afd2f0f0e05c349347a3cfbe778d
Merge: b98a31fa9b 4b35a0fd74
Author: Martin Desruisseaux 
AuthorDate: Mon May 8 19:14:21 2023 +0200

Merge branch '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 -
 .../apache/sis/coverage/SampleRangeFormatTest.java |   2 +-
 .../coverage/grid/BufferedGridCoverageTest.java|   2 +-
 .../coverage/grid/ConvertedGridCoverageTest.java   |   4 +-
 .../coverage/grid/DimensionalityReductionTest.java |   3 +-
 .../sis/coverage/grid/GridCoverage2DTest.java  |   6 +-
 .../sis/coverage/grid/GridDerivationTest.java  |   5 +-
 .../apache/sis/coverage/grid/GridExtentTest.java   |   7 +-
 .../apache/sis/coverage/grid/GridGeometryTest.java |   4 +-
 .../sis/coverage/grid/PixelTranslationTest.java|   3 +-
 .../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| 143 --
 .../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-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit b98a31fa9b860e69acc8fa89357e24f52d63bffc
Merge: 410b3a1f6a b486f990bc
Author: Martin Desruisseaux 
AuthorDate: Sat May 6 16:59:39 2023 +0200

Merge branch '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  |  20 +-
 .../apache/sis/feature/ExpressionOperation.java|  66 +-
 .../org/apache/sis/feature/FeatureOperations.java  |  74 +--
 .../main/java/org/apache/sis/feature/Features.java |  39 +++-
 .../sis/feature/GroupAsPolylineOperation.java  | 242 +
 .../java/org/apache/sis/feature/LinkOperation.java |   2 +-
 .../org/apache/sis/feature/OperationResult.java|  66 ++
 .../java/org/apache/sis/feature/SparseFeature.java |   1 +
 .../apache/sis/feature/StringJoinOperation.java|  12 +-
 .../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   |  49 -
 .../java/org/apache/sis/filter/PropertyValue.java  |   1 +
 .../sis/internal/coverage/j2d/ObservableImage.java |   2 +-
 .../sis/internal/feature/FeatureExpression.java|  19 +-
 .../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  |  65 ++
 .../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 +
 .../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  | 207 --
 .../org/apache/sis/internal/storage/gpx/Types.java |  31 ++-
 41 files changed, 1009 insertions(+), 378 deletions(-)

diff --cc 
core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
index fb74497a08,becfe57dfb..b80b9eea0d
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
@@@ -427,10 -446,13 +434,13 @@@ public abstract class AbstractFeature i
   * Executes the parameterless operation of the given name and sets the 
value of its result.
   * This method is the complement of {@link #getOperationValue(String)} 
for subclasses where
   * some properties may be operations. Not all operations accept 
assignments,
-  * but the {@linkplain FeatureOperations#link link} operation for 
instance does.
+  * but the {@linkplain FeatureOperations#link link} and
+  * {@linkplain FeatureOperations#compound compound} operations (for 
instances) do.
+  * Whether an operation is writable or not depends on whether the 
computed {@link Property}
+  * supports {@link Attribute#setValue(Object)} or {@link 
FeatureAssociation#setValue(Feature)}.
   *
   * @param  name   the name of the operation to execute. The caller is 
responsible to ensure that the
 - *property type for that name is an instance of {@link 
Operation}.
 + *property type for that name is an instance of {@link 
AbstractOperation}.
   * @param  value  the value to assign to the result of the named 
operation.
   * @throws IllegalStateException if the operation of the given name does 
not accept assignment.
   *
diff --cc 
core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
index db3bdd0056,88594a2fa2..05335b0335
--- 
a/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
@@@ -277,9 -281,8 +272,8 @@@ final class EnvelopeOperation extends A
  /**
   * Creates a new attribute for the 

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit ff2beab7ba1b2d4147cc8afb1d57fb87c64bcb6a
Merge: 62c8552cf8 8d1d6522c4
Author: Martin Desruisseaux 
AuthorDate: Sat Apr 29 15:05:57 2023 +0200

Merge branch 'geoapi-3.1'.

 .../{internal => }/coverage/CoverageCombiner.java  | 165 +++-
 .../sis/coverage/grid/GridCoverageBuilder.java |   5 +
 .../org/apache/sis/coverage/grid/GridExtent.java   |  82 +++-
 .../apache/sis/feature/ExpressionOperation.java| 220 +
 .../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  | 133 +++--
 .../org/apache/sis/storage/FeatureQueryTest.java   |  65 +-
 32 files changed, 1251 insertions(+), 312 deletions(-)

diff --cc 
core/sis-feature/src/main/java/org/apache/sis/feature/ExpressionOperation.java
index 00,78ecc4b7ad..964a1c143b
mode 00,100644..100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/feature/ExpressionOperation.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/feature/ExpressionOperation.java
@@@ -1,0 -1,227 +1,220 @@@
+ /*
+  * 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 distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ package org.apache.sis.feature;
+ 
+ import java.util.Map;
+ import java.util.Set;
+ import java.util.HashSet;
+ import java.util.Collection;
+ import java.util.function.Function;
 -import org.opengis.util.CodeList;
+ import org.opengis.parameter.ParameterValueGroup;
+ import org.opengis.parameter.ParameterDescriptorGroup;
+ import org.apache.sis.internal.feature.FeatureUtilities;
+ import org.apache.sis.internal.filter.FunctionNames;
+ import org.apache.sis.internal.filter.Visitor;
+ 
+ // Branch-dependent imports
 -import org.opengis.feature.Feature;
 -import org.opengis.feature.Property;
 -import org.opengis.feature.Attribute;
 -import org.opengis.feature.AttributeType;
 -import org.opengis.feature.IdentifiedType;
 -import org.opengis.filter.Filter;
 -import org.opengis.filter.Expression;
 -import org.opengis.filter.LogicalOperator;
 -import org.opengis.filter.ValueReference;
++import org.apache.sis.filter.Filter;
++import org.apache.sis.filter.Expression;
++import org.apache.sis.internal.geoapi.filter.LogicalOperator;
++import org.apache.sis.internal.geoapi.filter.ValueReference;
+ 
+ 
+ /**
+  * A feature property which is an operation implemented by a filter 
expression.
+  * This operation computes expression results from given feature instances 
only,
+  * there is no parameters.
+  *
+  * @author  

[sis] 01/01: Merge branch 'geoapi-3.1'. This is almost only javadoc.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 62c8552cf88595c4c25ed7aaa114b8ae6fc45eb4
Merge: 0865c08dfb 8f68fc28fa
Author: Martin Desruisseaux 
AuthorDate: Wed Apr 19 16:01:52 2023 +0200

Merge branch 'geoapi-3.1'.
This is almost only javadoc.

 .../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 +-
 .../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   |  36 ++--
 .../sis/metadata/iso/citation/DefaultCitation.java |  13 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1', omitting `CopyVisitor` internal class.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0865c08dfb62c88d7d7b40a3a6c8144f6b981b7f
Merge: 7d5dfd074e 33688738c6
Author: Martin Desruisseaux 
AuthorDate: Sun Apr 16 19:42:02 2023 +0200

Merge branch 'geoapi-3.1', omitting `CopyVisitor` internal class.

 .../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 | 988 +
 .../sis/coverage/grid/DisjointExtentException.java |   9 +-
 .../coverage/grid/FractionalGridCoordinates.java   |   6 +-
 .../sis/coverage/grid/GridCoordinatesView.java |   4 +-
 .../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  | 385 
 .../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/internal/coverage/j2d/ImageUtilities.java  |  78 +-
 .../coverage/j2d/MultiBandsIndexColorModel.java|  23 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 7d5dfd074ed1d8aa9a5f5a90c30fbf33a4015aff
Merge: 6c713fd637 1437fa191c
Author: Martin Desruisseaux 
AuthorDate: Sun Feb 26 16:35:30 2023 +0100

Merge branch '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 +-
 .../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 ++-
 pom.xml|   5 -
 .../java/org/apache/sis/storage/landsat/Band.java  |   3 +-
 .../apache/sis/storage/landsat/LandsatStore.java   |  56 ++--
 .../sis/storage/landsat/LandsatStoreProvider.java  |   3 +-
 .../apache/sis/storage/landsat/package-info.java   |   2 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 7598ed90ea75f420a113eaf91339e8dfd8c12e8c
Merge: 668c1d28b5 0a621ef6cf
Author: Martin Desruisseaux 
AuthorDate: Tue Jan 17 19:02:48 2023 +0100

Merge branch 'geoapi-3.1'.

 .../sis/referencing/factory/sql/EPSGDataAccess.java   | 13 +
 .../apache/sis/util/resources/IndexedResourceBundle.java  | 15 +--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --cc 
core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
index 90d48cc466,03c87279d1..75aa31a119
--- 
a/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
+++ 
b/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
@@@ -423,16 -425,12 +424,12 @@@ public class IndexedResourceBundle exte
  text = ((InternationalString) 
element).toString(getLocale());
  }
  replacement = CharSequences.shortSentence(text, 
MAX_STRING_LENGTH);
- } else if (element instanceof Throwable) {
- String message = Exceptions.getLocalizedMessage((Throwable) 
element, getLocale());
- if (message == null) {
- message = Classes.getShortClassName(element);
- }
- replacement = message;
+ } else if (element instanceof URI) {
+ replacement = ((URI) element).getPath();// For 
decoding encoded characters.
  } else if (element instanceof Class) {
  replacement = Classes.getShortName(getPublicType((Class) 
element));
 -} else if (element instanceof ControlledVocabulary) {
 -replacement = 
MetadataServices.getInstance().getCodeTitle((ControlledVocabulary) element, 
getLocale());
 +} else if (element instanceof CodeList) {
 +replacement = 
MetadataServices.getInstance().getCodeTitle((CodeList) element, getLocale());
  } else if (element instanceof Range) {
  final Range range = (Range) element;
  replacement = new RangeFormat(getLocale(), 
range.getElementType()).format(range);

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 835b893740268e17d7e1d89de2e0cda84aabab7c
Merge: 459597c6a6 f76afb0622
Author: Martin Desruisseaux 
AuthorDate: Wed Jan 11 12:19:15 2023 +0100

Merge branch '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-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 459597c6a64651f96ad87a793576cdcde85df2be
Merge: f3f3169460 c7d4b3ede7
Author: Martin Desruisseaux 
AuthorDate: Mon Jan 2 14:34:47 2023 +0100

Merge branch 'geoapi-3.1'

 .../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 +-
 .../org/apache/sis/feature/AbstractFeature.java|   2 +-
 .../apache/sis/feature/AbstractIdentifiedType.java |   4 +
 .../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  |   2 +
 .../java/org/apache/sis/feature/FeatureFormat.java |   5 +-
 .../sis/feature/FeatureOperationException.java |   1 +
 .../sis/feature/InvalidFeatureException.java   |   1 +
 .../org/apache/sis/feature/NamedFeatureType.java   |   2 +
 .../org/apache/sis/feature/SingletonAttribute.java |   1 +
 .../java/org/apache/sis/feature/SparseFeature.java |   1 +
 .../apache/sis/feature/StringJoinOperation.java|   2 +
 .../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 +-
 .../org/apache/sis/util/iso/RecordDefinition.java  |   2 +-
 .../main/java/org/apache/sis/xml/NilReason.java|   3 +-
 .../src/main/java/org/apache/sis/xml/XLink.java|   1 +
 .../sis/metadata/iso/extent/ExtentsTest.java   |   1 -
 .../apache/sis/test/xml/DocumentComparator.java|   6 +-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |  12 +-
 .../org/apache/sis/geometry/ArrayEnvelope.java |   1 +
 .../org/apache/sis/geometry/CoordinateFormat.java  |   8 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit b9602ed1a7e039e4eb950fafa7c63cc7a6b467ce
Merge: e7c5ccf5a9 c89fcb2b94
Author: Martin Desruisseaux 
AuthorDate: Mon Dec 26 14:19:56 2022 +0100

Merge branch 'geoapi-3.1'

 .../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  |  30 +-
 .../internal/metadata/ImplementationHelper.java|   5 +-
 .../org/apache/sis/metadata/PropertyAccessor.java  |   3 +-
 .../apache/sis/metadata/PropertyInformation.java   |   3 +-
 .../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 +-
 .../referencing/factory/sql/EPSGFactoryTest.java   |   2 -
 .../DefaultCoordinateOperationFactoryTest.java |  19 +-
 .../apache/sis/test/integration/MetadataTest.java  |   5 +-
 .../sis/test/suite/ReferencingTestSuite.java   |   2 +-
 .../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 +-
 .../org/apache/sis/util/CharSequencesTest.java |   3 -
 pom.xml|   2 +-
 .../apache/sis/internal/geotiff/Compression.java   |  46 +-
 .../org/apache/sis/internal/geotiff/Predictor.java |   8 +-
 .../apache/sis/internal/geotiff/package-info.java  |   2 +-
 .../storage/inflater/CompressionChannel.java   |  11 +-
 .../sis/internal/storage/inflater/Inflater.java|   2 +-
 .../org/apache/sis/storage/geotiff/DataCube.java   |   6 +-
 .../apache/sis/storage/geotiff/GeoKeysLoader.java  |  23 +-
 .../sis/storage/geotiff/ImageFileDirectory.java| 222 +++---
 .../sis/storage/geotiff/ImageMetadataBuilder.java  |  18 +-
 .../apache/sis/storage/geotiff/NativeMetadata.java |  26 +-
 .../java/org/apache/sis/storage/geotiff/Tags.java  | 192 ++---
 .../java/org/apache/sis/storage/geotiff/Type.java  |  76 +-
 .../apache/sis/storage/geotiff/package-info.java   |   2 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'. This is the upgrade from Java 8 to Java 11.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e7c5ccf5a900bf49cf045ad9a55c5cb36b8b2477
Merge: 217df02d3e f5bc633ac3
Author: Martin Desruisseaux 
AuthorDate: Tue Dec 13 14:25:57 2022 +0100

Merge branch '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|   8 +-
 .../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 +-
 .../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|   9 +-
 .../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/image/PositionalConsistencyImage.java  |   3 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 11ef22c60cffe9f4c861d155a38b6421c9eac35e
Merge: 2b6eec917a 20ae4b58a9
Author: Martin Desruisseaux 
AuthorDate: Wed Dec 7 18:45:51 2022 +0100

Merge branch 'geoapi-3.1'.

 .../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-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 2b6eec917a34e971fa73968d92a9a67c54da0075
Merge: ea85b9b19d 05a9bb3b01
Author: Martin Desruisseaux 
AuthorDate: Tue Dec 6 20:10:34 2022 +0100

Merge branch '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|  18 +-
 .../sis/internal/jaxb/metadata/DQM_Measure.java|  18 +-
 .../DQ_StandaloneQualityReportInformation.java |  18 +-
 .../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  |   6 +-
 .../metadata/iso/quality/DefaultBasicMeasure.java  |   6 +-
 .../metadata/iso/quality/DefaultDataQuality.java   |   6 +-
 ...ava => DefaultEvaluationReportInformation.java} |   6 +-
 ...ription.java => DefaultMeasureDescription.java} |   8 +-
 ...aultMeasure.java => DefaultQualityMeasure.java} |  24 +-
 .../sis/metadata/iso/quality/DefaultUsability.java |   4 +-
 .../iso/quality/DefaultUsabilityElement.java   | 108 
 .../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 +-
 .../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   |  91 +++
 .../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 +-
 73 files changed, 1014 insertions(+), 349 deletions(-)

diff --cc 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit dff7ab60bc17cf7220dcd7b35dacc52df6a5a214
Merge: 6b507d7cbd a143312778
Author: Martin Desruisseaux 
AuthorDate: Thu Oct 13 22:00:55 2022 +0200

Merge branch '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 +++---
 .../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 +-
 64 files changed, 634 insertions(+), 207 deletions(-)

diff --cc 
application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
index da16811fc3,f3d57a34c3..db83419008
--- 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
+++ 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
@@@ -22,6 -22,8 +22,7 @@@ import java.util.Collections
  import java.util.Spliterator;
  import javafx.application.Platform;
  import javafx.collections.ObservableListBase;
+ import javafx.concurrent.Worker;
 -import org.opengis.feature.Feature;
  import org.apache.sis.storage.FeatureSet;
  import 

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 6b507d7cbdd4abf57be410c19b0d7585e74577a0
Merge: a04bd4b298 e8bfb5ea7b
Author: Martin Desruisseaux 
AuthorDate: Wed Sep 21 12:03:27 2022 +0200

Merge branch '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 +-
 .../sis/internal/simple/CitationConstant.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 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit a04bd4b29816c91fc4dfc66135b8de5e962933a0
Merge: 6b6f91b255 371e65c59f
Author: Martin Desruisseaux 
AuthorDate: Sun Aug 21 19:56:17 2022 +0200

Merge branch 'geoapi-3.1'.

 .../sis/gui/metadata/IdentificationInfo.java   |  79 +++--
 .../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-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 61f9c7be796e7afa669501a21e0be7693821c981
Merge: a546a473a8 947dfd9042
Author: Martin Desruisseaux 
AuthorDate: Mon Aug 15 21:06:28 2022 +0200

Merge branch 'geoapi-3.1'.

 .../apache/sis/gui/coverage/CoverageCanvas.java|2 +-
 .../apache/sis/gui/coverage/IsolineRenderer.java   |2 +-
 .../sis/gui/coverage/StyledRenderingData.java  |2 +-
 .../java/org/apache/sis/image/ImageProcessor.java  |2 +-
 .../sis/internal/feature/j2d/MultiPolylines.java   |   13 +-
 .../sis/internal/feature/j2d/PathBuilder.java  |   13 +-
 .../apache/sis/internal/feature/j2d/Polyline.java  |   13 +-
 .../sis/internal/feature/j2d/package-info.java |2 +-
 .../internal/processing/image/IsolineTracer.java   | 1261 
 .../internal/processing/image/TiledProcess.java|6 +-
 .../internal/processing/image/package-info.java|2 +-
 .../sis/internal/processing/isoline/Fragments.java |  274 +
 .../processing/{image => isoline}/Isolines.java|  248 ++--
 .../sis/internal/processing/isoline/Joiner.java|  168 +++
 .../internal/processing/isoline/Parallelized.java  |  112 ++
 .../processing/isoline/PolylineBuffer.java |  210 
 .../internal/processing/isoline/PolylineStage.java |  116 ++
 .../sis/internal/processing/isoline/Result.java|  101 ++
 .../sis/internal/processing/isoline/Tracer.java|  739 
 .../{image => isoline}/package-info.java   |6 +-
 .../org/apache/sis/image/ImageProcessorTest.java   |4 +-
 .../{image => isoline}/IsolinesTest.java   |2 +-
 .../internal/processing/isoline/StepsViewer.java   |  426 +++
 .../apache/sis/test/suite/FeatureTestSuite.java|2 +-
 .../apache/sis/metadata/iso/DefaultMetadata.java   |5 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |4 +
 .../sis/referencing/AbstractReferenceSystem.java   |2 +
 .../apache/sis/referencing/crs/AbstractCRS.java|3 +-
 .../sis/referencing/crs/DefaultEngineeringCRS.java |  109 +-
 .../sis/referencing/crs/DefaultGeodeticCRS.java|6 +-
 .../sis/referencing/crs/DefaultImageCRS.java   |5 +-
 .../org/apache/sis/referencing/cs/AbstractCS.java  |1 +
 .../referencing/crs/DefaultEngineeringCRSTest.java |  100 +-
 33 files changed, 2435 insertions(+), 1526 deletions(-)

diff --cc 
core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
index d8703f35e7,76c642c072..4f966b9d20
--- 
a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
@@@ -30,14 -30,14 +30,14 @@@ import java.awt.image.RenderedImage
  import org.opengis.referencing.operation.MathTransform;
  import org.opengis.referencing.operation.TransformException;
  import org.apache.sis.image.PixelIterator;
++import org.apache.sis.image.SequenceType;
  import org.apache.sis.util.ArgumentChecks;
  import org.apache.sis.util.ArraysExt;
- import org.apache.sis.util.resources.Errors;
- import org.apache.sis.image.SequenceType;
+ import org.apache.sis.util.Debug;
  
- import static 
org.apache.sis.internal.processing.image.IsolineTracer.UPPER_LEFT;
- import static 
org.apache.sis.internal.processing.image.IsolineTracer.UPPER_RIGHT;
- import static 
org.apache.sis.internal.processing.image.IsolineTracer.LOWER_RIGHT;
+ import static org.apache.sis.internal.processing.isoline.Tracer.UPPER_LEFT;
+ import static org.apache.sis.internal.processing.isoline.Tracer.UPPER_RIGHT;
+ import static org.apache.sis.internal.processing.isoline.Tracer.LOWER_RIGHT;
  
  
  /**

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit a546a473a81dd710c674ceed6db2a5cdbd914586
Merge: 3362ae7b9b 1beb63780c
Author: Martin Desruisseaux 
AuthorDate: Wed Aug 10 17:04:47 2022 +0200

Merge branch '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-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3362ae7b9b6dd184d11e40ca207e3efb462c99e3
Merge: 09d75edb69 43debe04f2
Author: Martin Desruisseaux 
AuthorDate: Mon Jul 11 15:32:44 2022 +0200

Merge branch '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  |   2 +-
 .../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 +++-
 .../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 +-
 50 files changed, 1698 insertions(+), 239 deletions(-)

diff --cc 
core/sis-feature/src/main/java/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
index 00,81bb354bbe..bc4ece6a48
mode 00,100644..100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
@@@ -1,0 -1,127 +1,127 @@@
+ /*
+  * 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 distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ package org.apache.sis.coverage.grid;
+ 
+ import java.awt.image.RenderedImage;
+ 
+ // Branch-dependent imports
 -import org.opengis.coverage.CannotEvaluateException;
++import org.apache.sis.coverage.CannotEvaluateException;
+ 
+ 
+ /**
+  * A grid 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 09d75edb69ea5c0f394c768ac7cdf4a5de80
Merge: 78262e7625 b2d141b5e9
Author: Martin Desruisseaux 
AuthorDate: Thu Jun 30 12:13:16 2022 +0200

Merge branch '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   |   7 +-
 .../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 | 862 -
 .../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-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 97a5c714de8b5434e40b11de1fe7c39292b9f72f
Merge: cf19121ee4 2b32e74c22
Author: Martin Desruisseaux 
AuthorDate: Mon May 9 15:15:03 2022 +0200

Merge branch 'geoapi-3.1'

 NOTICE | 12 ++
 README | 18 +++---
 application/sis-console/src/main/artifact/README   | 28 +++---
 application/sis-javafx/src/main/artifact/README| 10 
 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
 .../apache/sis/setup/OptionalInstallations.java|  2 +-
 pom.xml|  2 +-
 28 files changed, 40 insertions(+), 34 deletions(-)

diff --cc pom.xml
index 11ea4113e2,5a4e7e17e1..930831261d
--- a/pom.xml
+++ b/pom.xml
@@@ -556,9 -556,9 +556,9 @@@
  8
  8
  ${project.version}
- 1.1
+ 1.2
  17 
 -3.1-SNAPSHOT
 +3.0.1

  

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit cf19121ee41c5704b695d0d99c3a2cca33521689
Merge: e0503ad983 c654790fde
Author: Martin Desruisseaux 
AuthorDate: Mon May 9 14:16:10 2022 +0200

Merge branch '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 +-
 .../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 +-
 .../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 +-
 .../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 +-
 .../apache/sis/internal/util/FinalFieldSetter.java | 112 ---
 .../apache/sis/internal/util/MetadataServices.java |   8 +-
 .../org/apache/sis/internal/util/Numerics.java |   2 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e0503ad983d9a9e733b7dc8aff2c95f4db5841d9
Merge: 0beabad754 8f4b197bc6
Author: Martin Desruisseaux 
AuthorDate: Thu May 5 16:04:04 2022 +0200

Merge branch 'geoapi-3.1'

 .../org/apache/sis/metadata/sql/Dispatcher.java|   2 +-
 .../MultiResolutionCoverageLoaderTest.java |   2 +-
 .../referencing/provider/AbstractMercator.java |  12 +-
 .../referencing/provider/CassiniSoldner.java   |   9 +-
 ...Soldner.java => LambertAzimuthalEqualArea.java} | 108 ---
 .../LambertAzimuthalEqualAreaSpherical.java|  77 +
 .../provider/LambertCylindricalEqualArea.java  |   9 +-
 .../internal/referencing/provider/Mercator1SP.java |   9 +-
 .../internal/referencing/provider/Mercator2SP.java |   9 +-
 .../provider/MercatorAuxiliarySphere.java  |  85 +
 .../referencing/provider/MillerCylindrical.java|   2 +-
 .../referencing/provider/ObliqueMercator.java  |   6 +-
 .../referencing/provider/PseudoMercator.java   |   2 +-
 .../java/org/apache/sis/referencing/Builder.java   |  14 +-
 .../operation/projection/AlbersEqualArea.java  |  24 +-
 ...AreaProjection.java => AuthalicConversion.java} | 122 +---
 .../operation/projection/AuthalicMercator.java | 115 +++
 .../operation/projection/AzimuthalEquidistant.java |   6 +-
 .../operation/projection/CassiniSoldner.java   |  87 --
 .../operation/projection/ConformalProjection.java  |   8 +-
 .../operation/projection/CylindricalEqualArea.java |  79 +++--
 .../operation/projection/Initializer.java  |  42 ++-
 .../projection/LambertAzimuthalEqualArea.java  | 284 +
 .../projection/LambertConicConformal.java  |  95 +++---
 .../referencing/operation/projection/Mercator.java | 135 +---
 .../operation/projection/MeridianArcBased.java |   4 +-
 .../projection/ModifiedAzimuthalEquidistant.java   |   6 +-
 .../operation/projection/Mollweide.java|  31 +-
 .../operation/projection/NormalizedProjection.java |  95 +++---
 .../operation/projection/ObliqueMercator.java  |  80 +++--
 .../operation/projection/ObliqueStereographic.java |  10 +-
 .../operation/projection/Orthographic.java |   4 +-
 .../operation/projection/PolarStereographic.java   |  83 +++--
 .../operation/projection/Polyconic.java|   6 +-
 .../operation/projection/ProjectionVariant.java|  58 
 .../operation/projection/SatelliteTracking.java|   4 +-
 .../operation/projection/Sinusoidal.java   |   6 +-
 .../operation/projection/TransverseMercator.java   |  44 ++-
 .../operation/projection/ZonedGridSystem.java  |   2 +-
 ...g.opengis.referencing.operation.OperationMethod |   3 +
 .../referencing/provider/ProvidersTest.java|   3 +
 ...ectionTest.java => AuthalicConversionTest.java} |  24 +-
 .../operation/projection/InitializerTest.java  |   2 +-
 .../projection/LambertAzimuthalEqualAreaTest.java  | 344 +
 .../operation/projection/MercatorTest.java |  72 -
 .../sis/referencing/operation/projection/NoOp.java |   4 +-
 .../projection/ProjectionResultComparator.java |   2 +-
 .../sis/test/suite/ReferencingTestSuite.java   |   3 +-
 .../org/apache/sis/storage/landsat/BandGroup.java  |   2 +-
 .../sis/internal/netcdf/DiscreteSampling.java  |   2 +-
 .../apache/sis/internal/netcdf/RasterResource.java |   2 +-
 .../org/apache/sis/internal/netcdf/TestCase.java   |   2 +-
 .../org/apache/sis/internal/sql/feature/Table.java |   4 +-
 .../sis/internal/storage/AggregatedFeatureSet.java |   2 +-
 .../sis/internal/storage/MemoryFeatureSet.java |   4 +-
 .../sis/internal/storage/MemoryGridResource.java   |   2 +-
 .../sis/internal/storage/TiledGridResource.java|   2 +-
 .../org/apache/sis/internal/storage/csv/Store.java |   6 +-
 .../sis/internal/storage/image/FormatFilter.java   |  23 +-
 .../sis/internal/storage/image/FormatFinder.java   | 288 +
 .../internal/storage/image/MultiImageStore.java|  62 
 .../internal/storage/image/SingleImageStore.java   | 191 
 .../internal/storage/image/WorldFileResource.java  |  16 +-
 .../sis/internal/storage/image/WorldFileStore.java | 116 +++
 .../storage/image/WorldFileStoreProvider.java  |  67 +++-
 .../sis/internal/storage/image/WritableStore.java  |  81 ++---
 .../sis/internal/storage/io/ChannelData.java   |   2 +
 .../storage/io/ChannelImageInputStream.java|  31 +-
 .../org/apache/sis/storage/AbstractFeatureSet.java |  20 +-
 .../sis/storage/AbstractGridCoverageResource.java  |  20 +-
 .../org/apache/sis/storage/AbstractResource.java   |  24 +-
 .../org/apache/sis/storage/CoverageSubset.java |   2 +-
 .../java/org/apache/sis/storage/DataStore.java |   2 +-
 .../java/org/apache/sis/storage/FeatureNaming.java |   1 +
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0beabad7541b35a0e29e3a5bfb485d321262f369
Merge: 3841c7aeae 15f1d671c9
Author: Martin Desruisseaux 
AuthorDate: Tue Apr 26 18:19:41 2022 +0200

Merge branch '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/internal/filter/FunctionRegister.java  |   2 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0741ad91476312a552e19ea776c570ec5f6ba14c
Merge: 2e5e958 bd18a3d
Author: Martin Desruisseaux 
AuthorDate: Tue Mar 8 10:51:46 2022 +0100

Merge branch '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-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 2e5e958d681eb12da1045da72dc2738a4c9d6534
Merge: 0d6fead 07ebe0c
Author: Martin Desruisseaux 
AuthorDate: Sun Mar 6 20:39:43 2022 +0100

Merge branch 'geoapi-3.1'

 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 |  86 +-
 .../internal/referencing/EPSGFactoryProxyCOP.java  |  59 ++
 ...GFactoryProxy.java => EPSGFactoryProxyCRS.java} |  43 +-
 .../internal/referencing/EPSGFactoryProxyCS.java   | 101 +++
 .../referencing/EPSGFactoryProxyDatum.java |  89 ++
 .../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, 4578 insertions(+), 346 deletions(-)

diff --cc 
core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
index 711d3f7,3afed12..3dbd0e5
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
@@@ -499,10 -510,10 +499,10 @@@ public abstract class AbstractFeature i
  } while ((element = it.next()) == null || 
base.isInstance(element));
  // Found an illegal value. Exeption is thrown below.
  }
- throw new ClassCastException(illegalValueClass(pt, base, 
element)); // 'element' can not be null here.
+ throw new ClassCastException(illegalValueClass(pt, base, 
element));  

[sis] 01/01: Merge branch 'geoapi-3.1'. Those commits add support for ESRI "GeogTran" WKT element.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0d6fead43e856e023f31d2bb9cc28b59e3460dc1
Merge: 01af141 83156f2
Author: Martin Desruisseaux 
AuthorDate: Thu Feb 24 11:36:33 2022 +0100

Merge branch 'geoapi-3.1'.
Those commits add support for ESRI "GeogTran" WKT element.

 .../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-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 01af1418e07eefd503fd21b8ebe846c24f34307c
Merge: 0e0cde0 4f07986
Author: Martin Desruisseaux 
AuthorDate: Mon Feb 21 13:02:13 2022 +0100

Merge branch '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(-)

diff --cc 
core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridEvaluator.java
index a5fe607,f246d44..8a38c1a
--- 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridEvaluator.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridEvaluator.java
@@@ -24,13 -26,17 +26,17 @@@ import org.opengis.referencing.operatio
  import org.opengis.referencing.operation.TransformException;
  import org.opengis.referencing.operation.CoordinateOperation;
  import org.opengis.referencing.crs.CoordinateReferenceSystem;
 -import org.opengis.coverage.CannotEvaluateException;
 -import org.opengis.coverage.PointOutsideCoverageException;
  import org.apache.sis.coverage.SampleDimension;
  import org.apache.sis.internal.coverage.j2d.ImageUtilities;
- import org.apache.sis.referencing.CRS;
+ import org.apache.sis.internal.referencing.DirectPositionView;
+ import org.apache.sis.internal.referencing.WraparoundAxesFinder;
  import org.apache.sis.referencing.operation.transform.MathTransforms;
+ import org.apache.sis.referencing.CRS;
+ import org.apache.sis.internal.system.Modules;
  import org.apache.sis.util.ArgumentChecks;
+ import org.apache.sis.util.logging.Logging;
 +import org.apache.sis.coverage.CannotEvaluateException;
 +import org.apache.sis.coverage.PointOutsideCoverageException;
  
  
  /**
diff --cc 
core/sis-feature/src/main/java/org/apache/sis/filter/LeafExpression.java
index 2ab4039,fee716d..14819e8
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/LeafExpression.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/LeafExpression.java
@@@ -134,14 -135,17 +134,17 @@@ abstract class LeafExpression exte
   * @return builder of the added property.
   */
  @Override
 -public PropertyTypeBuilder expectedType(FeatureType ignored, final 
FeatureTypeBuilder addTo) {
 +public PropertyTypeBuilder expectedType(DefaultFeatureType ignored, 
final FeatureTypeBuilder addTo) {
  final Class valueType = getValueClass();
- DefaultAttributeType propertyType = 

[sis] 01/01: Merge branch 'geoapi-3.1'. It allows to get the security fix with H2 upgrade. That vulnerability should have no practical incidence on SIS because H2 dependency was in tests only.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e339e1950cbab4f662ca27eb39bb68916ca74523
Merge: 94526e6 eb9ad08
Author: Martin Desruisseaux 
AuthorDate: Fri Jan 28 10:16:06 2022 +0100

Merge branch 'geoapi-3.1'. It allows to get the security fix with H2 
upgrade.
That vulnerability should have no practical incidence on SIS because H2 
dependency was in tests only.

 .../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(-)

diff --cc 
core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
index 5c2634c,e2e25d7..4fbf727
--- 
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
+++ 
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
@@@ -99,4 -105,23 +105,23 @@@ public final strictfp class MetadataCop
  assertTrue(message, message.contains("DefaultCitation"));
  }
  }
+ 
+ /**
+  * Tests with a metadata containing a {@link 
DefaultMetadata#getLocalesAndCharsets()} property.
+  * This property is defined by a {@link Map}.
+  */
+ @Test
+ public void testLocaleAndCharsets() {
+ final MetadataCopier copier = new 
MetadataCopier(MetadataStandard.ISO_19115);
+ final DefaultMetadata original = new DefaultMetadata();
+ original.getLocalesAndCharsets().put(Locale.FRENCH,   
StandardCharsets.UTF_8);
+ original.getLocalesAndCharsets().put(Locale.JAPANESE, 
StandardCharsets.UTF_16);
 -final Metadata copy = copier.copy(Metadata.class, original);
++final DefaultMetadata copy = (DefaultMetadata) 
copier.copy(Metadata.class, original);
+ final Map lc = copy.getLocalesAndCharsets();
+ assertEquals(StandardCharsets.UTF_8,  lc.get(Locale.FRENCH));
+ assertEquals(StandardCharsets.UTF_16, lc.get(Locale.JAPANESE));
+ assertEquals (original, copy);
+ assertNotSame(original, copy);
+ assertNotSame(original.getLocalesAndCharsets(), lc);
+ }
  }

[sis] 01/01: Merge branch 'geoapi-3.1' for fixing a test failure.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 94526e6b65fa44670f62d4536ad84cf776aa9c81
Merge: fb64b0b 9812159
Author: Martin Desruisseaux 
AuthorDate: Wed Jan 26 10:29:08 2022 +0100

Merge branch '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-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit fb64b0b9b0437845a5c193bea8082bb3f28d5495
Merge: df88006 c2534df
Author: Martin Desruisseaux 
AuthorDate: Thu Jan 20 19:13:39 2022 +0100

Merge branch '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 +-
 .../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 +-
 .../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 +--
 .../apache/sis/internal/netcdf/NamedElement.java   |   6 +-
 .../org/apache/sis/internal/netcdf/Variable.java   |  24 +-
 .../sis/internal/netcdf/ucar/DimensionWrapper.java |  13 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 7ea6427d63023545787e8810a526bb7382ff3f1a
Merge: e621d10 c6991bf
Author: Martin Desruisseaux 
AuthorDate: Sun Jan 2 02:33:49 2022 +0100

Merge branch '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 |  14 +-
 .../sis/feature/builder/FeatureTypeBuilder.java|  13 +-
 .../org/apache/sis/filter/ArithmeticFunction.java  |   8 +-
 .../org/apache/sis/filter/AssociationValue.java| 239 +++
 .../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  | 208 ++
 .../sis/internal/coverage/SampleDimensions.java|  41 --
 .../sis/internal/coverage/j2d/Colorizer.java   |  20 +-
 .../sis/internal/feature/FeatureExpression.java|  52 +--
 .../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 +-
 .../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 +-
 .../apache/sis/storage/geotiff/NativeMetadata.java |  36 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e621d10a14072fc1f41aedab2c4a2cfab50ca5ec
Merge: da97f66 a63fa19
Author: Martin Desruisseaux 
AuthorDate: Mon Dec 27 21:15:21 2021 +0100

Merge branch '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 +-
 .../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 +-
 .../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 +-
 .../transform/CoordinateSystemTransform.java   |   4 +-
 .../operation/transform/PassThroughTransform.java  |   4 +-
 .../referencing/j2d/AbstractShapeTest.java |  29 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit da97f6697ec33146474b4b79853e94edf7dd44cf
Merge: b94a500 c248954
Author: Martin Desruisseaux 
AuthorDate: Thu Dec 2 19:10:46 2021 +0100

Merge branch '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 +-
 .../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 ++-
 .../java/org/apache/sis/image/ResampledImage.java  |  10 +-
 .../org/apache/sis/image/SourceAlignedImage.java   |  27 +-
 .../org/apache/sis/image/StatisticsCalculator.java | 111 -
 .../java/org/apache/sis/image/Visualization.java   |   5 +-
 .../java/org/apache/sis/index/tree/PointTree.java  |   3 +-
 .../sis/internal/coverage/SampleDimensions.java| 112 +
 .../internal/coverage/j2d/ColorModelFactory.java   |   3 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit b94a500b295b52b9fbaf0bb8fdbf43c0ce4e7746
Merge: be181fa 5a19a70
Author: Martin Desruisseaux 
AuthorDate: Thu Nov 4 17:24:40 2021 +0100

Merge branch 'geoapi-3.1'

 .../main/java/org/apache/sis/gui/DataViewer.java   |  32 +-
 .../main/java/org/apache/sis/gui/RecentFiles.java  |  55 ++-
 .../java/org/apache/sis/gui/SystemMonitor.java | 116 +
 .../apache/sis/gui/coverage/CoverageCanvas.java|  34 +-
 .../java/org/apache/sis/gui/coverage/GridView.java |   4 +-
 .../org/apache/sis/gui/coverage/ImageRequest.java  |  17 +-
 .../org/apache/sis/gui/coverage/RenderingData.java |  13 +-
 .../org/apache/sis/gui/coverage/package-info.java  |   2 +-
 .../org/apache/sis/gui/dataset/FeatureList.java|   4 +-
 .../java/org/apache/sis/gui/dataset/LoadEvent.java |  31 +-
 .../dataset/{LoadEvent.java => ResourceEvent.java} |  41 +-
 .../apache/sis/gui/dataset/ResourceExplorer.java   | 264 ++
 .../org/apache/sis/gui/dataset/ResourceTree.java   | 529 ++---
 .../org/apache/sis/gui/dataset/package-info.java   |   6 +-
 .../java/org/apache/sis/gui/map/MapCanvas.java | 194 +++-
 .../java/org/apache/sis/gui/map/MapCanvasAWT.java  | 100 +++-
 .../java/org/apache/sis/gui/map/package-info.java  |   2 +-
 .../sis/gui/metadata/IdentificationInfo.java   |   2 +-
 .../apache/sis/gui/metadata/MetadataSummary.java   |  30 +-
 .../org/apache/sis/gui/metadata/MetadataTree.java  |   7 +-
 .../org/apache/sis/gui/metadata/package-info.java  |   2 +-
 .../main/java/org/apache/sis/gui/package-info.java |   2 +-
 .../gui/referencing/RecentReferenceSystems.java|   9 +-
 .../apache/sis/internal/gui/BackgroundThreads.java |  18 +-
 .../sis/internal/gui/FixedHeaderColumnSize.java|  89 
 .../org/apache/sis/internal/gui/GUIUtilities.java  |  19 +-
 .../sis/internal/gui/OptionalDataDownloader.java   |  31 +-
 .../org/apache/sis/internal/gui/PropertyView.java  |   4 +-
 .../apache/sis/internal/gui/ResourceLoader.java|  46 +-
 .../org/apache/sis/internal/gui/Resources.java |  22 +-
 .../apache/sis/internal/gui/Resources.properties   |   6 +-
 .../sis/internal/gui/Resources_fr.properties   |   6 +-
 .../java/org/apache/sis/internal/gui/Styles.java   |   2 +-
 .../apache/sis/internal/gui/io/FileAccessItem.java | 420 
 .../apache/sis/internal/gui/io/FileAccessView.java | 136 ++
 .../apache/sis/internal/gui}/io/package-info.java  |   8 +-
 .../org/apache/sis/internal/gui/package-info.java  |   2 +-
 .../java/org/apache/sis/coverage/CategoryList.java |   4 +-
 .../org/apache/sis/coverage/RegionOfInterest.java  | 156 ++
 .../org/apache/sis/coverage/SampleDimension.java   |  86 +++-
 .../coverage/grid/CoordinateOperationFinder.java   |   2 +-
 .../apache/sis/coverage/grid/GridCoverage2D.java   |  67 ++-
 .../sis/coverage/grid/GridCoverageProcessor.java   |  58 ++-
 .../apache/sis/coverage/grid/GridDerivation.java   |   5 +-
 .../apache/sis/filter/DefaultFilterFactory.java|   4 +-
 .../java/org/apache/sis/filter/LogicalFilter.java  |  15 +-
 .../java/org/apache/sis/filter/package-info.java   |   2 +-
 .../java/org/apache/sis/image/ImageProcessor.java  |  88 ++--
 .../java/org/apache/sis/image/MaskedImage.java | 478 +++
 .../java/org/apache/sis/image/PrefetchedImage.java |  87 +---
 .../java/org/apache/sis/image/ResampledImage.java  |  30 +-
 .../org/apache/sis/image/SourceAlignedImage.java   |  21 +-
 .../java/org/apache/sis/image/Visualization.java   | 420 ++--
 .../java/org/apache/sis/image/package-info.java|   9 +-
 .../internal/coverage/j2d/ColorModelFactory.java   |  12 +-
 .../sis/internal/coverage/j2d/Colorizer.java   |   2 +-
 .../sis/internal/coverage/j2d/FillValues.java  | 188 
 .../sis/internal/coverage/j2d/ImageLayout.java |  46 +-
 .../sis/internal/coverage/j2d/TilePlaceholder.java | 395 +++
 .../sis/internal/coverage/j2d/package-info.java|   2 +-
 .../org/apache/sis/coverage/CategoryListTest.java  |   3 +-
 .../org/apache/sis/filter/LogicalFilterTest.java   |   9 +-
 .../apache/sis/metadata/sql/CachedStatement.java   |   4 +-
 .../org/apache/sis/metadata/sql/package-info.java  |   2 +-
 core/sis-referencing/pom.xml   |  11 +
 .../factory/ConcurrentAuthorityFactory.java|   8 +-
 .../referencing/factory/sql/AuthorityCodes.java|  28 +-
 .../factory/sql/CloseableReference.java|  21 +-
 .../referencing/factory/sql/EPSGCodeFinder.java|   2 +
 .../referencing/factory/sql/EPSGDataAccess.java|  30 +-
 .../sis/referencing/factory/sql/package-info.java  |   2 +-
 .../operation/projection/AzimuthalEquidistant.java |   1 +
 .../projection/ModifiedAzimuthalEquidistant.java   |   6 +
 .../java/org/apache/sis/math/MathFunctions.java|   9 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'. This is mostly post 1.1-release cleanup and fixes of some of the bugs discovered in this process.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 465f0bf78cc712a9620096488dee26a5b47ade22
Merge: 90e1d9d 1e0f827
Author: Martin Desruisseaux 
AuthorDate: Thu Oct 14 18:29:16 2021 +0200

Merge branch 'geoapi-3.1'. This is mostly post 1.1-release cleanup and 
fixes of some of the bugs discovered in this process.

 NOTICE |   2 +-
 application/sis-console/src/main/artifact/bin/sis  |   2 +-
 application/sis-javafx/src/main/artifact/bin/sisfx |   4 +-
 .../sis-javafx/src/main/artifact/bin/sisfx.bat |   2 +-
 .../org/apache/sis/internal/book/Assembler.java|  84 +++-
 .../org/apache/sis/internal/book/package-info.java |  30 +++--
 .../org/apache/sis/coverage/BandedCoverage.java|  24 +++-
 .../java/org/apache/sis/coverage/CategoryList.java |   4 +-
 .../org/apache/sis/coverage/SampleDimension.java   |  46 +--
 .../org/apache/sis/coverage/grid/GridCoverage.java |  21 ++-
 .../sis/coverage/grid/GridCoverageBuilder.java |   2 +-
 .../apache/sis/coverage/grid/GridDerivation.java   | 136 ++-
 .../org/apache/sis/coverage/grid/GridExtent.java   |  29 +
 .../apache/sis/coverage/grid/GridExtentCRS.java|  36 +-
 .../org/apache/sis/coverage/grid/GridGeometry.java |  26 +---
 .../apache/sis/coverage/grid/ImageRenderer.java|  32 +
 .../org/apache/sis/coverage/grid/package-info.java |   2 +-
 .../java/org/apache/sis/coverage/package-info.java |   2 +-
 .../org/apache/sis/feature/AbstractFeature.java|  66 --
 .../java/org/apache/sis/feature/DenseFeature.java  |  12 +-
 .../java/org/apache/sis/feature/SparseFeature.java |  40 +++---
 .../java/org/apache/sis/image/PixelIterator.java   |   7 +-
 .../apache/sis/coverage/grid/GridExtentTest.java   |  29 -
 .../apache/sis/internal/jaxb/gts/package-info.java |   5 +-
 .../sis/metadata/iso/quality/AbstractElement.java  |   3 +-
 .../iso/quality/AbstractTemporalAccuracy.java  |   6 +-
 .../DefaultNonQuantitativeAttributeAccuracy.java   |   6 +-
 .../main/java/org/apache/sis/xml/Namespaces.java   |  14 +-
 .../main/java/org/apache/sis/xml/package-info.java |   2 +-
 .../java/org/apache/sis/test/sql/TestDatabase.java |   2 +-
 .../sis/test/xml/AnnotationConsistencyCheck.java   |   2 +-
 .../org/apache/sis/geometry/CoordinateFormat.java  |  16 +--
 .../java/org/apache/sis/geometry/package-info.java |   2 +-
 .../main/java/org/apache/sis/io/wkt/Symbols.java   |  26 +---
 .../java/org/apache/sis/io/wkt/package-info.java   |   2 +-
 .../org/apache/sis/referencing/datum/formulas.html |  24 ++--
 .../apache/sis/referencing/datum/package-info.java |   3 +-
 .../sis/referencing/factory/sql/EPSGInstaller.java |  28 +++-
 .../operation/builder/LocalizationGridBuilder.java |  41 +-
 .../operation/builder/package-info.java|   2 +-
 .../referencing/operation/matrix/MatrixSIS.java|   2 +-
 .../referencing/operation/transform/formulas.html  |  54 +---
 .../org/apache/sis/referencing/package-info.java   |   3 +-
 .../sis/referencing/factory/TestFactorySource.java |   2 +-
 .../java/org/apache/sis/setup/Configuration.java   |   2 +-
 .../main/java/org/apache/sis/util/Characters.java  |  26 +---
 .../apache/sis/util/logging/PerformanceLevel.java  |  27 +---
 .../org/apache/sis/util/logging/package-info.java  |   2 +-
 .../java/org/apache/sis/util/package-info.java |   2 +-
 .../sis/util/logging/PerformanceLevelTest.java |   8 +-
 pom.xml|   1 -
 .../sis/storage/earthobservation/LandsatStore.java |  73 ---
 .../earthobservation/LandsatStoreProvider.java |  44 ---
 .../sis/storage/earthobservation/package-info.java |  45 ---
 .../java/org/apache/sis/storage/landsat/Band.java  |   4 +-
 .../sis/storage/landsat/LandsatStoreProvider.java  |   4 +-
 .../sis/internal/geotiff/SchemaModifier.java   |  23 +++-
 .../apache/sis/internal/geotiff/package-info.java  |   2 +-
 .../sis/storage/geotiff/ImageFileDirectory.java|  19 ++-
 .../apache/sis/storage/geotiff/package-info.java   |   2 +-
 .../sis/storage/netcdf/NetcdfStoreProvider.java|  17 ++-
 .../apache/sis/internal/sql/feature/Analyzer.java  |  16 +--
 .../apache/sis/internal/sql/feature/Database.java  |   6 +-
 .../sis/internal/sql/feature/FeatureAdapter.java   |   6 +-
 .../sis/internal/sql/feature/FeatureAnalyzer.java  |  12 +-
 .../sis/internal/sql/feature/FeatureStream.java|   9 +-
 .../sis/internal/sql/feature/QueryAnalyzer.java|   2 +-
 .../apache/sis/internal/sql/feature/Relation.java  |  28 +++-
 .../sis/internal/sql/feature/SchemaModifier.java   |  14 +-
 .../org/apache/sis/internal/sql/feature/Table.java |   8 +-
 .../sis/internal/sql/feature/TableAnalyzer.java|  35 +++--
 .../sis/internal/sql/feature/package-info.java |   2 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3c3b5c9ea376956d64264a1795a47baadd4a998c
Merge: 0bc0b39 199a9f4
Author: Martin Desruisseaux 
AuthorDate: Wed Sep 29 17:09:11 2021 +0200

Merge branch 'geoapi-3.1'

 application/sis-console/pom.xml|  10 +-
 .../sis-console/src/main/artifact/lib/README   |   5 -
 .../src/main/artifact/lib/darwin/content.txt   |   2 -
 .../src/main/artifact/lib/linux/content.txt|   2 -
 .../src/main/artifact/lib/windows/content.txt  |   2 -
 .../apache/sis/console/ResourcesDownloader.java| 234 ---
 application/sis-javafx/doc/readme.txt  |   6 +-
 application/sis-javafx/pom.xml |  12 +-
 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   |  17 ++
 .../apache/sis/internal/gui/BackgroundThreads.java |  26 +++
 .../sis/internal/gui/OptionalDataDownloader.java   |  84 +++
 .../org/apache/sis/internal/gui/Resources.java |  21 ++
 .../apache/sis/internal/gui/Resources.properties   |   4 +
 .../sis/internal/gui/Resources_fr.properties   |   4 +
 .../org.apache.sis.setup.InstallationResources |   3 +
 .../sis/referencing/EPSGFactoryFallback.java   |   2 +-
 .../sis/referencing/factory/sql/EPSGInstaller.java |   2 +-
 .../factory/sql/InstallationScriptProvider.java|   2 +-
 .../test/integration/CoordinateOperationTest.java  |   3 +
 .../org/apache/sis/internal/system}/Fallback.java  |   4 +-
 .../apache/sis/setup/InstallationResources.java|   3 +-
 .../apache/sis/setup/OptionalInstallations.java| 253 +++--
 ide-project/NetBeans/build.xml |   7 +
 .../sis/internal/sql/feature/SchemaModifier.java   |   5 +-
 26 files changed, 371 insertions(+), 346 deletions(-)

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0bc0b39c16da26fa1f36c4b0e5c9edf769fccdfc
Merge: 880d42d 255c910
Author: Martin Desruisseaux 
AuthorDate: Mon Sep 27 14:22:18 2021 +0200

Merge branch 'geoapi-3.1'

 .../provider/FranceGeocentricInterpolation.java|  50 +-
 .../referencing/provider/PseudoPlateCarree.java|  14 +-
 .../internal/referencing/provider/Wraparound.java  |  32 +-
 .../main/java/org/apache/sis/referencing/CRS.java  |   1 -
 .../java/org/apache/sis/referencing/CommonCRS.java |   8 +-
 .../sis/referencing/StandardDefinitions.java   |   8 +-
 .../factory/GeodeticAuthorityFactory.java  |   1 -
 .../referencing/factory/sql/EPSGDataAccess.java| 129 +++---
 .../referencing/operation/matrix/MatrixSIS.java|  14 +
 .../sis/referencing/factory/sql/EPSG_Prepare.sql   |   1 +
 .../java/org/apache/sis/referencing/CRSTest.java   |  21 +
 .../org/apache/sis/referencing/CommonCRSTest.java  |   2 +-
 .../referencing/factory/sql/EPSGFactoryTest.java   |  12 +-
 .../transform/CartesianToSphericalTest.java|   2 +-
 .../report/CoordinateOperationMethods.java |  16 +-
 .../test/integration/CoordinateOperationTest.java  |  80 +++-
 pom.xml|   2 +-
 .../sis/storage/earthobservation/LandsatStore.java | 247 +-
 .../earthobservation/LandsatStoreProvider.java | 183 +---
 .../sis/storage/earthobservation/package-info.java |   7 +-
 .../LandsatResource.java => landsat/Band.java} |  12 +-
 .../BandGroup.java}|  36 +-
 .../BandGroupName.java}|   6 +-
 .../LandsatBand.java => landsat/BandName.java} |  30 +-
 .../LandsatStore.java  |  28 +-
 .../LandsatStoreProvider.java  |   4 +-
 .../MetadataReader.java}   |  48 +-
 .../doc-files/MetadataMapping.html}|   2 +-
 .../package-info.java  |  26 +-
 .../org.apache.sis.storage.DataStoreProvider   |   2 +-
 .../LandsatStoreProviderTest.java  |   4 +-
 .../MetadataReaderTest.java}   |   8 +-
 .../sis/test/suite/EarthObservationTestSuite.java  |   4 +-
 .../{earthobservation => landsat}/LandsatTest.txt  |   0
 .../apache/sis/storage/geotiff/GeoTiffStore.java   |   2 +-
 .../apache/sis/internal/sql/feature/Analyzer.java  | 504 ++---
 .../apache/sis/internal/sql/feature/Column.java|  42 +-
 .../apache/sis/internal/sql/feature/Database.java  |  20 +-
 .../sis/internal/sql/feature/FeatureAdapter.java   |   6 +-
 .../sis/internal/sql/feature/FeatureAnalyzer.java  | 406 +
 .../sis/internal/sql/feature/FeatureStream.java|   6 +-
 .../sis/internal/sql/feature/QueryAnalyzer.java| 185 
 .../apache/sis/internal/sql/feature/Resources.java |  10 +
 .../sis/internal/sql/feature/Resources.properties  |   2 +
 .../internal/sql/feature/Resources_fr.properties   |   2 +
 .../org/apache/sis/internal/sql/feature/Table.java |  37 +-
 .../sis/internal/sql/feature/TableAnalyzer.java| 245 +-
 .../sis/internal/sql/feature/TableReference.java   |  21 +-
 .../apache/sis/storage/sql/ResourceDefinition.java | 262 +++
 .../java/org/apache/sis/storage/sql/SQLStore.java  |  81 +++-
 .../apache/sis/storage/sql/SQLStoreProvider.java   |  84 ++--
 .../org/apache/sis/storage/sql/SQLStoreTest.java   | 202 -
 52 files changed, 1810 insertions(+), 1347 deletions(-)

diff --cc 
storage/sis-earth-observation/src/test/java/org/apache/sis/storage/landsat/MetadataReaderTest.java
index be1b26c,32df297..dc87fe9
--- 
a/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/landsat/MetadataReaderTest.java
+++ 
b/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/landsat/MetadataReaderTest.java
@@@ -14,9 -14,26 +14,9 @@@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
- package org.apache.sis.storage.earthobservation;
+ package org.apache.sis.storage.landsat;
  
  import java.util.regex.Matcher;
 -import java.io.BufferedReader;
 -import java.io.IOException;
 -import java.io.InputStreamReader;
 -import org.apache.sis.internal.storage.AbstractResource;
 -import org.opengis.metadata.Metadata;
 -import org.opengis.metadata.acquisition.Context;
 -import org.opengis.metadata.acquisition.OperationType;
 -import org.opengis.metadata.citation.DateType;
 -import org.opengis.metadata.content.CoverageContentType;
 -import org.opengis.metadata.content.TransferFunctionType;
 -import org.opengis.metadata.identification.Progress;
 -import org.opengis.metadata.identification.TopicCategory;
 -import org.opengis.metadata.maintenance.ScopeCode;
 -import org.opengis.metadata.spatial.DimensionNameType;
 -import 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 880d42d9998d4cbcdca5eab3f4350558470d6302
Merge: a56028b d859b67
Author: Martin Desruisseaux 
AuthorDate: Thu Sep 23 12:25:22 2021 +0200

Merge branch 'geoapi-3.1'

 application/sis-console/pom.xml|   4 -
 application/sis-console/src/main/artifact/README   |   6 +-
 application/sis-javafx/pom.xml |   5 -
 application/sis-openoffice/pom.xml |   5 -
 .../apache/sis/coverage/grid/GridDerivation.java   |   1 -
 .../org/apache/sis/coverage/grid/GridExtent.java   |  34 -
 .../org/apache/sis/coverage/grid/GridGeometry.java |   2 +-
 .../apache/sis/coverage/grid/SliceGeometry.java|   2 +-
 .../sis/coverage/grid}/WraparoundAdjustment.java   |  47 +--
 .../sis/coverage/grid/GridDerivationTest.java  |   2 +-
 .../apache/sis/coverage/grid/GridExtentTest.java   |  16 +--
 .../coverage/grid}/WraparoundAdjustmentTest.java   |  19 +--
 .../apache/sis/test/suite/FeatureTestSuite.java|   1 +
 .../sis/internal/jaxb/metadata/CI_Address.java |  16 +--
 .../sis/internal/jaxb/metadata/CI_Citation.java|  16 +--
 .../sis/internal/jaxb/metadata/CI_Contact.java |  16 +--
 .../apache/sis/internal/jaxb/metadata/CI_Date.java |  16 +--
 .../internal/jaxb/metadata/CI_OnlineResource.java  |  16 +--
 .../sis/internal/jaxb/metadata/CI_Party.java   |  16 +--
 .../internal/jaxb/metadata/CI_Responsibility.java  |  16 +--
 .../jaxb/metadata/CI_ResponsibleParty.java |  22 ++--
 .../sis/internal/jaxb/metadata/CI_Series.java  |  16 +--
 .../sis/internal/jaxb/metadata/CI_Telephone.java   |  16 +--
 .../sis/internal/jaxb/metadata/DQ_DataQuality.java |  16 +--
 .../sis/internal/jaxb/metadata/DQ_Element.java |  16 +--
 .../jaxb/metadata/DQ_PositionalAccuracy.java   |  16 +--
 .../sis/internal/jaxb/metadata/DQ_Result.java  |  16 +--
 .../sis/internal/jaxb/metadata/EX_Extent.java  |  16 +--
 .../jaxb/metadata/EX_GeographicExtent.java |  16 +--
 .../internal/jaxb/metadata/EX_TemporalExtent.java  |  16 +--
 .../internal/jaxb/metadata/EX_VerticalExtent.java  |  16 +--
 .../sis/internal/jaxb/metadata/LE_Algorithm.java   |  16 +--
 .../jaxb/metadata/LE_NominalResolution.java|  16 +--
 .../jaxb/metadata/LE_ProcessStepReport.java|  16 +--
 .../sis/internal/jaxb/metadata/LE_Processing.java  |  16 +--
 .../sis/internal/jaxb/metadata/LI_Lineage.java |  16 +--
 .../sis/internal/jaxb/metadata/LI_ProcessStep.java |  16 +--
 .../sis/internal/jaxb/metadata/LI_Source.java  |  16 +--
 .../jaxb/metadata/MD_AggregateInformation.java |  16 +--
 .../metadata/MD_ApplicationSchemaInformation.java  |  16 +--
 .../internal/jaxb/metadata/MD_AttributeGroup.java  |  16 +--
 .../internal/jaxb/metadata/MD_BrowseGraphic.java   |  16 +--
 .../sis/internal/jaxb/metadata/MD_Constraints.java |  16 +--
 .../jaxb/metadata/MD_ContentInformation.java   |  16 +--
 .../jaxb/metadata/MD_DataIdentification.java   |  16 +--
 .../jaxb/metadata/MD_DigitalTransferOptions.java   |  16 +--
 .../sis/internal/jaxb/metadata/MD_Dimension.java   |  16 +--
 .../internal/jaxb/metadata/MD_Distribution.java|  16 +--
 .../sis/internal/jaxb/metadata/MD_Distributor.java |  16 +--
 .../metadata/MD_ExtendedElementInformation.java|  16 +--
 .../internal/jaxb/metadata/MD_FeatureTypeInfo.java |  16 +--
 .../sis/internal/jaxb/metadata/MD_Format.java  |  16 +--
 .../jaxb/metadata/MD_GeometricObjects.java |  16 +--
 .../internal/jaxb/metadata/MD_Identification.java  |  16 +--
 .../sis/internal/jaxb/metadata/MD_Identifier.java  |  16 +--
 .../internal/jaxb/metadata/MD_KeywordClass.java|  16 +--
 .../sis/internal/jaxb/metadata/MD_Keywords.java|  16 +--
 .../jaxb/metadata/MD_MaintenanceInformation.java   |  16 +--
 .../sis/internal/jaxb/metadata/MD_Medium.java  |  16 +--
 .../sis/internal/jaxb/metadata/MD_Metadata.java|  16 +--
 .../metadata/MD_MetadataExtensionInformation.java  |  16 +--
 .../internal/jaxb/metadata/MD_MetadataScope.java   |  16 +--
 .../metadata/MD_PortrayalCatalogueReference.java   |  16 +--
 .../internal/jaxb/metadata/MD_RangeDimension.java  |  16 +--
 .../internal/jaxb/metadata/MD_Releasability.java   |  16 +--
 .../jaxb/metadata/MD_RepresentativeFraction.java   |  16 +--
 .../sis/internal/jaxb/metadata/MD_Resolution.java  |  16 +--
 .../sis/internal/jaxb/metadata/MD_Scope.java   |  18 +--
 .../jaxb/metadata/MD_ScopeDescription.java |  16 +--
 .../jaxb/metadata/MD_SpatialRepresentation.java|  16 +--
 .../jaxb/metadata/MD_StandardOrderProcess.java |  16 +--
 .../sis/internal/jaxb/metadata/MD_Usage.java   |  16 +--
 .../jaxb/metadata/MI_AcquisitionInformation.java   |  16 +--
 .../jaxb/metadata/MI_EnvironmentalRecord.java  |  16 +--
 .../sis/internal/jaxb/metadata/MI_Event.java   |  16 +--
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit a56028b94c7dadf011fad9eaa4a3ed6ccc36bfa4
Merge: 4863545 e495c9f
Author: Martin Desruisseaux 
AuthorDate: Sun Sep 19 19:03:23 2021 +0200

Merge branch 'geoapi-3.1'

 application/sis-console/pom.xml|   6 -
 .../apache/sis/gui/dataset/ResourceExplorer.java   |   8 +-
 .../org/apache/sis/internal/setup/FXFinder.java|   2 +-
 application/sis-openoffice/pom.xml |  33 +-
 .../src/main/unopkg/build-instruction.html |  18 +-
 .../sis-openoffice/src/main/unopkg/license.txt |  21 +-
 .../java/org/apache/sis/image/Interpolation.java   |   8 +-
 .../org/apache/sis/image/LanczosInterpolation.java |  94 ++-
 .../internal/coverage/j2d/ColorModelFactory.java   |   7 +
 .../apache/sis/internal/feature/Geometries.java|   4 +-
 .../apache/sis/internal/feature/GeometryType.java  |  11 +
 .../apache/sis/internal/feature/esri/Factory.java  |  97 ++-
 .../apache/sis/internal/feature/esri/Wrapper.java  |  78 +-
 .../apache/sis/internal/feature/j2d/Factory.java   |  64 ++
 .../sis/internal/feature/j2d/PointWrapper.java | 117 ++-
 .../apache/sis/internal/feature/j2d/Wrapper.java   | 199 -
 .../sis/internal/filter/GeometryConverter.java |   2 +-
 .../org/apache/sis/feature/CustomAttribute.java|   2 +-
 .../org/apache/sis/feature/FeatureTestCase.java|   2 +-
 .../builder/AssociationRoleBuilderTest.java|   2 +-
 .../BinarySpatialFilterUsingESRI_Test.java}|  39 +-
 .../BinarySpatialFilterUsingJava2D_Test.java   | 102 +++
 .../org/apache/sis/image/InterpolationTest.java|  22 +-
 .../internal/filter/sqlmm/RegistryTestCase.java|  27 +-
 ...ngJTS_Test.java => RegistryUsingESRI_Test.java} |  46 +-
 .../filter/sqlmm/RegistryUsingJTS_Test.java|   2 +-
 .../filter/sqlmm/RegistryUsingJava2D_Test.java |  82 ++
 .../apache/sis/test/suite/FeatureTestSuite.java|   4 +
 .../apache/sis/internal/jaxb/cat/CodeListUID.java  |   2 +-
 .../jaxb/gco/InternationalStringAdapter.java   |   2 +-
 .../jaxb/gco/InternationalStringConverter.java |   2 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |   5 +-
 .../sis/internal/jaxb/gts/TM_PeriodDuration.java   |   2 +-
 .../apache/sis/internal/jaxb/lan/PT_FreeText.java  |   4 +-
 .../sis/internal/jaxb/metadata/MD_Scope.java   |  16 +
 .../apache/sis/internal/simple/SimpleCitation.java |   2 +-
 .../apache/sis/metadata/iso/DefaultMetadata.java   |   2 +-
 .../sis/metadata/iso/quality/DefaultScope.java |   2 +-
 .../sis/metadata/iso/quality/package-info.java |   2 +-
 .../java/org/apache/sis/util/iso/AbstractName.java |   3 +-
 .../org/apache/sis/util/iso/DefaultLocalName.java  |   3 +-
 .../apache/sis/util/iso/DefaultNameFactory.java|   2 +
 .../org/apache/sis/util/iso/DefaultNameSpace.java  |   1 +
 .../main/java/org/apache/sis/util/iso/Types.java   |  34 +-
 .../java/org/apache/sis/util/iso/package-info.java |   9 -
 .../java/org/apache/sis/xml/MarshalContext.java|   2 +-
 .../java/org/apache/sis/xml/TransformVersion.java  |   2 +-
 .../java/org/apache/sis/xml/TransformedEvent.java  |   1 +
 .../main/java/org/apache/sis/xml/Transformer.java  |  92 ++-
 .../org/apache/sis/xml/TransformingNamespaces.java |   4 +-
 .../org/apache/sis/xml/TransformingReader.java |   4 +-
 .../org/apache/sis/xml/TransformingWriter.java |  34 +-
 .../src/main/java/org/apache/sis/xml/XML.java  |   2 +-
 .../src/main/java/org/apache/sis/xml/readme.html   |  21 +-
 .../org/apache/sis/xml/RenameOnExport.lst  |   4 +-
 .../org/apache/sis/xml/RenameOnImport.lst  |   2 +-
 .../sis/internal/jaxb/gco/PropertyTypeTest.java|   2 +-
 .../sis/internal/jaxb/gco/StringAdapterTest.java   |   4 +-
 .../internal/jaxb/lan/FreeTextMarshallingTest.java |   2 +-
 .../java/org/apache/sis/metadata/HashCodeTest.java |   2 +-
 .../apache/sis/metadata/MetadataStandardTest.java  |   2 +-
 .../sis/metadata/ModifiableMetadataTest.java   |   2 +-
 .../apache/sis/metadata/PropertyAccessorTest.java  |   2 +-
 .../apache/sis/metadata/TreeNodeChildrenTest.java  |   2 +-
 .../apache/sis/metadata/TreeTableFormatTest.java   |   2 +-
 .../java/org/apache/sis/metadata/ValueMapTest.java |   2 +-
 .../sis/metadata/iso/CustomMetadataTest.java   |   2 +-
 .../sis/metadata/iso/DefaultMetadataTest.java  |   2 +-
 .../metadata/iso/citation/DefaultCitationTest.java |   4 +-
 .../metadata/iso/citation/HardCodedCitations.java  |   2 +-
 .../sis/metadata/iso/extent/DefaultExtentTest.java |   2 +-
 .../iso/identification/DefaultKeywordsTest.java|   2 +-
 .../metadata/iso/lineage/DefaultLineageTest.java   |   2 +-
 .../iso/lineage/DefaultProcessStepTest.java|   2 +-
 .../sis/metadata/iso/quality/ScopeCodeTest.java|  79 ++
 .../iso/spatial/DefaultGeorectifiedTest.java   |   2 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit b25123db48345bbcef1e39c58ae304125cee7f42
Merge: ddfef3e 1105c74
Author: Martin Desruisseaux 
AuthorDate: Thu Oct 24 14:19:43 2019 +0200

Merge branch 'geoapi-3.1'

 application/sis-console/src/main/artifact/bin/sis  |   5 +-
 .../java/org/apache/sis/coverage/Category.java |   8 +-
 .../java/org/apache/sis/coverage/CategoryList.java |   8 +-
 .../coverage/IllegalSampleDimensionException.java  |  62 +
 .../org/apache/sis/coverage/SampleDimension.java   |   5 +-
 .../org/apache/sis/coverage/SampleRangeFormat.java | 146 +++-
 .../main/java/org/apache/sis/coverage/ToNaN.java   |   4 +-
 .../java/org/apache/sis/coverage/package-info.java |   2 +-
 .../apache/sis/coverage/SampleRangeFormatTest.java | 137 +++
 .../apache/sis/test/suite/FeatureTestSuite.java|   3 +-
 .../referencing/provider/AbstractLambert.java  |  22 ++
 .../referencing/provider/AbstractMercator.java |  22 ++
 .../provider/AbstractStereographic.java|  22 ++
 .../referencing/provider/AlbersEqualArea.java  |  89 ++-
 .../sis/internal/referencing/provider/ESRI.java|  54 -
 .../referencing/provider/Equirectangular.java  |  64 +
 .../provider/FranceGeocentricInterpolation.java|  10 +
 .../referencing/provider/GeocentricAffine.java |  61 +
 .../GeocentricAffineBetweenGeographic.java |  56 +
 .../referencing/provider/Geographic2Dto3D.java |   6 +
 .../provider/GeographicAndVerticalOffsets.java |   6 +
 .../referencing/provider/GeographicOffsets.java|  18 ++
 .../provider/GeographicToGeocentric.java   |  12 +
 .../referencing/provider/LambertConformal1SP.java  |  37 +++
 .../referencing/provider/LambertConformal2SP.java  |  75 +-
 .../provider/LambertConformalMichigan.java |  10 +
 .../referencing/provider/LambertConformalWest.java |  11 +
 .../provider/LambertCylindricalEqualArea.java  |  48 
 .../referencing/provider/MapProjection.java| 120 --
 .../internal/referencing/provider/Mercator1SP.java |  37 +++
 .../internal/referencing/provider/Mercator2SP.java |  29 ++-
 .../referencing/provider/MercatorSpherical.java|   2 +-
 .../internal/referencing/provider/Mollweide.java   |  24 ++
 .../internal/referencing/provider/Molodensky.java  |  26 +-
 .../sis/internal/referencing/provider/NADCON.java  |  20 ++
 .../sis/internal/referencing/provider/NTv2.java|  10 +
 .../referencing/provider/ObliqueMercator.java  |  93 +++-
 .../provider/ObliqueMercatorCenter.java|  20 ++
 .../referencing/provider/ObliqueStereographic.java |  33 +++
 .../referencing/provider/Orthographic.java | 196 
 .../referencing/provider/PolarStereographicA.java  |  37 +++
 .../referencing/provider/PolarStereographicB.java  |  43 +++-
 .../referencing/provider/PolarStereographicC.java  |  22 ++
 .../internal/referencing/provider/Polyconic.java   |  44 
 .../referencing/provider/RegionalMercator.java |  37 +++
 .../referencing/provider/SatelliteTracking.java|  60 +
 .../internal/referencing/provider/Sinusoidal.java  |  24 ++
 .../referencing/provider/TransverseMercator.java   |  37 ++-
 .../provider/ZonedTransverseMercator.java  |  21 ++
 .../java/org/apache/sis/referencing/Builder.java   |  48 +++-
 .../sis/referencing/operation/matrix/Matrix1.java  |  15 +-
 .../sis/referencing/operation/matrix/Matrix2.java  |  15 +-
 .../sis/referencing/operation/matrix/Matrix3.java  |  13 +-
 .../sis/referencing/operation/matrix/Matrix4.java  |  13 +-
 .../referencing/operation/matrix/package-info.java |   2 +-
 .../operation/projection/AlbersEqualArea.java  |   7 +-
 .../operation/projection/Initializer.java  |  16 +-
 .../referencing/operation/projection/Inverter.java | 105 +
 .../projection/LambertConicConformal.java  |   7 +-
 .../referencing/operation/projection/Mercator.java |   6 +-
 .../operation/projection/Mollweide.java|   8 +-
 .../operation/projection/ObliqueMercator.java  |   6 +-
 .../operation/projection/ObliqueStereographic.java |   7 +-
 .../operation/projection/Orthographic.java | 261 +
 .../operation/projection/Sinusoidal.java   |   7 +-
 .../operation/projection/ZonedGridSystem.java  |   2 +-
 ...g.opengis.referencing.operation.OperationMethod |   1 +
 .../referencing/provider/ProvidersTest.java|   3 +-
 .../operation/projection/OrthographicTest.java | 147 
 .../sis/test/suite/ReferencingTestSuite.java   |   1 +
 .../java/org/apache/sis/internal/jdk9/JDK9.java|  19 +-
 .../org/apache/sis/internal/jdk9/package-info.java |   2 +-
 .../main/java/org/apache/sis/io/TableAppender.java |   6 +-
 .../java/org/apache/sis/util/logging/Logging.java  |  11 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 283f5727535b454bd7ed4686c42ed7ea0d01ccec
Merge: 71f1c7d 574a063
Author: Martin Desruisseaux 
AuthorDate: Sat Oct 19 13:33:19 2019 +0200

Merge branch 'geoapi-3.1'.

 NOTICE |   2 +-
 README |   2 +-
 application/sis-console/src/main/artifact/README   |   2 +-
 .../org/apache/sis/internal/doclet/Doclet.java |   8 -
 .../org/apache/sis/coverage/SampleDimension.java   |   6 +-
 .../sis/internal/referencing/provider/ESRI.java|  59 +--
 .../referencing/provider/MapProjection.java|  56 +--
 .../provider/PolarStereographicSouth.java  |   4 +-
 .../referencing/provider/SatelliteTracking.java| 145 
 .../referencing/provider/package-info.java |   3 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |  37 +-
 .../main/java/org/apache/sis/referencing/CRS.java  |  42 +--
 .../operation/projection/Polyconic.java|   2 +-
 .../operation/projection/SatelliteTracking.java| 377 +++
 .../operation/projection/package-info.java |   3 +-
 .../operation/transform/IterationStrategy.java |  15 +-
 ...g.opengis.referencing.operation.OperationMethod |   1 +
 .../referencing/provider/Descriptions.properties   |   5 +
 .../apache/sis/geometry/CoordinateFormatTest.java  |   3 +-
 .../referencing/provider/ProvidersTest.java|  14 +-
 .../java/org/apache/sis/referencing/CRSTest.java   |  16 +-
 .../org/apache/sis/referencing/CommonCRSTest.java  |  14 +-
 .../projection/SatelliteTrackingTest.java  | 398 +
 .../transform/DefaultMathTransformFactoryTest.java |   9 +-
 .../sis/test/suite/ReferencingTestSuite.java   |   3 +-
 .../sis/internal/converter/ConverterRegistry.java  |   7 +
 .../apache/sis/internal/system/DaemonThread.java   |   4 +-
 .../java/org/apache/sis/internal/util/Strings.java |  21 +-
 .../main/java/org/apache/sis/measure/Angle.java|   2 +-
 .../main/java/org/apache/sis/measure/Range.java|   4 +-
 .../org/apache/sis/util/collection/WeakEntry.java  |  13 +-
 .../apache/sis/util/collection/WeakHashSet.java|   7 +-
 .../sis/util/collection/WeakValueHashMap.java  |   7 +-
 ide-project/NetBeans/build.xml |   1 +
 pom.xml|  13 +-
 src/main/config/logging.properties |   2 +-
 .../apache/sis/internal/netcdf/RasterResource.java |   4 +-
 .../org/apache/sis/internal/netcdf/Variable.java   |  14 +-
 .../sis/internal/netcdf/impl/VariableInfo.java |  10 +-
 .../apache/sis/internal/netcdf/package-info.java   |   2 +-
 .../internal/storage/io/HyperRectangleReader.java  |  13 +-
 .../org/apache/sis/internal/storage/io/Region.java |  78 +++-
 .../sis/internal/storage/io/package-info.java  |   2 +-
 43 files changed, 1245 insertions(+), 185 deletions(-)

diff --cc 
core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
index 882,a78648b..019020c
--- 
a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
+++ 
b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
@@@ -25,6 -25,6 +25,7 @@@ import org.opengis.parameter.GeneralPar
  import org.opengis.parameter.ParameterDescriptorGroup;
  import org.opengis.referencing.operation.OperationMethod;
  import org.apache.sis.referencing.operation.DefaultOperationMethod;
++import org.apache.sis.parameter.DefaultParameterDescriptor;
  import org.apache.sis.test.DependsOn;
  import org.apache.sis.test.TestCase;
  import org.junit.Test;
@@@ -248,4 -249,14 +250,14 @@@ public final strictfp class ProvidersTe
  }
  }
  }
+ 
+ /**
+  * Tests the description provided in some parameters.
+  */
+ @Test
+ public void testDescription() {
 -
assertFalse(SatelliteTracking.SATELLITE_ORBIT_INCLINATION.getDescription().length()
 == 0);
 -assertFalse(SatelliteTracking.SATELLITE_ORBITAL_PERIOD   
.getDescription().length() == 0);
 -assertFalse(SatelliteTracking.ASCENDING_NODE_PERIOD  
.getDescription().length() == 0);
++assertFalse(((DefaultParameterDescriptor) 
SatelliteTracking.SATELLITE_ORBIT_INCLINATION).getDescription().length() == 0);
++assertFalse(((DefaultParameterDescriptor) 
SatelliteTracking.SATELLITE_ORBITAL_PERIOD   ).getDescription().length() == 0);
++assertFalse(((DefaultParameterDescriptor) 
SatelliteTracking.ASCENDING_NODE_PERIOD  ).getDescription().length() == 0);
+ }
  }
diff --cc 
core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java
index 000,75aa143..0969170
mode 00,100644..100644
--- 

[sis] 01/01: Merge branch 'geoapi-3.1': port fixes from Apache SIS 1.0-RC1.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 71f1c7d5f037f4bff8ca97bd6498059306aa3cf0
Merge: ba0a5b3 7d1c6db
Author: Martin Desruisseaux 
AuthorDate: Fri Sep 20 20:38:40 2019 +0200

Merge branch 'geoapi-3.1': port fixes from Apache SIS 1.0-RC1.

 application/sis-console/pom.xml|   4 +
 application/sis-console/src/main/artifact/README   |   4 +-
 .../sis-console/src/main/artifact/lib/README   |   1 +
 .../src/main/ant/prepare-release.xml   |  26 +
 .../org/apache/sis/internal/doclet/Doclet.java |  37 +++
 .../org/apache/sis/internal/doclet/Taglet.java |  23 +
 .../java/org/apache/sis/image/SequenceType.java|   7 +-
 core/sis-referencing-by-identifiers/pom.xml|   4 +
 .../sis/referencing/operation/matrix/Matrices.java |   2 +-
 .../sis/referencing/factory/sql/epsg/package.html  |  32 +++---
 .../sis/referencing/report/package-info.java   |   2 +-
 .../org/apache/sis/measure/AbstractConverter.java  |   2 +-
 .../apache/sis/measure/ConcatenatedConverter.java  |   2 +-
 .../org/apache/sis/measure/ConventionalUnit.java   |   4 +-
 .../org/apache/sis/measure/IdentityConverter.java  | 109 +
 .../org/apache/sis/measure/LinearConverter.java|  49 +
 .../java/org/apache/sis/measure/SystemUnit.java|   4 +-
 .../main/java/org/apache/sis/measure/Units.java|   2 +-
 .../java/org/apache/sis/setup/Configuration.java   |  24 -
 .../apache/sis/measure/LinearConverterTest.java|  14 +--
 .../org/apache/sis/measure/QuantitiesTest.java |  17 
 ide-project/NetBeans/nbproject/project.properties  |   2 +-
 pom.xml|   9 +-
 .../apache/sis/profile/japan/JapaneseProfile.java  |  21 +++-
 .../sis/storage/WritableGridCoverageResource.java  |   4 +-
 25 files changed, 272 insertions(+), 133 deletions(-)

diff --cc core/sis-feature/src/main/java/org/apache/sis/image/SequenceType.java
index 8e42823,22783ba..241d372
--- a/core/sis-feature/src/main/java/org/apache/sis/image/SequenceType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/SequenceType.java
@@@ -14,17 -14,22 +14,20 @@@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
 +package org.apache.sis.image;
 +
  
  /**
 - * Filters features according their properties.
 - * A filter expression is a construct used to constraint a 
feature set to a subset.
 - *
 - * All filter and expression implementations provided by Apache SIS are 
thread-safe.
 - * They are not necessarily stateless however; for example a filter may 
remember which
 - * warnings have been reported in order to avoid to report the same warning 
twice.
 + * Placeholder for {@code org.opengis.coverage.grid.SequenceType}.
   *
 - * @author  Johann Sorel (Geomatys)
   * @author  Martin Desruisseaux (Geomatys)
-  * @version 1.0
-  * @since   1.0
+  * @version 1.1
+  *
+  * @see http://docs.opengeospatial.org/is/09-026r2/09-026r2.html;>OGC® Filter 
Encoding 2.0 Encoding Standard
+  *
+  * @since 1.1
   * @module
   */
 -package org.apache.sis.filter;
 +enum SequenceType {
 +LINEAR
 +}
diff --cc pom.xml
index f73ce66,dfc1590..44eaa62
--- a/pom.xml
+++ b/pom.xml
@@@ -560,8 -560,8 +560,8 @@@
  8
  8
  ${project.version}
- 1.0-M1 
+ 1.0 
 -3.1-SNAPSHOT
 +3.0.1
  2.3.2

  

[sis] 01/01: Merge branch 'geoapi-3.1': last-minute API changes before 1.0 release.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit ba0a5b3c331714910e1b99025e7aa124816d7506
Merge: 90b5999 6217d6d
Author: Martin Desruisseaux 
AuthorDate: Sat Sep 14 13:49:25 2019 +0200

Merge branch 'geoapi-3.1': last-minute API changes before 1.0 release.

 .../org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../internal/metadata/TransformationAccuracy.java  |  2 +-
 .../apache/sis/metadata/ModifiableMetadata.java| 12 
 .../java/org/apache/sis/metadata/StateChanger.java |  6 ++--
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |  4 +--
 .../apache/sis/metadata/iso/extent/Extents.java|  4 +--
 .../DefaultRepresentativeFraction.java |  2 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java|  2 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  2 +-
 .../sis/metadata/ModifiableMetadataTest.java   | 10 +++
 .../metadata/iso/citation/DefaultCitationTest.java |  6 ++--
 .../metadata/iso/citation/HardCodedCitations.java  |  8 +++---
 .../DefaultRepresentativeFractionTest.java |  4 +--
 .../referencing/gazetteer/FinalLocationType.java   |  2 +-
 .../referencing/PositionalAccuracyConstant.java|  2 +-
 .../sis/referencing/ImmutableIdentifier.java   |  4 +--
 .../apache/sis/referencing/NamedIdentifier.java|  4 +--
 .../referencing/factory/sql/EPSGDataAccess.java|  4 +--
 .../storage/earthobservation/LandsatReader.java|  2 +-
 .../sis/storage/earthobservation/LandsatStore.java | 31 -
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |  2 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 16 +--
 .../apache/sis/storage/netcdf/MetadataReader.java  |  2 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java | 10 +++
 .../java/org/apache/sis/storage/sql/SQLStore.java  | 10 +++
 .../sis/internal/storage/AbstractResource.java |  4 +--
 .../sis/internal/storage/MetadataBuilder.java  |  2 +-
 .../apache/sis/internal/storage/URIDataStore.java  | 11 
 .../apache/sis/internal/storage/folder/Store.java  |  8 +++---
 .../java/org/apache/sis/storage/DataStore.java | 32 --
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../main/java/org/apache/sis/storage/Resource.java | 10 +++
 .../apache/sis/storage/event/StoreListener.java|  4 +--
 .../apache/sis/storage/event/StoreListeners.java   | 16 +--
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++--
 .../sis/storage/event/StoreListenersTest.java  | 14 +-
 36 files changed, 137 insertions(+), 126 deletions(-)

diff --cc 
core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
index d2f1813,47be601..2f9508a
--- 
a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
+++ 
b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
@@@ -199,10 -201,12 +199,10 @@@ final class FinalLocationType extends A
   * @param  metadata  the metadata object to eventually copy, or {@code 
null}.
   * @return an unmodifiable copy of the given metadata object, or {@code 
null} if the given argument is {@code null}.
   */
 -private static  T unmodifiable(final Class type, T metadata) {
 +private static Object unmodifiable(Object metadata) {
  if (metadata instanceof ModifiableMetadata) {
 -metadata = MetadataCopier.forModifiable(((ModifiableMetadata) 
metadata).getStandard()).copy(type, metadata);
 +metadata = MetadataCopier.forModifiable(((ModifiableMetadata) 
metadata).getStandard()).copy(metadata);
- ((ModifiableMetadata) 
metadata).transition(ModifiableMetadata.State.FINAL);
+ ((ModifiableMetadata) 
metadata).transitionTo(ModifiableMetadata.State.FINAL);
  }
  return metadata;
  }

[sis] 01/01: Merge branch 'geoapi-3.1': remove deprecated methods.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 90b5999bd7855c46707cfee68c567621f3ae02a4
Merge: d9b2863 ddbee3b
Author: Martin Desruisseaux 
AuthorDate: Thu Sep 12 20:32:24 2019 +0200

Merge branch 'geoapi-3.1': remove deprecated methods.

 .../sis/feature/builder/FeatureTypeBuilder.java|   9 -
 .../java/org/apache/sis/internal/jaxb/Context.java |  14 +-
 .../apache/sis/internal/metadata/Identifiers.java  |   4 +-
 .../apache/sis/internal/metadata/Resources.java|   2 +-
 .../sis/internal/metadata/Resources.properties |   2 +-
 .../sis/internal/metadata/Resources_fr.properties  |   2 +-
 .../org/apache/sis/metadata/MetadataCopier.java|   2 +-
 .../apache/sis/metadata/ModifiableMetadata.java| 120 +--
 .../apache/sis/metadata/iso/DefaultIdentifier.java |   2 +-
 .../apache/sis/metadata/iso/DefaultMetadata.java   |   2 +-
 .../sis/metadata/iso/citation/Citations.java   |  35 +-
 .../sis/metadata/iso/citation/DefaultCitation.java |   2 +-
 .../sis/metadata/iso/citation/DefaultContact.java  |   2 +-
 .../metadata/iso/citation/DefaultTelephone.java|   4 +-
 .../iso/identification/AbstractIdentification.java |   2 +-
 .../apache/sis/metadata/sql/CachedStatement.java   |  25 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  15 -
 .../apache/sis/metadata/sql/MetadataSource.java|  77 ++---
 .../org/apache/sis/metadata/sql/package-info.java  |   2 +-
 .../java/org/apache/sis/xml/MarshallerPool.java|   8 +-
 .../main/java/org/apache/sis/xml/Namespaces.java   |  22 --
 .../src/main/java/org/apache/sis/xml/Pooled.java   |  18 +-
 .../src/main/java/org/apache/sis/xml/XML.java  |  31 +-
 .../main/java/org/apache/sis/xml/package-info.java |   2 +-
 .../apache/sis/metadata/MetadataCopierTest.java|  15 +
 .../apache/sis/metadata/MetadataStandardTest.java  |   4 +-
 .../metadata/iso/citation/DefaultCitationTest.java |  17 -
 .../referencing/gazetteer/FinalLocationType.java   |  14 +-
 .../sis/referencing/gazetteer/package-info.java|   2 +-
 .../referencing/gazetteer/LocationTypeTest.java|   2 +-
 .../org/apache/sis/distance/DistanceUtils.java | 102 --
 .../apache/sis/geometry/GeneralDirectPosition.java |  18 -
 .../sis/metadata/iso/ImmutableIdentifier.java  | 166 -
 .../sis/referencing/AbstractIdentifiedObject.java  |   1 -
 .../main/java/org/apache/sis/referencing/CRS.java  |  11 -
 .../java/org/apache/sis/referencing/CommonCRS.java |   4 +-
 .../apache/sis/referencing/IdentifiedObjects.java  |  12 +-
 .../apache/sis/referencing/cs/AxesConvention.java  |   9 -
 .../sis/referencing/datum/DefaultEllipsoid.java| 119 ---
 .../org/apache/sis/referencing/datum/Sphere.java   |  28 +-
 .../apache/sis/referencing/datum/package-info.java |   3 +-
 .../operation/transform/MathTransforms.java|   2 +-
 .../operation/transform/PassThroughTransform.java  |  13 +-
 .../org/apache/sis/referencing/package-info.java   |   2 +-
 .../apache/sis/distance/LatLonPointRadiusTest.java |  89 -
 .../referencing/datum/DefaultEllipsoidTest.java|  81 -
 .../test/integration/CoordinateOperationTest.java  |  79 ++---
 .../sis/test/suite/ReferencingTestSuite.java   |   3 -
 .../java/org/apache/sis/util/CharSequences.java|   2 +-
 .../java/org/apache/sis/util/ComparisonMode.java   |  18 -
 .../main/java/org/apache/sis/util/Utilities.java   |  10 -
 .../java/org/apache/sis/util/logging/Logging.java  |  28 +-
 .../apache/sis/util/logging/QuietLogRecord.java|  73 
 .../apache/sis/util/logging/WarningListener.java   |  93 -
 .../apache/sis/util/logging/WarningListeners.java  | 376 -
 .../org/apache/sis/util/logging/package-info.java  |   2 +-
 .../apache/sis/test/suite/UtilityTestSuite.java|   1 -
 .../sis/util/logging/WarningListenersTest.java | 118 ---
 .../java/org/apache/sis/internal/netcdf/Axis.java  |   2 +-
 .../apache/sis/index/tree}/LatLonPointRadius.java  |  61 +---
 .../java/org/apache/sis/index/tree/QuadTree.java   |   1 -
 .../sis/internal/storage/io/ChannelFactory.java|   8 +-
 .../java/org/apache/sis/storage/DataStore.java |  52 ---
 .../apache/sis/storage/event/StoreListeners.java   |  68 +---
 .../org/apache/sis/storage/event/package-info.java |   2 +-
 .../internal/storage/xml/stream/StaxDataStore.java |   2 +-
 66 files changed, 190 insertions(+), 1927 deletions(-)

diff --cc 
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
index f9802a1,1fb8556..165dbb5
--- 
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
+++ 
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
@@@ -92,11 -91,11 +92,11 @@@ public final class Identifiers extends 
   * 
   *   For information purpose (e.g. some {@code toString()} methods), 
use {@code getIdentifier(…, 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0ba78ebbdd2cecd6d746a821fe1a8abdd5fc9d6f
Merge: a888fcd e84fbdf
Author: Martin Desruisseaux 
AuthorDate: Wed Sep 11 18:42:55 2019 +0200

Merge branch 'geoapi-3.1'

 README |  28 +-
 .../main/java/org/apache/sis/console/Command.java  |   6 +-
 .../org/apache/sis/internal/doclet/Include.java|   2 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |   2 +-
 .../apache/sis/internal/metadata/Identifiers.java  |   4 +-
 .../main/java/org/apache/sis/util/iso/Names.java   |  20 +-
 .../java/org/apache/sis/util/iso/package-info.java |   3 +-
 .../java/org/apache/sis/xml/ValueConverter.java|   6 +-
 .../src/main/java/org/apache/sis/xml/XLink.java|  20 +-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |   7 +-
 .../java/org/apache/sis/geometry/Envelope2D.java   |   7 +-
 .../java/org/apache/sis/geometry/Envelopes.java|   4 +-
 .../org/apache/sis/geometry/GeneralEnvelope.java   |   7 +-
 .../java/org/apache/sis/geometry/package-info.java |   4 +-
 .../referencing/PositionalAccuracyConstant.java|   3 +
 .../internal/referencing/SignReversalComment.java  |   3 +
 .../java/org/apache/sis/io/wkt/Convention.java |   7 +-
 .../main/java/org/apache/sis/io/wkt/Symbols.java   |  10 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |  16 +-
 .../main/java/org/apache/sis/referencing/CRS.java  |  12 +-
 .../java/org/apache/sis/referencing/CommonCRS.java |  33 ++-
 .../sis/referencing/crs/DefaultCompoundCRS.java|  14 +-
 .../sis/referencing/datum/BursaWolfParameters.java |  18 +-
 .../factory/GeodeticAuthorityFactory.java  |  69 +++--
 .../referencing/factory/sql/EPSGDataAccess.java|  33 ++-
 .../operation/AbstractCoordinateOperation.java |   2 +-
 .../referencing/operation/matrix/MatrixSIS.java|   3 +-
 .../referencing/operation/matrix/package-info.java |   4 +-
 .../operation/projection/NormalizedProjection.java |  24 +-
 .../operation/transform/ContextualParameters.java  |  28 +-
 .../operation/transform/DatumShiftTransform.java   |  33 +--
 .../transform/DefaultMathTransformFactory.java |   2 +-
 .../operation/transform/LinearTransform.java   |   6 +-
 .../referencing/operation/transform/formulas.html  |  12 +-
 .../sis/internal/converter/SystemConverter.java|   3 +
 .../src/main/java/org/apache/sis/math/Plane.java   |   3 +-
 .../main/java/org/apache/sis/math/Statistics.java  |   3 +-
 .../main/java/org/apache/sis/measure/Units.java| 287 -
 .../org/apache/sis/util/LenientComparable.java |   3 +-
 .../org/apache/sis/util/collection/TreeTable.java  |   3 +-
 .../apache/sis/util/logging/MonolineFormatter.java |   3 +-
 pom.xml|   4 +-
 src/main/javadoc/sis.css   |  22 ++
 .../org/apache/sis/internal/netcdf/Convention.java |   2 +-
 .../apache/sis/storage/netcdf/AttributeNames.java  |   3 +-
 .../org/apache/sis/storage/WritableAggregate.java  |   2 +-
 46 files changed, 467 insertions(+), 323 deletions(-)

diff --cc pom.xml
index f251103,f4012ae..cae4606
--- a/pom.xml
+++ b/pom.xml
@@@ -863,9 -863,11 +863,11 @@@
true 
true   
true   
+   false  

+ https://docs.oracle.com/javase/8/docs/api
  
http://unitsofmeasurement.github.io/unit-api/site/apidocs
 -http://www.geoapi.org/snapshot/pending
 +http://www.geoapi.org/3.0/javadoc
  
http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/javadoc

  

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit a888fcdd1b884aeec5f28dc9beb5cb9ab8a9fc6d
Merge: 6b6cc17 b403553
Author: Martin Desruisseaux 
AuthorDate: Wed Sep 11 14:08:15 2019 +0200

Merge branch 'geoapi-3.1'

 .../apache/sis/console/ResourcesDownloader.java|   2 +-
 .../java/org/apache/sis/internal/jaxb/Context.java |   2 +-
 .../jaxb/gco/InternationalStringAdapter.java   |   2 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |   2 +-
 .../sis/internal/jaxb/gco/StringAdapter.java   |   2 +-
 .../sis/internal/jaxb/geometry/package-info.java   |   2 +-
 .../sis/internal/jaxb/gmi/LE_ProcessStep.java  |   2 +-
 .../apache/sis/internal/jaxb/gmi/LE_Source.java|   2 +-
 .../org/apache/sis/internal/jaxb/gmi/MI_Band.java  |   2 +-
 .../internal/jaxb/gmi/MI_CoverageDescription.java  |   2 +-
 .../sis/internal/jaxb/gmi/MI_Georectified.java |   2 +-
 .../sis/internal/jaxb/gmi/MI_Georeferenceable.java |   2 +-
 .../sis/internal/jaxb/gmi/MI_ImageDescription.java |   2 +-
 .../apache/sis/internal/jaxb/gmi/MI_Metadata.java  |   2 +-
 .../sis/internal/jaxb/metadata/CI_Address.java |   2 +-
 .../sis/internal/jaxb/metadata/CI_Citation.java|   2 +-
 .../sis/internal/jaxb/metadata/CI_Contact.java |   2 +-
 .../apache/sis/internal/jaxb/metadata/CI_Date.java |   2 +-
 .../internal/jaxb/metadata/CI_OnlineResource.java  |   2 +-
 .../sis/internal/jaxb/metadata/CI_Party.java   |   2 +-
 .../internal/jaxb/metadata/CI_Responsibility.java  |   2 +-
 .../jaxb/metadata/CI_ResponsibleParty.java |   2 +-
 .../sis/internal/jaxb/metadata/CI_Series.java  |   2 +-
 .../sis/internal/jaxb/metadata/CI_Telephone.java   |   2 +-
 .../sis/internal/jaxb/metadata/DQ_DataQuality.java |   2 +-
 .../sis/internal/jaxb/metadata/DQ_Element.java |   2 +-
 .../jaxb/metadata/DQ_PositionalAccuracy.java   |   2 +-
 .../sis/internal/jaxb/metadata/DQ_Result.java  |   2 +-
 .../sis/internal/jaxb/metadata/EX_Extent.java  |   2 +-
 .../jaxb/metadata/EX_GeographicExtent.java |   2 +-
 .../internal/jaxb/metadata/EX_TemporalExtent.java  |   2 +-
 .../internal/jaxb/metadata/EX_VerticalExtent.java  |   2 +-
 .../sis/internal/jaxb/metadata/LE_Algorithm.java   |   2 +-
 .../jaxb/metadata/LE_NominalResolution.java|   2 +-
 .../jaxb/metadata/LE_ProcessStepReport.java|   2 +-
 .../sis/internal/jaxb/metadata/LE_Processing.java  |   2 +-
 .../sis/internal/jaxb/metadata/LI_Lineage.java |   2 +-
 .../sis/internal/jaxb/metadata/LI_ProcessStep.java |   2 +-
 .../sis/internal/jaxb/metadata/LI_Source.java  |   2 +-
 .../jaxb/metadata/MD_AggregateInformation.java |   2 +-
 .../metadata/MD_ApplicationSchemaInformation.java  |   2 +-
 .../internal/jaxb/metadata/MD_AttributeGroup.java  |   2 +-
 .../internal/jaxb/metadata/MD_BrowseGraphic.java   |   2 +-
 .../sis/internal/jaxb/metadata/MD_Constraints.java |   2 +-
 .../jaxb/metadata/MD_ContentInformation.java   |   2 +-
 .../jaxb/metadata/MD_DataIdentification.java   |   2 +-
 .../jaxb/metadata/MD_DigitalTransferOptions.java   |   2 +-
 .../sis/internal/jaxb/metadata/MD_Dimension.java   |   2 +-
 .../internal/jaxb/metadata/MD_Distribution.java|   2 +-
 .../sis/internal/jaxb/metadata/MD_Distributor.java |   2 +-
 .../metadata/MD_ExtendedElementInformation.java|   2 +-
 .../internal/jaxb/metadata/MD_FeatureTypeInfo.java |   2 +-
 .../sis/internal/jaxb/metadata/MD_Format.java  |   2 +-
 .../jaxb/metadata/MD_GeometricObjects.java |   2 +-
 .../internal/jaxb/metadata/MD_Identification.java  |   2 +-
 .../sis/internal/jaxb/metadata/MD_Identifier.java  |   2 +-
 .../internal/jaxb/metadata/MD_KeywordClass.java|   2 +-
 .../sis/internal/jaxb/metadata/MD_Keywords.java|   2 +-
 .../jaxb/metadata/MD_MaintenanceInformation.java   |   2 +-
 .../sis/internal/jaxb/metadata/MD_Medium.java  |   2 +-
 .../sis/internal/jaxb/metadata/MD_Metadata.java|   2 +-
 .../metadata/MD_MetadataExtensionInformation.java  |   2 +-
 .../internal/jaxb/metadata/MD_MetadataScope.java   |   2 +-
 .../metadata/MD_PortrayalCatalogueReference.java   |   2 +-
 .../internal/jaxb/metadata/MD_RangeDimension.java  |   2 +-
 .../internal/jaxb/metadata/MD_Releasability.java   |   2 +-
 .../jaxb/metadata/MD_RepresentativeFraction.java   |   2 +-
 .../sis/internal/jaxb/metadata/MD_Resolution.java  |   2 +-
 .../sis/internal/jaxb/metadata/MD_Scope.java   |   2 +-
 .../jaxb/metadata/MD_ScopeDescription.java |   2 +-
 .../jaxb/metadata/MD_SpatialRepresentation.java|   2 +-
 .../jaxb/metadata/MD_StandardOrderProcess.java |   2 +-
 .../sis/internal/jaxb/metadata/MD_Usage.java   |   2 +-
 .../jaxb/metadata/MI_AcquisitionInformation.java   |   2 +-
 .../jaxb/metadata/MI_EnvironmentalRecord.java  |   2 +-
 .../sis/internal/jaxb/metadata/MI_Event.java   |   2 +-
 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9671eeb1ade4566930e5f1e3ffcd921871fbebd2
Merge: e6937d1 cbe6d78
Author: Martin Desruisseaux 
AuthorDate: Mon Sep 9 17:55:32 2019 +0200

Merge branch 'geoapi-3.1'

 .../java/org/apache/sis/console/package-info.java  |   2 +-
 .../java/org/apache/sis/image/PixelIterator.java   |   7 +
 .../apache/sis/image/WritablePixelIterator.java|   9 +-
 .../apache/sis/internal/metadata/Resources.java|  27 ++
 .../sis/internal/metadata/Resources.properties |   2 +
 .../sis/internal/metadata/Resources_fr.properties  |   2 +
 .../sis/internal/metadata/ServicesForUtility.java  |  29 +-
 .../sis/internal/metadata/sql/Initializer.java |  22 +-
 .../org/apache/sis/metadata/AbstractMetadata.java  |   1 -
 .../org/apache/sis/metadata/MetadataCopier.java|  41 +-
 .../apache/sis/metadata/iso/DefaultIdentifier.java |   7 +-
 .../sis/metadata/iso/citation/Citations.java   |  20 +-
 .../java/org/apache/sis/xml/ReferenceResolver.java |   2 +-
 .../apache/sis/metadata/MetadataCopierTest.java|  33 +-
 .../apache/sis/internal/jaxb/referencing/Code.java |   4 +-
 .../sis/internal/referencing/DeprecatedCode.java   |   2 +-
 .../sis/internal/referencing/WKTKeywords.java  |   2 +-
 .../internal/referencing/provider/EPSGName.java|   2 +-
 .../referencing/provider/MapProjection.java|   2 +-
 .../java/org/apache/sis/io/wkt/ElementKind.java|   2 +-
 .../main/java/org/apache/sis/io/wkt/Formatter.java |   2 +-
 .../apache/sis/io/wkt/GeodeticObjectParser.java|   2 +-
 .../main/java/org/apache/sis/io/wkt/WKTFormat.java |  43 +-
 .../sis/metadata/iso/ImmutableIdentifier.java  | 467 +
 .../java/org/apache/sis/parameter/Parameters.java  |   4 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |   5 +-
 .../java/org/apache/sis/referencing/Builder.java   |   1 -
 .../apache/sis/referencing/IdentifiedObjects.java  |   4 +-
 .../iso => referencing}/ImmutableIdentifier.java   |  57 +--
 .../apache/sis/referencing/NamedIdentifier.java|   1 -
 .../sis/referencing/crs/DefaultGeographicCRS.java  |   2 +-
 .../referencing/factory/sql/EPSGDataAccess.java|   2 +-
 .../operation/InverseOperationMethod.java  |   2 +-
 .../transform/CoordinateSystemTransform.java   |   2 +-
 .../transform/EllipsoidToCentricTransform.java |   2 +-
 .../sis/internal/jaxb/referencing/CodeTest.java|   2 +-
 .../parameter/DefaultParameterDescriptorTest.java  |   2 +-
 .../referencing/AbstractIdentifiedObjectTest.java  |   5 +-
 .../referencing/AbstractReferenceSystemTest.java   |   1 -
 .../org/apache/sis/referencing/BuilderTest.java|   1 -
 .../ImmutableIdentifierTest.java   |   2 +-
 .../apache/sis/referencing/cs/NormalizerTest.java  |   2 +-
 .../datum/DefaultTemporalDatumTest.java|   2 +-
 .../operation/DefaultOperationMethodTest.java  |   2 +-
 .../apache/sis/test/integration/MetadataTest.java  |   4 +-
 .../sis/test/suite/ReferencingTestSuite.java   |   2 +-
 .../org/apache/sis/internal/system/Supervisor.java |   2 -
 .../apache/sis/internal/util/MetadataServices.java |  25 ++
 .../sis/internal/util/TemporalUtilities.java   |   2 -
 .../java/org/apache/sis/setup/Configuration.java   | 102 +
 .../java/org/apache/sis/util/CharSequences.java|   4 +-
 .../java/org/apache/sis/util/Configuration.java|   8 +-
 pom.xml|  21 +-
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |   2 +-
 .../apache/sis/storage/sql/SQLStoreProvider.java   |   6 +-
 .../org/apache/sis/internal/storage/Resources.java |   5 +
 .../sis/internal/storage/Resources.properties  |   1 +
 .../sis/internal/storage/Resources_fr.properties   |   1 +
 .../storage/folder/FolderStoreProvider.java|   3 +-
 .../org/apache/sis/storage/DataStoreProvider.java  |  19 +-
 .../org/apache/sis/storage/StorageConnector.java   |  11 +-
 61 files changed, 433 insertions(+), 618 deletions(-)

diff --cc 
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
index 31074d2,2cf4b6c..d25347d
--- 
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
+++ 
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
@@@ -20,7 -20,9 +20,9 @@@ import java.text.Format
  import java.util.Locale;
  import java.util.TimeZone;
  import javax.sql.DataSource;
+ import java.sql.SQLException;
+ import java.util.function.Supplier;
 -import org.opengis.util.ControlledVocabulary;
 +import org.opengis.util.CodeList;
  import org.opengis.metadata.citation.Citation;
  import org.apache.sis.internal.util.MetadataServices;
  import org.apache.sis.internal.metadata.sql.Initializer;
@@@ -30,9 -32,10 +32,9 @@@ import org.apache.sis.util.logging.Logg
  import 

[sis] 01/01: Merge branch 'geoapi-3.1'

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e6937d1ac129eab5167f433c6482fdba4b2fce06
Merge: bd04498 5db8d26
Author: Martin Desruisseaux 
AuthorDate: Sat Sep 7 18:13:19 2019 +0200

Merge branch 'geoapi-3.1'

 .../org/apache/sis/console/TransformCommand.java   |   3 +-
 .../java/org/apache/sis/internal/jaxb/Context.java |  13 +-
 .../apache/sis/metadata/sql/MetadataSource.java|   6 +
 .../src/main/java/org/apache/sis/xml/Pooled.java   |  12 +-
 .../src/main/java/org/apache/sis/xml/XML.java  |  16 +
 .../metadata/iso/citation/DefaultContactTest.java  |  20 +-
 .../identification/DefaultBrowseGraphicTest.java   |  17 +-
 .../main/java/org/apache/sis/referencing/CRS.java  |  41 +-
 .../org/apache/sis/internal/system/Modules.java|   5 +
 .../java/org/apache/sis/util/logging/Logging.java  |  18 +-
 .../apache/sis/util/logging/QuietLogRecord.java|   3 +
 .../apache/sis/util/logging/WarningListener.java   |  19 +-
 .../apache/sis/util/logging/WarningListeners.java  |  16 +-
 .../sis/util/logging/EmptyWarningListeners.java|  71 ---
 .../sis/util/logging/WarningListenersTest.java |   1 +
 pom.xml|   1 -
 .../storage/earthobservation/LandsatReader.java|  13 +-
 .../sis/storage/earthobservation/LandsatStore.java |  30 +-
 .../earthobservation/LandsatReaderTest.java|   7 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   |  40 +-
 .../sis/storage/geotiff/ImageFileDirectory.java|   2 +-
 .../org/apache/sis/internal/netcdf/Decoder.java|   7 +-
 .../sis/internal/netcdf/DiscreteSampling.java  |   7 +-
 .../apache/sis/internal/netcdf/NamedElement.java   |   4 +-
 .../sis/internal/netcdf/impl/ChannelDecoder.java   |  13 +-
 .../sis/internal/netcdf/impl/FeaturesInfo.java |   6 +-
 .../sis/internal/netcdf/ucar/DecoderWrapper.java   |  15 +-
 .../sis/internal/netcdf/ucar/FeaturesWrapper.java  |   5 +-
 .../sis/internal/netcdf/ucar/LogAdapter.java   |  11 +-
 .../apache/sis/storage/netcdf/MetadataReader.java  |   9 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java |  30 +-
 .../sis/storage/netcdf/NetcdfStoreProvider.java|   8 +-
 .../org/apache/sis/internal/netcdf/TestCase.java   |  11 +-
 .../internal/netcdf/impl/ChannelDecoderTest.java   |   3 +-
 .../storage/netcdf/NetcdfStoreProviderTest.java|   9 +-
 .../apache/sis/internal/shapefile/AutoChecker.java |   4 +-
 .../internal/shapefile/ShapefileByteReader.java|   2 +-
 .../sis/storage/shapefile/InputFeatureStream.java  |   2 +-
 .../jdbc/AbstractTestBaseForInternalJDBC.java  |   2 +-
 .../sis/storage/shapefile/ShapeFileTest.java   |   4 +-
 .../apache/sis/internal/sql/feature/Analyzer.java  |   7 +-
 .../apache/sis/internal/sql/feature/Database.java  |   5 +-
 .../java/org/apache/sis/storage/sql/SQLStore.java  |  30 +-
 .../sis/internal/storage/AbstractFeatureSet.java   |  22 +-
 .../sis/internal/storage/AbstractGridResource.java |  22 +-
 .../sis/internal/storage/AbstractResource.java |  95 +--
 .../internal/storage/DocumentedStoreProvider.java  |   7 +-
 .../sis/internal/storage/MemoryFeatureSet.java |  11 +-
 .../apache/sis/internal/storage/URIDataStore.java  |  31 +-
 .../org/apache/sis/internal/storage/csv/Store.java |   4 +-
 .../apache/sis/internal/storage/folder/Store.java  |  32 +-
 .../sis/internal/storage/io/ChannelFactory.java|  33 +-
 .../sis/internal/storage/query/FeatureSubset.java  |  13 +-
 .../sis/internal/storage/wkt/StoreFormat.java  |  16 +-
 .../org/apache/sis/internal/storage/xml/Store.java |  39 +-
 .../java/org/apache/sis/storage/DataStore.java |  90 ++-
 .../org/apache/sis/storage/DataStoreProvider.java  |  22 +
 .../main/java/org/apache/sis/storage/Resource.java |  62 +-
 .../org/apache/sis/storage/event/ChangeEvent.java  |  60 --
 .../apache/sis/storage/event/ChangeListener.java   |  54 --
 .../apache/sis/storage/event}/QuietLogRecord.java  |  14 +-
 .../org/apache/sis/storage/event/StoreEvent.java   |  91 +++
 .../apache/sis/storage/event/StoreListener.java|  56 ++
 .../apache/sis/storage/event/StoreListeners.java   | 673 +
 .../org/apache/sis/storage/event/WarningEvent.java |  90 +++
 .../org/apache/sis/storage/event/package-info.java |  18 +-
 .../internal/storage/AbstractGridResourceTest.java |   3 -
 .../java/org/apache/sis/storage/DataStoreMock.java |  40 +-
 .../sis/storage/event/StoreListenersTest.java  | 109 
 .../apache/sis/test/suite/StorageTestSuite.java|   1 +
 .../internal/storage/xml/stream/StaxDataStore.java |  29 +-
 71 files changed, 1577 insertions(+), 708 deletions(-)

diff --cc 
core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
index eb37c03,e4c0dbe..0261fae
--- 
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
+++ 

[sis] 01/01: Merge branch 'geoapi-3.1'. Make Apache SIS compatible with Java 11. https://issues.apache.org/jira/browse/SIS-438

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit bd04498c959144f13fd269795b3101f9821fcae8
Merge: cd5fecb 3363d3c
Author: Martin Desruisseaux 
AuthorDate: Mon Sep 2 15:49:38 2019 +0200

Merge branch 'geoapi-3.1'. Make Apache SIS compatible with Java 11.
https://issues.apache.org/jira/browse/SIS-438

 NOTICE |  11 +-
 application/pom.xml|  17 ++-
 application/sis-console/pom.xml|   5 +
 application/sis-javafx/pom.xml |   5 +-
 .../org/apache/sis/internal/gui/Resources.java |   2 +-
 core/sis-metadata/pom.xml  |  13 +-
 .../apache/sis/internal/jaxb/gco/package-info.java |   5 +-
 .../java/org/apache/sis/xml/Implementation.java|  32 ++---
 .../java/org/apache/sis/xml/MarshallerPool.java|  25 +---
 .../apache/sis/xml/OGCNamespacePrefixMapper.java   |  79 
 .../sis/xml/OGCNamespacePrefixMapper_Endorsed.java |  73 ---
 .../src/main/java/org/apache/sis/xml/XML.java  |   7 +-
 .../apache/sis/test/suite/MetadataTestSuite.java   |   1 -
 .../org/apache/sis/xml/MarshallerPoolTest.java |   2 -
 .../sis/xml/OGCNamespacePrefixMapperTest.java  | 134 -
 core/sis-referencing/pom.xml   |   9 ++
 ide-project/NetBeans/nbproject/build-impl.xml  |  47 +++-
 ide-project/NetBeans/nbproject/genfiles.properties |   4 +-
 ide-project/NetBeans/nbproject/project.properties  |  43 ---
 ide-project/NetBeans/nbproject/project.xml |   2 -
 pom.xml|  24 +++-
 profiles/sis-french-profile/pom.xml|   5 +
 storage/sis-storage/pom.xml|   5 +
 storage/sis-xmlstore/pom.xml   |   5 +
 24 files changed, 137 insertions(+), 418 deletions(-)

diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 5d88045,2039f39..3f5e676
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
  build.xml.data.CRC32=58e6b21c
  build.xml.script.CRC32=462eaba0
  build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=1e9c8996
- nbproject/build-impl.xml.script.CRC32=1aba96b2
 -nbproject/build-impl.xml.data.CRC32=c66331aa
 -nbproject/build-impl.xml.script.CRC32=a8b9b922
++nbproject/build-impl.xml.data.CRC32=82e7f46a
++nbproject/build-impl.xml.script.CRC32=dbe1a9a7
  nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.92.0.48
diff --cc ide-project/NetBeans/nbproject/project.properties
index 5491b32,3c762ce..a91ab13
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -98,8 -96,11 +96,11 @@@ 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
 +geoapi.version   = 3.0.1
  jsr363.version   = 1.0
+ jaxb.version = 2.3.2
+ istack.version   = 3.0.8
+ activation.version   = 1.1
  jama.version = 1.0.3
  geographlib.version  = 1.49
  guava.version= 27.0.1-jre
@@@ -132,8 -132,9 +132,9 @@@ icons.version= 3.0.
  maven.repository   = ${user.home}/.m2/repository
  endorsed.classpath =
  javac.classpath=\
 -
${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${geoapi.version}.jar:\
 +
${maven.repository}/org/opengis/geoapi/${geoapi.version}/geoapi-${geoapi.version}.jar:\
  
${maven.repository}/javax/measure/unit-api/${jsr363.version}/unit-api-${jsr363.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:\
  
${maven.repository}/org/geonames/georss-rome/${georss.version}/georss-rome-${georss.version}.jar:\
diff --cc pom.xml
index d2f5ae1,16aae5e..226f294
--- a/pom.xml
+++ b/pom.xml
@@@ -547,7 -565,8 +565,8 @@@
  8
  ${project.version}
  1.0-M1 
 -3.1-SNAPSHOT
 +3.0.1
+ 2.3.2

  

[sis] 01/01: Merge branch 'geoapi-3.1' The main work is GeodeticCalculator on ellipsoid. The work on filters & expressions is excluded since filter interfaces are not available in GeoAPI 3.0.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 309aad84b195a29ffc08f218f27c66118b79289c
Merge: c8bf605 38edbe5
Author: Martin Desruisseaux 
AuthorDate: Tue Aug 27 11:29:17 2019 +0200

Merge branch 'geoapi-3.1'
The main work is GeodeticCalculator on ellipsoid.
The work on filters & expressions is excluded since filter interfaces are 
not available in GeoAPI 3.0.

 .../org/apache/sis/services/LocationServlet.java   |  13 +-
 .../apache/sis/coverage/grid/GridDerivation.java   |  92 +-
 .../org/apache/sis/coverage/grid/GridGeometry.java |   4 +
 .../java/org/apache/sis/feature/FeatureFormat.java |  11 +-
 .../main/java/org/apache/sis/feature/Features.java |   6 +
 .../java/org/apache/sis/internal/feature/ESRI.java |  17 +-
 .../sis/internal/feature/FeatureExpression.java|  46 -
 .../apache/sis/internal/feature/Geometries.java| 234 -
 .../java/org/apache/sis/internal/feature/JTS.java  | 100 ++-
 .../org/apache/sis/internal/feature/Java2D.java|  22 +-
 .../org/apache/sis/internal/feature/Resources.java |  15 +
 .../sis/internal/feature/Resources.properties  |   3 +
 .../sis/internal/feature/Resources_fr.properties   |   3 +
 .../org/apache/sis/internal/feature/jts/JTS.java   |  59 +-
 .../sis/coverage/grid/GridDerivationTest.java  |  30 +-
 .../apache/sis/test/suite/FeatureTestSuite.java|   2 +-
 .../org/apache/sis/distance/LatLonPointRadius.java |  45 +-
 .../sis/internal/referencing/EPSGFactoryProxy.java |   7 +-
 .../apache/sis/internal/referencing/Formulas.java  |   4 +-
 .../apache/sis/internal/referencing/Resources.java |   5 +
 .../sis/internal/referencing/Resources.properties  |   1 +
 .../internal/referencing/Resources_fr.properties   |   1 +
 .../referencing/provider/GeocentricAffine.java |   2 +-
 .../sis/referencing/GeodesicsOnEllipsoid.java  | 996 +
 .../apache/sis/referencing/GeodeticCalculator.java | 474 +++---
 .../apache/sis/referencing/GeodeticException.java  |  74 ++
 .../sis/referencing/datum/DefaultEllipsoid.java|   7 +-
 .../org/apache/sis/referencing/datum/Sphere.java   |   1 +
 .../sis/referencing/operation/matrix/Matrices.java |   5 +-
 .../operation/projection/Mollweide.java|   4 +-
 .../operation/projection/package-info.java |   6 +-
 .../apache/sis/referencing/ClenshawSummation.java  | 460 ++
 .../sis/referencing/GeodesicsOnEllipsoidTest.java  | 561 
 .../sis/referencing/GeodeticCalculatorTest.java| 371 +---
 .../sis/test/suite/ReferencingTestSuite.java   |   1 +
 .../main/java/org/apache/sis/io/TableAppender.java |   5 +-
 .../java/org/apache/sis/math/MathFunctions.java| 255 +-
 .../java/org/apache/sis/util/ArgumentChecks.java   |  25 +
 .../java/org/apache/sis/util/StringBuilders.java   |  31 +-
 .../org/apache/sis/math/MathFunctionsTest.java |  43 +
 .../test/java/org/apache/sis/test/TestCase.java|   3 +
 ide-project/NetBeans/nbproject/genfiles.properties |   4 +-
 ide-project/NetBeans/nbproject/project.properties  |   2 +-
 ide-project/NetBeans/nbproject/project.xml |   2 +
 .../apache/sis/internal/netcdf/RasterResource.java |  10 +-
 .../java/org/apache/sis/index/tree/QuadTree.java   |   5 +-
 .../org/apache/sis/internal/storage/Resources.java |  10 +
 .../sis/internal/storage/Resources.properties  |   2 +
 .../sis/internal/storage/Resources_fr.properties   |   2 +
 .../sis/internal/storage/query/FeatureSubset.java  |  10 +-
 .../sis/internal/storage/query/SimpleQuery.java|  32 +-
 .../storage/gpx/GroupAsPolylineOperation.java  |   3 +
 52 files changed, 3635 insertions(+), 491 deletions(-)

diff --cc 
core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
index 5ab8882,7bcc201..441db55
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
@@@ -399,7 -412,15 +400,15 @@@ public class FeatureFormat extends Tabu
  }
  value = 
feature.getPropertyValue(propertyType.getName().toString());
  if (value == null) {
- if (propertyType instanceof FieldType && ((FieldType) 
propertyType).getMinimumOccurs() == 0) {
 -if (propertyType instanceof AttributeType
 -&& ((AttributeType) 
propertyType).getMinimumOccurs() == 0
 -&& ((AttributeType) 
propertyType).characteristics().isEmpty())
++if (propertyType instanceof DefaultAttributeType
++&& ((DefaultAttributeType) 
propertyType).getMinimumOccurs() == 0
++&& ((DefaultAttributeType) 
propertyType).characteristics().isEmpty())
+ {
+ continue;   // If 

[sis] 01/01: Merge branch 'geoapi-3.1', without changing the way to create CodeList since the new API is not available in GeoAPI 3.0.1.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit c8bf60535d1d41870ef012bffaf6682ad468c41a
Merge: d2003d3 c468aad
Author: Martin Desruisseaux 
AuthorDate: Mon Jul 1 20:21:51 2019 +0200

Merge branch 'geoapi-3.1', without changing the way to create CodeList 
since the new API is not available in GeoAPI 3.0.1.

 .../org/apache/sis/internal/util/CodeLists.java|4 +
 ide-project/NetBeans/nbproject/build-impl.xml~ | 2128 
 2 files changed, 4 insertions(+), 2128 deletions(-)

diff --cc 
core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
index 092a548,ee9d73d..02d119a
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
@@@ -48,31 -51,19 +48,35 @@@ public final class CodeLists implement
  private final String codename;
  
  /**
 + * {@code true} if {@link CodeList#valueOf} is allowed to create new code 
lists.
 + */
 +private final boolean canCreate;
 +
 +/**
   * Creates a new filter for the specified code name.
   */
 -private CodeLists(final String codename) {
 +private CodeLists(final String codename, final boolean canCreate) {
  this.codename  = codename;
 +this.canCreate = canCreate;
 +}
 +
 +/**
 + * Returns the name of the code to create, or {@code null} if no new code 
list shall be created.
++ *
++ * @return the name specified at construction time.
 + */
 +@Override
 +public String codename() {
 +return canCreate ? codename : null;
  }
  
  /**
   * Returns {@code true} if the given code matches the name we are looking 
for.
+  *
+  * @param  code  the code list candidate.
   */
  @Override
 -public boolean test(final CodeList code) {
 +public boolean accept(final CodeList code) {
  for (final String candidate : code.names()) {
  if (accept(candidate, codename)) {
  return true;