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-4.0' into geoapi-3.1. Contains work on netCDF and addition of two map projections.
Date Tue, 30 Apr 2019 14:25:08 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 27511738522da4a4915643efe7bc0332a58674db
Merge: 93dca74 b280070
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Apr 30 16:24:20 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1. Contains work on netCDF and addition of two
map projections.

 .../sis/internal/metadata/ReferencingServices.java |   2 +-
 .../sis/internal/simple/SimpleIdentifier.java      |  31 +-
 .../apache/sis/metadata/PropertyInformation.java   |   5 +-
 .../org/apache/sis/metadata/TreeTableView.java     |   2 +-
 .../iso/extent/DefaultSpatialTemporalExtent.java   |   4 +-
 .../sis/internal/simple/SimpleIdentifierTest.java  |  12 -
 .../org/apache/sis/internal/map/MapContext.java    |   2 +-
 .../org/apache/sis/coverage/grid/GridGeometry.java |  32 +-
 .../apache/sis/coverage/grid/PixelTranslation.java |  24 +-
 .../apache/sis/coverage/grid/GridGeometryTest.java |  33 +-
 .../internal/referencing/ReferencingUtilities.java |  18 +
 .../referencing/provider/MercatorSpherical.java    |   2 +-
 .../internal/referencing/provider/Polyconic.java   | 117 +++++++
 .../referencing/provider/PseudoPlateCarree.java    |  13 +-
 .../internal/referencing/provider/Sinusoidal.java  | 103 ++++++
 .../org/apache/sis/parameter/ParameterFormat.java  |   2 +-
 .../java/org/apache/sis/referencing/CommonCRS.java |  46 +--
 .../sis/referencing/EPSGFactoryFallback.java       | 186 +++++++---
 .../sis/referencing/StandardDefinitions.java       |  85 +++--
 .../java/org/apache/sis/referencing/cs/Codes.java  |   3 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |   2 +-
 .../operation/CoordinateOperationContext.java      |  12 +-
 .../operation/CoordinateOperationRegistry.java     |   2 +-
 .../referencing/operation/matrix/package-info.java |   4 +-
 .../operation/projection/AlbersEqualArea.java      |   4 +-
 .../operation/projection/ConformalProjection.java  | 200 ++++-------
 .../operation/projection/CylindricalEqualArea.java |   6 +-
 .../operation/projection/EqualAreaProjection.java  | 206 +++++------
 .../operation/projection/Initializer.java          |  12 +-
 .../projection/LambertConicConformal.java          |   4 +-
 .../referencing/operation/projection/Mercator.java |   4 +-
 .../operation/projection/MeridianArcBased.java     | 222 ++++++++++++
 .../operation/projection/NormalizedProjection.java |   2 +-
 .../operation/projection/ObliqueMercator.java      |   1 -
 .../operation/projection/ObliqueStereographic.java |   3 +-
 .../operation/projection/PolarStereographic.java   |   4 +-
 .../operation/projection/Polyconic.java            | 382 +++++++++++++++++++++
 .../operation/projection/Sinusoidal.java           | 240 +++++++++++++
 .../operation/projection/TransverseMercator.java   | 183 ++++++----
 .../operation/transform/MathTransforms.java        |  36 +-
 .../operation/transform/TranslationTransform.java  |   9 +
 ...g.opengis.referencing.operation.OperationMethod |   2 +
 .../org/apache/sis/geometry/TransformTestCase.java |   2 +-
 .../referencing/provider/ProvidersTest.java        |   4 +-
 .../java/org/apache/sis/referencing/CRSTest.java   |   4 +-
 .../sis/referencing/EPSGFactoryFallbackTest.java   |  38 +-
 .../sis/referencing/StandardDefinitionsTest.java   |  33 +-
 .../sis/referencing/cs/DefaultCartesianCSTest.java |   7 +-
 .../operation/CoordinateOperationFinderTest.java   |   4 +-
 .../operation/projection/AlbersEqualAreaTest.java  |  10 +-
 .../projection/ConformalProjectionTest.java        | 136 ++++----
 .../projection/EqualAreaProjectionTest.java        | 127 +++++++
 .../projection/LambertConicConformalTest.java      |   8 +-
 .../projection/MapProjectionTestCase.java          |  27 +-
 .../projection/MercatorMethodComparison.java       | 107 ++----
 .../operation/projection/MercatorTest.java         |   8 +-
 .../operation/projection/MeridianArcTest.java      | 263 ++++++++++++++
 .../sis/referencing/operation/projection/NoOp.java |   1 -
 .../projection/ObliqueStereographicTest.java       |   2 +-
 .../operation/projection/PolyconicTest.java        | 155 +++++++++
 .../operation/projection/SinusoidalTest.java       | 131 +++++++
 .../projection/TransverseMercatorTest.java         |   6 +-
 .../operation/projection/ZonedGridSystemTest.java  |   6 +-
 .../sis/test/suite/ReferencingTestSuite.java       |   4 +
 .../org/apache/sis/internal/util/Constants.java    |   6 -
 .../sis/internal/util/StandardDateFormat.java      |   2 +-
 .../java/org/apache/sis/util/ArgumentChecks.java   |   2 +-
 .../java/org/apache/sis/util/collection/Cache.java |   2 +-
 .../java/org/apache/sis/util/package-info.java     |   2 +-
 ide-project/NetBeans/nbproject/genfiles.properties |   2 +-
 ide-project/NetBeans/nbproject/project.xml         |   1 +
 profiles/sis-french-profile/pom.xml                |   2 +-
 .../apache/sis/internal/earth/netcdf/GCOM_C.java   | 266 +++++++++++---
 .../apache/sis/internal/earth/netcdf/GCOM_W.java   |  36 +-
 .../org/apache/sis/storage/gdal/TransformTest.java |   3 +-
 .../org/apache/sis/storage/geotiff/CRSBuilder.java |   2 +-
 .../org/apache/sis/internal/netcdf/CRSBuilder.java |  64 ++--
 .../org/apache/sis/internal/netcdf/Convention.java | 253 +++++++++++++-
 .../org/apache/sis/internal/netcdf/Decoder.java    |   8 +
 .../java/org/apache/sis/internal/netcdf/Grid.java  |   2 +-
 .../apache/sis/internal/netcdf/GridMapping.java    | 243 +++++++++++--
 .../apache/sis/internal/netcdf/NamedElement.java   |   2 +-
 .../java/org/apache/sis/internal/netcdf/Node.java  | 190 ++++++++++
 .../apache/sis/internal/netcdf/RasterResource.java |  41 ++-
 .../org/apache/sis/internal/netcdf/Resources.java  |   6 +
 .../sis/internal/netcdf/Resources.properties       |   1 +
 .../sis/internal/netcdf/Resources_fr.properties    |   1 +
 .../org/apache/sis/internal/netcdf/Variable.java   | 153 +--------
 .../sis/internal/netcdf/impl/ChannelDecoder.java   |  14 +-
 .../sis/internal/netcdf/impl/VariableInfo.java     |  18 +-
 .../sis/internal/netcdf/ucar/DecoderWrapper.java   |  17 +
 .../sis/internal/netcdf/ucar/GroupWrapper.java     |  78 +++++
 .../sis/internal/netcdf/ucar/VariableWrapper.java  |  26 +-
 .../sis/internal/storage/AbstractResource.java     |   4 +-
 .../sis/internal/storage/StoreUtilities.java       |   4 +-
 .../org/apache/sis/internal/storage/csv/Store.java |   6 +-
 .../sis/internal/storage/xml/package-info.java     |   2 +-
 .../main/java/org/apache/sis/storage/DataSet.java  |   4 +-
 .../apache/sis/storage/GridCoverageResource.java   |  12 +
 .../main/java/org/apache/sis/storage/Resource.java |   2 +-
 .../org/apache/sis/internal/storage/gpx/Store.java |   4 +-
 101 files changed, 3722 insertions(+), 1104 deletions(-)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
index 65be3d6,a264a9d..83a3547
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
@@@ -19,9 -19,8 +19,8 @@@ package org.apache.sis.internal.simple
  import java.util.Objects;
  import java.io.Serializable;
  import org.opengis.util.InternationalString;
 -import org.opengis.metadata.Identifier;
 +import org.opengis.referencing.ReferenceIdentifier;
  import org.opengis.metadata.citation.Citation;
- import org.apache.sis.internal.util.Citations;
  import org.apache.sis.util.CharSequences;
  import org.apache.sis.util.Classes;
  import org.apache.sis.util.Deprecable;
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 2a2e855,dbff901..cb2fa3c
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
  build.xml.data.CRC32=58e6b21c
  build.xml.script.CRC32=462eaba0
  build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=1e0174fb
 -nbproject/build-impl.xml.data.CRC32=8f8309b2
 -nbproject/build-impl.xml.script.CRC32=a7689f96
++nbproject/build-impl.xml.data.CRC32=86faa61f
 +nbproject/build-impl.xml.script.CRC32=aa8f5386
  nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48


Mime
View raw message