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 <martin.desruisse...@geomatys.com>
AuthorDate: Tue Apr 2 19:32:40 2024 +0200
Merge branch 'geoapi-3.1'.
NOTICE | 5 ++++-
.../sis/referencing/gazetteer/SimpleLocation.java | 4 +++-
.../apache/sis/geometry/AbstractDirectPosition.java | 7 ++++---
.../org/apache/sis/geometry/DirectPosition1D.java | 8 +++++++-
.../org/apache/sis/geometry/DirectPosition2D.java | 5 +++--
.../apache/sis/geometry/AbstractEnvelopeTest.java | 20 ++++++++++----------
.../org/apache/sis/test/FailureDetailsReporter.java | 4 +++-
.../org/apache/sis/gui/coverage/CoverageCanvas.java | 6 +++---
8 files changed, 37 insertions(+), 22 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
index f741148698,b676c51bbb..28d89e3224
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
@@@ -193,7 -107,10 +192,9 @@@ public abstract class AbstractDirectPos
* @throws IndexOutOfBoundsException if the given index is negative or is
equal or greater
* than the {@linkplain #getDimension() position dimension}.
* @throws UnsupportedOperationException if this direct position is
immutable.
+ *
+ * @since 1.5
*/
- @Override
public void setCoordinate(int dimension, double value) {
throw new
UnsupportedOperationException(Errors.format(Errors.Keys.UnmodifiableObject_1,
getClass()));
}
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
index 7b9d21980e,cf7cd35615..e46a616fb7
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
@@@ -194,16 -191,16 +194,16 @@@ public final class AbstractEnvelopeTes
final Envelope envelope = create(type, 12, -4, 30, 50);
final DirectPosition lower = envelope.getLowerCorner();
final DirectPosition upper = envelope.getUpperCorner();
- assertEquals( 30, envelope.getMinimum (1), label);
- assertEquals( 50, envelope.getMaximum (1), label);
- assertEquals( 40, envelope.getMedian (1), label);
- assertEquals( 20, envelope.getSpan (1), label);
- assertEquals( 12, lower .getOrdinate(0), label);
- assertEquals(-180, envelope.getMinimum (0), label);
- assertEquals( -4, upper .getOrdinate(0), label);
- assertEquals(+180, envelope.getMaximum (0), label);
- assertEquals(-176, envelope.getMedian (0), label);
- assertEquals( 344, envelope.getSpan (0), label); //
360° - testSimpleEnvelope()
+ assertEquals( 30, envelope.getMinimum (1), label);
+ assertEquals( 50, envelope.getMaximum (1), label);
+ assertEquals( 40, envelope.getMedian (1), label);
+ assertEquals( 20, envelope.getSpan (1), label);
- assertEquals( 12, lower .getCoordinate(0), label);
++ assertEquals( 12, lower .getOrdinate (0), label);
+ assertEquals(-180, envelope.getMinimum (0), label);
- assertEquals( -4, upper .getCoordinate(0), label);
++ assertEquals( -4, upper .getOrdinate (0), label);
+ assertEquals(+180, envelope.getMaximum (0), label);
+ assertEquals(-176, envelope.getMedian (0), label);
+ assertEquals( 344, envelope.getSpan (0), label); //
360° - testSimpleEnvelope()
switch (type) {
default: {
final var ext = (AbstractEnvelope) envelope;
diff --cc
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
index ea00a17eb3,92e3e3ec6d..37916733bb
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
@@@ -1219,9 -1219,9 +1219,9 @@@ public class CoverageCanvas extends Map
+ "Max: %, 16.4f %, 16.4f%n"
+ "POI: %, 16.4f %, 16.4f%n"
+ "Min: %, 16.4f %, 16.4f%n",
- aoi.getMaxX(), aoi.getMaxY(),
- poi.getOrdinate(0), poi.getOrdinate(1),
- aoi.getMinX(), aoi.getMinY()))
+ aoi.getMaxX(), aoi.getMaxY(),
- poi.getCoordinate(0), poi.getCoordinate(1),
++ poi.getOrdinate(0), poi.getOrdinate(1),
+ aoi.getMinX(), aoi.getMinY()))
.appendHorizontalSeparator();
}
final Rectangle source = data.objectiveToData(aoi);
