sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-3.1'
Date Tue, 11 Jun 2019 15:24:50 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit ef457070610e26f4e063468057857fc5880c22e8
Merge: 069e51b 906814a
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Jun 11 17:24:00 2019 +0200

    Merge branch 'geoapi-3.1'

 .../org/apache/sis/console/IdentifierCommand.java  |   6 +-
 .../org/apache/sis/console/TransformCommand.java   |  18 +-
 .../apache/sis/console/IdentifierState.properties  |   2 +-
 .../sis/console/IdentifierState_fr.properties      |   2 +-
 .../org/apache/sis/openoffice/Transformer.java     |   4 +-
 .../sis/coverage/grid/GridCoordinatesView.java     |  18 +-
 .../java/org/apache/sis/internal/feature/ESRI.java |   8 +-
 .../apache/sis/internal/feature/Geometries.java    |  18 +-
 .../java/org/apache/sis/internal/feature/JTS.java  |  10 +-
 .../org/apache/sis/internal/feature/Java2D.java    |  14 +-
 .../apache/sis/internal/feature/MovingFeature.java |   4 +-
 .../org/apache/sis/internal/feature/Resources.java |   4 +-
 .../sis/internal/feature/Resources.properties      |   2 +-
 .../sis/internal/feature/Resources_fr.properties   |   2 +-
 .../sis/coverage/grid/GridDerivationTest.java      |   2 +-
 .../sis/internal/metadata/ReferencingServices.java |   4 +-
 .../iso/extent/DefaultGeographicBoundingBox.java   |   4 +-
 .../main/java/org/apache/sis/xml/NilReason.java    |   2 +-
 .../java/org/apache/sis/xml/NilReasonTest.java     |   4 +-
 .../gazetteer/GeohashReferenceSystem.java          |   4 +-
 .../gazetteer/MilitaryGridReferenceSystem.java     |   6 +-
 .../sis/referencing/gazetteer/SimpleLocation.java  |   8 +-
 .../sis/geometry/AbstractDirectPosition.java       |  63 +++--
 .../org/apache/sis/geometry/AbstractEnvelope.java  |  80 +++---
 .../org/apache/sis/geometry/ArrayEnvelope.java     | 146 +++++------
 .../org/apache/sis/geometry/CoordinateFormat.java  |  56 ++---
 .../org/apache/sis/geometry/CurveExtremum.java     |   8 +-
 .../org/apache/sis/geometry/DirectPosition1D.java  |  50 ++--
 .../org/apache/sis/geometry/DirectPosition2D.java  |  32 +--
 .../java/org/apache/sis/geometry/Envelope2D.java   |  86 +++----
 .../java/org/apache/sis/geometry/Envelopes.java    |  57 +++--
 .../apache/sis/geometry/GeneralDirectPosition.java | 145 ++++++-----
 .../org/apache/sis/geometry/GeneralEnvelope.java   | 268 ++++++++++-----------
 .../org/apache/sis/geometry/ImmutableEnvelope.java |  14 +-
 .../java/org/apache/sis/geometry/Shapes2D.java     |  16 +-
 .../java/org/apache/sis/geometry/SubEnvelope.java  |  54 ++---
 .../java/org/apache/sis/geometry/package-info.java |   2 +-
 .../internal/referencing/CoordinateOperations.java |   2 +-
 .../internal/referencing/DefinitionVerifier.java   |  16 +-
 .../internal/referencing/DirectPositionView.java   |  60 ++---
 .../internal/referencing/EPSGParameterDomain.java  |   2 +-
 .../apache/sis/internal/referencing/Formulas.java  |  26 +-
 .../internal/referencing/PositionTransformer.java  |   2 +-
 .../internal/referencing/ServicesForMetadata.java  |   4 +-
 .../referencing/j2d/IntervalRectangle.java         |  76 +++---
 .../sis/parameter/DefaultParameterValueGroup.java  |   2 +-
 .../parameter/UnmodifiableParameterValueGroup.java |   2 +-
 .../java/org/apache/sis/parameter/Verifier.java    |   2 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |   6 +-
 .../apache/sis/referencing/IdentifiedObjects.java  |   4 +-
 .../sis/referencing/crs/DefaultDerivedCRS.java     |   2 +-
 .../sis/referencing/crs/DefaultProjectedCRS.java   |   2 +-
 .../apache/sis/referencing/cs/AxesConvention.java  |   6 +-
 .../cs/DefaultCoordinateSystemAxis.java            |   8 +-
 .../apache/sis/referencing/cs/DefaultLinearCS.java |   2 +-
 .../org/apache/sis/referencing/cs/Normalizer.java  |   6 +-
 .../sis/referencing/datum/DefaultEllipsoid.java    |   4 +-
 .../factory/IdentifiedObjectFinder.java            |   6 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |   2 +-
 .../operation/AbstractCoordinateOperation.java     |   8 +-
 .../operation/CoordinateOperationFinder.java       |   6 +-
 .../operation/CoordinateOperationRegistry.java     |  10 +-
 .../operation/DefaultPassThroughOperation.java     |  16 +-
 .../sis/referencing/operation/matrix/Matrices.java |  28 +--
 .../referencing/operation/matrix/MatrixSIS.java    |  20 +-
 .../operation/matrix/NonSquareMatrix.java          |  16 +-
 .../sis/referencing/operation/matrix/Solver.java   |   2 +-
 .../projection/LambertConicConformal.java          |  12 +-
 .../operation/projection/NormalizedProjection.java |   8 +-
 .../operation/projection/package-info.java         |   2 +-
 .../transform/AbstractLinearTransform.java         |   6 +-
 .../operation/transform/AbstractMathTransform.java |  38 +--
 .../transform/AbstractMathTransform1D.java         |  28 +--
 .../operation/transform/ContextualParameters.java  |   4 +-
 .../operation/transform/CopyTransform.java         |  10 +-
 .../transform/DefaultMathTransformFactory.java     |  10 +-
 .../transform/InterpolatedGeocentricTransform.java |   2 +-
 .../transform/InterpolatedMolodenskyTransform.java |   2 +-
 .../operation/transform/IterationStrategy.java     |   4 +-
 .../operation/transform/LinearTransform.java       |   2 +-
 .../operation/transform/MathTransforms.java        |   4 +-
 .../operation/transform/MolodenskyTransform.java   |   4 +-
 .../operation/transform/PassThroughTransform.java  |   2 +-
 .../operation/transform/ProjectiveTransform.java   |   4 +-
 .../operation/transform/ScaleTransform.java        |   6 +-
 .../operation/transform/TranslationTransform.java  |   4 +-
 .../apache/sis/geometry/AbstractEnvelopeTest.java  |  14 +-
 .../org/apache/sis/geometry/ArrayEnvelopeTest.java |  12 +-
 .../apache/sis/geometry/CoordinateFormatTest.java  |   4 +-
 .../apache/sis/geometry/DirectPosition1DTest.java  |   4 +-
 .../apache/sis/geometry/DirectPosition2DTest.java  |   6 +-
 .../org/apache/sis/geometry/EnvelopesTest.java     |   4 +-
 .../sis/geometry/GeneralDirectPositionTest.java    |   6 +-
 .../apache/sis/geometry/GeneralEnvelopeTest.java   |  14 +-
 .../org/apache/sis/geometry/SubEnvelopeTest.java   |  30 +--
 .../sis/internal/referencing/FormulasTest.java     |  12 -
 .../provider/CoordinateFrameRotationTest.java      |   2 +-
 .../provider/GeocentricTranslationTest.java        |   2 +-
 .../provider/GeographicOffsetsTest.java            |   2 +-
 .../provider/PositionVector7ParamTest.java         |   2 +-
 .../parameter/DefaultParameterValueGroupTest.java  |   2 +-
 .../referencing/crs/DefaultProjectedCRSTest.java   |   2 +-
 .../apache/sis/referencing/cs/HardCodedAxes.java   |  44 ++--
 .../referencing/datum/TimeDependentBWPTest.java    |   2 +-
 .../operation/CoordinateOperationFinderTest.java   |   2 +-
 .../DefaultCoordinateOperationFactoryTest.java     |   2 +-
 .../operation/HardCodedConversions.java            |   6 +-
 .../builder/LinearTransformBuilderTest.java        |   4 +-
 .../referencing/operation/matrix/MatricesTest.java |   2 +-
 .../operation/projection/AlbersEqualAreaTest.java  |  18 +-
 .../projection/CylindricalEqualAreaTest.java       |   4 +-
 .../projection/LambertConicConformalTest.java      |   2 +-
 .../projection/MapProjectionTestCase.java          |   2 +-
 .../operation/projection/MercatorTest.java         |   2 +-
 .../operation/projection/MollweideTest.java        |   4 +-
 .../operation/projection/ObliqueMercatorTest.java  |   2 +-
 .../projection/ObliqueStereographicTest.java       |   2 +-
 .../projection/PolarStereographicTest.java         |   4 +-
 .../operation/projection/PolyconicTest.java        |   4 +-
 .../operation/projection/SinusoidalTest.java       |   4 +-
 .../projection/TransverseMercatorTest.java         |   4 +-
 .../transform/AbridgedMolodenskyTransformTest.java |   2 +-
 .../transform/AbstractMathTransformTest.java       |   2 +-
 .../operation/transform/CoordinateDomain.java      |  66 ++---
 .../operation/transform/CoordinateDomainTest.java  |   6 +-
 .../operation/transform/CopyTransformTest.java     |   2 +-
 .../transform/EllipsoidToCentricTransformTest.java |   8 +-
 .../InterpolatedGeocentricTransformTest.java       |   4 +-
 .../transform/MolodenskyTransformTest.java         |   2 +-
 .../operation/transform/PseudoTransform.java       |   2 +-
 .../org/apache/sis/test/ReferencingAssert.java     |  12 +-
 .../org/apache/sis/internal/util/Numerics.java     |   6 +-
 .../apache/sis/math/CompoundDirectPositions.java   |  26 +-
 .../src/main/java/org/apache/sis/math/Line.java    |  34 ++-
 .../src/main/java/org/apache/sis/math/Plane.java   |  27 ++-
 .../main/java/org/apache/sis/measure/Latitude.java |   4 +-
 .../org/apache/sis/measure/LinearConverter.java    |   2 +-
 .../java/org/apache/sis/measure/Longitude.java     |   4 +-
 .../java/org/apache/sis/util/ComparisonMode.java   |  42 +++-
 .../org/apache/sis/util/LenientComparable.java     |  12 +-
 .../main/java/org/apache/sis/util/Utilities.java   |  20 +-
 .../java/org/apache/sis/util/resources/Errors.java |  10 +-
 .../apache/sis/util/resources/Errors.properties    |   2 +-
 .../apache/sis/util/resources/Errors_fr.properties |   2 +-
 .../org/apache/sis/internal/util/NumericsTest.java |  20 +-
 .../src/test/java/org/apache/sis/test/Assert.java  |  18 +-
 .../java/org/apache/sis/test/TestUtilities.java    |   4 +-
 .../storage/earthobservation/LandsatReader.java    |   6 +-
 .../src/main/c/org_apache_sis_storage_gdal_PJ.c    |   4 +-
 .../sis/storage/geotiff/GridGeometryBuilder.java   |   6 +-
 .../apache/sis/storage/geotiff/Localization.java   |  12 +-
 .../apache/sis/internal/netcdf/impl/GridInfo.java  |  60 ++++-
 .../sis/internal/netcdf/ucar/GridWrapper.java      |   2 +-
 .../sis/internal/storage/MetadataBuilder.java      |  10 +-
 .../org/apache/sis/internal/storage/csv/Store.java |   2 +-
 .../apache/sis/internal/storage/folder/Store.java  |   3 -
 .../sis/internal/storage/io/ChannelFactory.java    |  31 ++-
 .../org/apache/sis/storage/StorageConnector.java   |   2 +-
 .../sis/storage/UnsupportedStorageException.java   |  25 +-
 159 files changed, 1290 insertions(+), 1167 deletions(-)

diff --cc core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
index 92027c0,efbb0ab..26b815e
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
@@@ -56,23 -54,26 +56,23 @@@ final class GridCoordinatesView 
      /**
       * Returns the number of dimension.
       */
 -    @Override
      public final int getDimension() {
-         return ordinates.length >>> 1;
+         return coordinates.length >>> 1;
      }
  
      /**
       * Returns all coordinate values.
       */
 -    @Override
      public final long[] getCoordinateValues() {
-         return Arrays.copyOfRange(ordinates, offset, offset + getDimension());
+         return Arrays.copyOfRange(coordinates, offset, offset + getDimension());
      }
  
      /**
       * Returns the coordinate value for the specified dimension.
       */
 -    @Override
      public final long getCoordinateValue(final int index) {
          ArgumentChecks.ensureValidIndex(getDimension(), index);
-         return ordinates[offset + index];
+         return coordinates[offset + index];
      }
  
      /**
diff --cc core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
index 1ef6fa7,b176415..b269e39
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
@@@ -628,16 -641,11 +628,16 @@@ public class MilitaryGridReferenceSyste
           * Decodes the given MGRS reference into a position and an envelope.
           * The Coordinate Reference System (CRS) associated to the returned position depends
on the given reference.
           *
 +         * <div class="warning"><b>Upcoming API change — generalization</b><br>
 +         * in a future SIS version, the type of returned element may be generalized
 +         * to the {@code org.opengis.referencing.gazetteer.Location} interface.
 +         * This change is pending GeoAPI revision.</div>
 +         *
           * @param  reference  MGRS string to decode.
-          * @return a new position with the longitude at ordinate 0 and latitude at ordinate
1.
+          * @return a new position with the longitude at coordinate 0 and latitude at coordinate
1.
           * @throws TransformException if an error occurred while parsing the given string.
           */
 -        public Location decode(final CharSequence reference) throws TransformException {
 +        public AbstractLocation decode(final CharSequence reference) throws TransformException
{
              ArgumentChecks.ensureNonEmpty("reference", reference);
              return new Decoder(this, reference);
          }
diff --cc core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
index 713d8bf,43b86db..822b0b6
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
@@@ -55,10 -55,10 +55,10 @@@ public strictfp class GeneralEnvelopeTe
       * This is set to {@code true} only when we intentionally want to create an invalid
envelope,
       * for example in order to test normalization.
       */
 -    boolean skipValidation;
 +    boolean skipValidation = !PENDING_NEXT_GEOAPI_RELEASE;
  
      /**
-      * Creates a new geographic envelope for the given ordinate values.
+      * Creates a new geographic envelope for the given coordinate values.
       * This method is overridden by {@link SubEnvelopeTest}.
       */
      GeneralEnvelope create(final double xmin, final double ymin, final double xmax, final
double ymax) {
diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
index e340a3c,f29d1fa..a30c1cc
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
@@@ -71,8 -72,9 +71,8 @@@ public final strictfp class AlbersEqual
                  0,          // False easting
                  0);         // False northing
  
-         final double delta = toRadians(100.0 / 60) / 1852;                  // Approximatively
100 metres.
+         final double delta = toRadians(100.0 / 60) / 1852;                  // Approximately
100 metres.
          derivativeDeltas = new double[] {delta, delta};
 -        toleranceModifier = ToleranceModifier.PROJECTION;
          tolerance = Formulas.LINEAR_TOLERANCE;
          final AlbersEqualArea kernel = (AlbersEqualArea) getKernel();
          assertTrue("isSpherical", isSpherical(kernel));
@@@ -119,8 -121,9 +119,8 @@@
                  0,          // False easting
                  0);         // False northing
  
-         final double delta = toRadians(100.0 / 60) / 1852;                  // Approximatively
100 metres.
+         final double delta = toRadians(100.0 / 60) / 1852;                  // Approximately
100 metres.
          derivativeDeltas = new double[] {delta, delta};
 -        toleranceModifier = ToleranceModifier.PROJECTION;
          tolerance = Formulas.LINEAR_TOLERANCE;
          final AlbersEqualArea kernel = (AlbersEqualArea) getKernel();
          assertFalse("isSpherical", isSpherical(kernel));
@@@ -241,10 -246,11 +241,10 @@@
                  200);       // False northing
  
          tolerance = Formulas.LINEAR_TOLERANCE;
-         final double delta = toRadians(100.0 / 60) / 1852;      // Approximatively 100 metres.
 -        toleranceModifier = ToleranceModifier.PROJECTION;
+         final double delta = toRadians(100.0 / 60) / 1852;      // Approximately 100 metres.
          derivativeDeltas = new double[] {delta, delta};
-         verifyInDomain(new double[] {-40, 10},                  // Minimal input ordinate
values
-                        new double[] {+40, 60},                  // Maximal input ordinate
values
+         verifyInDomain(new double[] {-40, 10},                  // Minimal input coordinate
values
+                        new double[] {+40, 60},                  // Maximal input coordinate
values
                         new int[]    {  5,  5},                  // Number of points to test
                         TestUtilities.createRandomNumberGenerator());
      }
diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
index 387a577,4998d6e..5000887
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
@@@ -162,7 -166,8 +162,7 @@@ public final strictfp class Cylindrical
                  200);       // False northing
  
          tolerance = Formulas.LINEAR_TOLERANCE;
-         final double delta = toRadians(100.0 / 60) / 1852;      // Approximatively 100 metres.
 -        toleranceModifier = ToleranceModifier.PROJECTION;
+         final double delta = toRadians(100.0 / 60) / 1852;      // Approximately 100 metres.
          derivativeDeltas = new double[] {delta, delta};
          verifyInDomain(CoordinateDomain.GEOGRAPHIC_SAFE, 0);
      }
diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
index 65d5467,f6c2339..164cecd
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
@@@ -132,10 -132,10 +132,10 @@@ public final strictfp class EllipsoidTo
          "testGeocentricToGeographic"
      })
      public void testRandomPoints() throws FactoryException, TransformException {
-         final double delta = toRadians(100.0 / 60) / 1852;          // Approximatively 100
metres
+         final double delta = toRadians(100.0 / 60) / 1852;          // Approximately 100
metres
          derivativeDeltas  = new double[] {delta, delta, 100};       // (Δλ, Δφ, Δh)
          tolerance         = Formulas.LINEAR_TOLERANCE;
 -        toleranceModifier = ToleranceModifier.PROJECTION;
 +//      toleranceModifier = ToleranceModifier.PROJECTION;
          createGeodeticConversion(CommonCRS.WGS84.ellipsoid(), true);
          verifyInDomain(CoordinateDomain.GEOGRAPHIC, 306954540);
      }


Mime
View raw message