(sis) branch geoapi-4.0 updated: Fix documentation that became innacurate after the improvement done in previous commit.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 7574429b2d Fix documentation that became innacurate after the
improvement done in previous commit.
7574429b2d is described below
commit 7574429b2db1a3d7c7293b1db116e2c5091ebf21
Author: Martin Desruisseaux
AuthorDate: Sat Apr 27 11:23:27 2024 +0200
Fix documentation that became innacurate after the improvement done in
previous commit.
---
.../apache/sis/referencing/ClenshawSummation.java | 24 +++---
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
index 96053fb6fa..2831ca0cd3 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
@@ -56,10 +56,16 @@ import org.apache.sis.pending.jdk.JDK21;
* This class is used for more complex formulas where the use of spreadsheet
become too difficult.
*
* Limitations
- * Current implementation can handle a maximum of 6 terms in the trigonometric
series (see {@link #compute()}).
- * This limit is too short for {@link
org.apache.sis.referencing.operation.projection.EquidistantCylindrical}.
- * It would be possible to generalize using an iterative algorithm. Given that
{@code EquidistantCylindrical}
- * is used less often than Mercator or Lambert projections, we have not done
this optimization yet.
+ * Current implementation can handle a maximum of 8 terms in the trigonometric
series.
+ * This limit is hard-coded in the {@link #compute()} method, but can be
expanded by using
+ * the {@link Precomputation} inner class for generating the {@code compute()}
code.
+ *
+ * Possible future evolution
+ * Maybe we should generate series expansions automatically for a given
precision and eccentricity,
+ * adding more terms until the last added term adds a correction smaller than
the desired precision.
+ * Then we could use {@link Precomputation} for generating the corresponding
Clenshaw summation.
+ * This improvement would be needed for planetary CRS, where map projections
may be applied on planet
+ * with higher eccentricity than Earth.
*
* @author Martin Desruisseaux (Geomatys)
*
@@ -346,9 +352,13 @@ public final class ClenshawSummation {
}
/**
- * Performs the Clenshaw summation. Current implementation uses hard-coded
coefficients for 6 terms.
- * See Charles F. F. Karney, Geodesics on an ellipsoid of revolution
(2011) equation 59
- * if generalization to an arbitrary number of coefficients is desired.
+ * Performs the Clenshaw summation. Current implementation uses hard-coded
coefficients for 8 terms.
+ * If more terms are needed, use {@link Precomputation} for generating the
code of this method.
+ *
+ * Possible future evolution
+ * It would be possible to compute those terms dynamically using {@link
Precomputation}.
+ * It would be useful if a future Apache SIS version generates series
expansion on-the-fly
+ * for a specified precision and eccentricity.
*
* @see https://issues.apache.org/jira/browse/SIS-465;>SIS-465
*/
(sis) branch geoapi-4.0 updated: Increase the maximum number of coefficients that we can compute for Clenshaw summation. This is a generator of generator of code. Needed for "Equidistant Cylindrical"
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new b85d81fee6 Increase the maximum number of coefficients that we can
compute for Clenshaw summation. This is a generator of generator of code.
Needed for "Equidistant Cylindrical" projection because the number of
coefficients exceed the previous limit (which was 6).
b85d81fee6 is described below
commit b85d81fee65fa785167c7641d9d4ba8835fb704d
Author: Martin Desruisseaux
AuthorDate: Fri Apr 26 19:05:46 2024 +0200
Increase the maximum number of coefficients that we can compute for
Clenshaw summation.
This is a generator of generator of code. Needed for "Equidistant
Cylindrical" projection
because the number of coefficients exceed the previous limit (which was 6).
---
.../apache/sis/referencing/ClenshawSummation.java | 141 +++--
1 file changed, 132 insertions(+), 9 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
index a37b1a1616..96053fb6fa 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
@@ -353,17 +353,140 @@ public final class ClenshawSummation {
* @see https://issues.apache.org/jira/browse/SIS-465;>SIS-465
*/
private void compute() {
-if (sineCoefficients.length > 6) {
-throw new UnsupportedOperationException("Too many coefficients for
current implementation.");
-}
cosineCoefficients = new Coefficient[] {
-sum(1, 0, -1, 0, 1),// A′ = A - C + E
-sum(0, 2, 0, -4, 0, 6),// B′ = 2B - 4D + 6F
-sum(0, 0, 4, 0, -12),// C′ = 4C - 12E
-sum(0, 0, 0, 8, 0, -32),// D′ = 8D - 32F
-sum(0, 0, 0, 0, 16),// E′ = 16E
-sum(0, 0, 0, 0, 0, 32),// F′ = 32F
+sum(1, 0, -1, 0, 1, 0, -1 ),// A′ =A -
C + E - G
+sum(0, 2, 0, -4, 0, 6, 0, -8),// B′ = 2B -
4D + 6F - 8H
+sum(0, 0, 4, 0, -12, 0, 24 ),// C′ = 4C -
12E + 24G
+sum(0, 0, 0, 8, 0, -32, 0, 80),// D′ = 8D -
32F + 80H
+sum(0, 0, 0, 0, 16, 0, -80 ),// E′ = 16E - 80G
+sum(0, 0, 0, 0, 0, 32, 0, -192),// F′ = 32F - 192H
+sum(0, 0, 0, 0, 0, 0, 64 ),// G′ = 64G
+sum(0, 0, 0, 0, 0, 0, 0, 128),// H′ = 128H
};
+if (sineCoefficients.length > cosineCoefficients.length) {
+throw new UnsupportedOperationException("Too many coefficients for
current implementation.");
+}
+}
+
+/**
+ * Computes the coefficients that are hard-coded in the {@link #compute()}
method.
+ * This class needs to be executed only when the maximal number of terms
increased.
+ * The formula is given by Charles F. F. Karney, Geodesics on an ellipsoid
of revolution (2011) equation 59:
+ *
+ * f(θ) = ∑(aₙ⋅sin(n⋅θ)
+ *
+ * where the sum is from n=1 to N and N
is the maximum number of terms.
+ * The equation can be rewritten as:
+ *
+ * f(θ) = b₁⋅sin(θ)
+ *
+ * where bₙ =
+ *
+ * 0 for n
N,
+ * aₙ + 2⋅bₙ₊₁⋅cos(θ) − bₙ₊₂ otherwise.
+ *
+ *
+ * This class computes b₁.
+ */
+public static final class Precomputation {
+/**
+ * The factors by which to multiply the aₙ terms.
+ * The first array index identifies the factors which is multiplied,
in reverse order.
+ * For example, if there is 4 terms to compute, then the factors are
in the following order:
+ *
+ *
+ * {@code multiplicands[0]} = factors by which to multiply
D (a₄).
+ * {@code multiplicands[1]} = factors by which to multiply
C (a₃).
+ * {@code multiplicands[2]} = factors by which to multiply
B (a₂).
+ * {@code multiplicands[3]} = factors by which to multiply
A (a₁).
+ *
+ *
+ * The second array index is the power by which to multiply {@code
cos(θ)}.
+ */
+private final int[][] multiplicands;
+
+/**
+ * Creates a new step in the iteration process for computing the
factors.
+ * This constructor shall be invoked with decreasing n
values,
+ * with b₁ computed
(sis) 02/02: Replace epsilon greek letter by eta for avoiding confusion with an error term or with eccentricity.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 011426fc99dcc7eda4c4c88ade00b0643cc8f214
Author: Martin Desruisseaux
AuthorDate: Fri Apr 26 12:00:35 2024 +0200
Replace epsilon greek letter by eta for avoiding confusion with an error
term or with eccentricity.
---
.../test/org/apache/sis/referencing/ClenshawSummation.java| 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
index c50951578b..a37b1a1616 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
@@ -101,7 +101,7 @@ public final class ClenshawSummation {
* Each {@code Coefficient} is itself defined by a sum of terms, for
example:
*
*
- * A = -1/2⋅ε + 3/16⋅ε³ + -1/32⋅ε⁵
+ * A = -1/2⋅η + 3/16⋅η³ + -1/32⋅η⁵
*/
private static final class Coefficient {
/**
@@ -111,7 +111,7 @@ public final class ClenshawSummation {
/**
* Creates a new coefficient defined by the sum of the given term.
Each term is intended to be multiplied
- * by some ε value raised to a different power. Those ε values and
their powers do not matter for this class
+ * by some η value raised to a different power. Those η values and
their powers do not matter for this class
* provided that all {@code Coefficient} instances associate the same
values and powers at the same indices.
*/
Coefficient(final Term... terms) {
@@ -160,7 +160,7 @@ public final class ClenshawSummation {
b.append(" + ");
}
t.appendTo(b);
-b.append(" * ε");
+b.append(" * η");
if (i != 0) {
b.append(i+1);
}
@@ -186,7 +186,7 @@ public final class ClenshawSummation {
* For example, a {@code Coefficient} may be defined as below:
*
*
- * A = -1/2⋅ε + 3/16⋅ε³ + -1/32⋅ε⁵
+ * A = -1/2⋅η + 3/16⋅η³ + -1/32⋅η⁵
*
* In above example each of -1/2, 3/16 and -1/32 fraction is a {@code
Term} instance.
* However, this class allows a term to be defined by an array of
fractions if each term
(sis) branch geoapi-4.0 updated (db9cbe5b13 -> 011426fc99)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
from db9cbe5b13 More extensive documentation on the new `getMetadata()`
methods. Provide default implementation using the information provided by
existing methods.
new fc7eca86b2 Initial version of Equidistant Cylindrical (EPSG:1028) map
projection with formulas as published in EPSG guidance notes.
new 011426fc99 Replace epsilon greek letter by eta for avoiding confusion
with an error term or with eccentricity.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/module-info.java | 1 +
.../operation/projection/CylindricalEqualArea.java | 4 +-
.../projection/EquidistantCylindrical.java | 194 +
.../operation/projection/NormalizedProjection.java | 5 +-
.../operation/provider/EquidistantCylindrical.java | 81 +
.../operation/provider/Equirectangular.java| 24 ++-
.../operation/transform/MathTransformProvider.java | 2 +-
.../apache/sis/referencing/ClenshawSummation.java | 19 +-
.../operation/projection/CassiniSoldnerTest.java | 6 +-
...ntTest.java => EquidistantCylindricalTest.java} | 75
.../operation/provider/ProvidersTest.java | 1 +
geoapi/snapshot| 2 +-
12 files changed, 354 insertions(+), 60 deletions(-)
create mode 100644
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/EquidistantCylindrical.java
create mode 100644
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/EquidistantCylindrical.java
copy
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/{ModifiedAzimuthalEquidistantTest.java
=> EquidistantCylindricalTest.java} (52%)
(sis) 01/02: Initial version of Equidistant Cylindrical (EPSG:1028) map projection with formulas as published in EPSG guidance notes.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit fc7eca86b224889013a1f2d368e6ba87300c376a
Author: Martin Desruisseaux
AuthorDate: Fri Apr 26 11:38:49 2024 +0200
Initial version of Equidistant Cylindrical (EPSG:1028) map projection
with formulas as published in EPSG guidance notes.
https://issues.apache.org/jira/browse/SIS-233
---
.../main/module-info.java | 1 +
.../operation/projection/CylindricalEqualArea.java | 4 +-
.../projection/EquidistantCylindrical.java | 194 +
.../operation/projection/NormalizedProjection.java | 5 +-
.../operation/provider/EquidistantCylindrical.java | 81 +
.../operation/provider/Equirectangular.java| 24 ++-
.../operation/transform/MathTransformProvider.java | 2 +-
.../apache/sis/referencing/ClenshawSummation.java | 11 +-
.../operation/projection/CassiniSoldnerTest.java | 6 +-
.../projection/EquidistantCylindricalTest.java | 90 ++
.../operation/provider/ProvidersTest.java | 1 +
geoapi/snapshot| 2 +-
12 files changed, 407 insertions(+), 14 deletions(-)
diff --git a/endorsed/src/org.apache.sis.referencing/main/module-info.java
b/endorsed/src/org.apache.sis.referencing/main/module-info.java
index 70b0b34ee3..d79c190aac 100644
--- a/endorsed/src/org.apache.sis.referencing/main/module-info.java
+++ b/endorsed/src/org.apache.sis.referencing/main/module-info.java
@@ -127,6 +127,7 @@ module org.apache.sis.referencing {
org.apache.sis.referencing.operation.provider.Orthographic,
org.apache.sis.referencing.operation.provider.ModifiedAzimuthalEquidistant,
org.apache.sis.referencing.operation.provider.AzimuthalEquidistantSpherical,
+
org.apache.sis.referencing.operation.provider.EquidistantCylindrical,
org.apache.sis.referencing.operation.provider.ZonedTransverseMercator,
org.apache.sis.referencing.operation.provider.Sinusoidal,
org.apache.sis.referencing.operation.provider.PseudoSinusoidal,
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
index e27c23a72f..24cbefaf78 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
@@ -122,8 +122,8 @@ public class CylindricalEqualArea extends
AuthalicConversion {
/**
* Creates a Cylindrical Equal Area projection from the given parameters.
*
- * @param method Description of the projection parameters.
- * @param parameters The parameter values of the projection to create.
+ * @param method description of the projection parameters.
+ * @param parameters the parameter values of the projection to create.
*/
public CylindricalEqualArea(final OperationMethod method, final Parameters
parameters) {
this(initializer(method, parameters));
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/EquidistantCylindrical.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/EquidistantCylindrical.java
new file mode 100644
index 00..de2edd02df
--- /dev/null
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/EquidistantCylindrical.java
@@ -0,0 +1,194 @@
+/*
+ * 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.referencing.operation.projection;
+
+import java.util.EnumMap;
+import static java.lang.Math.sin;
+import static java.lang.Math.cos;
+import static java.lang.Math.toRadians;
+import org.opengis.util.FactoryException;
+import org.opengis.parameter
(sis) branch geoapi-4.0 updated: More extensive documentation on the new `getMetadata()` methods. Provide default implementation using the information provided by existing methods.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new db9cbe5b13 More extensive documentation on the new `getMetadata()`
methods. Provide default implementation using the information provided by
existing methods.
db9cbe5b13 is described below
commit db9cbe5b13561c030d68e9983cd9f05839d60604
Author: Martin Desruisseaux
AuthorDate: Thu Apr 25 19:29:19 2024 +0200
More extensive documentation on the new `getMetadata()` methods.
Provide default implementation using the information provided by existing
methods.
The `throws DataStoreException` is omitted for now in order to be
consistent with other methods
such as `getEnvelope()`, `getResolution()`,
`getCoordinateReferenceSystem()`, `getTilingScheme()`.
The exception could be reintroduced, but we would need to revisit the
policy of existing methods
as well in order to be consistent.
---
.../apache/sis/storage/landsat/MetadataReader.java | 2 +-
.../geotiff/reader/ImageMetadataBuilder.java | 2 +-
.../apache/sis/storage/base/MetadataBuilder.java | 83 --
.../main/org/apache/sis/storage/tiling/Tile.java | 23 +++---
.../org/apache/sis/storage/tiling/TileMatrix.java | 73 ---
.../apache/sis/storage/tiling/TileMatrixSet.java | 49 +++--
.../main/org/apache/sis/storage/wkt/Store.java | 4 +-
7 files changed, 202 insertions(+), 34 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
index 4f942e6d54..a9f1c9515a 100644
---
a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
+++
b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
@@ -569,7 +569,7 @@ final class MetadataReader extends MetadataBuilder {
case "GRID_CELL_SIZE_PANCHROMATIC":
case "GRID_CELL_SIZE_REFLECTIVE":
case "GRID_CELL_SIZE_THERMAL": {
-addResolution(Double.parseDouble(value));
+addLinearResolution(Double.parseDouble(value));
break;
}
/*
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/ImageMetadataBuilder.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/ImageMetadataBuilder.java
index c21eaf27e7..fd198315c2 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/ImageMetadataBuilder.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/ImageMetadataBuilder.java
@@ -182,7 +182,7 @@ public final class ImageMetadataBuilder extends
MetadataBuilder {
* Destination: metadata/identificationInfo/spatialResolution/distance
*/
if (!Double.isNaN(resolution) && resolutionUnit != null) {
-
addResolution(resolutionUnit.getConverterTo(Units.METRE).convert(resolution));
+
addLinearResolution(resolutionUnit.getConverterTo(Units.METRE).convert(resolution));
}
/*
* Cell size is relevant only if the Threshholding TIFF tag value is
2. By convention in
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
index 4c17c8e31d..652d2bcf25 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
@@ -30,11 +30,13 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
+import java.util.function.BiConsumer;
import java.util.logging.Level;
import java.net.URI;
import java.nio.charset.Charset;
import javax.measure.Unit;
import javax.measure.quantity.Length;
+import javax.measure.IncommensurableException;
import org.opengis.util.MemberName;
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
@@ -55,6 +57,7 @@ import org.opengis.metadata.quality.Element;
import org.opengis.metadata.spatial.*;
import org.opengis.referencing.ReferenceSystem;
import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.crs.VerticalCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.Transf
(sis) branch geoapi-4.0 updated: Provide more context in the internal `createMapProjection(…)` method. This is needed when the projection needs to delegate to another method. This change replaces `Nor
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 0ee27a9df1 Provide more context in the internal
`createMapProjection(…)` method. This is needed when the projection needs to
delegate to another method. This change replaces
`NormalizedProjection.delegate(…)`.
0ee27a9df1 is described below
commit 0ee27a9df15a5cdcd1e2afd46195770265bae9da
Author: Martin Desruisseaux
AuthorDate: Wed Apr 24 13:06:36 2024 +0200
Provide more context in the internal `createMapProjection(…)` method.
This is needed when the projection needs to delegate to another method.
This change replaces `NormalizedProjection.delegate(…)`.
---
.../operation/projection/AlbersEqualArea.java | 19 +++---
.../operation/projection/CassiniSoldner.java | 16 ++---
.../operation/projection/CylindricalEqualArea.java | 19 +++---
.../projection/LambertConicConformal.java | 19 +++---
.../referencing/operation/projection/Mercator.java | 19 +++---
.../projection/ModifiedAzimuthalEquidistant.java | 19 +++---
.../operation/projection/NormalizedProjection.java | 74 +-
.../operation/projection/ObliqueStereographic.java | 27
.../operation/projection/PolarStereographic.java | 19 +++---
.../operation/projection/Polyconic.java| 19 +++---
.../operation/projection/SatelliteTracking.java| 16 ++---
.../operation/projection/Sinusoidal.java | 19 +++---
.../operation/projection/TransverseMercator.java | 26 +---
.../operation/provider/MapProjection.java | 2 +-
.../operation/provider/PolarStereographicA.java| 19 ++
.../operation/transform/MathTransformProvider.java | 6 +-
.../projection/LambertAzimuthalEqualAreaTest.java | 2 +-
.../projection/MapProjectionTestCase.java | 26
.../operation/projection/ObliqueMercatorTest.java | 3 +-
.../projection/ObliqueStereographicTest.java | 4 +-
20 files changed, 190 insertions(+), 183 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
index 02d52e111b..a4300e7976 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
@@ -21,7 +21,6 @@ import static java.lang.Math.*;
import org.opengis.util.FactoryException;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.MathTransformFactory;
import org.opengis.referencing.operation.Matrix;
import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.referencing.privy.Formulas;
@@ -33,6 +32,7 @@ import org.apache.sis.parameter.Parameters;
import org.apache.sis.referencing.operation.matrix.Matrix2;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.ContextualParameters;
+import org.apache.sis.referencing.operation.transform.MathTransformProvider;
import static org.apache.sis.referencing.operation.provider.AlbersEqualArea.*;
@@ -186,24 +186,23 @@ public class AlbersEqualArea extends AuthalicConversion {
}
/**
- * Returns the sequence of normalization → {@code this} →
denormalization transforms
- * as a whole. The transform returned by this method expects
(longitude, latitude)
- * coordinates in degrees and returns (x,y)
coordinates in metres.
+ * Returns the sequence of normalization → {@code this} →
denormalization transforms as a whole.
+ * The transform returned by this method expects (longitude,
latitude) coordinates
+ * in degrees and returns (x,y) coordinates
in metres.
+ * The non-linear part of the returned transform will be {@code this}
transform, except if the ellipsoid
+ * is spherical. In the latter case, {@code this} transform is replaced by
a simplified implementation.
*
- * The non-linear part of the returned transform will be {@code this}
transform, except if the ellipsoid
- * is spherical. In the latter case, {@code this} transform may be
replaced by a simplified implementation.
- *
- * @param factory The factory to use for creating the transform.
+ * @param parameters parameters and the factory to use for creating the
transform.
* @return the map projection from (λ,φ) to (x,y)
coordinates.
* @throws FactoryException if an error occurred while creating a
transform.
*/
@Override
-public MathTransform
(sis) branch main updated (428919e44a -> dadfde5d17)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 428919e44a Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and `VerticalDatumType`. add aacdba9e62 Post-merge cleanup: automatic reorder of commits. add 12371196a0 Merge branch 'geoapi-4.0' into geoapi-3.1: automatic reorganization of imports. new dadfde5d17 Merge branch 'geoapi-3.1': automatic imports reorganization. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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(-)
(sis) 01/01: Merge branch 'geoapi-3.1': automatic imports reorganization.
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) branch geoapi-3.1 updated (ff6542a3f7 -> 12371196a0)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from ff6542a3f7 Merge 'geoapi-4.0' into geoapi-3.1. add aacdba9e62 Post-merge cleanup: automatic reorder of commits. new 12371196a0 Merge branch 'geoapi-4.0' into geoapi-3.1: automatic reorganization of imports. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++- .../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +- .../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +- .../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++--- .../main/org/apache/sis/referencing/CRS.java | 6 -- .../main/org/apache/sis/referencing/CommonCRS.java| 4 +++- .../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++- .../org/apache/sis/referencing/EllipsoidalHeightSeparator.java| 4 +++- .../main/org/apache/sis/referencing/StandardDefinitions.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++- .../main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++- .../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 -- .../org/apache/sis/referencing/datum/DefaultPrimeMeridian.java| 4 +++- .../org/apache/sis/referencing/datum/DefaultVerticalDatum.java| 6 -- .../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++- .../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java| 4 +++- .../main/org/apache/sis/referencing/factory/sql/TableInfo.java| 2 +- .../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 ++-- .../org/apache/sis/referencing/internal/VerticalDatumTypes.java | 8 ++-- .../sis/referencing/operation/AbstractCoordinateOperation.java| 6 -- .../sis/referencing/operation/CoordinateOperationRegistry.java| 4 +++- .../org/apache/sis/referencing/operation/DefaultConversion.java | 4 ++-- .../referencing/operation/DefaultCoordinateOperationFactory.java | 6 -- .../apache/sis/referencing/operation/DefaultOperationMethod.java | 6 -- .../org/apache/sis/referencing/privy/CoordinateOperations.java| 4 +++- .../main/org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++- .../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +- .../test/org/apache/sis/referencing/CommonCRSTest.java| 2 +- .../apache/sis/referencing/datum/DefaultVerticalDatumTest.java| 4 +++- .../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +- .../apache/sis/referencing/internal/VerticalDatumTypesTest.java | 8 ++-- .../apache/sis/referencing/operation/provider/ProvidersTest.java | 4 +++- .../referencing/operation/transform/OperationMethodSetTest.java | 4 +++- .../apache/sis/referencing/report/CoordinateOperationMethods.java | 2 +- .../sis/test/integration/CoordinateReferenceSystemTest.java | 4 +++- .../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++- 37 files changed, 107 insertions(+), 49 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: automatic reorganization of imports.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 12371196a02296c3fb2bac05e17fc9f63efbf92b
Merge: ff6542a3f7 aacdba9e62
Author: Martin Desruisseaux
AuthorDate: Mon Apr 22 16:14:58 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1:
automatic reorganization of imports.
.../org/apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++-
.../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +-
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +-
.../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++---
.../main/org/apache/sis/referencing/CRS.java | 6 --
.../main/org/apache/sis/referencing/CommonCRS.java| 4 +++-
.../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++-
.../org/apache/sis/referencing/EllipsoidalHeightSeparator.java| 4 +++-
.../main/org/apache/sis/referencing/StandardDefinitions.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 --
.../org/apache/sis/referencing/datum/DefaultPrimeMeridian.java| 4 +++-
.../org/apache/sis/referencing/datum/DefaultVerticalDatum.java| 6 --
.../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++-
.../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java| 4 +++-
.../main/org/apache/sis/referencing/factory/sql/TableInfo.java| 2 +-
.../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 ++--
.../org/apache/sis/referencing/internal/VerticalDatumTypes.java | 8 ++--
.../sis/referencing/operation/AbstractCoordinateOperation.java| 6 --
.../sis/referencing/operation/CoordinateOperationRegistry.java| 4 +++-
.../org/apache/sis/referencing/operation/DefaultConversion.java | 4 ++--
.../referencing/operation/DefaultCoordinateOperationFactory.java | 6 --
.../apache/sis/referencing/operation/DefaultOperationMethod.java | 6 --
.../org/apache/sis/referencing/privy/CoordinateOperations.java| 4 +++-
.../main/org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++-
.../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +-
.../test/org/apache/sis/referencing/CommonCRSTest.java| 2 +-
.../apache/sis/referencing/datum/DefaultVerticalDatumTest.java| 4 +++-
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +-
.../apache/sis/referencing/internal/VerticalDatumTypesTest.java | 8 ++--
.../apache/sis/referencing/operation/provider/ProvidersTest.java | 4 +++-
.../referencing/operation/transform/OperationMethodSetTest.java | 4 +++-
.../apache/sis/referencing/report/CoordinateOperationMethods.java | 2 +-
.../sis/test/integration/CoordinateReferenceSystemTest.java | 4 +++-
.../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++-
37 files changed, 107 insertions(+), 49 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index ed14df684c,208b00e466..0ef3b23ce2
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
@@@ -47,6 -46,6 +46,9 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.util.privy.Constants;
import org.apache.sis.metadata.iso.citation.Citations;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.DistanceOperatorName;
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 4ea1c59659,5063035c46..441c62d0fd
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -28,10 -28,6 +28,10 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.privy.Constants;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
+// Specific to the main and geoapi-3.1 branches:
- import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.opengis.metadata.extent.Extent;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
endorsed/src
(sis) branch geoapi-4.0 updated: Post-merge cleanup: automatic reorder of commits.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new aacdba9e62 Post-merge cleanup: automatic reorder of commits. aacdba9e62 is described below commit aacdba9e621661c411853ba2f6b9270b718f75c0 Author: Martin Desruisseaux AuthorDate: Mon Apr 22 16:09:23 2024 +0200 Post-merge cleanup: automatic reorder of commits. --- .../apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++- .../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +- .../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++--- .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/CommonCRS.java | 4 +++- .../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++- .../org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++- .../org/apache/sis/referencing/datum/DefaultPrimeMeridian.java | 4 +++- .../org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 10 +- .../apache/sis/referencing/factory/CommonAuthorityFactory.java | 4 +++- .../sis/referencing/factory/sql/CoordinateOperationSet.java| 4 +++- .../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java | 4 +++- .../main/org/apache/sis/referencing/factory/sql/TableInfo.java | 2 +- .../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 2 +- .../apache/sis/referencing/internal/VerticalDatumTypes.java| 4 +++- .../sis/referencing/operation/AbstractCoordinateOperation.java | 2 +- .../sis/referencing/operation/CoordinateOperationRegistry.java | 4 +++- .../apache/sis/referencing/operation/DefaultConversion.java| 4 +++- .../sis/referencing/operation/DefaultOperationMethod.java | 4 +++- .../org/apache/sis/referencing/privy/CoordinateOperations.java | 4 +++- .../org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++- .../apache/sis/referencing/privy/GeodeticObjectBuilder.java| 4 +++- .../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +- .../test/org/apache/sis/referencing/cs/NormalizerTest.java | 4 +++- .../apache/sis/referencing/datum/DefaultVerticalDatumTest.java | 4 +++- .../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +- .../sis/referencing/internal/VerticalDatumTypesTest.java | 4 +++- .../sis/referencing/operation/provider/ProvidersTest.java | 4 +++- .../operation/transform/OperationMethodSetTest.java| 4 +++- .../org/apache/sis/referencing/privy/AxisDirectionsTest.java | 4 +++- .../sis/referencing/report/CoordinateOperationMethods.java | 2 +- .../sis/test/integration/CoordinateReferenceSystemTest.java| 4 +++- .../main/org/apache/sis/gui/referencing/CRSChooser.java| 4 +++- 34 files changed, 88 insertions(+), 40 deletions(-) diff --git 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 index c372eff258..208b00e466 100644 --- 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 @@ -30,7 +30,6 @@ import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.cs.CoordinateSystemAxis; import org.opengis.referencing.crs.ProjectedCRS; import org.opengis.referencing.crs.GeographicCRS; -import org.opengis.referencing.crs.DerivedCRS; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.OperationMethod; import org.opengis.referencing.operation.TransformException; @@ -51,6 +50,9 @@ import org.apache.sis.metadata.iso.citation.Citations; import org.opengis.filter.SpatialOperatorName; import org.opengis.filter.DistanceOperatorName; +// Specific to the geoapi-4.0 branch: +import org.opengis.referencing.crs.DerivedCRS; + /** * Context (such as desired CRS) in which a spatial operator will be executed. diff --git 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 index 2fda0bf211..14478406e7 100644 --- 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 @@ -49,7 +49,6 @@ import org.opengis.referencing.crs.VerticalCRS; import org.opengis.referencing.crs.GeographicCRS; import org.opengis.referencing.crs.CoordinateReferenceSystem; import
(sis) branch main updated (1483fcf71b -> 428919e44a)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 1483fcf71b Merge branch 'geoapi-3.1' add 918e07bcbc Avoid usage of the deprecated `AxisDirection.OTHER` code list value. add adbe2180c3 ISO 19111 upgrade: VerticalDatumType removed, replaced by RealizationMethod. add 43241772b6 Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated `AxisDirection.OTHER` and `VerticalDatumType`. add 3e79841b4c Post-merge adjustments in `VerticalDatumTypes`. add ff6542a3f7 Merge 'geoapi-4.0' into geoapi-3.1. new 428919e44a Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and `VerticalDatumType`. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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(-)
(sis) 01/01: Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and `VerticalDatumType`.
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}
+
(sis) branch geoapi-4.0 updated: Post-merge adjustments in `VerticalDatumTypes`.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 3e79841b4c Post-merge adjustments in `VerticalDatumTypes`.
3e79841b4c is described below
commit 3e79841b4c2fc5eac551b2ff9e8540853125c7c0
Author: Martin Desruisseaux
AuthorDate: Mon Apr 22 12:54:51 2024 +0200
Post-merge adjustments in `VerticalDatumTypes`.
---
.../apache/sis/io/wkt/GeodeticObjectParser.java| 5 ++-
.../main/org/apache/sis/referencing/CommonCRS.java | 6 +++-
.../sis/referencing/StandardDefinitions.java | 3 +-
.../referencing/factory/GeodeticObjectFactory.java | 4 +--
.../apache/sis/referencing/internal/Legacy.java| 2 +-
.../referencing/internal/VerticalDatumTypes.java | 39 +-
.../operation/CoordinateOperationRegistry.java | 2 +-
.../privy/EllipsoidalHeightCombiner.java | 3 +-
.../internal/VerticalDatumTypesTest.java | 12 +++
9 files changed, 55 insertions(+), 21 deletions(-)
diff --git
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
index 659162db6a..613eabf205 100644
---
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
@@ -689,7 +689,6 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator defaultUnit, final Datum
datum) throws ParseException, FactoryException
{
@@ -772,8 +771,8 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator unit = defaultUnit; // Depth, height
or time axis unit.
switch (type) {
/*
- * Cartesian — we can create axes only for geodetic datum, in
which case the axes are for
- * two-dimensional Projected or three-dimensional Geocentric
CRS.
+ * Cartesian — we can create axes only for geodetic datum, in
which case the axes
+ * are for two- or three-dimensional Projected or
three-dimensional Geocentric CRS.
*/
case WKTKeywords.Cartesian: {
if (datum != null && !(datum instanceof GeodeticDatum)) {
diff --git
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
index de5cd6e482..8abad5348b 100644
---
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
@@ -1467,7 +1467,11 @@ public enum CommonCRS {
if (isEPSG) {
object =
StandardDefinitions.createVerticalDatum(datum);
} else {
-// BAROMETRIC and ELLIPSOIDAL cases.
+/*
+ * All cases where the first constructor argument
is `false`, currently BAROMETRIC and
+ * ELLIPSOIDAL. The way to construct the
ellipsoidal pseudo-method shall be equivalent
+ * to a call to `VerticalDatumTypes.ellipsoidal()`.
+ */
RealizationMethod method = null;
if (this != OTHER_SURFACE) {
method = RealizationMethod.valueOf(name());
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index f872175d90..882f14cc30 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
@@ -74,7 +74,6 @@ import org.apache.sis.measure.Units;
import static
org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
@@ -348,7 +347,7 @@ final class StandardDefinitions {
case 5103: name = "North American Vertical Datum 1988"; alias =
"NAVD88"; break;
default: throw new AssertionError(code);
}
-return new DefaultVerticalDatum(properties(code, name, alias, true),
RealizationMethod.GEOID);
+return new DefaultVerticalDatum(properties(cod
(sis) branch geoapi-3.1 updated (43241772b6 -> ff6542a3f7)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 43241772b6 Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated `AxisDirection.OTHER` and `VerticalDatumType`. add 3e79841b4c Post-merge adjustments in `VerticalDatumTypes`. new ff6542a3f7 Merge 'geoapi-4.0' into geoapi-3.1. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sis/io/wkt/GeodeticObjectParser.java| 5 ++- .../main/org/apache/sis/referencing/CommonCRS.java | 6 +++- .../sis/referencing/StandardDefinitions.java | 2 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +-- .../apache/sis/referencing/internal/Legacy.java| 2 +- .../referencing/internal/VerticalDatumTypes.java | 39 +- .../operation/CoordinateOperationRegistry.java | 2 +- .../privy/EllipsoidalHeightCombiner.java | 3 +- .../internal/VerticalDatumTypesTest.java | 12 +++ 9 files changed, 55 insertions(+), 20 deletions(-)
(sis) 01/01: Merge 'geoapi-4.0' into geoapi-3.1.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit ff6542a3f7c116c3afb4db935c1385899da71971
Merge: 43241772b6 3e79841b4c
Author: Martin Desruisseaux
AuthorDate: Mon Apr 22 13:02:25 2024 +0200
Merge 'geoapi-4.0' into geoapi-3.1.
.../apache/sis/io/wkt/GeodeticObjectParser.java| 5 ++-
.../main/org/apache/sis/referencing/CommonCRS.java | 6 +++-
.../sis/referencing/StandardDefinitions.java | 2 +-
.../referencing/factory/GeodeticObjectFactory.java | 4 +--
.../apache/sis/referencing/internal/Legacy.java| 2 +-
.../referencing/internal/VerticalDatumTypes.java | 39 +-
.../operation/CoordinateOperationRegistry.java | 2 +-
.../privy/EllipsoidalHeightCombiner.java | 3 +-
.../internal/VerticalDatumTypesTest.java | 12 +++
9 files changed, 55 insertions(+), 20 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index d0f57b09ec,882f14cc30..0438435cad
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
@@@ -348,7 -347,7 +348,7 @@@ final class StandardDefinitions
case 5103: name = "North American Vertical Datum 1988"; alias =
"NAVD88"; break;
default: throw new AssertionError(code);
}
- return new DefaultVerticalDatum(properties(code, name, alias, true),
RealizationMethod.GEOID);
-return new DefaultVerticalDatum(properties(code, name, alias, true),
null);
++return new DefaultVerticalDatum(properties(code, name, alias, true),
(RealizationMethod) null);
}
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
index d7ff9b2036,d1e2e82a46..11f58d1e6d
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
@@@ -109,13 -127,12 +128,13 @@@ public final class VerticalDatumTypes
* Returns the legacy code for the datum type, or 2000 (other surface) if
unknown.
* This method is used for WKT 1 formatting.
*
- * @param method the realization method, or {@code null} if unknown.
+ * @param type the vertical datum type, or {@code null} if unknown.
* @return the legacy code for the given datum type, or 0 if unknown.
*/
-public static int toLegacy(final RealizationMethod method) {
-if (method != null) {
-switch (method.name().toUpperCase(Locale.US)) {
+@SuppressWarnings("deprecation")
+public static int toLegacy(final VerticalDatumType type) {
+if (type != null) {
- switch (type.name()) {
++switch (type.name().toUpperCase(Locale.US)) {
case ORTHOMETRIC: return 2001; // CS_VD_Orthometric
case ELLIPSOIDAL: return 2002; // CS_VD_Ellipsoidal
case BAROMETRIC: return 2003; //
CS_VD_AltitudeBarometric
@@@ -130,18 -147,18 +149,19 @@@
* Returns the vertical datum type from a realization method.
* If the given method cannot be mapped to a legacy type, then this
method returns "other surface".
* This is because the vertical datum type was a mandatory property in
legacy OGC/ISO standards.
+ * This method is used for writing GML documents older than GML 3.2.
*
* @param method the realization method, or {@code null}.
- * @return the vertical datum type name (never null).
+ * @return the vertical datum type (never null).
*/
-public static String toName(final RealizationMethod method) {
-if (method == RealizationMethod.GEOID) return "geoidal";
-if (method == RealizationMethod.TIDAL) return "depth";
+@SuppressWarnings("deprecation")
+public static VerticalDatumType fromMethod(final RealizationMethod
method) {
+if (method == RealizationMethod.GEOID) return
VerticalDatumType.GEOIDAL;
+if (method == RealizationMethod.TIDAL) return VerticalDatumType.DEPTH;
if (method != null) {
-return method.name().toLowerCase(Locale.US);
+return
VerticalDatumType.valueOf(method.name().toUpperCase(Locale.US));
}
-return "other surface";
+return VerticalDatumType.OTHER_SURFACE;
}
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/VerticalDatumTypesTest.java
index 98bc4ab01d,8e98da4827..2b846e8736
---
a/
(sis) branch geoapi-3.1 updated (74a6061f9e -> 43241772b6)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 74a6061f9e Merge branch 'geoapi-4.0' into geoapi-3.1: quasi-removal of non-standard `Projection` interface. add 918e07bcbc Avoid usage of the deprecated `AxisDirection.OTHER` code list value. add adbe2180c3 ISO 19111 upgrade: VerticalDatumType removed, replaced by RealizationMethod. new 43241772b6 Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated `AxisDirection.OTHER` and `VerticalDatumType`. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sis/coverage/grid/GridExtentCRS.java| 6 +- .../apache/sis/metadata/iso/extent/Extents.java| 66 +++--- .../sis/metadata/iso/extent/ExtentsTest.java | 9 +- .../org/apache/sis/test/mock/VerticalCRSMock.java | 25 +-- .../apache/sis/io/wkt/GeodeticObjectParser.java| 29 ++- .../main/org/apache/sis/referencing/CRS.java | 4 +- .../main/org/apache/sis/referencing/CommonCRS.java | 28 +-- .../org/apache/sis/referencing/cs/AbstractCS.java | 5 +- .../main/org/apache/sis/referencing/cs/Codes.java | 24 ++- .../org/apache/sis/referencing/cs/Normalizer.java | 4 +- .../referencing/datum/DefaultVerticalDatum.java| 82 ++- .../referencing/factory/GeodeticObjectFactory.java | 28 ++- .../referencing/factory/sql/EPSGCodeFinder.java| 7 - .../referencing/factory/sql/EPSGDataAccess.java| 14 +- .../sis/referencing/factory/sql/TableInfo.java | 1 - .../apache/sis/referencing/internal/Legacy.java| 7 +- .../referencing/internal/VerticalDatumTypes.java | 240 ++--- .../sis/referencing/operation/matrix/Matrices.java | 2 +- .../sis/referencing/privy/AxisDirections.java | 8 +- .../privy/EllipsoidalHeightCombiner.java | 2 +- .../referencing/privy/ReferencingUtilities.java| 8 +- .../org/apache/sis/io/wkt/TransliteratorTest.java | 12 +- .../org/apache/sis/referencing/CommonCRSTest.java | 24 ++- .../apache/sis/referencing/cs/HardCodedAxes.java | 4 +- .../apache/sis/referencing/cs/NormalizerTest.java | 1 + .../datum/DefaultVerticalDatumTest.java| 43 +--- .../sis/referencing/datum/HardCodedDatum.java | 6 +- .../referencing/datum/VerticalDatum (GML 3.1).xml | 2 +- .../internal/VerticalDatumTypesTest.java | 25 +-- .../sis/referencing/privy/AxisDirectionsTest.java | 20 +- .../sis/test/integration/MetadataVerticalTest.java | 2 - .../org/apache/sis/storage/netcdf/base/Axis.java | 2 +- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +- geoapi/snapshot| 2 +- 34 files changed, 328 insertions(+), 416 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated `AxisDirection.OTHER` and `VerticalDatumType`.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 43241772b657472a14b8ff52fde9cc2e8f18fca9
Merge: 74a6061f9e adbe2180c3
Author: Martin Desruisseaux
AuthorDate: Fri Apr 19 19:18:45 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated
`AxisDirection.OTHER` and `VerticalDatumType`.
.../apache/sis/coverage/grid/GridExtentCRS.java| 6 +-
.../apache/sis/metadata/iso/extent/Extents.java| 66 +++---
.../sis/metadata/iso/extent/ExtentsTest.java | 9 +-
.../org/apache/sis/test/mock/VerticalCRSMock.java | 25 +--
.../apache/sis/io/wkt/GeodeticObjectParser.java| 29 ++-
.../main/org/apache/sis/referencing/CRS.java | 4 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 28 +--
.../org/apache/sis/referencing/cs/AbstractCS.java | 5 +-
.../main/org/apache/sis/referencing/cs/Codes.java | 24 ++-
.../org/apache/sis/referencing/cs/Normalizer.java | 4 +-
.../referencing/datum/DefaultVerticalDatum.java| 82 ++-
.../referencing/factory/GeodeticObjectFactory.java | 28 ++-
.../referencing/factory/sql/EPSGCodeFinder.java| 7 -
.../referencing/factory/sql/EPSGDataAccess.java| 14 +-
.../sis/referencing/factory/sql/TableInfo.java | 1 -
.../apache/sis/referencing/internal/Legacy.java| 7 +-
.../referencing/internal/VerticalDatumTypes.java | 240 ++---
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../sis/referencing/privy/AxisDirections.java | 8 +-
.../privy/EllipsoidalHeightCombiner.java | 2 +-
.../referencing/privy/ReferencingUtilities.java| 8 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 12 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 24 ++-
.../apache/sis/referencing/cs/HardCodedAxes.java | 4 +-
.../apache/sis/referencing/cs/NormalizerTest.java | 1 +
.../datum/DefaultVerticalDatumTest.java| 43 +---
.../sis/referencing/datum/HardCodedDatum.java | 6 +-
.../referencing/datum/VerticalDatum (GML 3.1).xml | 2 +-
.../internal/VerticalDatumTypesTest.java | 25 +--
.../sis/referencing/privy/AxisDirectionsTest.java | 20 +-
.../sis/test/integration/MetadataVerticalTest.java | 2 -
.../org/apache/sis/storage/netcdf/base/Axis.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +-
geoapi/snapshot| 2 +-
34 files changed, 328 insertions(+), 416 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index e189a2e320,4b9315783c..2ad61c5b4f
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
@@@ -23,13 -23,8 +23,12 @@@ import org.opengis.referencing.cs.Coord
import org.opengis.referencing.cs.RangeMeaning;
import org.opengis.referencing.cs.VerticalCS;
import org.opengis.referencing.datum.VerticalDatum;
- import org.opengis.referencing.datum.VerticalDatumType;
import org.apache.sis.measure.Units;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.extent.Extent;
+import org.opengis.util.InternationalString;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Optional;
import org.opengis.referencing.datum.RealizationMethod;
@@@ -135,10 -119,7 +123,9 @@@ public final class VerticalCRSMock exte
}
@Override public String getAbbreviation()
{return up ? "h" : "d";}
+@Override public InternationalString getScope()
{return null;}
+@Override public Extent getDomainOfValidity()
{return null;}
@Override public Optional getRealizationMethod()
{return Optional.ofNullable(method);}
- @Override public VerticalDatumType getVerticalDatumType()
{return type;}
@Override public VerticalDatum getDatum()
{return this;}
@Override public VerticalCS getCoordinateSystem()
{return this;}
@Override public int getDimension()
{return 1;}
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
index 1bd437faf7,f69e8f1555..1625e20723
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
@@@ -197,6 -197,6 +197,7 @@@ public class AbstractCS extends Abstrac
* @param properties properties given at construction time, or {@code
null} if none.
* @throws IllegalArgumentException if an axis has an illegal direction
or an illegal
(sis) branch geoapi-4.0 updated: ISO 19111 upgrade: VerticalDatumType removed, replaced by RealizationMethod.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new adbe2180c3 ISO 19111 upgrade: VerticalDatumType removed, replaced by
RealizationMethod.
adbe2180c3 is described below
commit adbe2180c30699c9b6db3b843a511d0d9f11dc2d
Author: Martin Desruisseaux
AuthorDate: Fri Apr 19 17:32:26 2024 +0200
ISO 19111 upgrade: VerticalDatumType removed, replaced by RealizationMethod.
---
.../apache/sis/metadata/iso/extent/Extents.java| 66 +++---
.../sis/metadata/iso/extent/ExtentsTest.java | 9 +-
.../org/apache/sis/test/mock/VerticalCRSMock.java | 25 +--
.../apache/sis/io/wkt/GeodeticObjectParser.java| 24 +-
.../main/org/apache/sis/referencing/CRS.java | 4 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 28 +--
.../referencing/datum/DefaultVerticalDatum.java| 143 +++-
.../apache/sis/referencing/datum/package-info.java | 1 -
.../referencing/factory/GeodeticObjectFactory.java | 13 +-
.../referencing/factory/sql/EPSGCodeFinder.java| 7 -
.../referencing/factory/sql/EPSGDataAccess.java| 14 +-
.../referencing/internal/VerticalDatumTypes.java | 242 ++---
.../privy/EllipsoidalHeightCombiner.java | 2 +-
.../referencing/privy/ReferencingUtilities.java| 8 +-
.../xml/bind/referencing/CD_VerticalDatumType.java | 45
.../org/apache/sis/referencing/CommonCRSTest.java | 24 +-
.../datum/DefaultVerticalDatumTest.java| 43 +---
.../sis/referencing/datum/HardCodedDatum.java | 6 +-
.../referencing/datum/VerticalDatum (GML 3.1).xml | 2 +-
.../internal/VerticalDatumTypesTest.java | 28 +--
.../sis/test/integration/MetadataVerticalTest.java | 2 -
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +-
geoapi/snapshot| 2 +-
23 files changed, 262 insertions(+), 478 deletions(-)
diff --git
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
index 81cb4cbb9e..2fda0bf211 100644
---
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
@@ -49,7 +49,7 @@ import org.opengis.referencing.crs.VerticalCRS;
import org.opengis.referencing.crs.GeographicCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.datum.VerticalDatum;
-import org.opengis.referencing.datum.VerticalDatumType;
+import org.opengis.referencing.datum.RealizationMethod;
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.CoordinateOperation;
import org.apache.sis.metadata.InvalidMetadataException;
@@ -87,7 +87,7 @@ import
org.opengis.geometry.MismatchedReferenceSystemException;
*
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.4
+ * @version 1.5
*
* @see org.apache.sis.geometry.Envelopes
*
@@ -357,37 +357,29 @@ public final class Extents extends Static {
}
/**
- * Returns the union of chosen vertical ranges found in the given extent,
or {@code null} if none.
- * This method gives preference to heights above the Mean Sea Level when
possible.
- * Depths have negative height values: if the
- * {@linkplain
org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis#getDirection() axis
direction}
- * is toward down, then this method reverses the sign of minimum and
maximum values.
- *
- * Multi-occurrences
+ * Returns the union of a subset of vertical ranges found in the given
extent, or {@code null} if none.
* If the given {@code Extent} object contains more than one vertical
extent, then this method
* performs a choice based on the vertical datum and the unit of
measurement:
*
*
- * Choice based on vertical datum
- * Only the extents associated (indirectly, through their CRS) to the
same non-null {@link VerticalDatumType}
- * will be taken in account. If all datum types are null, then this
method conservatively uses only the first
- * vertical extent. Otherwise the datum type used for filtering the
vertical extents is:
+ * Choice based on realization method
+ * Only the extents associated (indirectly, through their CRS) to the
same non-null {@link RealizationMethod}
+ * will be taken in account. If all realization methods are absent, then
this method conservatively uses only
+ * the first vertical extent. Otherwise the realization method used for
filtering the vertical extents is:
*
*
- * {@link VerticalDatumType#GEOIDAL} or {@link
(sis) branch geoapi-4.0 updated: Avoid usage of the deprecated `AxisDirection.OTHER` code list value.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 918e07bcbc Avoid usage of the deprecated `AxisDirection.OTHER` code
list value.
918e07bcbc is described below
commit 918e07bcbc1c2787cfffb8a124151932599e199d
Author: Martin Desruisseaux
AuthorDate: Fri Apr 19 11:31:58 2024 +0200
Avoid usage of the deprecated `AxisDirection.OTHER` code list value.
---
.../apache/sis/coverage/grid/GridExtentCRS.java| 6 ++---
.../apache/sis/io/wkt/GeodeticObjectParser.java| 5 ++--
.../org/apache/sis/referencing/cs/AbstractCS.java | 4 +--
.../main/org/apache/sis/referencing/cs/Codes.java | 24 +
.../org/apache/sis/referencing/cs/Normalizer.java | 9 ---
.../sis/referencing/factory/sql/TableInfo.java | 1 -
.../apache/sis/referencing/internal/Legacy.java| 16 +---
.../referencing/operation/DefaultConversion.java | 3 ++-
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../sis/referencing/privy/AxisDirections.java | 24 ++---
.../org/apache/sis/io/wkt/TransliteratorTest.java | 12 -
.../apache/sis/referencing/cs/HardCodedAxes.java | 4 +--
.../apache/sis/referencing/cs/NormalizerTest.java | 5 ++--
.../sis/referencing/privy/AxisDirectionsTest.java | 30 ++
.../org/apache/sis/storage/netcdf/base/Axis.java | 2 +-
.../sis/util/collection/CodeListSetTest.java | 26 +--
geoapi/snapshot| 2 +-
17 files changed, 108 insertions(+), 67 deletions(-)
diff --git
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
index cacfa9b7fa..95020e45e4 100644
---
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
@@ -299,7 +299,7 @@ final class GridExtentCRS {
abbreviation = "t"; direction = AxisDirection.FUTURE;
hasTime = true;
} else {
abbreviation = abbreviation(target);
-direction = AxisDirection.OTHER;
+direction = AxisDirection.UNSPECIFIED;
hasOther = true;
}
/*
@@ -311,7 +311,7 @@ final class GridExtentCRS {
final CoordinateSystemAxis previous = axes[k];
if (previous != null) {
if
(direction.equals(AxisDirections.absolute(previous.getDirection( {
-direction = AxisDirection.OTHER;
+direction = AxisDirection.UNSPECIFIED;
hasOther = true;
}
if (abbreviation.equals(previous.getAbbreviation())) {
@@ -334,7 +334,7 @@ final class GridExtentCRS {
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);
}
}
/*
diff --git
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
index f0678cf713..2ab59defc8 100644
---
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
@@ -867,7 +867,7 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator properties =
parseMetadataAndClose(element, name, baseCRS);
final Map axisName =
singletonMap(CoordinateSystem.NAME_KEY, AxisDirections.appendTo(new
StringBuilder("CS"), axes));
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
index a7a8ca7b3b..f69e8f1555 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
@@ -228,11 +228,11 @@ public class AbstractCS extends AbstractIdentifiedObject
implements CoordinateSy
* more than one time axis. Such case happen in meteorological
models.
*
(sis) 01/01: Merge branch 'geoapi-3.1'
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) branch main updated (66a5fa5253 -> 1483fcf71b)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 66a5fa5253 Merge branch 'geoapi-3.1' https://issues.apache.org/jira/browse/SIS-597 add 7a049f9417 Update for the removal of the non-standard `org.opengis.referencing.operation.Projection` interface. add 74a6061f9e Merge branch 'geoapi-4.0' into geoapi-3.1: quasi-removal of non-standard `Projection` interface. new 1483fcf71b Merge branch 'geoapi-3.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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(-)
(sis) branch geoapi-3.1 updated (883dfe7e9b -> 74a6061f9e)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 883dfe7e9b Merge branch 'geoapi-4.0' into geoapi-3.1: removal of non-standard PlanarProjection, ConicProjection and CylindricalProjection interfaces. add 7a049f9417 Update for the removal of the non-standard `org.opengis.referencing.operation.Projection` interface. new 74a6061f9e Merge branch 'geoapi-4.0' into geoapi-3.1: quasi-removal of non-standard `Projection` interface. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/org/apache/sis/xml/XLink.java | 1 + .../sis/referencing/crs/AbstractDerivedCRS.java| 10 +-- .../referencing/factory/sql/AuthorityCodes.java| 45 - .../referencing/factory/sql/EPSGDataAccess.java| 32 + .../sis/referencing/factory/sql/TableInfo.java | 4 +- .../operation/AbstractCoordinateOperation.java | 4 +- .../referencing/operation/DefaultConversion.java | 71 +--- .../DefaultCoordinateOperationFactory.java | 6 +- .../operation/DefaultOperationMethod.java | 20 +++--- .../operation/DefaultPassThroughOperation.java | 3 +- .../referencing/operation/DefaultProjection.java | 36 +-- .../apache/sis/referencing/operation/SubTypes.java | 75 -- .../operation/provider/AbstractProvider.java | 6 +- .../operation/provider/Equirectangular.java| 4 +- .../operation/provider/MapProjection.java | 4 +- .../operation/provider/PseudoPlateCarree.java | 3 - .../provider/ZonedTransverseMercator.java | 4 +- .../transform/DefaultMathTransformFactory.java | 12 ++-- .../referencing/factory/sql/EPSGFactoryTest.java | 11 +--- .../operation/CoordinateOperationFinderTest.java | 3 +- .../operation/DefaultConversionTest.java | 21 +++--- .../operation/provider/ProvidersTest.java | 3 +- .../transform/DefaultMathTransformFactoryTest.java | 19 +++--- .../report/CoordinateOperationMethods.java | 4 +- geoapi/snapshot| 2 +- 25 files changed, 108 insertions(+), 295 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: quasi-removal of non-standard `Projection` interface.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 74a6061f9ea89eddb33461af10c672c4dfe920fd
Merge: 883dfe7e9b 7a049f9417
Author: Martin Desruisseaux
AuthorDate: Thu Apr 18 17:27:13 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: quasi-removal of non-standard
`Projection` interface.
.../main/org/apache/sis/xml/XLink.java | 1 +
.../sis/referencing/crs/AbstractDerivedCRS.java| 10 +--
.../referencing/factory/sql/AuthorityCodes.java| 45 -
.../referencing/factory/sql/EPSGDataAccess.java| 32 +
.../sis/referencing/factory/sql/TableInfo.java | 4 +-
.../operation/AbstractCoordinateOperation.java | 4 +-
.../referencing/operation/DefaultConversion.java | 71 +---
.../DefaultCoordinateOperationFactory.java | 6 +-
.../operation/DefaultOperationMethod.java | 20 +++---
.../operation/DefaultPassThroughOperation.java | 3 +-
.../referencing/operation/DefaultProjection.java | 36 +--
.../apache/sis/referencing/operation/SubTypes.java | 75 --
.../operation/provider/AbstractProvider.java | 6 +-
.../operation/provider/Equirectangular.java| 4 +-
.../operation/provider/MapProjection.java | 4 +-
.../operation/provider/PseudoPlateCarree.java | 3 -
.../provider/ZonedTransverseMercator.java | 4 +-
.../transform/DefaultMathTransformFactory.java | 12 ++--
.../referencing/factory/sql/EPSGFactoryTest.java | 11 +---
.../operation/CoordinateOperationFinderTest.java | 3 +-
.../operation/DefaultConversionTest.java | 21 +++---
.../operation/provider/ProvidersTest.java | 3 +-
.../transform/DefaultMathTransformFactoryTest.java | 19 +++---
.../report/CoordinateOperationMethods.java | 4 +-
geoapi/snapshot| 2 +-
25 files changed, 108 insertions(+), 295 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
index ebbd881eee,7b2f7e7655..29391a9043
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
@@@ -168,7 -165,7 +168,7 @@@ abstract class AbstractDerivedCRSWARNING: this method is invoked (indirectly) at construction
time.
+ * Consequently, it shall return a constant value - this method is not
allowed to
+ * depend on the object state.
+ */
+abstract Class getConversionType();
+
- /**
- * Returns the GeoAPI interface implemented by this class.
- */
- @Override
- public abstract Class getInterface();
-
+/**
+ * Returns the datum of the {@linkplain #getBaseCRS() base CRS}.
*
* @return the datum of the base CRS.
*/
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
index 4aadfc1fa5,90cf08b7bd..44cb55e6e2
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
@@@ -41,6 -40,6 +41,10 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeographicCRS;
++import org.opengis.referencing.crs.ProjectedCRS;
++
/**
* A parameterized mathematical operation that converts coordinates to
another CRS without any change of
@@@ -219,14 -217,11 +222,12 @@@ public class DefaultConversion extends
* @param source the new source CRS.
* @param target the new target CRS.
* @param factory the factory to use for creating a transform from
the parameters or for performing axis changes.
- * @param actual an array of length 1 where to store the actual
operation method used by the math transform factory.
*/
-private DefaultConversion(final Conversion definition,
- final CoordinateReferenceSystem source,
- final CoordinateReferenceSystem target,
- final MathTransformFactory factory) throws
FactoryException
+@SuppressWarnings("deprecation")
+DefaultConversion(final Conversion definition,
+ final CoordinateReferenceSystem source,
+ final CoordinateReferenceSystem target,
- final MathTransformFactory factory,
- final OperationMethod[] actual) throws FactoryException
++ final MathTransformFacto
(sis) branch geoapi-4.0 updated: Update for the removal of the non-standard `org.opengis.referencing.operation.Projection` interface.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 7a049f9417 Update for the removal of the non-standard
`org.opengis.referencing.operation.Projection` interface.
7a049f9417 is described below
commit 7a049f9417379966bb8b6351c657657c916192d9
Author: Martin Desruisseaux
AuthorDate: Thu Apr 18 16:01:05 2024 +0200
Update for the removal of the non-standard
`org.opengis.referencing.operation.Projection` interface.
---
.../main/org/apache/sis/xml/XLink.java | 1 +
.../sis/referencing/crs/AbstractDerivedCRS.java| 39 ++
.../sis/referencing/crs/DefaultDerivedCRS.java | 11 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 18 +--
.../sis/referencing/crs/ExplicitParameters.java| 2 +-
.../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 | 75 ---
.../DefaultCoordinateOperationFactory.java | 24 +---
.../operation/DefaultOperationMethod.java | 20 ++-
.../operation/DefaultPassThroughOperation.java | 3 +-
.../referencing/operation/DefaultProjection.java | 139 -
.../apache/sis/referencing/operation/SubTypes.java | 75 ---
.../operation/provider/AbstractProvider.java | 6 +-
.../operation/provider/Equirectangular.java| 4 +-
.../operation/provider/MapProjection.java | 4 +-
.../operation/provider/PseudoPlateCarree.java | 3 -
.../provider/ZonedTransverseMercator.java | 4 +-
.../transform/DefaultMathTransformFactory.java | 12 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 11 +-
.../operation/CoordinateOperationFinderTest.java | 3 +-
.../operation/DefaultConversionTest.java | 21 ++--
.../operation/provider/ProvidersTest.java | 3 +-
.../transform/DefaultMathTransformFactoryTest.java | 19 +--
.../report/CoordinateOperationMethods.java | 4 +-
geoapi/snapshot| 2 +-
28 files changed, 116 insertions(+), 472 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XLink.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XLink.java
index e0ad0e8901..b5cf1d8592 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XLink.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XLink.java
@@ -398,6 +398,7 @@ public class XLink implements Serializable {
if (hashCode != 0) {
throw new
UnsupportedOperationException(Errors.format(Errors.Keys.UnmodifiableObject_1,
"XLink"));
}
+@SuppressWarnings("LocalVariableHidesMemberVariable")
final Type type = this.type;
if (type != null) {
if (value != null) {
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
index e27652217b..7b2f7e7655 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
@@ -51,8 +51,6 @@ import org.apache.sis.util.resources.Errors;
* A coordinate reference system that is defined by its coordinate conversion
from another CRS.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- *
- * @param the conversion type, either {@code Conversion} or {@code
Projection}.
*/
@XmlType(name = "AbstractGeneralDerivedCRSType")
@XmlRootElement(name = "AbstractGeneralDerivedCRS")
@@ -60,7 +58,7 @@ import org.apache.sis.util.resources.Errors;
DefaultDerivedCRS.class,
DefaultProjectedCRS.class
})
-abstract class AbstractDerivedCRS extends AbstractCRS
implements DerivedCRS {
+abstract class AbstractDerivedCRS extends AbstractCRS implements DerivedCRS {
/**
* Serial number for inter-operability with different versions.
*/
@@ -76,7 +74,7 @@ abstract class AbstractDerivedCRS
extends AbstractCRS impl
* @see #getConversionFromBase()
*/
@SuppressWarnings("serial") // Most SIS implementations are
serializable.
-private C conversionFromBase;
+private Conversion conversionFromBase;
/**
* Creates a derived CRS from a defining conversion.
@@ -111,7 +109,7 @@ abstract class AbstractDerivedCRS
extends AbstractCRS impl
* Creates a new CRS derived from the spe
(sis) 01/01: Merge branch 'geoapi-3.1' https://issues.apache.org/jira/browse/SIS-597
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) branch main updated (161a5fe3c8 -> 66a5fa5253)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 161a5fe3c8 Merge branch 'geoapi-3.1', but without the assumption that `ProjectedCRS` extends `DerivedCRS`. IT means that `GeneralDerivedCRS` needs to be used more often than on the `geoapi-3.1` branch. add 5bfa0612ca Remove usage of `PlanarProjection`, `ConicProjection` and `CylindricalProjection` sub-interfaces. add 1182c4c724 Change in the type of ProjectedCRS.baseCRS: relaxed from GeographicCRS to GeodeticCRS for conformance to ISO 19111. add 883dfe7e9b Merge branch 'geoapi-4.0' into geoapi-3.1: removal of non-standard PlanarProjection, ConicProjection and CylindricalProjection interfaces. new 66a5fa5253 Merge branch 'geoapi-3.1' https://issues.apache.org/jira/browse/SIS-597 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/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(-) delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConicProjection.java delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCylindricalProjection.java delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultPlanarProjection.java
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: removal of non-standard PlanarProjection, ConicProjection and CylindricalProjection interfaces.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 883dfe7e9b481d6163c3f483e4b4a8c5eea61c78
Merge: 20ded9bfa1 1182c4c724
Author: Martin Desruisseaux
AuthorDate: Thu Apr 18 11:38:35 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: removal of non-standard
PlanarProjection, ConicProjection and CylindricalProjection interfaces.
https://issues.apache.org/jira/browse/SIS-597
.../org/apache/sis/buildtools/book/OGC.lst | 1 -
.../org/apache/sis/portrayal/CanvasContext.java| 4 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 4 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 19 ++--
.../referencing/factory/sql/EPSGDataAccess.java| 2 +-
.../operation/AbstractCoordinateOperation.java | 3 -
.../operation/DefaultConicProjection.java | 108 -
.../referencing/operation/DefaultConversion.java | 41
.../DefaultCoordinateOperationFactory.java | 15 +--
.../operation/DefaultCylindricalProjection.java| 108 -
.../operation/DefaultOperationMethod.java | 5 +-
.../operation/DefaultPlanarProjection.java | 108 -
.../referencing/operation/DefaultProjection.java | 13 ++-
.../apache/sis/referencing/operation/SubTypes.java | 40 +---
.../operation/provider/AbstractLambert.java| 3 +-
.../operation/provider/AbstractMercator.java | 3 +-
.../operation/provider/AbstractStereographic.java | 3 +-
.../operation/provider/AlbersEqualArea.java| 3 +-
.../provider/AzimuthalEquidistantSpherical.java| 3 +-
.../operation/provider/CassiniSoldner.java | 3 +-
.../operation/provider/Equirectangular.java| 4 +-
.../provider/LambertAzimuthalEqualArea.java| 3 +-
.../provider/LambertCylindricalEqualArea.java | 3 +-
.../LambertCylindricalEqualAreaSpherical.java | 3 +-
.../operation/provider/MapProjection.java | 9 +-
.../provider/ModifiedAzimuthalEquidistant.java | 3 +-
.../referencing/operation/provider/Mollweide.java | 3 +-
.../operation/provider/Orthographic.java | 3 +-
.../referencing/operation/provider/Polyconic.java | 3 +-
.../operation/provider/SatelliteTracking.java | 3 +-
.../referencing/operation/provider/Sinusoidal.java | 3 +-
.../org/apache/sis/geometry/TransformTestCase.java | 15 +--
.../sis/io/wkt/GeodeticObjectParserTest.java | 4 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 4 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 3 +-
.../transform/OperationMethodSetTest.java | 52 +-
.../report/CoordinateOperationMethods.java | 19 ++--
.../report/CoordinateReferenceSystems.java | 2 +-
.../integration/CoordinateReferenceSystemTest.java | 6 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 4 +-
geoapi/snapshot| 2 +-
41 files changed, 117 insertions(+), 523 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
index 1202bad9c7,0a69f68c58..d2bfb89b47
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
@@@ -23,7 -23,7 +23,8 @@@ import jakarta.xml.bind.annotation.XmlR
import javax.measure.Unit;
import javax.measure.quantity.Angle;
import org.opengis.referencing.crs.ProjectedCRS;
+import org.opengis.referencing.crs.GeographicCRS;
+ import org.opengis.referencing.crs.GeodeticCRS;
import org.opengis.referencing.cs.CartesianCS;
import org.opengis.referencing.cs.CoordinateSystem; // For
javadoc
import org.opengis.referencing.datum.GeodeticDatum;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
index b4f4c42b55,bbf45d2eef..1903225188
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
@@@ -593,17 -592,7 +592,7 @@@ next: for (int i=components.size(); -
throw new IllegalArgumentException(Errors.format(
Errors.Keys.ForbiddenAttribute_2, "interpolationCRS",
baseType));
}
- final GeographicCRS baseCRS = (GeographicCRS) sourceCRS;
- final ProjectedCRS crs = (ProjectedCRS) targetCRS;
- if (CylindricalProjection.class.isAssignableFrom(baseType)) {
- op = new DefaultCylindricalProjection(properties, baseCRS,
c
(sis) branch geoapi-3.1 updated (20ded9bfa1 -> 883dfe7e9b)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 20ded9bfa1 Merge branch 'geoapi-4.0' into geoapi-3.1, but keep checking for `GeneralDerivedCRS` in `instanceof` checks. add 5bfa0612ca Remove usage of `PlanarProjection`, `ConicProjection` and `CylindricalProjection` sub-interfaces. add 1182c4c724 Change in the type of ProjectedCRS.baseCRS: relaxed from GeographicCRS to GeodeticCRS for conformance to ISO 19111. new 883dfe7e9b Merge branch 'geoapi-4.0' into geoapi-3.1: removal of non-standard PlanarProjection, ConicProjection and CylindricalProjection interfaces. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/buildtools/book/OGC.lst | 1 - .../org/apache/sis/portrayal/CanvasContext.java| 4 +- .../gazetteer/MilitaryGridReferenceSystem.java | 4 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 19 ++-- .../referencing/factory/sql/EPSGDataAccess.java| 2 +- .../operation/AbstractCoordinateOperation.java | 3 - .../operation/DefaultConicProjection.java | 108 - .../referencing/operation/DefaultConversion.java | 41 .../DefaultCoordinateOperationFactory.java | 15 +-- .../operation/DefaultCylindricalProjection.java| 108 - .../operation/DefaultOperationMethod.java | 5 +- .../operation/DefaultPlanarProjection.java | 108 - .../referencing/operation/DefaultProjection.java | 13 ++- .../apache/sis/referencing/operation/SubTypes.java | 40 +--- .../operation/provider/AbstractLambert.java| 3 +- .../operation/provider/AbstractMercator.java | 3 +- .../operation/provider/AbstractStereographic.java | 3 +- .../operation/provider/AlbersEqualArea.java| 3 +- .../provider/AzimuthalEquidistantSpherical.java| 3 +- .../operation/provider/CassiniSoldner.java | 3 +- .../operation/provider/Equirectangular.java| 4 +- .../provider/LambertAzimuthalEqualArea.java| 3 +- .../provider/LambertCylindricalEqualArea.java | 3 +- .../LambertCylindricalEqualAreaSpherical.java | 3 +- .../operation/provider/MapProjection.java | 9 +- .../provider/ModifiedAzimuthalEquidistant.java | 3 +- .../referencing/operation/provider/Mollweide.java | 3 +- .../operation/provider/Orthographic.java | 3 +- .../referencing/operation/provider/Polyconic.java | 3 +- .../operation/provider/SatelliteTracking.java | 3 +- .../referencing/operation/provider/Sinusoidal.java | 3 +- .../org/apache/sis/geometry/TransformTestCase.java | 15 +-- .../sis/io/wkt/GeodeticObjectParserTest.java | 4 +- .../referencing/crs/DefaultProjectedCRSTest.java | 4 +- .../referencing/factory/sql/EPSGFactoryTest.java | 3 +- .../transform/OperationMethodSetTest.java | 52 +- .../report/CoordinateOperationMethods.java | 19 ++-- .../report/CoordinateReferenceSystems.java | 2 +- .../integration/CoordinateReferenceSystemTest.java | 6 +- .../sis/storage/geotiff/reader/CRSBuilder.java | 4 +- geoapi/snapshot| 2 +- 41 files changed, 117 insertions(+), 523 deletions(-) delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConicProjection.java delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCylindricalProjection.java delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultPlanarProjection.java
(sis) branch geoapi-4.0 updated: Change in the type of ProjectedCRS.baseCRS: relaxed from GeographicCRS to GeodeticCRS for conformance to ISO 19111.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 1182c4c724 Change in the type of ProjectedCRS.baseCRS: relaxed from
GeographicCRS to GeodeticCRS for conformance to ISO 19111.
1182c4c724 is described below
commit 1182c4c724c953cc122cf9fa00d20a046bd9deb6
Author: Martin Desruisseaux
AuthorDate: Wed Apr 17 18:53:37 2024 +0200
Change in the type of ProjectedCRS.baseCRS:
relaxed from GeographicCRS to GeodeticCRS for conformance to ISO 19111.
---
.../org/apache/sis/buildtools/book/OGC.lst | 1 -
.../org/apache/sis/portrayal/CanvasContext.java| 4 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 4 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java| 4 +-
.../main/org/apache/sis/referencing/CRS.java | 4 +-
.../referencing/EllipsoidalHeightSeparator.java| 5 +--
.../sis/referencing/crs/DefaultProjectedCRS.java | 44 --
.../{SC_GeographicCRS.java => SC_GeodeticCRS.java} | 37 +-
.../apache/sis/referencing/crs/package-info.java | 2 +-
.../factory/CommonAuthorityFactory.java| 3 +-
.../referencing/factory/GeodeticObjectFactory.java | 2 +-
.../factory/MultiAuthoritiesFactory.java | 4 +-
.../referencing/factory/sql/EPSGDataAccess.java| 6 +--
.../referencing/operation/DefaultConversion.java | 7 ++--
.../DefaultCoordinateOperationFactory.java | 10 ++---
.../referencing/operation/DefaultProjection.java | 12 +++---
.../privy/EllipsoidalHeightCombiner.java | 4 +-
.../referencing/privy/GeodeticObjectBuilder.java | 3 +-
.../sis/xml/bind/referencing/SC_GeodeticCRS.md | 2 +
.../sis/xml/bind/referencing/SC_GeographicCRS.md | 4 --
.../org/apache/sis/geometry/TransformTestCase.java | 15
.../sis/io/wkt/GeodeticObjectParserTest.java | 4 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 4 +-
.../report/CoordinateReferenceSystems.java | 2 +-
.../integration/CoordinateReferenceSystemTest.java | 16
.../sis/storage/geotiff/reader/CRSBuilder.java | 4 +-
geoapi/snapshot| 2 +-
27 files changed, 105 insertions(+), 104 deletions(-)
diff --git a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
index 7cc85d7506..f9449cb40b 100644
--- a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
+++ b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
@@ -217,7 +217,6 @@ SC_EngineeringCRS
SC_GeneralDerivedCRS
SC_GeocentricCRS
SC_GeodeticCRS
-SC_GeographicCRS
SC_ImageCRS
SC_ProjectedCRS
SC_SingleCRS
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
index 38477fde68..aae76518d5 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
@@ -19,7 +19,7 @@ package org.apache.sis.portrayal;
import java.util.Optional;
import java.util.OptionalDouble;
import org.opengis.metadata.extent.GeographicBoundingBox;
-import org.opengis.referencing.crs.GeographicCRS;
+import org.opengis.referencing.crs.GeodeticCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.datum.Ellipsoid;
import org.opengis.referencing.operation.Matrix;
@@ -201,7 +201,7 @@ final class CanvasContext extends
CoordinateOperationContext {
}
combined[j] = m;
}
-final Ellipsoid ellipsoid = ((GeographicCRS)
objectiveToGeographic.getTargetCRS()).getDatum().getEllipsoid();
+final Ellipsoid ellipsoid = ((GeodeticCRS)
objectiveToGeographic.getTargetCRS()).getDatum().getEllipsoid();
double radius = Formulas.radiusOfConformalSphere(ellipsoid,
combined[1]);
radius =
ellipsoid.getAxisUnit().getConverterTo(Units.METRE).convert(radius);
resolution = MathFunctions.magnitude(combined) * radius;
diff --git
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
index 7af3c082e8..50f61b01a4 100644
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
@@ -4
(sis) branch geoapi-4.0 updated: Remove usage of `PlanarProjection`, `ConicProjection` and `CylindricalProjection` sub-interfaces.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 5bfa0612ca Remove usage of `PlanarProjection`, `ConicProjection` and
`CylindricalProjection` sub-interfaces.
5bfa0612ca is described below
commit 5bfa0612ca40c0a431b16ca937f401fd62b812b4
Author: Martin Desruisseaux
AuthorDate: Wed Apr 17 11:36:30 2024 +0200
Remove usage of `PlanarProjection`, `ConicProjection` and
`CylindricalProjection` sub-interfaces.
https://issues.apache.org/jira/browse/SIS-597
---
.../operation/AbstractCoordinateOperation.java | 3 -
.../operation/DefaultConicProjection.java | 108 -
.../referencing/operation/DefaultConversion.java | 36 +++
.../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 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 3 +-
.../transform/OperationMethodSetTest.java | 52 +-
.../report/CoordinateOperationMethods.java | 19 ++--
geoapi/snapshot| 2 +-
30 files changed, 82 insertions(+), 488 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
index 75910575f1..9bd95fe8b8 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
@@ -439,9 +439,6 @@ check: for (int isTarget=0; ; isTarget++) {//
0 == source check; 1
* {@link org.opengis.referencing.operation.Transformation},
* {@link org.opengis.referencing.operation.Conversion},
* {@link org.opengis.referencing.operation.Projection},
- * {@link org.opengis.referencing.operation.CylindricalProjection},
- * {@link org.opengis.referencing.operation.ConicProjection},
- * {@link org.opengis.referencing.operation.PlanarProjection},
* {@link org.opengis.referencing.operation.PassThroughOperation} or
* {@link org.opengis.referencing.operation.ConcatenatedOperation},
* then this method delegates to the {@code castOrCopy(…)} method of
the corresponding SIS subclass.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConicProjection.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConicProjection.java
deleted file mode 100644
index a801bd6094..00
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConicProjection.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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
(sis) 02/02: Merge branch 'geoapi-3.1', but without the assumption that `ProjectedCRS` extends `DerivedCRS`. IT means that `GeneralDerivedCRS` needs to be used more often than on the `geoapi-3.1` bran
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 161a5fe3c8e79997b5b64d566067fd359a0e241b
Merge: 39df6c6024 20ded9bfa1
Author: Martin Desruisseaux
AuthorDate: Tue Apr 16 16:37:44 2024 +0200
Merge branch 'geoapi-3.1', but without the assumption that `ProjectedCRS`
extends `DerivedCRS`.
IT means that `GeneralDerivedCRS` needs to be used more often than on the
`geoapi-3.1` branch.
.../apache/sis/io/wkt/GeodeticObjectParser.java| 2 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 2 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++--
.../main/org/apache/sis/referencing/CRS.java | 4 ++--
.../sis/referencing/crs/DefaultDerivedCRS.java | 5 ++---
.../referencing/datum/DefaultVerticalDatum.java| 1 -
.../referencing/factory/sql/AuthorityCodes.java| 10 +
.../referencing/factory/sql/EPSGCodeFinder.java| 2 +-
.../sis/referencing/factory/sql/TableInfo.java | 24 +-
.../operation/CoordinateOperationFinder.java | 12 +--
.../operation/transform/ConcatenatedTransform.java | 2 +-
11 files changed, 45 insertions(+), 23 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
index 96e209538a,e0a3a531aa..4f911e51e5
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
@@@ -18,7 -18,7 +18,6 @@@ package org.apache.sis.referencing.datu
import java.util.Map;
import java.util.Objects;
--import java.util.Optional;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
index 1682f75053,906f1e94a6..12e1769ed8
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
@@@ -254,6 -251,28 +255,27 @@@ final class TableInfo
return CharSequences.isAcronymForWords(name, expected);
}
+ /**
+ * Appends a {@code WHERE} clause together with a condition for searching
the specified object.
+ * This method delegates to {@link #where(Class, StringBuilder)} with the
type of the given object,
+ * except that some object properties may be inspected for resolving
ambiguities.
+ *
+ * @param object the object to search in the database.
+ * @param buffer where to append the {@code WHERE} clause.
+ */
-@SuppressWarnings("deprecation")
+ final void where(final IdentifiedObject object, final StringBuilder
buffer) {
+ Class userType = object.getClass();
+ if (object instanceof GeodeticCRS) {
+ final CoordinateSystem cs = ((GeodeticCRS)
object).getCoordinateSystem();
+ if (cs instanceof EllipsoidalCS) {
+ userType = GeographicCRS.class;
+ } else if (cs instanceof CartesianCS || cs instanceof
SphericalCS) {
+ userType = GeocentricCRS.class;
+ }
+ }
+ where(userType, buffer);
+ }
+
/**
* Appends a {@code WHERE} clause together with a condition for searching
the most specific subtype,
* if such condition can be added. The clause appended by this method
looks like the following example
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
index 91d78cbf25,82eeff00dc..35f9d4d476
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
@@@ -367,13 -368,13 +367,13 @@@ public class CoordinateOperationFinder
/**
* Creates operations from an arbitrary single CRS to a derived
coordinate reference system.
* Conversions from {@code GeographicCRS} to {@code ProjectedCRS} are
also handled by this method,
- * since projected CRS are a special kind of {@code DerivedCRS}.
+ * since projected CRS are a special kind of {@code GeneralDerivedCRS}.
*
* The default implementation constructs the following operation
chain:
- * sourceCRS → {@linkplain
GeneralDerivedCRS#getBaseCRS() baseCRS} → targetCRS
+ * sourceCRS → {@linkplain DerivedCRS#getBaseCRS()
baseCRS} → targetCRS
*
* where the conversion from {@code baseCRS} to {@code targetCRS} is
obtained from
- * targetCRS.{@linkplain General
(sis) branch main updated (00b4a72d2f -> 161a5fe3c8)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 00b4a72d2f 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. new 39df6c6024 Add warnings about `GeodeticCRS` type that may be replaced by `GeodeticCRS` type in a future version. add d9303f1d7d Temporarily use "2.0" as the version number for methods that are deprecated in the `geoapi-3.1` branch but not yet on main. add 6fd7c530f7 Use the SIS-specific `DefaultGeocentricCRS` class in one place where we removed the `GeocentricCRS` interface. This is needed for avoiding an ambiguity when searching codes in an EPSG database. add 6c50bd371c Update for the removal of `GeneralDerivedCRS` from GeoAPI 4.0. This is replaced by direct usage of `DerivedCRS`. add 20ded9bfa1 Merge branch 'geoapi-4.0' into geoapi-3.1, but keep checking for `GeneralDerivedCRS` in `instanceof` checks. new 161a5fe3c8 Merge branch 'geoapi-3.1', but without the assumption that `ProjectedCRS` extends `DerivedCRS`. IT means that `GeneralDerivedCRS` needs to be used more often than on the `geoapi-3.1` branch. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sis/io/wkt/GeodeticObjectParser.java| 2 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 2 +- .../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++-- .../main/org/apache/sis/referencing/CRS.java | 4 ++-- .../sis/referencing/crs/DefaultDerivedCRS.java | 5 ++--- .../referencing/datum/DefaultVerticalDatum.java| 1 - .../factory/ConcurrentAuthorityFactory.java| 4 .../factory/GeodeticAuthorityFactory.java | 4 .../referencing/factory/GeodeticObjectFactory.java | 8 .../factory/MultiAuthoritiesFactory.java | 4 .../referencing/factory/sql/AuthorityCodes.java| 10 + .../referencing/factory/sql/EPSGCodeFinder.java| 2 +- .../sis/referencing/factory/sql/TableInfo.java | 24 +- .../operation/CoordinateOperationFinder.java | 12 +-- .../operation/transform/ConcatenatedTransform.java | 2 +- 15 files changed, 65 insertions(+), 23 deletions(-)
(sis) 01/02: Add warnings about `GeodeticCRS` type that may be replaced by `GeodeticCRS` type in a future version.
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 39df6c6024da0ad136d1f1cebb39aaff8d501727
Author: Martin Desruisseaux
AuthorDate: Tue Apr 16 13:59:09 2024 +0200
Add warnings about `GeodeticCRS` type that may be replaced by `GeodeticCRS`
type in a future version.
---
.../sis/referencing/factory/ConcurrentAuthorityFactory.java | 4
.../apache/sis/referencing/factory/GeodeticAuthorityFactory.java | 4
.../org/apache/sis/referencing/factory/GeodeticObjectFactory.java | 8
.../apache/sis/referencing/factory/MultiAuthoritiesFactory.java | 4
4 files changed, 20 insertions(+)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
index 2688f607cd..63527e9e79 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
@@ -935,6 +935,10 @@ public abstract class ConcurrentAuthorityFactory
*
*
+ * 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 coordinate reference system for the given code.
* @throws FactoryException if the object creation failed.
*/
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
index a5d86d0ee3..db8b1d7f60 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
@@ -344,6 +344,10 @@ public abstract class GeodeticAuthorityFactory extends
AbstractFactory implement
* EPSG:4984 World Geodetic System 1972
*
*
+ * 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.
+ *
* Default implementation
* The default implementation delegates to {@link
#createCoordinateReferenceSystem(String)} and casts the result.
* If the result cannot be casted, then a {@link
NoSuchAuthorityCodeException} is thrown.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
index 771df2dd98..7c8d8f2d31 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
@@ -320,6 +320,10 @@ public class GeodeticObjectFactory extends AbstractFactory
implements CRSFactory
* An {@linkplain #createGeocentricCRS(Map, GeodeticDatum, SphericalCS)
alternate method} allows creation of the
* same kind of CRS with spherical coordinate system instead of a
Cartesian one.
*
+ * 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.
+ *
* Dependencies
* The components needed by this method can be created by the following
methods:
*
@@ -398,6 +402,10 @@ public class GeodeticObjectFactory extends AbstractFactory
implements CRSFactory
* An {@linkplain #createGeocentricCRS(Map, GeodeticDatum, CartesianCS)
alternate method} allows creation of the
* same kind of CRS with Cartesian coordinate system instead of a
spherical one.
*
+ * 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.
+ *
* Dependencies
* The components needed by this method can be created by the following
methods:
*
diff --git
(sis) branch geoapi-3.1 updated (d9303f1d7d -> 20ded9bfa1)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from d9303f1d7d Temporarily use "2.0" as the version number for methods that are deprecated in the `geoapi-3.1` branch but not yet on main. add 6fd7c530f7 Use the SIS-specific `DefaultGeocentricCRS` class in one place where we removed the `GeocentricCRS` interface. This is needed for avoiding an ambiguity when searching codes in an EPSG database. add 6c50bd371c Update for the removal of `GeneralDerivedCRS` from GeoAPI 4.0. This is replaced by direct usage of `DerivedCRS`. new 20ded9bfa1 Merge branch 'geoapi-4.0' into geoapi-3.1, but keep checking for `GeneralDerivedCRS` in `instanceof` checks. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/buildtools/book/GEOAPI.lst | 1 - .../geometry/wrapper/SpatialOperationContext.java | 2 ++ .../apache/sis/io/wkt/GeodeticObjectParser.java| 2 +- .../org/apache/sis/io/wkt/MathTransformParser.java | 2 +- .../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++-- .../main/org/apache/sis/referencing/CRS.java | 7 +++--- .../sis/referencing/crs/AbstractDerivedCRS.java| 1 + .../sis/referencing/crs/DefaultDerivedCRS.java | 5 ++--- .../referencing/datum/DefaultPrimeMeridian.java| 1 + .../referencing/factory/AuthorityFactoryProxy.java | 1 + .../factory/MultiAuthoritiesFactory.java | 4 +++- .../referencing/factory/sql/AuthorityCodes.java| 10 + .../factory/sql/CoordinateOperationSet.java| 1 + .../referencing/factory/sql/EPSGCodeFinder.java| 2 +- .../sis/referencing/factory/sql/TableInfo.java | 25 +- .../operation/AbstractCoordinateOperation.java | 11 +- .../operation/CoordinateOperationFinder.java | 21 +++--- .../operation/DefaultOperationMethod.java | 1 + .../referencing/operation/SubOperationInfo.java| 1 + .../operation/transform/ConcatenatedTransform.java | 2 +- .../referencing/privy/CoordinateOperations.java| 1 + .../sis/referencing/privy/DefinitionVerifier.java | 1 + .../report/CoordinateOperationMethods.java | 6 +++--- .../report/CoordinateReferenceSystems.java | 5 ++--- .../integration/CoordinateReferenceSystemTest.java | 5 ++--- geoapi/snapshot| 2 +- .../src/org.apache.sis.gui/bundle/conf/imports.jsh | 1 - 27 files changed, 82 insertions(+), 43 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1, but keep checking for `GeneralDerivedCRS` in `instanceof` checks.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 20ded9bfa17d1c1217c96f5bb3a897bbc25d535b
Merge: d9303f1d7d 6c50bd371c
Author: Martin Desruisseaux
AuthorDate: Tue Apr 16 15:36:18 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, but keep checking for
`GeneralDerivedCRS` in `instanceof` checks.
.../org/apache/sis/buildtools/book/GEOAPI.lst | 1 -
.../geometry/wrapper/SpatialOperationContext.java | 2 ++
.../apache/sis/io/wkt/GeodeticObjectParser.java| 2 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 2 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++--
.../main/org/apache/sis/referencing/CRS.java | 7 +++---
.../sis/referencing/crs/AbstractDerivedCRS.java| 1 +
.../sis/referencing/crs/DefaultDerivedCRS.java | 5 ++---
.../referencing/datum/DefaultPrimeMeridian.java| 1 +
.../referencing/factory/AuthorityFactoryProxy.java | 1 +
.../factory/MultiAuthoritiesFactory.java | 4 +++-
.../referencing/factory/sql/AuthorityCodes.java| 10 +
.../factory/sql/CoordinateOperationSet.java| 1 +
.../referencing/factory/sql/EPSGCodeFinder.java| 2 +-
.../sis/referencing/factory/sql/TableInfo.java | 25 +-
.../operation/AbstractCoordinateOperation.java | 11 +-
.../operation/CoordinateOperationFinder.java | 21 +++---
.../operation/DefaultOperationMethod.java | 1 +
.../referencing/operation/SubOperationInfo.java| 1 +
.../operation/transform/ConcatenatedTransform.java | 2 +-
.../referencing/privy/CoordinateOperations.java| 1 +
.../sis/referencing/privy/DefinitionVerifier.java | 1 +
.../report/CoordinateOperationMethods.java | 6 +++---
.../report/CoordinateReferenceSystems.java | 5 ++---
.../integration/CoordinateReferenceSystemTest.java | 5 ++---
geoapi/snapshot| 2 +-
.../src/org.apache.sis.gui/bundle/conf/imports.jsh | 1 -
27 files changed, 82 insertions(+), 43 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index 871ce7619b,c372eff258..ed14df684c
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
@@@ -304,6 -304,6 +304,7 @@@ select: if (commonCRS == null)
* @throws TransformException if a coordinate conversion was required but
failed.
* @throws IncommensurableException if a coordinate system does not use
the expected units.
*/
++@SuppressWarnings("deprecation")
private static CoordinateReferenceSystem usingSystemUnit(final
GeometryWrapper geometry,
final
CoordinateReferenceSystem geometryCRS,
CoordinateReferenceSystem targetCRS,
@@@ -372,6 -372,6 +373,7 @@@
* @throws TransformException if a coordinate conversion was required
but failed.
* @throws IncommensurableException if a coordinate system does not
use the expected units.
*/
++@SuppressWarnings("deprecation")
ProjectedCRS create(final GeographicCRS baseCRS, DirectPosition
centroid, CoordinateReferenceSystem geometryCRS)
throws FactoryException, TransformException,
IncommensurableException
{
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 5ce1cc255d,4fb5f64603..d6ab6fa8cf
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -1714,8 -1708,8 +1714,8 @@@ class GeodeticObjectParser extends Math
* @param parent the parent element.
* @param dimension the minimal number of dimensions (usually 2).
* @param csType the default coordinate system type, or {@code null}
if unknown.
- *Should be non-null only when parsing a {@link
GeneralDerivedCRS#getBaseCRS()} component.
+ *Should be non-null only when parsing a {@link
DerivedCRS#getBaseCRS()} component.
- * @return the {@code "GeodeticCRS"} element as a {@link GeographicCRS}
or {@link GeodeticCRS} object.
+ * @return the {@code "GeodeticCRS"} element as a {@link GeographicCRS}
or {@link GeocentricCRS} object.
* @throws ParseException if the {@code "GeodeticCRS"} element cannot be
parsed.
*
* @see
org.apache.sis.referencing.crs.DefaultGeographicCRS#formatTo(Formatter)
diff
(sis) branch geoapi-4.0 updated: Update for the removal of `GeneralDerivedCRS` from GeoAPI 4.0. This is replaced by direct usage of `DerivedCRS`.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 6c50bd371c Update for the removal of `GeneralDerivedCRS` from GeoAPI
4.0. This is replaced by direct usage of `DerivedCRS`.
6c50bd371c is described below
commit 6c50bd371c210bb3ee28525f9abe0f2ad59de146
Author: Martin Desruisseaux
AuthorDate: Tue Apr 16 14:42:06 2024 +0200
Update for the removal of `GeneralDerivedCRS` from GeoAPI 4.0.
This is replaced by direct usage of `DerivedCRS`.
---
.../org/apache/sis/buildtools/book/GEOAPI.lst | 1 -
.../geometry/wrapper/SpatialOperationContext.java | 10 +++
.../apache/sis/io/wkt/GeodeticObjectParser.java| 2 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 2 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 4 +--
.../main/org/apache/sis/referencing/CRS.java | 12
.../apache/sis/referencing/crs/AbstractCRS.java| 7 ++---
.../sis/referencing/crs/AbstractDerivedCRS.java| 12
.../sis/referencing/crs/DefaultDerivedCRS.java | 5 ++--
.../referencing/datum/DefaultPrimeMeridian.java| 4 +--
.../referencing/factory/AuthorityFactoryProxy.java | 2 +-
.../factory/MultiAuthoritiesFactory.java | 2 +-
.../factory/sql/CoordinateOperationSet.java| 6 ++--
.../referencing/factory/sql/EPSGCodeFinder.java| 6 ++--
.../operation/AbstractCoordinateOperation.java | 19 ++--
.../operation/CoordinateOperationFinder.java | 34 +++---
.../operation/CoordinateOperationRegistry.java | 5 ++--
.../referencing/operation/DefaultConversion.java | 8 ++---
.../operation/DefaultOperationMethod.java | 6 ++--
.../referencing/operation/SubOperationInfo.java| 4 +--
.../operation/transform/ConcatenatedTransform.java | 2 +-
.../referencing/privy/CoordinateOperations.java| 6 ++--
.../sis/referencing/privy/DefinitionVerifier.java | 8 ++---
.../referencing/privy/ReferencingUtilities.java| 5 ++--
.../report/CoordinateOperationMethods.java | 6 ++--
.../report/CoordinateReferenceSystems.java | 5 ++--
.../integration/CoordinateReferenceSystemTest.java | 5 ++--
geoapi/snapshot| 2 +-
.../src/org.apache.sis.gui/bundle/conf/imports.jsh | 1 -
.../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++---
30 files changed, 93 insertions(+), 105 deletions(-)
diff --git
a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
index dfea7437fb..ca0059bed2 100644
--- a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
+++ b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
@@ -79,7 +79,6 @@ FormatConsistency
Formula
GCP
GCPCollection
-GeneralDerivedCRS
GeneralParameterDescriptor
GeneralParameterValue
GeodeticCRS
diff --git
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
index 871ce7619b..c372eff258 100644
---
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
@@ -30,7 +30,7 @@ import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.crs.ProjectedCRS;
import org.opengis.referencing.crs.GeographicCRS;
-import org.opengis.referencing.crs.GeneralDerivedCRS;
+import org.opengis.referencing.crs.DerivedCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.OperationMethod;
import org.opengis.referencing.operation.TransformException;
@@ -319,8 +319,8 @@ select: if (commonCRS == null) {
if (Units.isLinear(systemUnit) && targetCRS instanceof
GeographicCRS) {
return Projector.instance().create((GeographicCRS) targetCRS,
geometry.getCentroid(), geometryCRS);
}
-if (targetCRS instanceof GeneralDerivedCRS) {
-targetCRS = ((GeneralDerivedCRS) targetCRS).getBaseCRS();
+if (targetCRS instanceof DerivedCRS) {
+targetCRS = ((DerivedCRS) targetCRS).getBaseCRS();
} else {
throw new
IncommensurableException(Errors.format(Errors.Keys.InconsistentUnitsForCS_1,
systemUnit));
}
@@ -381,8 +381,8 @@ select: if (commonCRS == null) {
* Note that a CRS can be both derived and geographic, so we need
to do this check first in order to
* avoid derived geographic CRS such as
(sis) branch geoapi-3.1 updated: Temporarily use "2.0" as the version number for methods that are deprecated in the `geoapi-3.1` branch but not yet on main.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-3.1 by this push:
new d9303f1d7d Temporarily use "2.0" as the version number for methods
that are deprecated in the `geoapi-3.1` branch but not yet on main.
d9303f1d7d is described below
commit d9303f1d7d9a1126f0c7c7ff4bec383a60d2574b
Author: Martin Desruisseaux
AuthorDate: Tue Apr 16 13:08:39 2024 +0200
Temporarily use "2.0" as the version number for methods that are deprecated
in the `geoapi-3.1` branch but not yet on main.
---
.../main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 4 ++--
.../org/apache/sis/referencing/factory/AuthorityFactoryProxy.java | 4 +++-
.../apache/sis/referencing/factory/ConcurrentAuthorityFactory.java | 2 +-
.../apache/sis/referencing/factory/GeodeticAuthorityFactory.java| 2 +-
.../org/apache/sis/referencing/factory/GeodeticObjectFactory.java | 6 +++---
.../org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java | 2 +-
.../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java| 2 +-
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
index f7584808d6..e0a3a531aa 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
@@ -168,7 +168,7 @@ public class DefaultVerticalDatum extends AbstractDatum
implements VerticalDatum
*
* @deprecated As of ISO 19111:2019, the {@code VerticalDatumType}
argument is replaced by {@code RealizationMethod}.
*/
-@Deprecated(since = "2.0")
+@Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public DefaultVerticalDatum(final Map properties, final
VerticalDatumType type) {
super(properties);
this.type = Objects.requireNonNull(type);
@@ -289,7 +289,7 @@ public class DefaultVerticalDatum extends AbstractDatum
implements VerticalDatum
* @deprecated As of ISO 19111:2019, the {@code VerticalDatumType}
argument is replaced by {@code RealizationMethod}.
*/
@Override
-@Deprecated(since = "2.0")
+@Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public VerticalDatumType getVerticalDatumType() {
return type();
}
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
index 2063b996f8..1c2cba8911 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
@@ -460,7 +460,7 @@ abstract class AuthorityFactoryProxy {
}
};
-@Deprecated(since = "1.5")
+@Deprecated(since = "2.0") // Temporary version number until this branch
is released.
static final AuthorityFactoryProxy GEOCENTRIC_CRS =
new AuthorityFactoryProxy(GeocentricCRS.class,
AuthorityFactoryIdentifier.CRS) {
@Override GeocentricCRS create(GeodeticAuthorityFactory factory,
String code) throws FactoryException {
@@ -571,6 +571,8 @@ abstract class AuthorityFactoryProxy {
static final AuthorityFactoryProxy[] PROXIES = new
AuthorityFactoryProxy[] {
PROJECTED_CRS, // Special kind of GeneralDerivedCRS.
GEOGRAPHIC_CRS, // Special kind of GeodeticCRS.
+GEOCENTRIC_CRS, // Special kind of GeodeticCRS.
+GEODETIC_CRS,
VERTICAL_CRS,
TEMPORAL_CRS,
IMAGE_CRS, // Can be seen as a special kind of EngineeringCRS
(even if not shown in hierarchy).
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
index d413fc2e81..74351d232d 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
@@ -959,7 +959,7 @@ public abstract class ConcurrentAuthorityFactory properties,
final GeodeticDatum datum, final CartesianCS cs) throws
Factor
(sis) branch geoapi-4.0 updated: Use the SIS-specific `DefaultGeocentricCRS` class in one place where we removed the `GeocentricCRS` interface. This is needed for avoiding an ambiguity when searching
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 6fd7c530f7 Use the SIS-specific `DefaultGeocentricCRS` class in one
place where we removed the `GeocentricCRS` interface. This is needed for
avoiding an ambiguity when searching codes in an EPSG database.
6fd7c530f7 is described below
commit 6fd7c530f7d5181b5dd2fc5bb86af2ba2cc73999
Author: Martin Desruisseaux
AuthorDate: Tue Apr 16 11:50:09 2024 +0200
Use the SIS-specific `DefaultGeocentricCRS` class in one place where we
removed the `GeocentricCRS` interface.
This is needed for avoiding an ambiguity when searching codes in an EPSG
database.
---
.../sis/referencing/crs/DefaultTemporalCRS.java| 1 +
.../referencing/factory/AuthorityFactoryProxy.java | 1 +
.../factory/ConcurrentAuthorityFactory.java| 2 ++
.../factory/GeodeticAuthorityFactory.java | 2 ++
.../referencing/factory/GeodeticObjectFactory.java | 4 +++
.../factory/MultiAuthoritiesFactory.java | 2 ++
.../referencing/factory/sql/AuthorityCodes.java| 10 ---
.../referencing/factory/sql/EPSGCodeFinder.java| 2 +-
.../sis/referencing/factory/sql/TableInfo.java | 35 --
9 files changed, 52 insertions(+), 7 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
index 8a55606a48..3644a65a34 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
@@ -152,6 +152,7 @@ public class DefaultTemporalCRS extends AbstractCRS
implements TemporalCRS {
*
* @see
org.apache.sis.referencing.factory.GeodeticObjectFactory#createTemporalCRS(Map,
TemporalDatum, TimeCS)
*/
+@SuppressWarnings("this-escape")
public DefaultTemporalCRS(final Map properties,
final TemporalDatum datum,
final TimeCScs)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
index 8947411b87..7893b80b77 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
@@ -543,6 +543,7 @@ abstract class AuthorityFactoryProxy {
static final AuthorityFactoryProxy[] PROXIES = new
AuthorityFactoryProxy[] {
PROJECTED_CRS, // Special kind of GeneralDerivedCRS.
GEOGRAPHIC_CRS, // Special kind of GeodeticCRS.
+GEODETIC_CRS,
VERTICAL_CRS,
TEMPORAL_CRS,
ENGINEERING_CRS,
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
index 34e23dddab..f7d6ab7758 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
@@ -937,6 +937,8 @@ public abstract class ConcurrentAuthorityFactory properties,
@@ -420,6 +422,8 @@ public class GeodeticObjectFactory extends AbstractFactory
implements CRSFactory
*
* @see DefaultGeocentricCRS#DefaultGeocentricCRS(Map, GeodeticDatum,
SphericalCS)
* @see GeodeticAuthorityFactory#createGeodeticCRS(String)
+ *
+ * @since 1.5
*/
@Override
public GeodeticCRS createGeodeticCRS(final Map properties,
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
index 55fe728fb9..0bcfff9048 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
@@ -956,6 +956,8 @@ public class MultiAuthoritiesFactory extends
GeodeticAuthorityFactory implements
*
* @return the coordinate reference system for the given code.
* @throws FactoryException if the object creation failed.
+ *
+ * @since 1.5
*/
@Override
(sis) branch main updated (2c90ee97ab -> 00b4a72d2f)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 2c90ee97ab Merge branch 'geoapi-3.1'. add 247d4bb78e Update for change in GeoAPI 4.0: deprecated `GeocentricCRS` interface is removed. add 798a145e1e Merge branch 'geoapi-4.0' into geoapi-3.1, but keep implementing the `GeocentricCRS` interface even if deprecated. However with this commit, the code now avoids to depend on that interface. new 00b4a72d2f 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. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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(-)
(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
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-4.0' into geoapi-3.1, but keep implementing the `GeocentricCRS` interface even if deprecated. However with this commit, the code now avoids to depend on that interfac
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 798a145e1e56c102494c63cadba1f286fb1a9bad
Merge: f0d4a254e4 247d4bb78e
Author: Martin Desruisseaux
AuthorDate: Mon Apr 15 19:01:28 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, but keep implementing the
`GeocentricCRS` interface even if deprecated.
However with this commit, the code now avoids to depend on that interface.
.../org/apache/sis/buildtools/book/GEOAPI.lst | 1 -
.../apache/sis/io/wkt/GeodeticObjectParser.java| 7 +--
.../main/org/apache/sis/referencing/CommonCRS.java | 17 +++---
.../apache/sis/referencing/crs/AbstractCRS.java| 26 -
.../sis/referencing/crs/DefaultDerivedCRS.java | 51 ++
.../sis/referencing/crs/DefaultGeocentricCRS.java | 52 ++
.../sis/referencing/crs/DefaultGeodeticCRS.java| 15 +-
.../sis/referencing/crs/DefaultGeographicCRS.java | 32 +--
.../sis/referencing/crs/DefaultParametricCRS.java | 1 +
.../sis/referencing/crs/DefaultTemporalCRS.java| 1 +
.../sis/referencing/crs/DefaultVerticalCRS.java| 1 +
.../sis/referencing/crs/SC_GeographicCRS.java | 5 +-
.../org/apache/sis/referencing/crs/SubTypes.java | 32 ++-
.../referencing/factory/AuthorityFactoryProxy.java | 13 -
.../factory/ConcurrentAuthorityFactory.java| 24 +++--
.../factory/GeodeticAuthorityFactory.java | 18 ++-
.../referencing/factory/GeodeticObjectFactory.java | 62 +++---
.../factory/MultiAuthoritiesFactory.java | 17 --
.../referencing/factory/sql/EPSGDataAccess.java| 4 +-
.../referencing/internal/EPSGFactoryProxyCRS.java | 9 +++-
.../apache/sis/referencing/internal/Legacy.java| 14 +
.../operation/DefaultOperationMethod.java | 1 -
.../operation/provider/AbstractProvider.java | 2 +-
.../referencing/privy/ReferencingUtilities.java| 2 +-
.../apache/sis/referencing/privy/WKTKeywords.java | 5 +-
.../apache/sis/xml/bind/referencing/SC_CRS.java| 4 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 3 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 8 ++-
.../sis/referencing/EPSGFactoryFallbackTest.java | 14 +++--
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 24 -
.../referencing/factory/AuthorityFactoryMock.java | 5 +-
.../factory/MultiAuthoritiesFactoryTest.java | 3 --
.../referencing/factory/sql/EPSGFactoryTest.java | 3 +-
.../operation/CoordinateOperationFinderTest.java | 5 +-
.../sis/referencing/privy/WKTKeywordsTest.java | 5 +-
.../report/CoordinateReferenceSystems.java | 4 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 12 ++---
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 7 ++-
geoapi/snapshot| 2 +-
.../org/apache/sis/gui/referencing/CRSChooser.java | 4 +-
40 files changed, 324 insertions(+), 191 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
index 3a6a1f637a,38c5dff592..44dd64e661
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
@@@ -223,12 -246,10 +246,11 @@@ public class AbstractCRS extends Abstra
* If the given object is {@code null}, then this method returns
{@code null}.
* Otherwise if the given object is an instance of
* {@link org.opengis.referencing.crs.GeodeticCRS} (including the
- * {@link org.opengis.referencing.crs.GeographicCRS} and
- * {@link org.opengis.referencing.crs.GeocentricCRS} subtypes),
+ * {@link org.opengis.referencing.crs.GeographicCRS subtype}),
* {@link org.opengis.referencing.crs.VerticalCRS},
* {@link org.opengis.referencing.crs.TemporalCRS},
- * {@link org.opengis.referencing.crs.EngineeringCRS} or
+ * {@link org.opengis.referencing.crs.EngineeringCRS},
+ * {@link org.opengis.referencing.crs.ImageCRS} or
* {@link org.apache.sis.referencing.cs.DefaultCompoundCS},
* then this method delegates to the {@code castOrCopy(…)} method
of the corresponding SIS subclass.
* Note that if the given object implements more than one of the
above-cited interfaces,
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
index 1cc86465d3,21aec9e2b5..6a01107efb
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
@@@ -368,7 -369,7 +369,7 @@@ public class
(sis) branch geoapi-3.1 updated (f0d4a254e4 -> 798a145e1e)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from f0d4a254e4 Merge branch 'geoapi-4.0' into geoapi-3.1. add 247d4bb78e Update for change in GeoAPI 4.0: deprecated `GeocentricCRS` interface is removed. new 798a145e1e Merge branch 'geoapi-4.0' into geoapi-3.1, but keep implementing the `GeocentricCRS` interface even if deprecated. However with this commit, the code now avoids to depend on that interface. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/buildtools/book/GEOAPI.lst | 1 - .../apache/sis/io/wkt/GeodeticObjectParser.java| 7 +-- .../main/org/apache/sis/referencing/CommonCRS.java | 17 +++--- .../apache/sis/referencing/crs/AbstractCRS.java| 26 - .../sis/referencing/crs/DefaultDerivedCRS.java | 51 ++ .../sis/referencing/crs/DefaultGeocentricCRS.java | 52 ++ .../sis/referencing/crs/DefaultGeodeticCRS.java| 15 +- .../sis/referencing/crs/DefaultGeographicCRS.java | 32 +-- .../sis/referencing/crs/DefaultParametricCRS.java | 1 + .../sis/referencing/crs/DefaultTemporalCRS.java| 1 + .../sis/referencing/crs/DefaultVerticalCRS.java| 1 + .../sis/referencing/crs/SC_GeographicCRS.java | 5 +- .../org/apache/sis/referencing/crs/SubTypes.java | 32 ++- .../referencing/factory/AuthorityFactoryProxy.java | 13 - .../factory/ConcurrentAuthorityFactory.java| 24 +++-- .../factory/GeodeticAuthorityFactory.java | 18 ++- .../referencing/factory/GeodeticObjectFactory.java | 62 +++--- .../factory/MultiAuthoritiesFactory.java | 17 -- .../referencing/factory/sql/EPSGDataAccess.java| 4 +- .../referencing/internal/EPSGFactoryProxyCRS.java | 9 +++- .../apache/sis/referencing/internal/Legacy.java| 14 + .../operation/DefaultOperationMethod.java | 1 - .../operation/provider/AbstractProvider.java | 2 +- .../referencing/privy/ReferencingUtilities.java| 2 +- .../apache/sis/referencing/privy/WKTKeywords.java | 5 +- .../apache/sis/xml/bind/referencing/SC_CRS.java| 4 +- .../sis/io/wkt/GeodeticObjectParserTest.java | 3 +- .../org/apache/sis/referencing/CommonCRSTest.java | 8 ++- .../sis/referencing/EPSGFactoryFallbackTest.java | 14 +++-- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 24 - .../referencing/factory/AuthorityFactoryMock.java | 5 +- .../factory/MultiAuthoritiesFactoryTest.java | 3 -- .../referencing/factory/sql/EPSGFactoryTest.java | 3 +- .../operation/CoordinateOperationFinderTest.java | 5 +- .../sis/referencing/privy/WKTKeywordsTest.java | 5 +- .../report/CoordinateReferenceSystems.java | 4 +- .../sis/storage/geotiff/reader/CRSBuilder.java | 12 ++--- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 7 ++- geoapi/snapshot| 2 +- .../org/apache/sis/gui/referencing/CRSChooser.java | 4 +- 40 files changed, 324 insertions(+), 191 deletions(-)
(sis) branch geoapi-4.0 updated: Update for change in GeoAPI 4.0: deprecated `GeocentricCRS` interface is removed.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 247d4bb78e Update for change in GeoAPI 4.0: deprecated `GeocentricCRS`
interface is removed.
247d4bb78e is described below
commit 247d4bb78e88c98b7e125dc7e827806d0b6637d7
Author: Martin Desruisseaux
AuthorDate: Mon Apr 15 17:46:48 2024 +0200
Update for change in GeoAPI 4.0: deprecated `GeocentricCRS` interface is
removed.
---
.../org/apache/sis/buildtools/book/GEOAPI.lst | 1 -
.../apache/sis/io/wkt/GeodeticObjectParser.java| 9 ++--
.../main/org/apache/sis/referencing/CommonCRS.java | 17 +++---
.../sis/referencing/EPSGFactoryFallback.java | 11 ++--
.../apache/sis/referencing/crs/AbstractCRS.java| 26 -
.../sis/referencing/crs/DefaultDerivedCRS.java | 51 ++
.../sis/referencing/crs/DefaultGeocentricCRS.java | 62 --
.../sis/referencing/crs/DefaultGeodeticCRS.java| 15 +-
.../sis/referencing/crs/DefaultGeographicCRS.java | 32 +--
.../sis/referencing/crs/DefaultParametricCRS.java | 1 +
.../sis/referencing/crs/DefaultTemporalCRS.java| 2 +-
.../sis/referencing/crs/DefaultVerticalCRS.java| 1 +
.../sis/referencing/crs/SC_GeographicCRS.java | 5 +-
.../org/apache/sis/referencing/crs/SubTypes.java | 32 ++-
.../sis/referencing/datum/BursaWolfParameters.java | 2 +-
.../referencing/factory/AuthorityFactoryProxy.java | 14 +++--
.../factory/ConcurrentAuthorityFactory.java| 16 +++---
.../factory/GeodeticAuthorityFactory.java | 8 +--
.../referencing/factory/GeodeticObjectFactory.java | 24 +++--
.../factory/MultiAuthoritiesFactory.java | 10 ++--
.../referencing/factory/sql/EPSGDataAccess.java| 4 +-
.../sis/referencing/factory/sql/TableInfo.java | 3 +-
.../referencing/internal/EPSGFactoryProxyCRS.java | 7 ++-
.../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 | 6 +--
.../apache/sis/xml/bind/referencing/SC_CRS.java| 4 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 3 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 8 ++-
.../sis/referencing/EPSGFactoryFallbackTest.java | 14 +++--
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 24 -
.../referencing/factory/AuthorityFactoryMock.java | 5 +-
.../factory/MultiAuthoritiesFactoryTest.java | 3 --
.../referencing/factory/sql/EPSGFactoryTest.java | 3 +-
.../operation/CoordinateOperationFinderTest.java | 5 +-
.../sis/referencing/privy/WKTKeywordsTest.java | 5 +-
.../report/CoordinateReferenceSystems.java | 4 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 12 ++---
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 7 ++-
geoapi/snapshot| 2 +-
.../org/apache/sis/gui/referencing/CRSChooser.java | 4 +-
43 files changed, 242 insertions(+), 239 deletions(-)
diff --git
a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
index 98b792e99c..dfea7437fb 100644
--- a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
+++ b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
@@ -82,7 +82,6 @@ GCPCollection
GeneralDerivedCRS
GeneralParameterDescriptor
GeneralParameterValue
-GeocentricCRS
GeodeticCRS
GeodeticDatum
GeographicBoundingBox
diff --git
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
index f08bd05626..9486ec792b 100644
---
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
@@ -1647,8 +1647,9 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator properties = parseMetadataAndClose(element,
name, datum);
+final Map properties =
parseMetadataAndClose(element, name, datum);
if (baseCRS != null) {
+properties.put(Legacy.DERIVED_TYPE_KEY, EngineeringCRS.class);
return crsFactory.createDerivedCRS(properties, baseCRS,
fromBase, cs);
}
return crsFactory.createEngineeringCRS(properties, datum, cs);
@@ -1708,7 +1709,7 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator codes = new LinkedHashSet<>();
if (pm) cod
(sis) branch main updated (d98b7a3e07 -> 2c90ee97ab)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from d98b7a3e07 Merge branch 'geoapi-3.1'. add b362b47c1f Upgrade for the removal of `OperationMethod.getSourceDimensions()` and `getTargetDimensions()` methods from GeoAPI. This change implies the removal of `AbstractProvider.redimension(int, int)` method from Apache SIS internal API, which is a major simplification but requires that we specify the desired source/target dimensions in another way. This is done by adding a `MathTransformProvider.Context` interface. add 7ed0df72f3 As a consequence of the change in previous commit, remove the SIS-specific "dim" parameter in Geographic/Geocentric conversions. That parameter was not part of OGC standard neither in EPSG database. It was a hack needed by SIS as a way to specify the desired number of dimensions, but this hack is no longer needed now. add 184ea54db1 Minor cleaning for a method which is no longer worth to define. add f0d4a254e4 Merge branch 'geoapi-4.0' into geoapi-3.1. new 2c90ee97ab Merge branch 'geoapi-3.1'. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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
(sis) 01/01: Merge branch 'geoapi-3.1'.
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) branch geoapi-3.1 updated (9696bd8bfe -> f0d4a254e4)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 9696bd8bfe Merge branch 'geoapi-4.0' into geoapi-3.1. add b362b47c1f Upgrade for the removal of `OperationMethod.getSourceDimensions()` and `getTargetDimensions()` methods from GeoAPI. This change implies the removal of `AbstractProvider.redimension(int, int)` method from Apache SIS internal API, which is a major simplification but requires that we specify the desired source/target dimensions in another way. This is done by adding a `MathTransformProvider.Context` interface. add 7ed0df72f3 As a consequence of the change in previous commit, remove the SIS-specific "dim" parameter in Geographic/Geocentric conversions. That parameter was not part of OGC standard neither in EPSG database. It was a hack needed by SIS as a way to specify the desired number of dimensions, but this hack is no longer needed now. add 184ea54db1 Minor cleaning for a method which is no longer worth to define. new f0d4a254e4 Merge branch 'geoapi-4.0' into geoapi-3.1. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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 +-- .../
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit f0d4a254e4122b119e2939a5ac73b6dfca8052f3 Merge: 9696bd8bfe 184ea54db1 Author: Martin Desruisseaux AuthorDate: Sat Apr 13 11:08:30 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../apache/sis/io/wkt/GeodeticObjectParser.java| 13 +- .../sis/referencing/PropertiesConverter.java | 3 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 20 ++- .../referencing/factory/GeodeticObjectFactory.java | 22 +-- .../apache/sis/referencing/internal/Resources.java | 7 +- .../sis/referencing/internal/Resources.properties | 1 - .../referencing/internal/Resources_fr.properties | 1 - .../operation/CoordinateOperationFinder.java | 8 +- .../operation/CoordinateOperationRegistry.java | 2 +- .../operation/DefaultOperationMethod.java | 2 +- .../operation/projection/NormalizedProjection.java | 8 +- .../operation/provider/AbridgedMolodensky.java | 46 + .../operation/provider/AbstractMercator.java | 3 +- .../operation/provider/AbstractProvider.java | 199 - .../operation/provider/AbstractStereographic.java | 3 +- .../sis/referencing/operation/provider/Affine.java | 88 +++-- .../operation/provider/AxisOrderReversal.java | 84 ++--- .../operation/provider/AxisOrderReversal3D.java| 23 ++- .../provider/CoordinateFrameRotation2D.java| 34 ++-- .../provider/CoordinateFrameRotation3D.java| 41 +++-- .../operation/provider/Equirectangular.java| 17 +- .../provider/FranceGeocentricInterpolation.java| 91 ++ .../operation/provider/GeocentricAffine.java | 71 .../GeocentricAffineBetweenGeographic.java | 64 +++ .../operation/provider/GeocentricToGeographic.java | 64 ++- .../provider/GeocentricToTopocentric.java | 41 ++--- .../provider/GeocentricTranslation2D.java | 34 ++-- .../provider/GeocentricTranslation3D.java | 42 +++-- .../operation/provider/GeodeticOperation.java | 188 --- .../operation/provider/Geographic2Dto3D.java | 66 --- .../operation/provider/Geographic3Dto2D.java | 100 ++- .../provider/GeographicAndVerticalOffsets.java | 31 +--- .../operation/provider/GeographicOffsets.java | 94 +- .../operation/provider/GeographicOffsets2D.java| 44 +++-- .../operation/provider/GeographicRedimension.java | 95 -- .../operation/provider/GeographicToGeocentric.java | 113 +++- .../provider/GeographicToTopocentric.java | 33 +--- .../operation/provider/Interpolation1D.java| 36 +--- .../operation/provider/LongitudeRotation.java | 44 + .../operation/provider/MapProjection.java | 85 - .../operation/provider/MapProjection3D.java| 92 -- .../referencing/operation/provider/Molodensky.java | 77 ++-- .../sis/referencing/operation/provider/NADCON.java | 16 +- .../sis/referencing/operation/provider/NTv1.java | 14 +- .../sis/referencing/operation/provider/NTv2.java | 24 +-- .../operation/provider/NorthPoleRotation.java | 16 +- .../operation/provider/ObliqueMercator.java| 2 +- .../operation/provider/ObliqueStereographic.java | 3 +- .../operation/provider/PositionVector7Param2D.java | 34 ++-- .../operation/provider/PositionVector7Param3D.java | 41 +++-- .../operation/provider/PseudoPlateCarree.java | 15 +- .../operation/provider/SatelliteTracking.java | 3 +- .../referencing/operation/provider/Sinusoidal.java | 3 +- .../operation/provider/SouthPoleRotation.java | 16 +- .../operation/provider/VerticalOffset.java | 28 +-- .../referencing/operation/provider/Wraparound.java | 19 +- .../provider/ZonedTransverseMercator.java | 14 +- .../transform/DefaultMathTransformFactory.java | 106 +++ .../transform/EllipsoidToCentricTransform.java | 4 + .../operation/transform/MathTransformProvider.java | 172 +++--- .../operation/transform/MolodenskyTransform.java | 1 + .../referencing/crs/DefaultProjectedCRSTest.java | 53 +- .../operation/CoordinateOperationRegistryTest.java | 4 +- .../FranceGeocentricInterpolationTest.java | 8 - .../operation/provider/Geographic3Dto2DTest.java | 19 +- .../operation/provider/LongitudeRotationTest.java | 9 +- .../operation/provider/MolodenskyTest.java | 60 --- .../operation/provider/ProviderMock.java | 16 +- .../operation/provider/ProvidersTest.java | 119 geoapi/snapshot| 2 +- 70 files changed, 1131 insertions(+), 1820 deletions(-) diff --cc geoapi/snapshot index d7b6639c48,0c4eba464e..b03ead17de --- a/geoapi
(sis) branch geoapi-4.0 updated (b362b47c1f -> 184ea54db1)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from b362b47c1f Upgrade for the removal of `OperationMethod.getSourceDimensions()` and `getTargetDimensions()` methods from GeoAPI. This change implies the removal of `AbstractProvider.redimension(int, int)` method from Apache SIS internal API, which is a major simplification but requires that we specify the desired source/target dimensions in another way. This is done by adding a `MathTransformProvider.Context` interface. new 7ed0df72f3 As a consequence of the change in previous commit, remove the SIS-specific "dim" parameter in Geographic/Geocentric conversions. That parameter was not part of OGC standard neither in EPSG database. It was a hack needed by SIS as a way to specify the desired number of dimensions, but this hack is no longer needed now. new 184ea54db1 Minor cleaning for a method which is no longer worth to define. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../referencing/factory/GeodeticObjectFactory.java | 14 ++-- .../operation/CoordinateOperationFinder.java | 8 + .../provider/FranceGeocentricInterpolation.java| 16 ++--- .../GeocentricAffineBetweenGeographic.java | 16 - .../operation/provider/GeocentricToGeographic.java | 4 +-- .../operation/provider/GeographicToGeocentric.java | 42 -- .../referencing/operation/provider/Molodensky.java | 15 ++-- .../referencing/operation/provider/Wraparound.java | 5 ++- .../transform/DefaultMathTransformFactory.java | 3 -- .../transform/EllipsoidToCentricTransform.java | 8 ++--- .../operation/transform/MolodenskyTransform.java | 1 + 11 files changed, 32 insertions(+), 100 deletions(-)
(sis) 01/02: As a consequence of the change in previous commit, remove the SIS-specific "dim" parameter in Geographic/Geocentric conversions. That parameter was not part of OGC standard neither in EPS
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 7ed0df72f30a51c0d4aa2a17957eb9761364d5b4
Author: Martin Desruisseaux
AuthorDate: Fri Apr 12 17:36:17 2024 +0200
As a consequence of the change in previous commit, remove the SIS-specific
"dim" parameter in Geographic/Geocentric conversions.
That parameter was not part of OGC standard neither in EPSG database. It
was a hack needed by SIS as a way to specify the desired
number of dimensions, but this hack is no longer needed now.
---
.../operation/CoordinateOperationFinder.java | 8 +
.../provider/FranceGeocentricInterpolation.java| 16 ++---
.../GeocentricAffineBetweenGeographic.java | 16 -
.../operation/provider/GeocentricToGeographic.java | 4 +--
.../operation/provider/GeographicToGeocentric.java | 42 --
.../referencing/operation/provider/Molodensky.java | 15 ++--
.../referencing/operation/provider/Wraparound.java | 5 ++-
.../transform/DefaultMathTransformFactory.java | 3 --
.../transform/EllipsoidToCentricTransform.java | 8 ++---
.../operation/transform/MolodenskyTransform.java | 1 +
10 files changed, 30 insertions(+), 88 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
index b6635b8178..985ad9e777 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
@@ -626,21 +626,15 @@ public class CoordinateOperationFinder extends
CoordinateOperationRegistry {
}
} else if (identifier == GEOCENTRIC_CONVERSION) {
/*
- * Geographic ↔︎ Geocentric conversion. The "dim" parameter is
Apache SIS specific but is guaranteed
- * to be present since we use SIS parameter descriptors directly.
The default number of dimension is 3,
- * but we specify the value unconditionally anyway as a safety.
+ * Geographic ↔︎ Geocentric conversion.
*/
final ParameterDescriptorGroup descriptor;
-final GeodeticCRS geographic;
if (isGeographicToGeocentric) {
-geographic = sourceCRS;
descriptor = GeographicToGeocentric.PARAMETERS;
} else {
-geographic = targetCRS;
descriptor = GeocentricToGeographic.PARAMETERS;
}
parameters = descriptor.createValue();
-
parameters.parameter(Constants.DIM).setValue(geographic.getCoordinateSystem().getDimension());
} else {
/*
* Coordinate system change (including change in the number of
dimensions) without datum shift.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
index b17cd63b6d..9c4e08516d 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
@@ -34,7 +34,6 @@ import javax.measure.quantity.Length;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.ParameterNotFoundException;
-import org.opengis.parameter.InvalidParameterValueException;
import org.opengis.referencing.datum.Ellipsoid;
import org.opengis.referencing.cs.EllipsoidalCS;
import org.opengis.referencing.operation.Transformation;
@@ -56,7 +55,6 @@ import org.apache.sis.measure.Units;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
-import static org.apache.sis.util.privy.Constants.DIM;
/**
@@ -281,16 +279,8 @@ public final class FranceGeocentricInterpolation extends
AbstractProvider {
*/
@Override
public MathTransform createMathTransform(final Context context) throws
FactoryException {
-int n = 2; // Default number of dimensions.
final Parameters pg =
Parameters.castOrWrap(context.getCompletedParameters());
-final Integer dim = pg.getValue(Molodensky.DIMENSION);
-if (dim != null) {
-n = dim;// Unboxing.
-if (n < 2 || n > 3) {
(sis) 02/02: Minor cleaning for a method which is no longer worth to define.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 184ea54db1f1e91a9b0a85c30d1c351853d73927
Author: Martin Desruisseaux
AuthorDate: Fri Apr 12 17:42:06 2024 +0200
Minor cleaning for a method which is no longer worth to define.
---
.../sis/referencing/factory/GeodeticObjectFactory.java | 14 ++
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
index 4e53130ade..cf596c51d3 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
@@ -282,7 +282,7 @@ public class GeodeticObjectFactory extends AbstractFactory
implements CRSFactory
@Override
protected Object invisibleEntry(final Object key) {
if (ReferencingFactoryContainer.MT_FACTORY.equals(key)) {
-return getMathTransformFactory();
+return DefaultMathTransformFactory.provider();
} else {
return super.invisibleEntry(key);
}
@@ -290,16 +290,6 @@ public class GeodeticObjectFactory extends AbstractFactory
implements CRSFactory
};
}
-/**
- * Returns the math transform factory for internal usage only.
- * The {@code MathTransformFactory} is normally not needed by {@code
GeodeticObjectFactory},
- * except when constructing the Apache SIS implementation of derived and
projected CRS.
- * For this reason, we will fetch this dependency only if really requested.
- */
-final MathTransformFactory getMathTransformFactory() {
-return DefaultMathTransformFactory.provider();
-}
-
/**
* Returns a unique instance of the given object. If this method recycles
an existing object,
* then the existing instance is returned silently. Otherwise this method
logs a message at
@@ -1577,7 +1567,7 @@ public class GeodeticObjectFactory extends
AbstractFactory implements CRSFactory
c.setAccessible(true);
parserConstructor = c;
}
-p = c.newInstance(defaultProperties, this,
getMathTransformFactory());
+p = c.newInstance(defaultProperties, this,
DefaultMathTransformFactory.provider());
} catch (ReflectiveOperationException e) {
throw new FactoryException(e);
}
(sis) branch main updated (65771ca1ee -> d98b7a3e07)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 65771ca1ee Merge branch 'geoapi-3.1': automatic post-merge import reorganization. add 9c72d89383 Post-merge cleanup: edit documentation, remove unnecessary `@SuppressWarnings`. add e5d010c2e1 Add a safety for parsing a CRS code as an HTTP URL when using the fallback factory. It seems necessary for the tests on the Jenkins server. The reason why the code doesn't go through `MultiAuthoritiesFactory` on the Jenkins server is unknown (we cannot reproduce this test failure locally). add 9696bd8bfe Merge branch 'geoapi-4.0' into geoapi-3.1. new d98b7a3e07 Merge branch 'geoapi-3.1'. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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(-)
(sis) 01/01: Merge branch 'geoapi-3.1'.
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/Defau
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit 9696bd8bfe4ee87cf7432196327aa9ead17ededa Merge: e111cc6c47 e5d010c2e1 Author: Martin Desruisseaux AuthorDate: Tue Apr 9 16:55:33 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../sis/buildtools/coding/ReorganizeImports.java | 11 +++- .../apache/sis/metadata/ModifiableMetadata.java| 11 ++-- .../apache/sis/metadata/iso/extent/Extents.java| 6 ++--- .../iso/quality/AbstractTemporalQuality.java | 1 - ...DefaultNonQuantitativeAttributeCorrectness.java | 1 - .../metadata/simple/SimpleIdentifiedObject.java| 6 +++-- .../org/apache/sis/xml/PooledUnmarshaller.java | 2 +- .../sis/util/iso/DefaultRecordSchemaTest.java | 2 +- .../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 + .../sis/referencing/EPSGFactoryFallback.java | 15 ++- .../referencing/privy/ReferencingUtilities.java| 1 + .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 3 ++- .../sis/util/DefaultInternationalString.java | 30 -- .../main/org/apache/sis/util/Locales.java | 17 ++-- .../test/org/apache/sis/test/LoggingWatcher.java | 8 -- .../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++--- 18 files changed, 68 insertions(+), 60 deletions(-)
(sis) branch geoapi-3.1 updated (e111cc6c47 -> 9696bd8bfe)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from e111cc6c47 Post-merge automatic import reorganization. add 9c72d89383 Post-merge cleanup: edit documentation, remove unnecessary `@SuppressWarnings`. add e5d010c2e1 Add a safety for parsing a CRS code as an HTTP URL when using the fallback factory. It seems necessary for the tests on the Jenkins server. The reason why the code doesn't go through `MultiAuthoritiesFactory` on the Jenkins server is unknown (we cannot reproduce this test failure locally). new 9696bd8bfe Merge branch 'geoapi-4.0' into geoapi-3.1. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../sis/buildtools/coding/ReorganizeImports.java | 11 +++- .../apache/sis/metadata/ModifiableMetadata.java| 11 ++-- .../apache/sis/metadata/iso/extent/Extents.java| 6 ++--- .../iso/quality/AbstractTemporalQuality.java | 1 - ...DefaultNonQuantitativeAttributeCorrectness.java | 1 - .../metadata/simple/SimpleIdentifiedObject.java| 6 +++-- .../org/apache/sis/xml/PooledUnmarshaller.java | 2 +- .../sis/util/iso/DefaultRecordSchemaTest.java | 2 +- .../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 + .../sis/referencing/EPSGFactoryFallback.java | 15 ++- .../referencing/privy/ReferencingUtilities.java| 1 + .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 3 ++- .../sis/util/DefaultInternationalString.java | 30 -- .../main/org/apache/sis/util/Locales.java | 17 ++-- .../test/org/apache/sis/test/LoggingWatcher.java | 8 -- .../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++--- 18 files changed, 68 insertions(+), 60 deletions(-)
(sis) branch geoapi-4.0 updated: Add a safety for parsing a CRS code as an HTTP URL when using the fallback factory. It seems necessary for the tests on the Jenkins server. The reason why the code doe
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new e5d010c2e1 Add a safety for parsing a CRS code as an HTTP URL when
using the fallback factory. It seems necessary for the tests on the Jenkins
server. The reason why the code doesn't go through `MultiAuthoritiesFactory` on
the Jenkins server is unknown (we cannot reproduce this test failure locally).
e5d010c2e1 is described below
commit e5d010c2e165871526b7902352cae0800324485b
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 16:35:56 2024 +0200
Add a safety for parsing a CRS code as an HTTP URL when using the fallback
factory.
It seems necessary for the tests on the Jenkins server. The reason why the
code
doesn't go through `MultiAuthoritiesFactory` on the Jenkins server is
unknown
(we cannot reproduce this test failure locally).
---
.../org/apache/sis/referencing/EPSGFactoryFallback.java | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
index 38a495452a..d680035673 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
@@ -279,13 +279,16 @@ final class EPSGFactoryFallback extends
GeodeticAuthorityFactory
private Object predefined(String code, final int kind) throws
NoSuchAuthorityCodeException {
try {
/*
- * Parse the value after the last ':'. We do not bother to verify
if the part before ':' is legal
- * (e.g. "EPSG:4326", "EPSG::4326", "urn:ogc:def:crs:epsg::4326",
etc.) because this analysis has
- * already be done by MultiAuthoritiesFactory. We nevertheless
skip the prefix in case this factory
- * is used directly (not through MultiAuthoritiesFactory), which
should be rare. The main case is
- * when using the factory returned by
AuthorityFactories.fallback(…).
+ * Parse the value after the last ':' for an URN of the form
"urn:ogc:def:crs:epsg::4326",
+ * or after the last '#' for an URL of the form
"http://www.opengis.net/gml/srs/epsg.xml#4326;.
+ * We do not bother to verify if the part before ':' or '#' is
legal because this analysis has
+ * already be done by `MultiAuthoritiesFactory`. The check for
separator should be unnecessary,
+ * but we nevertheless do it because this factory is sometime
invoked directly rather than through
+ * `MultiAuthoritiesFactory`. The direct invocation happens when
`CRS.forCode(String)` fallbacks
+ * on `AuthorityFactories.fallback(…)`.
*/
-code = CharSequences.trimWhitespaces(code,
code.lastIndexOf(Constants.DEFAULT_SEPARATOR) + 1, code.length()).toString();
+final int s =
Math.max(code.lastIndexOf(Constants.DEFAULT_SEPARATOR), code.lastIndexOf('#'));
+code = CharSequences.trimWhitespaces(code, s + 1,
code.length()).toString();
final short n = Short.parseShort(code);
if ((kind & (ELLIPSOID | DATUM | CRS)) != 0) {
for (final CommonCRS crs : CommonCRS.values()) {
(sis) branch geoapi-4.0 updated: Post-merge cleanup: edit documentation, remove unnecessary `@SuppressWarnings`.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 9c72d89383 Post-merge cleanup: edit documentation, remove unnecessary
`@SuppressWarnings`.
9c72d89383 is described below
commit 9c72d893836cfa4586fdc5bb4358bf80911fd82f
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 15:56:25 2024 +0200
Post-merge cleanup: edit documentation, remove unnecessary
`@SuppressWarnings`.
---
.../sis/buildtools/coding/ReorganizeImports.java | 11 +++-
.../apache/sis/metadata/ModifiableMetadata.java| 11 ++--
.../apache/sis/metadata/iso/extent/Extents.java| 6 ++---
.../iso/quality/AbstractTemporalQuality.java | 1 -
...DefaultNonQuantitativeAttributeCorrectness.java | 1 -
.../metadata/simple/SimpleIdentifiedObject.java| 6 +++--
.../org/apache/sis/xml/PooledUnmarshaller.java | 2 +-
.../sis/util/iso/DefaultRecordSchemaTest.java | 2 +-
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 +
.../sis/referencing/crs/DefaultEngineeringCRS.java | 1 -
.../sis/referencing/datum/AbstractDatum.java | 1 -
.../org/apache/sis/referencing/datum/SubTypes.java | 1 -
.../referencing/privy/ReferencingUtilities.java| 1 +
.../sis/referencing/GeodeticObjectVerifier.java| 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++-
.../sis/referencing/datum/HardCodedDatum.java | 3 ++-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 3 ++-
.../sis/util/DefaultInternationalString.java | 30 --
.../main/org/apache/sis/util/Locales.java | 17 ++--
.../test/org/apache/sis/test/LoggingWatcher.java | 8 --
.../org/apache/sis/gui/referencing/CRSChooser.java | 9 ---
22 files changed, 63 insertions(+), 60 deletions(-)
diff --git
a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
index 33a9d79113..c7e46b9cbd 100644
---
a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
+++
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
@@ -59,28 +59,25 @@ import java.util.Set;
*
* {@snippet lang="shell" :
* cd geoapi-4.0
+ * git diff
* git add --update
- * git diff --staged
* gradle test
* git diff
* git add --update
- * git commit
+ * git commit --message "Post-merge automatic reorganization of imports
order."
* }
*
* Then temporarily stash the changes in {@code geoapi-3.1}, merge, pop the
stashed changes, test and commit:
*
* {@snippet lang="shell" :
* cd ../geoapi-3.1
+ * git diff
* git add --update
- * git diff --staged
- * git stash --message "Import reordering"
* git merge geoapi-4.0 -s ours --no-commit
- * git stash pop
- * git add --update
* gradle test
* git diff
* git add --update
- * git commit
+ * git commit --message "Merge of automatic reorganization of imports order."
* }
*
* Finally apply the same pattern on the {@code main} branch.
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
index 6be665b756..c04139e60f 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
@@ -923,8 +923,15 @@ public abstract class ModifiableMetadata extends
AbstractMetadata {
* is assignable to {@link CodeList}, {@link Enum}, {@link String}, {@link
Charset},
* {@link Locale} or {@link Currency}, and {@linkplain
List}.class otherwise.
* Subclasses can override this method for choosing different kind of
collections.
- * Note however that {@link Set} should be used only with immutable
element types,
- * for {@linkplain Object#hashCode() hash code} stability.
+ *
+ * Constraints
+ * Implementations should comply to the following constraints:
+ *
+ * This method may be invoked (indirectly) at construction
time.
+ *Therefor, the implementation should not depend on the object
state.
+ * The {@link Set} type should be returned only when the set
elements are immutable.
+ *This is needed for {@linkplain Object#hashCode() hash code}
stability.
+ *
*
* @paramthe type of elements in the collection to be
created.
* @param elementType the type of elements in the collection to be
created.
diff --git
a/endorsed/src/org.apache.sis.metadata/main/o
(sis) 01/01: Merge branch 'geoapi-3.1': automatic post-merge import reorganization.
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 geoapi
(sis) branch main updated (3403855d45 -> 65771ca1ee)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 3403855d45 Merge branch 'geoapi-3.1'. add ecf5857313 Post-merge automatic import reorganization. add e111cc6c47 Post-merge automatic import reorganization. new 65771ca1ee Merge branch 'geoapi-3.1': automatic post-merge import reorganization. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/metadata/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(-)
(sis) branch geoapi-3.1 updated (abe39d4ffc -> e111cc6c47)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from abe39d4ffc Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. add ecf5857313 Post-merge automatic import reorganization. new e111cc6c47 Post-merge automatic import reorganization. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +- .../test/org/apache/sis/test/mock/VerticalCRSMock.java| 6 -- .../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +- .../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java | 6 +++--- .../main/org/apache/sis/referencing/Properties.java | 4 ++-- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +- .../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +- .../org/apache/sis/referencing/AbstractReferenceSystemTest.java | 8 .../test/org/apache/sis/referencing/CRSTest.java | 6 +++--- .../test/org/apache/sis/referencing/GeodeticObjectVerifier.java | 8 .../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 6 +++--- .../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 6 +++--- .../test/org/apache/sis/test/TestUtilities.java | 8 13 files changed, 34 insertions(+), 32 deletions(-)
(sis) 01/01: Post-merge automatic import reorganization.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit e111cc6c47ef23db83975025c4a7dbbb23bd596b
Merge: abe39d4ffc ecf5857313
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 14:35:16 2024 +0200
Post-merge automatic import reorganization.
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java| 6 --
.../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java | 6 +++---
.../main/org/apache/sis/referencing/Properties.java | 4 ++--
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +-
.../org/apache/sis/referencing/AbstractReferenceSystemTest.java | 8
.../test/org/apache/sis/referencing/CRSTest.java | 6 +++---
.../test/org/apache/sis/referencing/GeodeticObjectVerifier.java | 8
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 6 +++---
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 6 +++---
.../test/org/apache/sis/test/TestUtilities.java | 8
13 files changed, 34 insertions(+), 32 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index bee7ecae16,09e22bcf63..d75dbdb9db
---
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
@@@ -29,9 -28,6 +28,10 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.privy.Constants;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* 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 e3e3e59eea,93a0221081..e189a2e320
---
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,9 -24,8 +24,12 @@@ 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;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index 2726522a23,289b12216a..5a3d432312
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
@@@ -33,9 -31,6 +31,11 @@@ import org.apache.sis.util.Deprecable
import org.apache.sis.util.privy.AbstractMap;
import org.apache.sis.referencing.privy.CoordinateOperations;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.ReferenceSystem;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.opengis.referencing.datum.Datum;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
index 6d95249674,24d4cb655e..2a12ed66a7
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
@@@ -23,8 -22,8 +22,9 @@@ import org.apache.sis.xml.NilObject
import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.util.resources.Vocabulary;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.Identifier;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.util.InternationalString;
+import org.opengis.referencing.ReferenceIdentifier;
/**
(sis) branch geoapi-4.0 updated: Post-merge automatic import reorganization.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new ecf5857313 Post-merge automatic import reorganization.
ecf5857313 is described below
commit ecf58573132347e11b9cc910038361b863522e76
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 14:32:27 2024 +0200
Post-merge automatic import reorganization.
---
.../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java | 6 +++---
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 6 +++---
.../main/org/apache/sis/referencing/Properties.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../main/org/apache/sis/referencing/datum/AbstractDatum.java | 4 +++-
.../main/org/apache/sis/referencing/internal/Legacy.java | 2 +-
.../org/apache/sis/referencing/AbstractReferenceSystemTest.java | 8
.../test/org/apache/sis/referencing/CRSTest.java | 6 +++---
.../test/org/apache/sis/referencing/GeodeticObjectVerifier.java | 8
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 6 +++---
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 6 +++---
.../test/org/apache/sis/test/TestUtilities.java | 8
13 files changed, 34 insertions(+), 32 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
index 85bd4a9132..c9f6cc706c 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
@@ -30,7 +30,6 @@ import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementRef;
import jakarta.xml.bind.annotation.XmlElementRefs;
import jakarta.xml.bind.annotation.XmlRootElement;
-import org.opentest4j.AssertionFailedError;
import org.opengis.annotation.UML;
import org.opengis.annotation.Obligation;
import org.opengis.annotation.Specification;
@@ -42,6 +41,7 @@ import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.cat.CodeListUID;
// Test dependencies
+import org.opentest4j.AssertionFailedError;
import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCaseWithLogs;
diff --git
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
index 04e97af060..f7cc6fb91d 100644
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
@@ -21,15 +21,15 @@ import java.util.HashMap;
import org.apache.sis.metadata.iso.citation.DefaultOrganisation;
import org.apache.sis.metadata.iso.extent.DefaultExtent;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+
/**
* Tests {@link ReferencingByIdentifiers}.
diff --git
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
index b882cec7f4..5ee05e7d77 100644
---
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
@@ -84,13 +84,13 @@ import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+
// Specific to the geoapi-4.0 branch:
import org.apache.sis.referencing.crs.DefaultImageCRS;
import org.apache.sis.referencing.datum.DefaultImageDatum;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-
/**
* Well Known Text (WKT) parser for referencing objects. This include
(sis) branch main updated (129054c2fa -> 3403855d45)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 129054c2fa Merge automatic import reorganization (for isolating the difference between branches). add cb2e0de6f8 Fix an import order. add 938f77504b Avoid usage of `getScope()` and `getDomainOfValidity()` methods, which are deprecated in GeoAPI 3.1 and removed in GeoAPI 4.0. They are replaced by `ObjectDomain`. add abe39d4ffc Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. new 3403855d45 Merge branch 'geoapi-3.1'. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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(-)
(sis) 01/01: Merge branch 'geoapi-3.1'.
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
* Prop
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit abe39d4ffccdf0e5209169c26bde265bf9e27377 Merge: 72bf4148b1 938f77504b Author: Martin Desruisseaux AuthorDate: Tue Apr 9 11:16:12 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. .../sis/buildtools/coding/ReorganizeImports.java | 1 + .../apache/sis/coverage/grid/GridExtentCRS.java| 9 ++-- .../sis/metadata/iso/extent/DefaultExtent.java | 3 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 ++ .../metadata/simple/SimpleIdentifiedObject.java| 1 + .../referencing/gazetteer/FinalLocationType.java | 9 ++-- .../gazetteer/ModifiableLocationType.java | 2 +- .../gazetteer/ReferencingByIdentifiers.java| 38 ++- .../gazetteer/ReferencingByIdentifiersTest.java| 5 +- .../main/org/apache/sis/io/wkt/ElementKind.java| 50 .../apache/sis/io/wkt/GeodeticObjectParser.java| 8 ++-- .../sis/referencing/AbstractIdentifiedObject.java | 13 +++--- .../main/org/apache/sis/referencing/Builder.java | 4 +- .../main/org/apache/sis/referencing/CRS.java | 26 --- .../apache/sis/referencing/IdentifiedObjects.java | 54 +- .../org/apache/sis/referencing/Properties.java | 7 +-- .../sis/referencing/StandardDefinitions.java | 2 +- .../apache/sis/referencing/crs/AbstractCRS.java| 5 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 4 +- .../sis/referencing/datum/BursaWolfParameters.java | 5 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../referencing/factory/sql/EPSGDataAccess.java| 7 +-- .../operation/AbstractCoordinateOperation.java | 5 +- .../operation/AbstractSingleOperation.java | 3 +- .../operation/CoordinateOperationFinder.java | 3 +- .../operation/CoordinateOperationSorter.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 3 +- .../referencing/operation/DefaultConversion.java | 4 +- .../DefaultCoordinateOperationFactory.java | 18 .../operation/DefaultPassThroughOperation.java | 3 +- .../operation/DefaultTransformation.java | 4 +- .../operation/InverseOperationMethod.java | 5 +- .../operation/transform/AbstractMathTransform.java | 2 +- .../operation/transform/DomainDefinition.java | 2 +- .../operation/transform/MathTransforms.java| 2 +- .../privy/EllipsoidalHeightCombiner.java | 11 +++-- .../referencing/privy/GeodeticObjectBuilder.java | 5 +- .../referencing/privy/NilReferencingObject.java| 21 ++--- .../referencing/AbstractReferenceSystemTest.java | 15 -- .../test/org/apache/sis/referencing/CRSTest.java | 5 +- .../sis/referencing/GeodeticObjectVerifier.java| 37 ++- .../referencing/crs/DefaultGeodeticCRSTest.java| 3 +- .../referencing/crs/DefaultProjectedCRSTest.java | 3 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +- .../datum/DefaultGeodeticDatumTest.java| 12 +++-- .../datum/DefaultTemporalDatumTest.java| 16 --- .../datum/DefaultVerticalDatumTest.java| 5 +- .../sis/referencing/datum/HardCodedDatum.java | 26 +-- .../operation/SingleOperationMarshallingTest.java | 12 +++-- .../apache/sis/test/integration/MetadataTest.java | 3 +- .../sis/test/integration/MetadataVerticalTest.java | 5 +- .../apache/sis/storage/base/MetadataBuilder.java | 5 +- .../main/org/apache/sis/util/ComparisonMode.java | 4 +- .../org/apache/sis/util/LenientComparable.java | 3 +- .../test/org/apache/sis/test/TestUtilities.java| 32 + geoapi/snapshot| 2 +- .../org/apache/sis/gui/referencing/CRSChooser.java | 24 ++ .../gui/referencing/RecentReferenceSystems.java| 2 +- .../main/org/apache/sis/gui/referencing/Utils.java | 24 ++ 59 files changed, 390 insertions(+), 207 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java index 1b9ca46297,b882cec7f4..798c00d7e8 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java @@@ -85,9 -84,13 +84,12 @@@ import org.apache.sis.util.privy.String import org.apache.sis.util.resources.Errors; import org.apache.sis.util.iso.Types; -// Specific to the geoapi-4.0 branch: -import org.apache.sis.referencing.crs.DefaultImageCRS; -import org.apache.sis.referencing.datum.DefaultImageDatum; +// Specific to the main and geoapi-3.1 branches: +import
(sis) branch geoapi-3.1 updated (72bf4148b1 -> abe39d4ffc)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 72bf4148b1 Merge automatic import reorganization. add cb2e0de6f8 Fix an import order. add 938f77504b Avoid usage of `getScope()` and `getDomainOfValidity()` methods, which are deprecated in GeoAPI 3.1 and removed in GeoAPI 4.0. They are replaced by `ObjectDomain`. new abe39d4ffc Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../sis/buildtools/coding/ReorganizeImports.java | 1 + .../apache/sis/coverage/grid/GridExtentCRS.java| 9 ++-- .../sis/metadata/iso/extent/DefaultExtent.java | 3 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 ++ .../metadata/simple/SimpleIdentifiedObject.java| 1 + .../referencing/gazetteer/FinalLocationType.java | 9 ++-- .../gazetteer/ModifiableLocationType.java | 2 +- .../gazetteer/ReferencingByIdentifiers.java| 38 ++- .../gazetteer/ReferencingByIdentifiersTest.java| 5 +- .../main/org/apache/sis/io/wkt/ElementKind.java| 50 .../apache/sis/io/wkt/GeodeticObjectParser.java| 8 ++-- .../sis/referencing/AbstractIdentifiedObject.java | 13 +++--- .../main/org/apache/sis/referencing/Builder.java | 4 +- .../main/org/apache/sis/referencing/CRS.java | 26 --- .../apache/sis/referencing/IdentifiedObjects.java | 54 +- .../org/apache/sis/referencing/Properties.java | 7 +-- .../sis/referencing/StandardDefinitions.java | 2 +- .../apache/sis/referencing/crs/AbstractCRS.java| 5 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 4 +- .../sis/referencing/datum/BursaWolfParameters.java | 5 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../referencing/factory/sql/EPSGDataAccess.java| 7 +-- .../operation/AbstractCoordinateOperation.java | 5 +- .../operation/AbstractSingleOperation.java | 3 +- .../operation/CoordinateOperationFinder.java | 3 +- .../operation/CoordinateOperationSorter.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 3 +- .../referencing/operation/DefaultConversion.java | 4 +- .../DefaultCoordinateOperationFactory.java | 18 .../operation/DefaultPassThroughOperation.java | 3 +- .../operation/DefaultTransformation.java | 4 +- .../operation/InverseOperationMethod.java | 5 +- .../operation/transform/AbstractMathTransform.java | 2 +- .../operation/transform/DomainDefinition.java | 2 +- .../operation/transform/MathTransforms.java| 2 +- .../privy/EllipsoidalHeightCombiner.java | 11 +++-- .../referencing/privy/GeodeticObjectBuilder.java | 5 +- .../referencing/privy/NilReferencingObject.java| 21 ++--- .../referencing/AbstractReferenceSystemTest.java | 15 -- .../test/org/apache/sis/referencing/CRSTest.java | 5 +- .../sis/referencing/GeodeticObjectVerifier.java| 37 ++- .../referencing/crs/DefaultGeodeticCRSTest.java| 3 +- .../referencing/crs/DefaultProjectedCRSTest.java | 3 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +- .../datum/DefaultGeodeticDatumTest.java| 12 +++-- .../datum/DefaultTemporalDatumTest.java| 16 --- .../datum/DefaultVerticalDatumTest.java| 5 +- .../sis/referencing/datum/HardCodedDatum.java | 26 +-- .../operation/SingleOperationMarshallingTest.java | 12 +++-- .../apache/sis/test/integration/MetadataTest.java | 3 +- .../sis/test/integration/MetadataVerticalTest.java | 5 +- .../apache/sis/storage/base/MetadataBuilder.java | 5 +- .../main/org/apache/sis/util/ComparisonMode.java | 4 +- .../org/apache/sis/util/LenientComparable.java | 3 +- .../test/org/apache/sis/test/TestUtilities.java| 32 + geoapi/snapshot| 2 +- .../org/apache/sis/gui/referencing/CRSChooser.java | 24 ++ .../gui/referencing/RecentReferenceSystems.java| 2 +- .../main/org/apache/sis/gui/referencing/Utils.java | 24 ++ 59 files changed, 390 insertions(+), 207 deletions(-)
(sis) branch geoapi-4.0 updated: Avoid usage of `getScope()` and `getDomainOfValidity()` methods, which are deprecated in GeoAPI 3.1 and removed in GeoAPI 4.0. They are replaced by `ObjectDomain`.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new 938f77504b Avoid usage of `getScope()` and `getDomainOfValidity()` methods, which are deprecated in GeoAPI 3.1 and removed in GeoAPI 4.0. They are replaced by `ObjectDomain`. 938f77504b is described below commit 938f77504b154880819dd631a97e481e61ce0313 Author: Martin Desruisseaux AuthorDate: Mon Apr 8 16:46:38 2024 +0200 Avoid usage of `getScope()` and `getDomainOfValidity()` methods, which are deprecated in GeoAPI 3.1 and removed in GeoAPI 4.0. They are replaced by `ObjectDomain`. --- .../apache/sis/coverage/grid/GridExtentCRS.java| 9 ++-- .../sis/metadata/iso/extent/DefaultExtent.java | 3 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 ++ .../metadata/simple/SimpleIdentifiedObject.java| 34 + .../org/apache/sis/test/mock/VerticalCRSMock.java | 4 -- .../referencing/gazetteer/FinalLocationType.java | 9 ++-- .../gazetteer/ModifiableLocationType.java | 2 +- .../gazetteer/ReferencingByIdentifiers.java| 38 ++ .../gazetteer/ReferencingByIdentifiersTest.java| 5 +- .../main/org/apache/sis/io/wkt/ElementKind.java| 50 --- .../apache/sis/io/wkt/GeodeticObjectParser.java| 8 +-- .../sis/referencing/AbstractIdentifiedObject.java | 13 +++-- .../main/org/apache/sis/referencing/Builder.java | 4 +- .../main/org/apache/sis/referencing/CRS.java | 26 -- .../apache/sis/referencing/IdentifiedObjects.java | 54 +++- .../org/apache/sis/referencing/Properties.java | 29 +-- .../sis/referencing/StandardDefinitions.java | 2 +- .../apache/sis/referencing/crs/AbstractCRS.java| 5 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 4 +- .../sis/referencing/datum/AbstractDatum.java | 58 ++ .../sis/referencing/datum/BursaWolfParameters.java | 5 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../referencing/factory/sql/EPSGDataAccess.java| 7 +-- .../apache/sis/referencing/internal/Legacy.java| 53 .../operation/AbstractCoordinateOperation.java | 5 +- .../operation/AbstractSingleOperation.java | 3 +- .../operation/CoordinateOperationFinder.java | 3 +- .../operation/CoordinateOperationSorter.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 3 +- .../referencing/operation/DefaultConversion.java | 4 +- .../DefaultCoordinateOperationFactory.java | 18 --- .../operation/DefaultPassThroughOperation.java | 3 +- .../operation/DefaultTransformation.java | 4 +- .../operation/InverseOperationMethod.java | 5 +- .../operation/transform/AbstractMathTransform.java | 2 +- .../operation/transform/DomainDefinition.java | 2 +- .../operation/transform/MathTransforms.java| 2 +- .../privy/EllipsoidalHeightCombiner.java | 11 ++-- .../referencing/privy/GeodeticObjectBuilder.java | 5 +- .../referencing/privy/NilReferencingObject.java| 13 +++-- .../referencing/AbstractReferenceSystemTest.java | 15 -- .../test/org/apache/sis/referencing/CRSTest.java | 5 +- .../sis/referencing/GeodeticObjectVerifier.java| 39 ++- .../referencing/crs/DefaultGeodeticCRSTest.java| 3 +- .../referencing/crs/DefaultProjectedCRSTest.java | 3 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +- .../datum/DefaultGeodeticDatumTest.java| 12 +++-- .../datum/DefaultTemporalDatumTest.java| 16 +++--- .../datum/DefaultVerticalDatumTest.java| 5 +- .../sis/referencing/datum/HardCodedDatum.java | 22 ++-- .../operation/SingleOperationMarshallingTest.java | 12 +++-- .../apache/sis/test/integration/MetadataTest.java | 3 +- .../sis/test/integration/MetadataVerticalTest.java | 5 +- .../apache/sis/storage/base/MetadataBuilder.java | 5 +- .../main/org/apache/sis/util/ComparisonMode.java | 4 +- .../org/apache/sis/util/LenientComparable.java | 3 +- .../test/org/apache/sis/test/TestUtilities.java| 32 .../test/org/apache/sis/util/ClassesTest.java | 9 +--- geoapi/snapshot| 2 +- .../org/apache/sis/gui/referencing/CRSChooser.java | 24 + .../gui/referencing/RecentReferenceSystems.java| 2 +- .../main/org/apache/sis/gui/referencing/Utils.java | 24 ++--- 62 files changed, 467 insertions(+), 298 deletions(-) diff --git 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 index e11b6372c8..cacfa9b7fa 100644 --- a/endorsed/src
(sis) branch geoapi-4.0 updated: Fix an import order.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new cb2e0de6f8 Fix an import order.
cb2e0de6f8 is described below
commit cb2e0de6f8c8a14a7d5392b5d3a87a275aaf4fdf
Author: Martin Desruisseaux
AuthorDate: Sat Apr 6 00:47:58 2024 +0200
Fix an import order.
---
.../main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java | 1 +
.../test/org/apache/sis/test/FailureDetailsReporter.java| 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
index 76865f7e99..33a9d79113 100644
---
a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
+++
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
@@ -148,6 +148,7 @@ public final class ReorganizeImports extends
SimpleFileVisitor {
*/
private static final String[] TEST_ELEMENTS = {
"org.junit",
+"org.opentest4j",
"org.opengis.test",
"org.apache.sis.image.TiledImageMock",
"org.apache.sis.referencing.cs.HardCodedAxes",
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
index fff3e277e2..4bb02bcf7f 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
@@ -17,9 +17,9 @@
package org.apache.sis.test;
import java.io.PrintStream;
-import org.opentest4j.TestAbortedException;
// Test dependencies
+import org.opentest4j.TestAbortedException;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
(sis) 01/01: Merge automatic import reorganization (for isolating the difference between branches).
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 129054c2fa6523e70400e8e7dc892e0fa64faacf Merge: a5db7e3106 72bf4148b1 Author: Martin Desruisseaux AuthorDate: Sat Apr 6 00:44:34 2024 +0200 Merge automatic import reorganization (for isolating the difference between branches). .../apache/sis/coverage/grid/FractionalGridCoordinates.java| 2 +- .../org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +- .../sis/pending/geoapi/referencing/DynamicReferenceFrame.java | 1 - .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultImageCRS.java | 6 -- .../main/org/apache/sis/referencing/crs/SubTypes.java | 4 +++- .../org/apache/sis/referencing/cs/DefaultUserDefinedCS.java| 4 +++- .../main/org/apache/sis/referencing/cs/SubTypes.java | 4 +++- .../org/apache/sis/referencing/datum/DefaultImageDatum.java| 4 +++- .../main/org/apache/sis/referencing/datum/SubTypes.java| 2 ++ .../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 +++- .../apache/sis/referencing/internal/EPSGFactoryProxyDatum.java | 4 +++- .../main/org/apache/sis/referencing/privy/AxisDirections.java | 4 ++-- .../org/apache/sis/referencing/privy/ReferencingUtilities.java | 8 .../org/apache/sis/xml/bind/referencing/CD_ImageDatum.java | 4 +++- .../org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java | 4 +++- .../org/apache/sis/referencing/privy/AxisDirectionsTest.java | 10 +- .../main/org/apache/sis/math/CompoundDirectPositions.java | 4 +++- 18 files changed, 47 insertions(+), 26 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java index 7ec5dc53e3,a7e59a1e39..24d03e4e27 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java @@@ -29,8 -28,9 +28,9 @@@ import org.apache.sis.util.StringBuilde import org.apache.sis.util.privy.Strings; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coverage.PointOutsideCoverageException; -import org.opengis.coverage.grid.GridCoordinates; +// Specific to the main branch: ++import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.apache.sis.coverage.PointOutsideCoverageException; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/pending/geoapi/referencing/DynamicReferenceFrame.java index d2cf1b37cb,f35ee94813..e22df3a479 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/pending/geoapi/referencing/DynamicReferenceFrame.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/pending/geoapi/referencing/DynamicReferenceFrame.java @@@ -14,14 -14,7 +14,13 @@@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.map.service; +package org.apache.sis.pending.geoapi.referencing; + +import java.time.temporal.Temporal; +import org.opengis.referencing.datum.Datum; +import org.opengis.annotation.UML; - +import static org.opengis.annotation.Obligation.*; +import static org.opengis.annotation.Specification.*; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java index 763e9465ef,2e81e6e73b..644aac07e6 --- 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 @@@ -91,10 -91,13 +91,10 @@@ import org.apache.sis.util.privy.Numeri 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.referencing.datum.DynamicReferenceFrame; -import org.opengis.metadata.extent.BoundingPolygon; -import org.opengis.metadata.extent.GeographicExtent; -import org.opengis.coordinate.CoordinateMetadata; +// Specific to the main branch: ++import org.apache.sis.referencing.internal.Legacy; +import org.apache.sis.pending.geoapi.referencing.DynamicReferenceFrame; +import org.apache.sis.coordinate.DefaultCoordinateMetadata; - import org.apache.sis.referencing.internal.Legacy; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java index 8c8528438e,958903d8d5..2c28035e26 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java +++ b/endorsed/src/org.apache.sis.referencing
(sis) branch main updated (a5db7e3106 -> 129054c2fa)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from a5db7e3106 Merge branch 'geoapi-3.1'. add 770e730bd6 Post-merge automatic import reorganization. add 72bf4148b1 Merge automatic import reorganization. new 129054c2fa Merge automatic import reorganization (for isolating the difference between branches). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sis/coverage/grid/FractionalGridCoordinates.java| 2 +- .../org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +- .../sis/pending/geoapi/referencing/DynamicReferenceFrame.java | 1 - .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultImageCRS.java | 6 -- .../main/org/apache/sis/referencing/crs/SubTypes.java | 4 +++- .../org/apache/sis/referencing/cs/DefaultUserDefinedCS.java| 4 +++- .../main/org/apache/sis/referencing/cs/SubTypes.java | 4 +++- .../org/apache/sis/referencing/datum/DefaultImageDatum.java| 4 +++- .../main/org/apache/sis/referencing/datum/SubTypes.java| 2 ++ .../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 +++- .../apache/sis/referencing/internal/EPSGFactoryProxyDatum.java | 4 +++- .../main/org/apache/sis/referencing/privy/AxisDirections.java | 4 ++-- .../org/apache/sis/referencing/privy/ReferencingUtilities.java | 8 .../org/apache/sis/xml/bind/referencing/CD_ImageDatum.java | 4 +++- .../org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java | 4 +++- .../org/apache/sis/referencing/privy/AxisDirectionsTest.java | 10 +- .../main/org/apache/sis/math/CompoundDirectPositions.java | 4 +++- 18 files changed, 47 insertions(+), 26 deletions(-)
(sis) branch geoapi-3.1 updated (f173cc01f5 -> 72bf4148b1)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from f173cc01f5 Merge branch 'geoapi-4.0' into geoapi-3.1, but without the removal of deprecated interfaces and methods. add 770e730bd6 Post-merge automatic import reorganization. new 72bf4148b1 Merge automatic import reorganization. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../test/org/apache/sis/metadata/PropertyAccessorTest.java| 2 +- .../test/org/apache/sis/test/mock/VerticalCRSMock.java| 2 +- .../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +- .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 8 .../main/org/apache/sis/referencing/crs/DefaultImageCRS.java | 6 -- .../main/org/apache/sis/referencing/crs/SubTypes.java | 4 +++- .../main/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java | 4 +++- .../main/org/apache/sis/referencing/cs/SubTypes.java | 4 +++- .../main/org/apache/sis/referencing/datum/DefaultImageDatum.java | 4 +++- .../org/apache/sis/referencing/datum/DefaultVerticalDatum.java| 2 +- .../main/org/apache/sis/referencing/datum/SubTypes.java | 2 ++ .../org/apache/sis/referencing/internal/EPSGFactoryProxy.java | 4 +++- .../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 +++- .../apache/sis/referencing/internal/EPSGFactoryProxyDatum.java| 4 +++- .../main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java | 4 +++- .../org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java | 4 +++- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 4 +--- .../apache/sis/referencing/report/CoordinateReferenceSystems.java | 2 +- .../test/org/apache/sis/test/integration/MetadataTest.java| 8 20 files changed, 48 insertions(+), 28 deletions(-)
(sis) 01/01: Merge automatic import reorganization.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 72bf4148b1dd4297b86abc71990622b6a16fa5f9
Merge: f173cc01f5 770e730bd6
Author: Martin Desruisseaux
AuthorDate: Sat Apr 6 00:39:36 2024 +0200
Merge automatic import reorganization.
.../test/org/apache/sis/metadata/PropertyAccessorTest.java| 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java| 2 +-
.../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +-
.../main/org/apache/sis/referencing/CRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 8
.../main/org/apache/sis/referencing/crs/DefaultImageCRS.java | 6 --
.../main/org/apache/sis/referencing/crs/SubTypes.java | 4 +++-
.../main/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java | 4 +++-
.../main/org/apache/sis/referencing/cs/SubTypes.java | 4 +++-
.../main/org/apache/sis/referencing/datum/DefaultImageDatum.java | 4 +++-
.../org/apache/sis/referencing/datum/DefaultVerticalDatum.java| 2 +-
.../main/org/apache/sis/referencing/datum/SubTypes.java | 2 ++
.../org/apache/sis/referencing/internal/EPSGFactoryProxy.java | 4 +++-
.../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 +++-
.../apache/sis/referencing/internal/EPSGFactoryProxyDatum.java| 4 +++-
.../main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java | 4 +++-
.../org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java | 4 +++-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 4 +---
.../apache/sis/referencing/report/CoordinateReferenceSystems.java | 2 +-
.../test/org/apache/sis/test/integration/MetadataTest.java| 8
20 files changed, 48 insertions(+), 28 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index b3389026ae,9bbd7005c4..be198665a2
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@@ -62,16 -62,15 +62,16 @@@ import org.apache.sis.metadata.iso.cita
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.referencing.ReferenceIdentifier;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
- import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.referencing.ObjectDomain;
+ import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.temporal.Duration;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.citation.Responsibility;
-
/**
* Tests the {@link PropertyAccessor} class. Every tests in this class
instantiates directly a
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
index 3a5f1d5a7d,e9e58b45d8..1a466619d6
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
@@@ -32,6 -30,9 +30,10 @@@ import org.apache.sis.referencing.cs.Ab
import org.apache.sis.metadata.privy.ImplementationHelper;
import org.apache.sis.io.wkt.Formatter;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.referencing.datum.DefaultImageDatum;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.ImageCRS;
++import org.opengis.referencing.datum.ImageDatum;
+
/**
* A 2-dimensional engineering coordinate reference system applied to
locations in images.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SubTypes.java
index 1053074749,2b160b158a..635941e542
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SubTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SubTypes.java
@@@ -37,6 -36,6 +36,9 @@@ import org.opengis.referencing.datum.Ge
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.cs.AxesConvention;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.ImageCRS;
++
/**
* Implementation of {@link AbstractCRS} methods that require knowledge about
subclasses.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
index 86b26fc3d1,304f1a38dd..525b514ee2
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis
(sis) branch geoapi-4.0 updated: Post-merge automatic import reorganization.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new 770e730bd6 Post-merge automatic import reorganization. 770e730bd6 is described below commit 770e730bd610a83c3c0cafcd0a5b47e5b8741736 Author: Martin Desruisseaux AuthorDate: Sat Apr 6 00:24:36 2024 +0200 Post-merge automatic import reorganization. --- .../test/org/apache/sis/metadata/PropertyAccessorTest.java| 2 +- .../test/org/apache/sis/test/mock/VerticalCRSMock.java| 2 +- .../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +- .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 8 .../org/apache/sis/referencing/datum/DefaultVerticalDatum.java| 2 +- .../org/apache/sis/referencing/internal/EPSGFactoryProxy.java | 4 +++- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 4 +--- .../apache/sis/referencing/report/CoordinateReferenceSystems.java | 2 +- .../test/org/apache/sis/test/integration/MetadataTest.java| 6 +++--- .../test/org/apache/sis/test/FailureDetailsReporter.java | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java index 22c99e5890..9bbd7005c4 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java @@ -64,8 +64,8 @@ import static org.apache.sis.metadata.Assertions.assertTitleEquals; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.content.AttributeGroup; -import org.opengis.referencing.datum.DatumEnsemble; import org.opengis.referencing.ObjectDomain; +import org.opengis.referencing.datum.DatumEnsemble; import org.opengis.temporal.Duration; // Specific to the geoapi-4.0 branch: diff --git 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 index aecb15b43e..e3e3e59eea 100644 --- 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 @@ -16,7 +16,6 @@ */ package org.apache.sis.test.mock; -import java.util.Optional; import javax.measure.Unit; import org.opengis.metadata.extent.Extent; import org.opengis.referencing.crs.VerticalCRS; @@ -30,6 +29,7 @@ import org.opengis.util.InternationalString; import org.apache.sis.measure.Units; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.util.Optional; import org.opengis.referencing.datum.RealizationMethod; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java index facb63e4c2..a5ee561b56 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java @@ -22,11 +22,11 @@ import java.io.Serializable; import java.time.temporal.Temporal; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.referencing.IdentifiedObjects; +import org.apache.sis.referencing.CRS; import org.apache.sis.referencing.privy.WKTUtilities; import org.apache.sis.referencing.privy.WKTKeywords; import org.apache.sis.referencing.internal.Resources; import org.apache.sis.referencing.internal.Epoch; -import org.apache.sis.referencing.CRS; import org.apache.sis.io.wkt.FormattableObject; import org.apache.sis.io.wkt.Formatter; import org.apache.sis.util.ComparisonMode; diff --git 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 index 3e50020cb0..8a4f1e6ab5 100644 --- 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 @@ -95,9 +95,9 @@ import org.apache.sis.util.logging.Logging; import org.opengis.geometry.Geometry; import org.opengis.referencing.ObjectDomain; import org.opengis.referencing.datum.DynamicReferenceFrame; -import org.opengis.coordinate.CoordinateMetadata; import org.opengis.metadata.extent.BoundingPolygon; import
(sis) branch main updated (b35ebd489f -> a5db7e3106)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from b35ebd489f Merge branch 'geoapi-3.1'. This is the beginning of an upgrade to ISO 19111:2019. add cfb0e166e2 Post-merge cleanup. The `DefaultGeocentricCRS` class and its factory methods are marked as deprecated since 2.0 instead of 1.5 because we will not deprecate that class in the branch that depends on GeoAPI 3.0, because there is no replacement. The replacements will need to wait for GeoAPI 3.1. add c39f9ef256 Update for the removal of deprecated ImageDatum, ImageCRS and UserDefinedCS interfaces. Those interfaces were defined in ISO 19111:2007 but removed in ISO 19111:2019. add f173cc01f5 Merge branch 'geoapi-4.0' into geoapi-3.1, but without the removal of deprecated interfaces and methods. new a5db7e3106 Merge branch 'geoapi-3.1'. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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(-)
(sis) 01/01: Merge branch 'geoapi-3.1'.
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));
+ }
+ }
}
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1, but without the removal of deprecated interfaces and methods.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit f173cc01f50286ae1e9b854a39b2b5b1ad95f84f
Merge: b86dbe8b92 c39f9ef256
Author: Martin Desruisseaux
AuthorDate: Fri Apr 5 22:53:07 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, but without the removal of
deprecated interfaces and methods.
.../main/org/apache/sis/util/iso/Types.java | 4 ++--
.../apache/sis/openoffice/ReferencingFunctions.java | 1 +
.../main/org/apache/sis/io/wkt/Convention.java | 7 +--
.../org/apache/sis/io/wkt/GeodeticObjectParser.java | 8
.../main/org/apache/sis/referencing/CRS.java | 20 ++--
.../apache/sis/referencing/EPSGFactoryFallback.java | 1 +
.../sis/referencing/crs/DefaultEngineeringCRS.java | 4
.../sis/referencing/crs/DefaultGeocentricCRS.java| 2 +-
.../apache/sis/referencing/crs/DefaultImageCRS.java | 6 +++---
.../sis/referencing/cs/DefaultUserDefinedCS.java | 4 ++--
.../sis/referencing/datum/DefaultImageDatum.java | 6 +++---
.../referencing/factory/AuthorityFactoryProxy.java | 1 +
.../referencing/factory/CommonAuthorityFactory.java | 1 +
.../factory/ConcurrentAuthorityFactory.java | 3 ++-
.../factory/GeodeticAuthorityFactory.java| 4 ++--
.../referencing/factory/GeodeticObjectFactory.java | 12 ++--
.../referencing/factory/MultiAuthoritiesFactory.java | 3 ++-
.../sis/referencing/factory/sql/EPSGDataAccess.java | 1 +
.../sis/referencing/internal/EPSGFactoryProxy.java | 2 +-
.../referencing/internal/EPSGFactoryProxyCRS.java| 2 +-
.../apache/sis/referencing/internal/Resources.java | 5 +
.../sis/referencing/internal/Resources.properties| 1 +
.../sis/referencing/internal/Resources_fr.properties | 1 +
.../operation/AbstractCoordinateOperation.java | 2 +-
.../operation/TransformedCoordinateSet.java | 2 +-
.../sis/referencing/AuthorityFactoriesTest.java | 3 ++-
.../referencing/factory/AuthorityFactoryMock.java| 4
.../operation/provider/ProvidersTest.java| 1 -
geoapi/snapshot | 2 +-
29 files changed, 69 insertions(+), 44 deletions(-)
diff --cc
endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
index 2701a8bf28,2fbfc7b4d3..3883c2dee6
---
a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
+++
b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
@@@ -106,6 -110,6 +106,7 @@@ public class ReferencingFunctions exten
* @throws FactoryException if an error occurred while creating the
object.
* @throws DataStoreException if an error occurred while reading a data
file.
*/
++@SuppressWarnings("removal")
private IdentifiedObject getIdentifiedObject(final String codeOrPath,
CodeType type)
throws FactoryException, DataStoreException
{
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 840710fe4c,56001c098e..1b9ca46297
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -1563,11 -1564,10 +1563,11 @@@ class GeodeticObjectParser extends Math
*
* @param mode{@link #FIRST}, {@link #OPTIONAL} or {@link
#MANDATORY}.
* @param parent the parent element.
- * @return the {@code "ImageDatum"} element as an {@link ImageDatum}
object.
+ * @return the {@code "ImageDatum"} element.
* @throws ParseException if the {@code "ImageDatum"} element cannot be
parsed.
*/
-private DefaultImageDatum parseImageDatum(final int mode, final Element
parent) throws ParseException {
+@SuppressWarnings("deprecation")
+private ImageDatum parseImageDatum(final int mode, final Element parent)
throws ParseException {
final Element element = parent.pullElement(mode,
WKTKeywords.ImageDatum, WKTKeywords.IDatum);
if (element == null) {
return null;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
index 38a495452a,38a495452a..5970702890
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
@@@ -264,6 -264,6 +264,7 @@@ final class EPSGFactoryFallback extend
* Returns a coordinate reference system, datum or ellipsoid for the
given EPSG code.
*/
@Override
++@SuppressWarnings("removal")
pu
(sis) branch geoapi-3.1 updated (b86dbe8b92 -> f173cc01f5)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from b86dbe8b92 Merge branch 'geoapi-4.0' into geoapi-3.1: First round of upgrade to ISO 19111:2019. add cfb0e166e2 Post-merge cleanup. The `DefaultGeocentricCRS` class and its factory methods are marked as deprecated since 2.0 instead of 1.5 because we will not deprecate that class in the branch that depends on GeoAPI 3.0, because there is no replacement. The replacements will need to wait for GeoAPI 3.1. add c39f9ef256 Update for the removal of deprecated ImageDatum, ImageCRS and UserDefinedCS interfaces. Those interfaces were defined in ISO 19111:2007 but removed in ISO 19111:2019. new f173cc01f5 Merge branch 'geoapi-4.0' into geoapi-3.1, but without the removal of deprecated interfaces and methods. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/org/apache/sis/util/iso/Types.java | 4 ++-- .../apache/sis/openoffice/ReferencingFunctions.java | 1 + .../main/org/apache/sis/io/wkt/Convention.java | 7 +-- .../org/apache/sis/io/wkt/GeodeticObjectParser.java | 8 .../main/org/apache/sis/referencing/CRS.java | 20 ++-- .../apache/sis/referencing/EPSGFactoryFallback.java | 1 + .../sis/referencing/crs/DefaultEngineeringCRS.java | 4 .../sis/referencing/crs/DefaultGeocentricCRS.java| 2 +- .../apache/sis/referencing/crs/DefaultImageCRS.java | 6 +++--- .../sis/referencing/cs/DefaultUserDefinedCS.java | 4 ++-- .../sis/referencing/datum/DefaultImageDatum.java | 6 +++--- .../referencing/factory/AuthorityFactoryProxy.java | 1 + .../referencing/factory/CommonAuthorityFactory.java | 1 + .../factory/ConcurrentAuthorityFactory.java | 3 ++- .../factory/GeodeticAuthorityFactory.java| 4 ++-- .../referencing/factory/GeodeticObjectFactory.java | 12 ++-- .../referencing/factory/MultiAuthoritiesFactory.java | 3 ++- .../sis/referencing/factory/sql/EPSGDataAccess.java | 1 + .../sis/referencing/internal/EPSGFactoryProxy.java | 2 +- .../referencing/internal/EPSGFactoryProxyCRS.java| 2 +- .../apache/sis/referencing/internal/Resources.java | 5 + .../sis/referencing/internal/Resources.properties| 1 + .../sis/referencing/internal/Resources_fr.properties | 1 + .../operation/AbstractCoordinateOperation.java | 2 +- .../operation/TransformedCoordinateSet.java | 2 +- .../sis/referencing/AuthorityFactoriesTest.java | 3 ++- .../referencing/factory/AuthorityFactoryMock.java| 4 .../operation/provider/ProvidersTest.java| 1 - geoapi/snapshot | 2 +- 29 files changed, 69 insertions(+), 44 deletions(-)
(sis) 02/02: Update for the removal of deprecated ImageDatum, ImageCRS and UserDefinedCS interfaces. Those interfaces were defined in ISO 19111:2007 but removed in ISO 19111:2019.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit c39f9ef2560e2a003f0801b602fb126cb06f3e49
Author: Martin Desruisseaux
AuthorDate: Fri Apr 5 19:18:04 2024 +0200
Update for the removal of deprecated ImageDatum, ImageCRS and UserDefinedCS
interfaces.
Those interfaces were defined in ISO 19111:2007 but removed in ISO
19111:2019.
---
.../org/apache/sis/buildtools/book/GEOAPI.lst | 3 -
.../org/apache/sis/buildtools/book/OGC.lst | 2 -
.../sis/openoffice/ReferencingFunctions.java | 11 +-
.../main/org/apache/sis/io/wkt/Convention.java | 7 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java| 27 ++---
.../apache/sis/referencing/crs/AbstractCRS.java| 3 +-
.../sis/referencing/crs/DefaultEngineeringCRS.java | 12 +-
.../sis/referencing/crs/DefaultImageCRS.java | 71 ++-
.../org/apache/sis/referencing/crs/SubTypes.java | 4 -
.../org/apache/sis/referencing/cs/AbstractCS.java | 5 +-
.../sis/referencing/cs/DefaultUserDefinedCS.java | 51 +---
.../org/apache/sis/referencing/cs/SubTypes.java| 5 -
.../sis/referencing/datum/AbstractDatum.java | 5 +-
.../sis/referencing/datum/DefaultImageDatum.java | 68 +--
.../org/apache/sis/referencing/datum/SubTypes.java | 4 -
.../referencing/factory/AuthorityFactoryProxy.java | 32 ++---
.../factory/ConcurrentAuthorityFactory.java| 54 -
.../factory/GeodeticAuthorityFactory.java | 50
.../referencing/factory/GeodeticObjectFactory.java | 133 +
.../factory/MultiAuthoritiesFactory.java | 45 ---
.../sis/referencing/internal/EPSGFactoryProxy.java | 6 -
.../referencing/internal/EPSGFactoryProxyCRS.java | 7 --
.../internal/EPSGFactoryProxyDatum.java| 7 --
.../referencing/operation/SubOperationInfo.java| 6 +-
.../sis/xml/bind/referencing/CD_ImageDatum.java| 14 +--
.../sis/xml/bind/referencing/CS_UserDefinedCS.java | 14 +--
.../sis/referencing/AuthorityFactoriesTest.java| 3 +-
geoapi/snapshot| 2 +-
28 files changed, 80 insertions(+), 571 deletions(-)
diff --git
a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
index fa371b7c86..98b792e99c 100644
--- a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
+++ b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
@@ -101,8 +101,6 @@ GriddedDataPositionalAccuracy
Identification
IdentifiedObject
Identifier
-ImageCRS
-ImageDatum
ImageDescription
ImagingCondition
Individual
@@ -223,7 +221,6 @@ Trigger
UML
Usability
Usage
-UserDefinedCS
ValidatorContainer
Validators
VectorSpatialRepresentation
diff --git a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
index 771ccac556..7cc85d7506 100644
--- a/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
+++ b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
@@ -17,7 +17,6 @@ CD_Datum
CD_Ellipsoid
CD_EngineeringDatum
CD_GeodeticDatum
-CD_ImageDatum
CD_PixelInCell
CD_PrimeMeridian
CD_TemporalDatum
@@ -53,7 +52,6 @@ CS_PolarCS
CS_RangeMeaning
CS_SphericalCS
CS_TimeCS
-CS_UserDefinedCS
CS_VerticalCS
CV_ContinuousCoverage
CV_Coverage
diff --git
a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
index 2701a8bf28..2fbfc7b4d3 100644
---
a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
+++
b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
@@ -45,6 +45,10 @@ import org.apache.sis.storage.base.CodeType;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
+// Specific to the geoapi-4.0 branch:
+import org.opengis.referencing.crs.CRSAuthorityFactory;
+import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
+
/**
* Implements the {@link XReferencing} methods to make available to Apache
OpenOffice.
@@ -120,7 +124,12 @@ public class ReferencingFunctions extends CalcAddins
implements XReferencing {
type = CodeType.guess(codeOrPath);
}
if (type.equals(CodeType.URN)) {
-object =
CRS.getAuthorityFactory(null).createObject(codeOrPath);
+CRSAuthorityFactory factory =
CRS.getAuthorityFactory(null);
+if (factory instanceof GeodeticAuthorityFactory) {
+object
(sis) branch geoapi-4.0 updated (4ec3a9b103 -> c39f9ef256)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from 4ec3a9b103 Resolve a few warnings (not all) about the deprecated `VerticalDatumType` code list. new cfb0e166e2 Post-merge cleanup. The `DefaultGeocentricCRS` class and its factory methods are marked as deprecated since 2.0 instead of 1.5 because we will not deprecate that class in the branch that depends on GeoAPI 3.0, because there is no replacement. The replacements will need to wait for GeoAPI 3.1. new c39f9ef256 Update for the removal of deprecated ImageDatum, ImageCRS and UserDefinedCS interfaces. Those interfaces were defined in ISO 19111:2007 but removed in ISO 19111:2019. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/buildtools/book/GEOAPI.lst | 3 - .../org/apache/sis/buildtools/book/OGC.lst | 2 - .../main/org/apache/sis/util/iso/Types.java| 4 +- .../apache/sis/metadata/PropertyAccessorTest.java | 2 +- .../sis/openoffice/ReferencingFunctions.java | 11 +- .../main/org/apache/sis/io/wkt/Convention.java | 7 +- .../apache/sis/io/wkt/GeodeticObjectParser.java| 27 ++-- .../main/org/apache/sis/referencing/CRS.java | 20 ++- .../apache/sis/referencing/crs/AbstractCRS.java| 3 +- .../sis/referencing/crs/DefaultEngineeringCRS.java | 12 +- .../sis/referencing/crs/DefaultGeocentricCRS.java | 2 +- .../sis/referencing/crs/DefaultImageCRS.java | 71 ++ .../org/apache/sis/referencing/crs/SubTypes.java | 4 - .../org/apache/sis/referencing/cs/AbstractCS.java | 5 +- .../sis/referencing/cs/DefaultUserDefinedCS.java | 51 +--- .../org/apache/sis/referencing/cs/SubTypes.java| 5 - .../sis/referencing/datum/AbstractDatum.java | 5 +- .../sis/referencing/datum/DefaultImageDatum.java | 68 +- .../org/apache/sis/referencing/datum/SubTypes.java | 4 - .../referencing/factory/AuthorityFactoryProxy.java | 32 + .../factory/ConcurrentAuthorityFactory.java| 56 +--- .../factory/GeodeticAuthorityFactory.java | 52 +--- .../referencing/factory/GeodeticObjectFactory.java | 143 + .../factory/MultiAuthoritiesFactory.java | 47 +-- .../sis/referencing/internal/EPSGFactoryProxy.java | 6 - .../referencing/internal/EPSGFactoryProxyCRS.java | 9 +- .../internal/EPSGFactoryProxyDatum.java| 7 - .../apache/sis/referencing/internal/Resources.java | 5 + .../sis/referencing/internal/Resources.properties | 1 + .../referencing/internal/Resources_fr.properties | 1 + .../operation/AbstractCoordinateOperation.java | 2 +- .../referencing/operation/SubOperationInfo.java| 6 +- .../operation/TransformedCoordinateSet.java| 2 +- .../sis/xml/bind/referencing/CD_ImageDatum.java| 14 +- .../sis/xml/bind/referencing/CS_UserDefinedCS.java | 14 +- .../sis/referencing/AuthorityFactoriesTest.java| 3 +- .../referencing/factory/AuthorityFactoryMock.java | 3 + .../operation/provider/ProvidersTest.java | 1 - geoapi/snapshot| 2 +- 39 files changed, 119 insertions(+), 593 deletions(-)
(sis) 01/02: Post-merge cleanup. The `DefaultGeocentricCRS` class and its factory methods are marked as deprecated since 2.0 instead of 1.5 because we will not deprecate that class in the branch that
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit cfb0e166e291a96049faff4cb9a9d1c7230f8786
Author: Martin Desruisseaux
AuthorDate: Fri Apr 5 16:37:00 2024 +0200
Post-merge cleanup.
The `DefaultGeocentricCRS` class and its factory methods are marked as
deprecated since 2.0 instead of 1.5
because we will not deprecate that class in the branch that depends on
GeoAPI 3.0, because there is no replacement.
The replacements will need to wait for GeoAPI 3.1.
---
.../main/org/apache/sis/util/iso/Types.java | 4 ++--
.../apache/sis/metadata/PropertyAccessorTest.java| 2 +-
.../main/org/apache/sis/referencing/CRS.java | 20 ++--
.../sis/referencing/crs/DefaultGeocentricCRS.java| 2 +-
.../factory/ConcurrentAuthorityFactory.java | 2 +-
.../factory/GeodeticAuthorityFactory.java| 2 +-
.../referencing/factory/GeodeticObjectFactory.java | 10 +-
.../referencing/factory/MultiAuthoritiesFactory.java | 2 +-
.../referencing/internal/EPSGFactoryProxyCRS.java| 2 +-
.../apache/sis/referencing/internal/Resources.java | 5 +
.../sis/referencing/internal/Resources.properties| 1 +
.../sis/referencing/internal/Resources_fr.properties | 1 +
.../operation/AbstractCoordinateOperation.java | 2 +-
.../operation/TransformedCoordinateSet.java | 2 +-
.../referencing/factory/AuthorityFactoryMock.java| 3 +++
.../operation/provider/ProvidersTest.java| 1 -
16 files changed, 39 insertions(+), 22 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
index af97040987..fabfd4b0d5 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
@@ -506,8 +506,8 @@ public final class Types extends Static {
* The package prefix (e.g. {@code "CI_"} in {@code "CI_Citation"}) can be
omitted.
* The flexibility is provided for allowing transition to newer ISO
standards,
* which are dropping the package prefixes.
- * For example, {@code "AxisDirection"} in ISO 19111:2007
- * has been renamed {@code "AxisDirection"} in ISO 19111:2018.
+ * For example, {@code "CS_AxisDirection"} in ISO 19111:2007
+ * has been renamed {@code "AxisDirection"} in ISO 19111:2019.
*
* Only identifiers for the stable part of GeoAPI or for some Apache
SIS classes are recognized.
* This method does not handle the identifiers for interfaces in the
{@code geoapi-pending} module.
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index c54740d362..22c99e5890 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@ -64,12 +64,12 @@ import static
org.apache.sis.metadata.Assertions.assertTitleEquals;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
+import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.referencing.ObjectDomain;
import org.opengis.temporal.Duration;
// Specific to the geoapi-4.0 branch:
import org.opengis.metadata.citation.Responsibility;
-import org.opengis.referencing.datum.DatumEnsemble;
/**
diff --git
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
index 502d5a95ec..3e50020cb0 100644
---
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
@@ -958,30 +958,38 @@ 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 {@linkplain DynamicReferenceFrame dynamic
datum}, then 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
+ * 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
(sis) branch main updated (eaa46cbfba -> b35ebd489f)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from eaa46cbfba Merge branch 'geoapi-3.1'. add 57c421ab99 Partial upgrade for ISO 19111:2019. This commit merely ensures that the code still compile. It does not yet implement new features such as dynamic datums and point motion operations. However this commit has some skeleton classes for dynamic CRS. add 194ed455ba Resolve deprecation warnings about `AuthorityFactory.getDescriptionText(String)`. add 4ec3a9b103 Resolve a few warnings (not all) about the deprecated `VerticalDatumType` code list. add b86dbe8b92 Merge branch 'geoapi-4.0' into geoapi-3.1: First round of upgrade to ISO 19111:2019. new b35ebd489f Merge branch 'geoapi-3.1'. This is the beginning of an upgrade to ISO 19111:2019. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/metadata/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} | 38 +++-- .../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 | 10 +- .../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} | 32 ++-- .../pending/geoapi/referencing}/package-info.java | 6 +- .../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/TransformedCoordinateS
(sis) 01/01: Merge branch 'geoapi-3.1'. This is the beginning of an upgrade to ISO 19111:2019.
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
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: First round of upgrade to ISO 19111:2019.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit b86dbe8b92f1e17747cb2acf85534c629ec6454b Merge: 9ca908d78d 4ec3a9b103 Author: Martin Desruisseaux AuthorDate: Thu Apr 4 18:20:21 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1: First round of upgrade to ISO 19111:2019. https://issues.apache.org/jira/browse/SIS-592 .../org/apache/sis/metadata/PropertyAccessor.java | 7 +- .../apache/sis/metadata/PropertyComparator.java| 2 +- .../apache/sis/metadata/iso/extent/Extents.java| 1 + .../main/org/apache/sis/util/iso/Types.java| 10 +- .../apache/sis/metadata/PropertyAccessorTest.java | 6 +- .../apache/sis/test/mock/GeographicCRSMock.java} | 35 ++-- .../org/apache/sis/test/mock/VerticalCRSMock.java | 53 -- .../org/apache/sis/util/iso/TypeNamesTest.java | 2 +- .../test/org/apache/sis/util/iso/TypesTest.java| 13 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../main/module-info.java | 1 + .../sis/coordinate/AbstractCoordinateSet.java | 80 .../sis/coordinate/DefaultCoordinateMetadata.java | 208 + .../package-info.java} | 32 +--- .../apache/sis/geometry/WraparoundAdjustment.java | 2 +- .../main/org/apache/sis/io/wkt/Convention.java | 3 +- .../main/org/apache/sis/io/wkt/Formatter.java | 26 ++- .../apache/sis/io/wkt/GeodeticObjectParser.java| 16 +- .../main/org/apache/sis/io/wkt/VerticalInfo.java | 10 +- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 20 +- .../main/org/apache/sis/referencing/CRS.java | 75 ++-- .../main/org/apache/sis/referencing/CommonCRS.java | 4 +- .../org/apache/sis/referencing/DisplayName.java| 84 + .../sis/referencing/EPSGFactoryFallback.java | 1 + .../apache/sis/referencing/IdentifiedObjects.java | 26 ++- .../sis/referencing/StandardDefinitions.java | 6 +- .../apache/sis/referencing/crs/AbstractCRS.java| 1 + .../sis/referencing/crs/DefaultCompoundCRS.java| 79 ++-- .../sis/referencing/crs/DefaultDerivedCRS.java | 36 +++- .../sis/referencing/crs/DefaultEngineeringCRS.java | 3 + .../sis/referencing/crs/DefaultGeocentricCRS.java | 4 + .../sis/referencing/crs/DefaultImageCRS.java | 4 + .../org/apache/sis/referencing/crs/SubTypes.java | 7 +- .../apache/sis/referencing/cs/DefaultTimeCS.java | 16 ++ .../sis/referencing/cs/DefaultUserDefinedCS.java | 3 + .../org/apache/sis/referencing/cs/Normalizer.java | 12 +- .../org/apache/sis/referencing/cs/SubTypes.java| 1 + .../sis/referencing/datum/AbstractDatum.java | 111 +++ .../referencing/datum/DefaultEngineeringDatum.java | 10 +- .../referencing/datum/DefaultGeodeticDatum.java| 10 +- .../sis/referencing/datum/DefaultImageDatum.java | 16 +- .../referencing/datum/DefaultParametricDatum.java | 11 +- .../referencing/datum/DefaultTemporalDatum.java| 10 +- .../referencing/datum/DefaultVerticalDatum.java| 85 - .../org/apache/sis/referencing/datum/SubTypes.java | 1 + .../apache/sis/referencing/datum/package-info.java | 2 +- .../referencing/factory/AuthorityFactoryProxy.java | 25 ++- .../factory/CommonAuthorityFactory.java| 30 +-- .../factory/ConcurrentAuthorityFactory.java| 23 ++- .../factory/GeodeticAuthorityFactory.java | 53 +- .../referencing/factory/GeodeticObjectFactory.java | 35 +++- .../factory/IdentifiedObjectFinder.java| 4 +- .../factory/MultiAuthoritiesFactory.java | 26 ++- .../referencing/factory/sql/AuthorityCodes.java| 8 +- .../referencing/factory/sql/EPSGDataAccess.java| 39 ++-- .../sis/referencing/factory/sql/TableInfo.java | 1 + .../sis/referencing/factory/sql/package-info.java | 2 +- .../sis/referencing/internal/EPSGFactoryProxy.java | 8 +- .../referencing/internal/EPSGFactoryProxyCRS.java | 2 + .../internal/EPSGFactoryProxyDatum.java| 1 + .../org/apache/sis/referencing/internal/Epoch.java | 93 + .../apache/sis/referencing/internal/Resources.java | 5 + .../sis/referencing/internal/Resources.properties | 1 + .../referencing/internal/Resources_fr.properties | 1 + .../referencing/internal/VerticalDatumTypes.java | 1 + .../operation/AbstractCoordinateOperation.java | 74 ++-- .../operation/CoordinateOperationRegistry.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 4 +- .../referencing/operation/DefaultConversion.java | 7 +- .../DefaultCoordinateOperationFactory.java | 2 +- .../referencing/operation/SubOperationInfo.java| 1 + .../operation/TransformedCoordinateSet.java| 151 +++ .../sis/referencing/privy
(sis) branch geoapi-3.1 updated (9ca908d78d -> b86dbe8b92)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 9ca908d78d Merge branch 'geoapi-4.0' into geoapi-3.1: cleanup before work on ISO 19111:2019. add 57c421ab99 Partial upgrade for ISO 19111:2019. This commit merely ensures that the code still compile. It does not yet implement new features such as dynamic datums and point motion operations. However this commit has some skeleton classes for dynamic CRS. add 194ed455ba Resolve deprecation warnings about `AuthorityFactory.getDescriptionText(String)`. add 4ec3a9b103 Resolve a few warnings (not all) about the deprecated `VerticalDatumType` code list. new b86dbe8b92 Merge branch 'geoapi-4.0' into geoapi-3.1: First round of upgrade to ISO 19111:2019. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/metadata/PropertyAccessor.java | 7 +- .../apache/sis/metadata/PropertyComparator.java| 2 +- .../apache/sis/metadata/iso/extent/Extents.java| 1 + .../main/org/apache/sis/util/iso/Types.java| 10 +- .../apache/sis/metadata/PropertyAccessorTest.java | 6 +- .../apache/sis/test/mock/GeographicCRSMock.java} | 38 ++-- .../org/apache/sis/test/mock/VerticalCRSMock.java | 53 -- .../org/apache/sis/util/iso/TypeNamesTest.java | 2 +- .../test/org/apache/sis/util/iso/TypesTest.java| 13 +- .../sis/openoffice/ReferencingFunctions.java | 4 +- .../main/module-info.java | 1 + .../sis/coordinate/AbstractCoordinateSet.java | 80 .../sis/coordinate/DefaultCoordinateMetadata.java | 208 + .../org/apache/sis/coordinate}/package-info.java | 10 +- .../apache/sis/geometry/WraparoundAdjustment.java | 2 +- .../main/org/apache/sis/io/wkt/Convention.java | 3 +- .../main/org/apache/sis/io/wkt/Formatter.java | 26 ++- .../apache/sis/io/wkt/GeodeticObjectParser.java| 16 +- .../main/org/apache/sis/io/wkt/VerticalInfo.java | 10 +- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 20 +- .../main/org/apache/sis/referencing/CRS.java | 75 ++-- .../main/org/apache/sis/referencing/CommonCRS.java | 4 +- .../org/apache/sis/referencing/DisplayName.java| 84 + .../sis/referencing/EPSGFactoryFallback.java | 1 + .../apache/sis/referencing/IdentifiedObjects.java | 26 ++- .../sis/referencing/StandardDefinitions.java | 6 +- .../apache/sis/referencing/crs/AbstractCRS.java| 1 + .../sis/referencing/crs/DefaultCompoundCRS.java| 79 ++-- .../sis/referencing/crs/DefaultDerivedCRS.java | 36 +++- .../sis/referencing/crs/DefaultEngineeringCRS.java | 3 + .../sis/referencing/crs/DefaultGeocentricCRS.java | 4 + .../sis/referencing/crs/DefaultImageCRS.java | 4 + .../org/apache/sis/referencing/crs/SubTypes.java | 7 +- .../apache/sis/referencing/cs/DefaultTimeCS.java | 16 ++ .../sis/referencing/cs/DefaultUserDefinedCS.java | 3 + .../org/apache/sis/referencing/cs/Normalizer.java | 12 +- .../org/apache/sis/referencing/cs/SubTypes.java| 1 + .../sis/referencing/datum/AbstractDatum.java | 111 +++ .../referencing/datum/DefaultEngineeringDatum.java | 10 +- .../referencing/datum/DefaultGeodeticDatum.java| 10 +- .../sis/referencing/datum/DefaultImageDatum.java | 16 +- .../referencing/datum/DefaultParametricDatum.java | 11 +- .../referencing/datum/DefaultTemporalDatum.java| 10 +- .../referencing/datum/DefaultVerticalDatum.java| 85 - .../org/apache/sis/referencing/datum/SubTypes.java | 1 + .../apache/sis/referencing/datum/package-info.java | 2 +- .../referencing/factory/AuthorityFactoryProxy.java | 25 ++- .../factory/CommonAuthorityFactory.java| 30 +-- .../factory/ConcurrentAuthorityFactory.java| 23 ++- .../factory/GeodeticAuthorityFactory.java | 53 +- .../referencing/factory/GeodeticObjectFactory.java | 35 +++- .../factory/IdentifiedObjectFinder.java| 4 +- .../factory/MultiAuthoritiesFactory.java | 26 ++- .../referencing/factory/sql/AuthorityCodes.java| 8 +- .../referencing/factory/sql/EPSGDataAccess.java| 39 ++-- .../sis/referencing/factory/sql/TableInfo.java | 1 + .../sis/referencing/factory/sql/package-info.java | 2 +- .../sis/referencing/internal/EPSGFactoryProxy.java | 8 +- .../referencing/internal/EPSGFactoryProxyCRS.java | 2 + .../internal/EPSGFactoryProxyDatum.java| 1 + .../org/apache/sis/referencing/internal/Epoch.java | 93 + .../apache/sis/referencing/internal/Resources.java | 5 +
(sis) 02/02: Resolve a few warnings (not all) about the deprecated `VerticalDatumType` code list.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 4ec3a9b1038e9c64251abd185feb9239416de514
Author: Martin Desruisseaux
AuthorDate: Thu Apr 4 16:34:16 2024 +0200
Resolve a few warnings (not all) about the deprecated `VerticalDatumType`
code list.
---
.../apache/sis/metadata/iso/extent/Extents.java| 1 +
.../org/apache/sis/test/mock/VerticalCRSMock.java | 49 -
.../main/org/apache/sis/io/wkt/VerticalInfo.java | 10 +--
.../sis/referencing/StandardDefinitions.java | 6 +-
.../referencing/datum/DefaultVerticalDatum.java| 75 ++--
.../referencing/factory/GeodeticObjectFactory.java | 3 +
.../xml/bind/referencing/CD_VerticalDatumType.java | 1 +
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 6 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 1 +
.../datum/DefaultVerticalDatumTest.java| 1 +
.../sis/referencing/datum/HardCodedDatum.java | 2 +
.../report/CoordinateReferenceSystems.java | 9 ++-
.../apache/sis/test/integration/MetadataTest.java | 80 +++---
.../sis/test/integration/MetadataVerticalTest.java | 6 +-
14 files changed, 176 insertions(+), 74 deletions(-)
diff --git
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
index a3cb0d5f00..18e7e5e0f2 100644
---
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
@@ -416,6 +416,7 @@ public final class Extents extends Static {
* @since 0.4
*/
@OptionalCandidate
+@SuppressWarnings("deprecation")
public static MeasurementRange getVerticalRange(final Extent
extent) {
MeasurementRange range = null;
VerticalDatumType selectedType = null;
diff --git
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
index 6c3dcb1d61..aecb15b43e 100644
---
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
@@ -16,6 +16,7 @@
*/
package org.apache.sis.test.mock;
+import java.util.Optional;
import javax.measure.Unit;
import org.opengis.metadata.extent.Extent;
import org.opengis.referencing.crs.VerticalCRS;
@@ -28,6 +29,9 @@ import org.opengis.referencing.datum.VerticalDatumType;
import org.opengis.util.InternationalString;
import org.apache.sis.measure.Units;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.datum.RealizationMethod;
+
/**
* A dummy implementation of {@link VerticalCRS}, which is also its own datum,
coordinate system and axis.
@@ -42,32 +46,42 @@ public final class VerticalCRSMock extends
IdentifiedObjectMock
* Height in metres.
*/
public static final VerticalCRS HEIGHT = new VerticalCRSMock("Height",
+RealizationMethod.GEOID,
VerticalDatumType.GEOIDAL, Double.NEGATIVE_INFINITY,
Double.POSITIVE_INFINITY, Units.METRE, true);
/**
* Height in feet.
*/
public static final VerticalCRS HEIGHT_ft = new VerticalCRSMock("Height",
+RealizationMethod.GEOID,
VerticalDatumType.GEOIDAL, Double.NEGATIVE_INFINITY,
Double.POSITIVE_INFINITY, Units.FOOT, true);
/**
* Height estimated from hPa.
*/
public static final VerticalCRS BAROMETRIC_HEIGHT = new
VerticalCRSMock("Barometric height",
+RealizationMethod.LEVELLING,
VerticalDatumType.BAROMETRIC, 0, Double.POSITIVE_INFINITY,
Units.HECTOPASCAL, true);
/**
* Depth in metres.
*/
public static final VerticalCRS DEPTH = new VerticalCRSMock("Depth",
+RealizationMethod.TIDAL,
VerticalDatumType.DEPTH, 0, Double.POSITIVE_INFINITY, Units.METRE,
false);
/**
* Depth as a fraction of the sea floor depth at the location of the point
for which the depth is evaluated.
*/
public static final VerticalCRS SIGMA_LEVEL = new VerticalCRSMock("Sigma
level",
+null,
VerticalDatumType.OTHER_SURFACE, 0, 1, Units.UNITY, false);
+/**
+ * The realization method (geoid, tidal, etc.), or {@code null} if
unspecified.
+ */
+private final RealizationMethod method;
+
/**
* The datum type (geoidal, barometric, etc.).
*/
@@ -92,16 +106,18 @@ public final class VerticalCRSMock extends
IdentifiedObjectMock
* Creates a new vertical CRS for the given n
(sis) 01/02: Resolve deprecation warnings about `AuthorityFactory.getDescriptionText(String)`.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 194ed455ba61b6d5596b8bb501719a594dfb0d86
Author: Martin Desruisseaux
AuthorDate: Thu Apr 4 14:53:45 2024 +0200
Resolve deprecation warnings about
`AuthorityFactory.getDescriptionText(String)`.
---
.../sis/openoffice/ReferencingFunctions.java | 4 +-
.../main/org/apache/sis/io/wkt/WKTDictionary.java | 20 --
.../org/apache/sis/referencing/DisplayName.java| 84 ++
.../apache/sis/referencing/IdentifiedObjects.java | 24 ++-
.../referencing/factory/AuthorityFactoryProxy.java | 22 +++---
.../factory/CommonAuthorityFactory.java| 30
.../factory/ConcurrentAuthorityFactory.java| 11 +--
.../factory/GeodeticAuthorityFactory.java | 41 ---
.../factory/IdentifiedObjectFinder.java| 4 +-
.../factory/MultiAuthoritiesFactory.java | 14 ++--
.../referencing/factory/sql/AuthorityCodes.java| 8 +--
.../referencing/factory/sql/EPSGDataAccess.java| 37 ++
.../sis/referencing/factory/sql/package-info.java | 2 +-
.../sis/referencing/internal/EPSGFactoryProxy.java | 8 ++-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 20 --
.../sis/referencing/AuthorityFactoriesTest.java| 17 +++--
.../factory/CommonAuthorityFactoryTest.java| 18 +++--
.../factory/MultiAuthoritiesFactoryTest.java | 2 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 12 ++--
.../report/CoordinateReferenceSystems.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Axis.java | 2 +-
.../apache/sis/storage/netcdf/base/Linearizer.java | 5 +-
.../main/org/apache/sis/storage/wkt/Store.java | 5 +-
.../apache/sis/gui/referencing/AuthorityCodes.java | 3 +-
24 files changed, 293 insertions(+), 102 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
index 5221e076d8..2701a8bf28 100644
---
a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
+++
b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
@@ -173,8 +173,8 @@ public class ReferencingFunctions extends CalcAddins
implements XReferencing {
if (object != null) {
return object.getName().getCode();
}
-// In Apache SIS implementation, 'getDescriptionText' returns the
name.
-name =
CRS.getAuthorityFactory(null).getDescriptionText(codeOrPath);
+// In Apache SIS implementation, `getDescriptionText(…)` returns
the identified object name.
+name =
CRS.getAuthorityFactory(null).getDescriptionText(IdentifiedObject.class,
codeOrPath).orElse(null);
} catch (Exception exception) {
return getLocalizedMessage(exception);
}
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
index d64321c788..fdbf241c8a 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Objects;
+import java.util.Optional;
import java.util.stream.Stream;
import java.util.function.Predicate;
import java.util.function.Consumer;
@@ -38,6 +39,7 @@ import org.opengis.util.InternationalString;
import org.opengis.metadata.citation.Citation;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.NoSuchAuthorityCodeException;
+import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
import org.apache.sis.referencing.factory.FactoryDataException;
import org.apache.sis.referencing.privy.ReferencingUtilities;
@@ -128,7 +130,7 @@ import org.opengis.metadata.Identifier;
* {@link org.apache.sis.referencing.factory.sql.EPSGFactory}.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.1
+ * @version 1.5
* @since 1.1
*/
public class WKTDictionary extends GeodeticAuthorityFactory {
@@ -957,25 +959,31 @@ public class WKTDictionary extends
GeodeticAuthorityFactory {
/**
* Gets a description of the object corresponding to a code.
*
+ * @param type the type of object for which to get a description.
* @param code value allocated by authority.
* @return a description of the object, or {@code null} if {@code null} if
none.
* @throws NoSuchAuthorityCodeException if the specified
(sis) branch geoapi-4.0 updated (57c421ab99 -> 4ec3a9b103)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from 57c421ab99 Partial upgrade for ISO 19111:2019. This commit merely ensures that the code still compile. It does not yet implement new features such as dynamic datums and point motion operations. However this commit has some skeleton classes for dynamic CRS. new 194ed455ba Resolve deprecation warnings about `AuthorityFactory.getDescriptionText(String)`. new 4ec3a9b103 Resolve a few warnings (not all) about the deprecated `VerticalDatumType` code list. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sis/metadata/iso/extent/Extents.java| 1 + .../org/apache/sis/test/mock/VerticalCRSMock.java | 49 - .../sis/openoffice/ReferencingFunctions.java | 4 +- .../main/org/apache/sis/io/wkt/VerticalInfo.java | 10 +-- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 20 -- .../org/apache/sis/referencing/DisplayName.java| 84 ++ .../apache/sis/referencing/IdentifiedObjects.java | 24 ++- .../sis/referencing/StandardDefinitions.java | 6 +- .../referencing/datum/DefaultVerticalDatum.java| 75 +-- .../referencing/factory/AuthorityFactoryProxy.java | 22 +++--- .../factory/CommonAuthorityFactory.java| 30 .../factory/ConcurrentAuthorityFactory.java| 11 +-- .../factory/GeodeticAuthorityFactory.java | 41 --- .../referencing/factory/GeodeticObjectFactory.java | 3 + .../factory/IdentifiedObjectFinder.java| 4 +- .../factory/MultiAuthoritiesFactory.java | 14 ++-- .../referencing/factory/sql/AuthorityCodes.java| 8 +-- .../referencing/factory/sql/EPSGDataAccess.java| 37 ++ .../sis/referencing/factory/sql/package-info.java | 2 +- .../sis/referencing/internal/EPSGFactoryProxy.java | 8 ++- .../xml/bind/referencing/CD_VerticalDatumType.java | 1 + .../org/apache/sis/io/wkt/WKTDictionaryTest.java | 20 -- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 6 +- .../sis/referencing/AuthorityFactoriesTest.java| 17 +++-- .../org/apache/sis/referencing/CommonCRSTest.java | 1 + .../datum/DefaultVerticalDatumTest.java| 1 + .../sis/referencing/datum/HardCodedDatum.java | 2 + .../factory/CommonAuthorityFactoryTest.java| 18 +++-- .../factory/MultiAuthoritiesFactoryTest.java | 2 +- .../referencing/factory/sql/EPSGFactoryTest.java | 12 ++-- .../report/CoordinateReferenceSystems.java | 11 +-- .../apache/sis/test/integration/MetadataTest.java | 80 +++-- .../sis/test/integration/MetadataVerticalTest.java | 6 +- .../org/apache/sis/storage/netcdf/base/Axis.java | 2 +- .../apache/sis/storage/netcdf/base/Linearizer.java | 5 +- .../main/org/apache/sis/storage/wkt/Store.java | 5 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 3 +- 37 files changed, 469 insertions(+), 176 deletions(-) create mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DisplayName.java
(sis) branch main updated (3990491cc6 -> eaa46cbfba)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 3990491cc6 Merge branch 'geoapi-3.1': - Documentation fixes. - Rename "ordinate" as "coordinate" where possible. add 46ab59a6e5 Complete the renaming from `getOrdinate(int)` to `getCoordinate(int)` in a few missing places. Fix documentation and code formatting in some places that we forgot to update. add fdb650d7e9 Add a notice about Font-GIS licence: SIL Open Font License (OFL) version 1.1 add 93a19f385e Avoid unnecessary message for aborted tests. add 0580fecf48 Remove a few methods that can be provided as default GeoAPI methods. add 9ca908d78d Merge branch 'geoapi-4.0' into geoapi-3.1: cleanup before work on ISO 19111:2019. new eaa46cbfba Merge branch 'geoapi-3.1'. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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(-)
(sis) 01/01: Merge branch 'geoapi-3.1'.
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),
- a
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: cleanup before work on ISO 19111:2019.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit 9ca908d78de921ff6914acf1c971ce7bed6d885d Merge: 969036a87b 0580fecf48 Author: Martin Desruisseaux AuthorDate: Tue Apr 2 19:06:40 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1: cleanup before work on ISO 19111:2019. NOTICE | 5 ++- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../coverage/grid/FractionalGridCoordinates.java | 17 -- .../apache/sis/geometry/wrapper/Geometries.java| 4 +-- .../gazetteer/GeohashReferenceSystem.java | 4 +-- .../sis/referencing/gazetteer/SimpleLocation.java | 6 ++-- .../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +- .../sis/geometry/AbstractDirectPosition.java | 38 +++--- .../org/apache/sis/geometry/DirectPosition1D.java | 8 - .../org/apache/sis/geometry/DirectPosition2D.java | 5 +-- .../main/org/apache/sis/geometry/Envelope2D.java | 4 +-- .../apache/sis/referencing/GeodeticCalculator.java | 4 +-- .../sis/referencing/operation/matrix/Matrices.java | 2 +- .../transform/EllipsoidToCentricTransform.java | 2 +- .../sis/referencing/privy/AffineTransform2D.java | 6 ++-- .../apache/sis/geometry/AbstractEnvelopeTest.java | 16 - .../org/apache/sis/referencing/Assertions.java | 4 +-- .../apache/sis/math/CompoundDirectPositions.java | 37 - .../apache/sis/test/FailureDetailsReporter.java| 4 ++- geoapi/snapshot| 2 +- .../apache/sis/gui/coverage/CoverageCanvas.java| 6 ++-- .../main/org/apache/sis/gui/map/StatusBar.java | 2 +- 22 files changed, 56 insertions(+), 124 deletions(-) diff --cc geoapi/snapshot index a8fd5fbba6,1162a09f9c..f9a461bdd6 --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit a8fd5fbba605327efa4fba0be01f8e349b5ec1ba -Subproject commit 1162a09f9ca0ca5afb29356de81d8e5b938a2dcf ++Subproject commit f9a461bdd615ccddd270eb38dea04f943ed1d941
(sis) branch geoapi-3.1 updated (969036a87b -> 9ca908d78d)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 969036a87b Merge branch 'geoapi-4.0' into geoapi-3.1. add 46ab59a6e5 Complete the renaming from `getOrdinate(int)` to `getCoordinate(int)` in a few missing places. Fix documentation and code formatting in some places that we forgot to update. add fdb650d7e9 Add a notice about Font-GIS licence: SIL Open Font License (OFL) version 1.1 add 93a19f385e Avoid unnecessary message for aborted tests. add 0580fecf48 Remove a few methods that can be provided as default GeoAPI methods. new 9ca908d78d Merge branch 'geoapi-4.0' into geoapi-3.1: cleanup before work on ISO 19111:2019. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE | 5 ++- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../coverage/grid/FractionalGridCoordinates.java | 17 -- .../apache/sis/geometry/wrapper/Geometries.java| 4 +-- .../gazetteer/GeohashReferenceSystem.java | 4 +-- .../sis/referencing/gazetteer/SimpleLocation.java | 6 ++-- .../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +- .../sis/geometry/AbstractDirectPosition.java | 38 +++--- .../org/apache/sis/geometry/DirectPosition1D.java | 8 - .../org/apache/sis/geometry/DirectPosition2D.java | 5 +-- .../main/org/apache/sis/geometry/Envelope2D.java | 4 +-- .../apache/sis/referencing/GeodeticCalculator.java | 4 +-- .../sis/referencing/operation/matrix/Matrices.java | 2 +- .../transform/EllipsoidToCentricTransform.java | 2 +- .../sis/referencing/privy/AffineTransform2D.java | 6 ++-- .../apache/sis/geometry/AbstractEnvelopeTest.java | 16 - .../org/apache/sis/referencing/Assertions.java | 4 +-- .../apache/sis/math/CompoundDirectPositions.java | 37 - .../apache/sis/test/FailureDetailsReporter.java| 4 ++- geoapi/snapshot| 2 +- .../apache/sis/gui/coverage/CoverageCanvas.java| 6 ++-- .../main/org/apache/sis/gui/map/StatusBar.java | 2 +- 22 files changed, 56 insertions(+), 124 deletions(-)
(sis) 03/03: Remove a few methods that can be provided as default GeoAPI methods.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 0580fecf48a141c3fb41b330fe9e2717ae80f244
Author: Martin Desruisseaux
AuthorDate: Fri Mar 15 16:43:10 2024 +0100
Remove a few methods that can be provided as default GeoAPI methods.
---
.../coverage/grid/FractionalGridCoordinates.java | 17 --
.../sis/referencing/gazetteer/SimpleLocation.java | 4 ++-
.../sis/geometry/AbstractDirectPosition.java | 34 +---
.../org/apache/sis/geometry/DirectPosition2D.java | 5 +--
.../apache/sis/math/CompoundDirectPositions.java | 37 --
geoapi/snapshot| 2 +-
6 files changed, 8 insertions(+), 91 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
index 73e5bda9cf..a7e59a1e39 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
@@ -22,7 +22,6 @@ import org.opengis.geometry.DirectPosition;
import org.opengis.geometry.MismatchedDimensionException;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.datum.PixelInCell;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.StringBuilders;
@@ -383,22 +382,6 @@ public class FractionalGridCoordinates implements
GridCoordinates, Serializable
super(other);
}
-/**
- * Returns the direct position, which is this object itself.
- */
-@Override
-public DirectPosition getDirectPosition() {
-return this;
-}
-
-/**
- * Grid coordinates have no coordinate reference system.
- */
-@Override
-public CoordinateReferenceSystem getCoordinateReferenceSystem() {
-return null;
-}
-
/**
* Returns all coordinate values.
*/
diff --git
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/SimpleLocation.java
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/SimpleLocation.java
index 8b30c58684..992c5b54dd 100644
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/SimpleLocation.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/SimpleLocation.java
@@ -122,7 +122,9 @@ class SimpleLocation extends AbstractLocation implements
DirectPosition, Envelop
}
/**
- * Returns the direct position, which is itself.
+ * Returns this direct position.
+ *
+ * @return {@code this}.
*/
@Override
public final DirectPosition getDirectPosition() {
diff --git
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
index 146a0c029e..b676c51bbb 100644
---
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
@@ -87,8 +87,7 @@ public abstract class AbstractDirectPosition extends
FormattableObject implement
}
/**
- * Returns always {@code this}, the direct position for this
- * {@linkplain org.opengis.geometry.coordinate.Position position}.
+ * Returns this direct position.
*
* @return {@code this}.
*/
@@ -97,37 +96,6 @@ public abstract class AbstractDirectPosition extends
FormattableObject implement
return this;
}
-/**
- * Returns the coordinate reference system in which the coordinate tuple
is given.
- * May be {@code null} if this particular {@code DirectPosition} is
included in a larger object
- * with such a reference to a {@linkplain CoordinateReferenceSystem
coordinate reference system}.
- *
- * The default implementation returns {@code null}.
- * Subclasses should override this method if the CRS can be provided.
- *
- * @return the coordinate reference system, or {@code null}.
- */
-@Override
-public CoordinateReferenceSystem getCoordinateReferenceSystem() {
-return null;
-}
-
-/**
- * Returns a sequence of numbers that hold the coordinate of this position
in its reference system.
- *
- * @return the coordinates.
- *
- * @since
(sis) branch geoapi-4.0 updated (46ab59a6e5 -> 0580fecf48)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from 46ab59a6e5 Complete the renaming from `getOrdinate(int)` to `getCoordinate(int)` in a few missing places. Fix documentation and code formatting in some places that we forgot to update. new fdb650d7e9 Add a notice about Font-GIS licence: SIL Open Font License (OFL) version 1.1 new 93a19f385e Avoid unnecessary message for aborted tests. new 0580fecf48 Remove a few methods that can be provided as default GeoAPI methods. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE | 5 ++- .../coverage/grid/FractionalGridCoordinates.java | 17 -- .../sis/referencing/gazetteer/SimpleLocation.java | 4 ++- .../sis/geometry/AbstractDirectPosition.java | 34 +--- .../org/apache/sis/geometry/DirectPosition2D.java | 5 +-- .../apache/sis/math/CompoundDirectPositions.java | 37 -- .../apache/sis/test/FailureDetailsReporter.java| 4 ++- geoapi/snapshot| 2 +- 8 files changed, 15 insertions(+), 93 deletions(-)
(sis) 01/03: Add a notice about Font-GIS licence: SIL Open Font License (OFL) version 1.1
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git commit fdb650d7e924157085c79fcc5060b6d86cf90c63 Author: Martin Desruisseaux AuthorDate: Fri Mar 15 10:15:50 2024 +0100 Add a notice about Font-GIS licence: SIL Open Font License (OFL) version 1.1 --- NOTICE | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 30192ad466..e31e4889e1 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Spatial Information System (SIS) -Copyright 2010-2023 The Apache Software Foundation +Copyright 2010-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). @@ -49,3 +49,6 @@ https://epsg.org/terms-of-use.html The optional `org.apache.sis.gui` module depends on JavaFX published under GPL 2 with classpath exception. https://github.com/openjdk/jfx/blob/master/LICENSE + +The optional `org.apache.sis.gui` module downloads Font-GIS at build time. +Font-GIS is published under SIL Open Font License (OFL) version 1.1.
(sis) 02/03: Avoid unnecessary message for aborted tests.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 93a19f385edddf1519753b2166a8a29b21918203
Author: Martin Desruisseaux
AuthorDate: Fri Mar 15 10:37:48 2024 +0100
Avoid unnecessary message for aborted tests.
---
.../test/org/apache/sis/test/FailureDetailsReporter.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
index 87477edf7b..4bb02bcf7f 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
@@ -19,6 +19,7 @@ package org.apache.sis.test;
import java.io.PrintStream;
// Test dependencies
+import org.opentest4j.TestAbortedException;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -61,7 +62,8 @@ public final class FailureDetailsReporter implements
BeforeEachCallback, AfterEa
public final void afterEach(final ExtensionContext description) {
boolean flush = TestCase.VERBOSE;
LogRecordCollector.INSTANCE.setCurrentTest(null);
-if (description.getExecutionException().isPresent()) {
+Throwable ex = description.getExecutionException().orElse(null);
+if (ex != null && !(ex instanceof TestAbortedException)) {
description.getTestMethod().ifPresent((method) -> {
final Long seed = TestUtilities.randomSeed.get();
if (seed != null) {
(sis) branch geoapi-4.0 updated: Complete the renaming from `getOrdinate(int)` to `getCoordinate(int)` in a few missing places. Fix documentation and code formatting in some places that we forgot to u
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 46ab59a6e5 Complete the renaming from `getOrdinate(int)` to
`getCoordinate(int)` in a few missing places. Fix documentation and code
formatting in some places that we forgot to update.
46ab59a6e5 is described below
commit 46ab59a6e5d33d01e23eca0e7a853e20d9b6fd06
Author: Martin Desruisseaux
AuthorDate: Thu Mar 14 19:12:43 2024 +0100
Complete the renaming from `getOrdinate(int)` to `getCoordinate(int)` in a
few missing places.
Fix documentation and code formatting in some places that we forgot to
update.
---
.../org/apache/sis/coverage/grid/DimensionReducer.java | 2 +-
.../main/org/apache/sis/geometry/wrapper/Geometries.java | 4 ++--
.../referencing/gazetteer/GeohashReferenceSystem.java| 4 ++--
.../apache/sis/referencing/gazetteer/SimpleLocation.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +-
.../org/apache/sis/geometry/AbstractDirectPosition.java | 8 ++--
.../main/org/apache/sis/geometry/DirectPosition1D.java | 8 +++-
.../main/org/apache/sis/geometry/Envelope2D.java | 4 ++--
.../org/apache/sis/referencing/GeodeticCalculator.java | 4 ++--
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../operation/transform/EllipsoidToCentricTransform.java | 2 +-
.../apache/sis/referencing/privy/AffineTransform2D.java | 6 +++---
.../org/apache/sis/geometry/AbstractEnvelopeTest.java| 16
.../test/org/apache/sis/referencing/Assertions.java | 4 ++--
.../main/org/apache/sis/gui/coverage/CoverageCanvas.java | 6 +++---
.../main/org/apache/sis/gui/map/StatusBar.java | 2 +-
16 files changed, 43 insertions(+), 33 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionReducer.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionReducer.java
index 5f49b96f02..6815cbe74c 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionReducer.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionReducer.java
@@ -101,7 +101,7 @@ final class DimensionReducer {
final GeneralEnvelope envelope = new GeneralEnvelope(reducedCRS);
for (int i=0; i < dimensions.length; i++) {
final int s = dimensions[i];
-envelope.setRange(i, lowerCorner.getCoordinate(s),
upperCorner.getOrdinate(s));
+envelope.setRange(i, lowerCorner.getCoordinate(s),
upperCorner.getCoordinate(s));
}
return envelope;
}
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
index 6ad72ba35c..6a411d8fe5 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
@@ -326,8 +326,8 @@ public abstract class Geometries implements Serializable
{
final Object geometry;
final int n = point.getDimension();
switch (n) {
-case 2: geometry = createPoint(point.getCoordinate(0),
point.getOrdinate(1)); break;
-case 3: geometry = createPoint(point.getCoordinate(0),
point.getOrdinate(1), point.getOrdinate(2)); break;
+case 2: geometry = createPoint(point.getCoordinate(0),
point.getCoordinate(1)); break;
+case 3: geometry = createPoint(point.getCoordinate(0),
point.getCoordinate(1), point.getCoordinate(2)); break;
default: throw new
MismatchedDimensionException(Errors.format(Errors.Keys.MismatchedDimension_3,
"point", (n <= 2) ? 2 : 3, n));
}
final GeometryWrapper wrapper = castOrWrap(geometry);
diff --git
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
index bb72a0abd8..1666a27797 100644
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
@@ -472,7 +472,7 @@ public class GeohashReferenceSystem extends
ReferencingByIdentifiers {
} catch (FactoryException e) {
throw new GazetteerException(e.getLocalizedMessage(), e);
}
-return encode(position.getCoordinate(1), position.getOrdinate(0));
+
(sis) 01/01: Merge branch 'geoapi-3.1': - Documentation fixes. - Rename "ordinate" as "coordinate" where possible.
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 {@
(sis) branch main updated (2466fc7ddf -> 3990491cc6)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 2466fc7ddf Merge branch 'geoapi-3.1' add 306866f45d English grammar fix: "split" is an irregular verb. Replace also a closed bug report by JEP 447. add 145b4a415a Add javafx Glyph and FontGIS dependency (work by Johann Sorel). add 925df3bf08 Rename getOrdinate(int) as getCoordinate(int) for compliance with ISO 19111 terminology. Same for setOrdinate(int, double) and getCoordinate() (renamed getCoordinates()). add 969036a87b Merge branch 'geoapi-4.0' into geoapi-3.1. new 3990491cc6 Merge branch 'geoapi-3.1': - Documentation fixes. - Rename "ordinate" as "coordinate" where possible. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .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(
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit 969036a87b7163b6bd1a79ce29d49ac3a09b3ca8 Merge: 9b511f4d6a 925df3bf08 Author: Martin Desruisseaux AuthorDate: Thu Mar 14 17:16:21 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. .gitignore | 3 + .../buildtools/coding/VerifyVersionInJavadoc.java | 2 +- .../main/org/apache/sis/coverage/CategoryList.java | 4 +- .../coverage/grid/CoordinateOperationFinder.java | 2 +- .../apache/sis/coverage/grid/DefaultEvaluator.java | 2 +- .../apache/sis/coverage/grid/DimensionReducer.java | 4 +- .../sis/coverage/grid/DimensionalityReduction.java | 2 +- .../coverage/grid/FractionalGridCoordinates.java | 8 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../org/apache/sis/coverage/grid/GridExtent.java | 8 +- .../apache/sis/coverage/privy/TileOpExecutor.java | 2 +- .../apache/sis/geometry/wrapper/Geometries.java| 12 +- .../geometry/wrapper/SpatialOperationContext.java | 2 +- .../apache/sis/geometry/wrapper/jts/Wrapper.java | 6 +- .../main/org/apache/sis/image/ErrorHandler.java| 2 +- .../org/apache/sis/image/MultiSourceLayout.java| 5 +- .../main/org/apache/sis/image/ResamplingGrid.java | 12 +- .../org/apache/sis/image/SourceAlignedImage.java | 8 +- .../apache/sis/image/processing/TiledProcess.java | 6 +- .../sis/image/processing/isoline/Tracer.java | 2 +- .../coverage/grid/DimensionalityReductionTest.java | 2 +- .../sis/coverage/grid/GridDerivationTest.java | 4 +- .../apache/sis/coverage/grid/GridExtentTest.java | 2 +- .../apache/sis/filter/sqlmm/RegistryTestCase.java | 2 +- .../apache/sis/geometry/wrapper/jts/JTSTest.java | 8 +- .../sis/metadata/iso/citation/Citations.java | 2 +- .../main/org/apache/sis/util/iso/Names.java| 2 +- .../main/org/apache/sis/xml/Namespaces.java| 2 +- .../org/apache/sis/xml/TransformingReader.java | 2 +- .../sis/metadata/iso/extent/ExtentsTest.java | 8 +- .../org/apache/sis/openoffice/Transformer.java | 6 +- .../main/org/apache/sis/portrayal/Canvas.java | 4 +- .../org/apache/sis/portrayal/CanvasExtent.java | 4 +- .../referencing/gazetteer/AbstractLocation.java| 2 +- .../gazetteer/GeohashReferenceSystem.java | 8 +- .../sis/referencing/gazetteer/LocationFormat.java | 4 +- .../gazetteer/MilitaryGridReferenceSystem.java | 24 +- .../sis/referencing/gazetteer/SimpleLocation.java | 8 +- .../gazetteer/GeohashReferenceSystemTest.java | 4 +- .../gazetteer/MilitaryGridReferenceSystemTest.java | 102 ++-- .../sis/geometry/AbstractDirectPosition.java | 22 +- .../org/apache/sis/geometry/AbstractEnvelope.java | 38 +- .../org/apache/sis/geometry/ArrayEnvelope.java | 8 +- .../org/apache/sis/geometry/CoordinateFormat.java | 2 +- .../org/apache/sis/geometry/DirectPosition1D.java | 8 +- .../org/apache/sis/geometry/DirectPosition2D.java | 22 +- .../main/org/apache/sis/geometry/Envelope2D.java | 4 +- .../main/org/apache/sis/geometry/Envelopes.java| 24 +- .../apache/sis/geometry/GeneralDirectPosition.java | 32 +- .../org/apache/sis/geometry/GeneralEnvelope.java | 14 +- .../apache/sis/geometry/WraparoundAdjustment.java | 8 +- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 2 +- .../apache/sis/referencing/GeodeticCalculator.java | 10 +- .../operation/builder/LinearTransformBuilder.java | 16 +- .../sis/referencing/operation/matrix/Matrices.java | 8 +- .../operation/transform/AbstractMathTransform.java | 12 +- .../transform/AbstractMathTransform1D.java | 4 +- .../transform/EllipsoidToCentricTransform.java | 6 +- .../operation/transform/IdentityTransform.java | 2 +- .../operation/transform/MathTransforms.java| 4 +- .../operation/transform/PassThroughTransform.java | 2 +- .../operation/transform/ProjectiveTransform.java | 2 +- .../transform/SpecializableTransform.java | 4 +- .../sis/referencing/privy/AffineTransform2D.java | 10 +- .../sis/referencing/privy/DirectPositionView.java | 6 +- .../sis/referencing/privy/IntervalRectangle.java | 8 +- .../referencing/privy/WraparoundApplicator.java| 4 +- .../apache/sis/geometry/AbstractEnvelopeTest.java | 64 +-- .../apache/sis/geometry/CoordinateFormatTest.java | 21 +- .../apache/sis/geometry/DirectPosition1DTest.java | 2 +- .../apache/sis/geometry/DirectPosition2DTest.java | 2 +- .../sis/geometry/GeneralDirectPositionTest.java| 6 +- .../apache/sis/geometry/GeneralEnvelopeTest.java | 24 +- .../sis/geometry/WraparoundAdjustmentTest.java | 4 +- .../org/apache/sis/referencing/Assertions.java | 8 +- .../sis/referencing
