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 <martin.desruisse...@geomatys.com> 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<G> 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)); + return encode(position.getCoordinate(1), position.getCoordinate(0)); } /** @@ -500,7 +500,7 @@ public class GeohashReferenceSystem extends ReferencingByIdentifiers { throw new GazetteerException(e.getLocalizedMessage(), e); } setPrecision(precision, position); - return encode(position.getCoordinate(1), position.getOrdinate(0)); + return encode(position.getCoordinate(1), position.getCoordinate(0)); } /** 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 76f4966110..8b30c58684 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 @@ -152,7 +152,7 @@ class SimpleLocation extends AbstractLocation implements DirectPosition, Envelop */ @Override public final double[] getCoordinates() { - return new double[] {getCoordinate(0), getOrdinate(1)}; + return new double[] {getCoordinate(0), getCoordinate(1)}; } /** diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java index 1c16c4ec34..24e44dea37 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java @@ -635,7 +635,7 @@ public final class MilitaryGridReferenceSystemTest extends TestCase { final DirectPosition r = decode(coder, reference); final ProjectedCRS crs = (ProjectedCRS) r.getCoordinateReferenceSystem(); assertSame(expected, crs.getConversionFromBase().getMathTransform().transform(position, expected)); - final double distance = expected.distance(r.getCoordinate(0), r.getOrdinate(1)); + final double distance = expected.distance(r.getCoordinate(0), r.getCoordinate(1)); if (!(distance < 1.5)) { // Use '!' for catching NaN. final String lineSeparator = System.lineSeparator(); fail("Consistency check failed for φ = " + position.x + " and λ = " + position.y + lineSeparator 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 5713010cd9..146a0c029e 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 @@ -58,7 +58,7 @@ import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches; * serializable, is left to subclasses.</p> * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.1 + * @version 1.5 * @since 0.3 */ public abstract class AbstractDirectPosition extends FormattableObject implements DirectPosition { @@ -116,6 +116,8 @@ public abstract class AbstractDirectPosition extends FormattableObject implement * Returns a sequence of numbers that hold the coordinate of this position in its reference system. * * @return the coordinates. + * + * @since 1.5 */ @Override public double[] getCoordinates() { @@ -137,6 +139,8 @@ public abstract class AbstractDirectPosition extends FormattableObject implement * @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) { @@ -452,7 +456,7 @@ parse: while (i < length) { final int dimension = getDimension(); if (dimension == that.getDimension()) { for (int i=0; i<dimension; i++) { - if (!Numerics.equals(getCoordinate(i), that.getOrdinate(i))) { + if (!Numerics.equals(getCoordinate(i), that.getCoordinate(i))) { return false; } } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/DirectPosition1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/DirectPosition1D.java index 9be3ee7089..fe779520ce 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/DirectPosition1D.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/DirectPosition1D.java @@ -36,7 +36,7 @@ import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches; * A one-dimensional position within some coordinate reference system. * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.0 + * @version 1.5 * * @see DirectPosition2D * @see GeneralDirectPosition @@ -153,6 +153,8 @@ public class DirectPosition1D extends AbstractDirectPosition implements Serializ * This method is final for ensuring consistency with the {@link #coordinate} field, which is public.</div> * * @return the coordinates. + * + * @since 1.5 */ @Override public final double[] getCoordinates() { @@ -168,6 +170,8 @@ public class DirectPosition1D extends AbstractDirectPosition implements Serializ * @param dimension the dimension, which must be 0. * @return the {@link #coordinate}. * @throws IndexOutOfBoundsException if the specified dimension is out of bounds. + * + * @since 1.5 */ @Override public final double getCoordinate(final int dimension) throws IndexOutOfBoundsException { @@ -184,6 +188,8 @@ public class DirectPosition1D extends AbstractDirectPosition implements Serializ * @param dimension the dimension, which must be 0. * @param value the coordinate value. * @throws IndexOutOfBoundsException if the specified dimension is out of bounds. + * + * @since 1.5 */ @Override public void setCoordinate(int dimension, double value) throws IndexOutOfBoundsException { diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java index 5528f8bfb1..e2af501e78 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java @@ -157,8 +157,8 @@ public class Envelope2D extends Rectangle2D.Double implements Envelope, Emptiabl * JDK constraint: The call to ensureDimensionMatch(…) should have been first if Sun/Oracle * fixed RFE #4093999 (Relax constraint on placement of this()/super() call in constructors). */ - this(lowerCorner.getCoordinate(0), lowerCorner.getOrdinate(1), - upperCorner.getCoordinate(0), upperCorner.getOrdinate(1)); + this(lowerCorner.getCoordinate(0), lowerCorner.getCoordinate(1), + upperCorner.getCoordinate(0), upperCorner.getCoordinate(1)); ensureDimensionMatches("crs", DIMENSION, crs); this.crs = crs; } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java index 5e76e03f43..c3d2864340 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java @@ -409,7 +409,7 @@ public class GeodeticCalculator { } catch (TransformException e) { throw new IllegalArgumentException(transformError(false), e); } - setStartGeographicPoint(p.getCoordinate(0), p.getOrdinate(1)); + setStartGeographicPoint(p.getCoordinate(0), p.getCoordinate(1)); } /** @@ -476,7 +476,7 @@ public class GeodeticCalculator { } catch (TransformException e) { throw new IllegalArgumentException(transformError(false), e); } - setEndGeographicPoint(p.getCoordinate(0), p.getOrdinate(1)); + setEndGeographicPoint(p.getCoordinate(0), p.getCoordinate(1)); } /** diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java index ec2c6e63e8..294001201b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java @@ -392,7 +392,7 @@ public final class Matrices extends Static { * anti-meridian. */ final double scale = dstEnvelope.getSpan(i) / srcEnvelope.getSpan(i); - final double translate = dstCorner.getCoordinate(i) - srcCorner.getOrdinate(i)*scale; + final double translate = dstCorner.getCoordinate(i) - srcCorner.getCoordinate(i)*scale; matrix.setElement(i, i, scale); matrix.setElement(i, srcDim, translate); } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java index 86c699ac5a..8af3ca1a69 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java @@ -499,7 +499,7 @@ public class EllipsoidToCentricTransform extends AbstractMathTransform implement case 3: wh = true; h = point.getCoordinate(2); break; case 2: wh = false; h = 0; break; } - return transform(point.getCoordinate(0), point.getOrdinate(1), h, null, 0, true, wh); + return transform(point.getCoordinate(0), point.getCoordinate(1), h, null, 0, true, wh); } /** diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AffineTransform2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AffineTransform2D.java index a11ba1af99..f8bac5339e 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AffineTransform2D.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AffineTransform2D.java @@ -273,14 +273,14 @@ public class AffineTransform2D extends ImmutableAffineTransform } } else { if (ptDst == null) { - final DirectPosition2D point = new DirectPosition2D(ptSrc.getCoordinate(0), ptSrc.getOrdinate(1)); + final DirectPosition2D point = new DirectPosition2D(ptSrc.getCoordinate(0), ptSrc.getCoordinate(1)); super.transform(point, point); return point; } ArgumentChecks.ensureDimensionMatches("ptDst", DIMENSION, ptDst); if (ptDst instanceof Point2D) { final Point2D point = (Point2D) ptDst; - point.setLocation(ptSrc.getCoordinate(0), ptSrc.getOrdinate(1)); + point.setLocation(ptSrc.getCoordinate(0), ptSrc.getCoordinate(1)); super.transform(point, point); return ptDst; } @@ -288,7 +288,7 @@ public class AffineTransform2D extends ImmutableAffineTransform /* * At this point, we have no choice to create a temporary Point2D. */ - final Point2D.Double point = new Point2D.Double(ptSrc.getCoordinate(0), ptSrc.getOrdinate(1)); + final Point2D.Double point = new Point2D.Double(ptSrc.getCoordinate(0), ptSrc.getCoordinate(1)); super.transform(point, point); ptDst.setCoordinate(0, point.x); ptDst.setCoordinate(1, point.y); diff --git 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 index 5a0cffcdb0..cf7cd35615 100644 --- 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 @@ -191,16 +191,16 @@ public final class AbstractEnvelopeTest extends TestCase { 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( 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(-180, envelope.getMinimum (0), label); + assertEquals(-180, envelope.getMinimum (0), label); assertEquals( -4, upper .getCoordinate(0), label); - assertEquals(+180, envelope.getMaximum (0), label); - assertEquals(-176, envelope.getMedian (0), label); - assertEquals( 344, envelope.getSpan (0), label); // 360° - testSimpleEnvelope() + 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 --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java index 6864b13498..0a38012253 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java @@ -293,8 +293,8 @@ public final class Assertions extends Static { if (i < tolerances.length) { tolerance = tolerances[i]; } - if (abs(expectedLower.getCoordinate(i) - actualLower.getOrdinate(i)) > tolerance || - abs(expectedUpper.getCoordinate(i) - actualUpper.getOrdinate(i)) > tolerance) + if (abs(expectedLower.getCoordinate(i) - actualLower.getCoordinate(i)) > tolerance || + abs(expectedUpper.getCoordinate(i) - actualUpper.getCoordinate(i)) > tolerance) { fail("Envelopes are not equal in dimension " + i + ":\n" + "expected " + Envelopes.toString(expected) + "\n" diff --git 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 index 277758d99c..92e3e3ec6d 100644 --- 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 @@ public class CoverageCanvas extends MapCanvasAWT { + "Max: %, 16.4f %, 16.4f%n" + "POI: %, 16.4f %, 16.4f%n" + "Min: %, 16.4f %, 16.4f%n", - aoi.getMaxX(), aoi.getMaxY(), - poi.getCoordinate(0), poi.getOrdinate(1), - aoi.getMinX(), aoi.getMinY())) + aoi.getMaxX(), aoi.getMaxY(), + poi.getCoordinate(0), poi.getCoordinate(1), + aoi.getMinX(), aoi.getMinY())) .appendHorizontalSeparator(); } final Rectangle source = data.objectiveToData(aoi); diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java index 0c9176b023..ab66f5da71 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java @@ -996,7 +996,7 @@ public class StatusBar extends Widget implements EventHandler<MouseEvent> { final double y = lastY; lastX = lastY = Double.NaN; if (!Double.isNaN(x) && !Double.isNaN(y)) { - if (current == null || current.getCoordinate(0) != x || current.getOrdinate(1) != y) { + if (current == null || current.getCoordinate(0) != x || current.getCoordinate(1) != y) { setLocalCoordinates(x, y); } }