Merge master into 3.1.x

Author: desruisseaux

geoapi-conformance/src/main/java/org/opengis/test/Assertions.java

@@ -404,18 +404,33 @@ public static void assertAxisDirectionsEqual(final CoordinateSystem cs, final Ax
         }
     }
 
+    /**
+     * Asserts that the given matrix is equal to the expected one, with a tolerance of zero.
+     * Positive zeros are considered equal to negative zeros, and any NaN value is considered equal
+     * to all other NaN values.
+     *
+     * @param expected  the expected matrix, which may be {@code null}.
+     * @param actual    the matrix to compare, or {@code null}.
+     * @param label     header of the exception message in case of failure, or {@code null} if none.
+     */
+    public static void assertMatrixEquals(final Matrix expected, final Matrix actual, final String label) {
+        assertMatrixEquals(expected, actual, 0, label);
+    }
+
     /**
      * Asserts that the given matrix is equal to the expected one, up to the given tolerance value.
+     * Positive zeros are considered equal to negative zeros, and any NaN value is considered equal
+     * to all other NaN values.
      *
      * @param expected   the expected matrix, which may be {@code null}.
      * @param actual     the matrix to compare, or {@code null}.
      * @param tolerance  the tolerance threshold.
-     * @param message    header of the exception message in case of failure, or {@code null} if none.
+     * @param label      header of the exception message in case of failure, or {@code null} if none.
      *
      * @see org.opengis.test.referencing.TransformTestCase#assertMatrixEquals(Matrix, Matrix, Matrix, String)
      */
-    public static void assertMatrixEquals(final Matrix expected, final Matrix actual, final double tolerance, final String message) {
-        if (isNull(expected, actual, message)) {
+    public static void assertMatrixEquals(final Matrix expected, final Matrix actual, final double tolerance, final String label) {
+        if (isNull(expected, actual, label)) {
             return;
         }
         final int numRow = actual.getNumRow();
@@ -427,7 +442,7 @@ public static void assertMatrixEquals(final Matrix expected, final Matrix actual
                 final double e = expected.getElement(j,i);
                 final double a = actual.getElement(j,i);
                 if (!(StrictMath.abs(e - a) <= tolerance) && Double.doubleToLongBits(a) != Double.doubleToLongBits(e)) {
-                    fail(nonNull(message) + "Matrix.getElement(" + j + ", " + i + "): expected " + e + " but got " + a);
+                    fail(nonNull(label) + "Matrix.getElement(" + j + ", " + i + "): expected " + e + " but got " + a);
                 }
             }
         }

geoapi/src/main/java/org/opengis/util/Record.java

@@ -99,20 +99,6 @@ default Map<MemberName, Object> getAttributes() {
         return getFields();
     }
 
-    /**
-     * Returns the value for a field of the specified name.
-     *
-     * @param  name  the name of the field to lookup.
-     * @return the value of the field for the given name.
-     *
-     * @deprecated This method has been removed from the ISO 19103:2015 standard. It has been kept in GeoAPI
-     *             for convenience, but renamed {@link #get(MemberName)} for consistency with common practice.
-     */
-    @Deprecated(since="3.1")
-    default Object locate(MemberName name) {
-        return get(name);
-    }
-
     /**
      * Returns the value for a field of the specified name.
      * This is functionally equivalent to the following code:
@@ -128,15 +114,9 @@ default Object locate(MemberName name) {
      * @return the value of the field for the given name.
      *
      * @see RecordType#locate(MemberName)
-     *
-     * @departure historic
-     *   This method was named {@code locate} in ISO 19103:2005 and removed in ISO 19103:2015.
-     *   It has been kept in GeoAPI as a convenience shortcut for a frequently used operation.
-     *
-     * @since 3.1
      */
     @UML(identifier="locate", obligation=MANDATORY, specification=ISO_19103, version=2005)
-    default Object get(MemberName name) {
+    default Object locate(MemberName name) {
         return getFields().get(name);
     }
 

geoapi/src/main/java/org/opengis/util/RecordType.java

@@ -189,7 +189,7 @@ default Set<MemberName> getMembers() {
      *   as a shortcut to other methods.
      *
      * @see #getFieldTypes()
-     * @see Record#get(MemberName)
+     * @see Record#locate(MemberName)
      */
     @UML(identifier="locate", obligation=MANDATORY, specification=ISO_19103, version=2005)
     default TypeName locate(MemberName name) {