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 Wed, 17 Oct 2018 16:56:08 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 d816232521989fb617d6717b0ad2481624180522
Merge: 28a9f64 b30fc90
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Oct 17 18:55:28 2018 +0200

    Merge branch 'geoapi-3.1'.

 application/sis-openoffice/pom.xml                 |   6 +
 .../apache/sis/io/wkt/GeodeticObjectParser.java    |   2 +-
 .../org/apache/sis/coverage/grid/GridExtent.java   |  73 ++++--
 .../org/apache/sis/coverage/grid/GridGeometry.java | 281 ++++++++++++++-------
 .../apache/sis/coverage/grid/GridGeometryTest.java |  20 +-
 .../org/apache/sis/referencing/cs/AbstractCS.java  |   8 +-
 .../operation/AbstractCoordinateOperation.java     |   5 +-
 .../operation/matrix/GeneralMatrix.java            |   5 +-
 .../operation/projection/ObliqueMercator.java      |   2 +-
 .../sis/test/integration/ConsistencyTest.java      |  63 ++++-
 .../org/apache/sis/internal/util/Numerics.java     |  17 +-
 .../apache/sis/measure/SexagesimalConverter.java   |  20 +-
 .../main/java/org/apache/sis/measure/Units.java    |   2 +-
 .../main/java/org/apache/sis/util/Utilities.java   |   8 +-
 .../org/apache/sis/util/resources/Vocabulary.java  |  35 +++
 .../sis/util/resources/Vocabulary.properties       |   7 +
 .../sis/util/resources/Vocabulary_fr.properties    |   7 +
 .../sis/measure/SexagesimalConverterTest.java      |  13 +-
 pom.xml                                            |  15 +-
 .../org/apache/sis/internal/storage/csv/Store.java |   7 +-
 20 files changed, 449 insertions(+), 147 deletions(-)

diff --cc core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
index e4efea7,f4055a9..bdb1491
--- a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
+++ b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
@@@ -350,10 -359,10 +356,8 @@@ public class GridExtent implements Seri
       * @param  extent  the grid envelope to copy.
       * @throws IllegalArgumentException if a coordinate value in the low part is
       *         greater than the corresponding coordinate value in the high part.
--     *
--     * @see #castOrCopy(GridEnvelope)
       */
 -    protected GridExtent(final GridEnvelope extent) {
 +    protected GridExtent(final GridExtent extent) {
          ArgumentChecks.ensureNonNull("extent", extent);
          final int dimension = extent.getDimension();
          ordinates = allocate(dimension);
diff --cc pom.xml
index c96bd69,d151b45..2560cd9
--- a/pom.xml
+++ b/pom.xml
@@@ -513,8 -524,8 +524,8 @@@
      <maven.compiler.source>8</maven.compiler.source>
      <maven.compiler.target>8</maven.compiler.target>
      <sis.plugin.version>${project.version}</sis.plugin.version>
-     <sis.non-free.version>0.8</sis.non-free.version>
+     <sis.non-free.version>1.0-M1</sis.non-free.version>
 -    <geoapi.version>3.1-SNAPSHOT</geoapi.version>
 +    <geoapi.version>3.0.1</geoapi.version>
    </properties>
  
    <profiles>


Mime
View raw message