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 bug fixes from branch 'geoapi-3.1'.
Date Mon, 03 Jun 2019 13:42:32 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 dffc143903ddd7beb1808962c7f12337d85d4f12
Merge: 6d188cf 5539286
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Mon Jun 3 15:41:28 2019 +0200

    Merge bug fixes from branch 'geoapi-3.1'.

 .../metadata/EllipsoidalHeightCombiner.java        |  15 +-
 .../apache/sis/coverage/grid/GridDerivation.java   |   2 +
 .../apache/sis/coverage/grid/ImageRenderer.java    |  64 +--
 .../referencing/GeodeticObjectBuilder.java         | 123 ++++-
 .../referencing/ReferencingFactoryContainer.java   |  14 +
 .../internal/referencing/ReferencingUtilities.java |  46 --
 .../sis/internal/referencing/j2d/Bezier.java       |  21 +-
 .../main/java/org/apache/sis/referencing/CRS.java  |   7 +-
 .../apache/sis/referencing/GeodeticCalculator.java |  46 +-
 .../sis/referencing/datum/AbstractDatum.java       |   2 +-
 .../referencing/factory/sql/EPSGCodeFinder.java    | 538 +++++++++++++++++++++
 .../referencing/factory/sql/EPSGDataAccess.java    | 285 +----------
 .../sis/referencing/factory/sql/TableInfo.java     |   4 +-
 .../operation/builder/LinearTransformBuilder.java  |  18 +-
 .../operation/builder/LocalizationGridBuilder.java |   5 +-
 .../operation/projection/ConformalProjection.java  |   2 +-
 .../sis/referencing/GeodeticCalculatorTest.java    |   4 +-
 .../main/java/org/apache/sis/util/Exceptions.java  |  25 +-
 src/main/config/logging.properties                 |  11 +-
 .../storage/earthobservation/LandsatReader.java    |  99 ++--
 .../org/apache/sis/storage/geotiff/CRSBuilder.java |   2 +-
 .../java/org/apache/sis/internal/netcdf/Axis.java  | 178 +++++--
 .../org/apache/sis/internal/netcdf/CRSBuilder.java |   3 +-
 .../org/apache/sis/internal/netcdf/Convention.java |  63 +--
 .../org/apache/sis/internal/netcdf/DataType.java   |   2 +-
 .../org/apache/sis/internal/netcdf/Decoder.java    |  82 +++-
 .../java/org/apache/sis/internal/netcdf/Grid.java  |  61 +--
 .../apache/sis/internal/netcdf/GridCacheKey.java   | 251 ++++++++++
 .../apache/sis/internal/netcdf/GridMapping.java    |  33 +-
 .../org/apache/sis/internal/netcdf/Linearizer.java |   2 +-
 .../java/org/apache/sis/internal/netcdf/Node.java  | 170 +++++--
 .../apache/sis/internal/netcdf/RasterResource.java |  28 +-
 .../org/apache/sis/internal/netcdf/Resources.java  |  10 +
 .../sis/internal/netcdf/Resources.properties       |   2 +
 .../sis/internal/netcdf/Resources_fr.properties    |   2 +
 .../sis/internal/netcdf/impl/ChannelDecoder.java   |  53 +-
 .../sis/internal/netcdf/impl/FeaturesInfo.java     |  18 +-
 .../sis/internal/netcdf/impl/VariableInfo.java     | 155 +-----
 .../sis/internal/netcdf/ucar/DecoderWrapper.java   |   2 +-
 .../sis/internal/netcdf/ucar/GroupWrapper.java     |   8 +-
 .../sis/internal/netcdf/ucar/VariableWrapper.java  |  67 ++-
 .../apache/sis/storage/netcdf/MetadataReader.java  |  26 +-
 .../org/apache/sis/internal/netcdf/GridTest.java   |  23 +-
 .../org/apache/sis/internal/netcdf/TestCase.java   |   2 +-
 .../apache/sis/internal/netcdf/VariableTest.java   |  47 +-
 .../sis/internal/netcdf/impl/VariableInfoTest.java |  13 -
 .../apache/sis/internal/storage/io/ByteWriter.java | 215 ++++++++
 .../sis/internal/storage/io/package-info.java      |   2 +-
 48 files changed, 1981 insertions(+), 870 deletions(-)

diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index 1a4d5d8,f5fdebe..3add962
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@@ -82,8 -82,8 +82,7 @@@ import org.apache.sis.internal.system.L
  import org.apache.sis.internal.system.Semaphores;
  import org.apache.sis.internal.util.Constants;
  import org.apache.sis.internal.util.CollectionsExt;
 -import org.apache.sis.internal.util.StandardDateFormat;
  import org.apache.sis.metadata.iso.ImmutableIdentifier;
- import org.apache.sis.metadata.iso.citation.Citations;
  import org.apache.sis.metadata.iso.citation.DefaultCitation;
  import org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
  import org.apache.sis.metadata.iso.extent.DefaultExtent;
@@@ -121,13 -119,7 +118,12 @@@ import org.apache.sis.measure.Units
  import static org.apache.sis.util.Utilities.equalsIgnoreMetadata;
  import static org.apache.sis.internal.util.StandardDateFormat.UTC;
  import static org.apache.sis.internal.referencing.ServicesForMetadata.CONNECTION;
- import static org.apache.sis.internal.metadata.NameToIdentifier.Simplifier.ESRI_DATUM_PREFIX;
  
 +// Branch-dependent imports
 +import org.apache.sis.internal.util.StandardDateFormat;
 +import org.apache.sis.referencing.cs.DefaultParametricCS;
 +import org.apache.sis.referencing.datum.DefaultParametricDatum;
 +
  
  /**
   * <cite>Data Access Object</cite> (DAO) creating geodetic objects from a JDBC
connection to an EPSG database.
diff --cc storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
index a291872,31dc007..c3d3240
--- a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
+++ b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
@@@ -896,9 -893,9 +893,9 @@@ final class LandsatReader extends Metad
       * @throws FactoryException if an error occurred while creating the Coordinate Reference
System.
       */
      final Metadata getMetadata() throws FactoryException {
-         metadata.addLanguage(Locale.ENGLISH, MetadataBuilder.Scope.METADATA);
-         metadata.addResourceScope(ScopeCode.valueOf("COVERAGE"), null);
-         metadata.addTopicCategory(TopicCategory.GEOSCIENTIFIC_INFORMATION);
+         addLanguage(Locale.ENGLISH, MetadataBuilder.Scope.METADATA);
 -        addResourceScope(ScopeCode.COVERAGE, null);
++        addResourceScope(ScopeCode.valueOf("COVERAGE"), null);
+         addTopicCategory(TopicCategory.GEOSCIENTIFIC_INFORMATION);
          try {
              flushSceneTime();
          } catch (DateTimeException e) {
diff --cc storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
index 5e14acf,63c55ca..e5c4859
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
@@@ -39,11 -44,9 +44,12 @@@ import org.apache.sis.util.logging.Perf
  import org.apache.sis.util.logging.WarningListeners;
  import org.apache.sis.internal.util.StandardDateFormat;
  import org.apache.sis.internal.system.DefaultFactories;
+ import org.apache.sis.internal.system.Modules;
  import org.apache.sis.internal.referencing.ReferencingFactoryContainer;
  
 +// Branch-dependent imports
 +import org.apache.sis.util.iso.DefaultNameFactory;
 +
  
  /**
   * The API used internally by Apache SIS for fetching variables and attribute values from
a netCDF file.
@@@ -136,11 -152,12 +155,12 @@@ public abstract class Decoder extends R
       */
      protected Decoder(final GeometryLibrary geomlib, final WarningListeners<DataStore>
listeners) {
          Objects.requireNonNull(listeners);
-         this.geomlib     = geomlib;
-         this.listeners   = listeners;
-         this.nameFactory = DefaultFactories.forBuildin(NameFactory.class, DefaultNameFactory.class);
-         this.datumCache  = new Datum[CRSBuilder.DATUM_CACHE_SIZE];
-         this.gridMapping = new HashMap<>();
+         this.geomlib      = geomlib;
+         this.listeners    = listeners;
 -        this.nameFactory  = DefaultFactories.forBuildin(NameFactory.class);
++        this.nameFactory  = DefaultFactories.forBuildin(NameFactory.class, DefaultNameFactory.class);
+         this.datumCache   = new Datum[CRSBuilder.DATUM_CACHE_SIZE];
+         this.gridMapping  = new HashMap<>();
+         localizationGrids = new HashMap<>();
      }
  
      /**
diff --cc storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
index fefbb68,f9781f6..5863eaf
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
@@@ -20,9 -22,10 +22,9 @@@ import org.opengis.parameter.ParameterV
  import org.apache.sis.storage.DataStoreException;
  import org.apache.sis.test.DependsOn;
  import org.apache.sis.test.DependsOnMethod;
 -import org.opengis.test.dataset.TestData;
  import org.junit.Test;
  
- import static org.junit.Assert.*;
+ import static org.opengis.test.Assert.*;
  import static org.apache.sis.test.TestUtilities.getSingleton;
  
  
diff --cc storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
index 14efed7,4bc4e4d..a945a82
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
@@@ -19,12 -19,9 +19,9 @@@ package org.apache.sis.internal.netcdf.
  import java.io.IOException;
  import org.apache.sis.internal.netcdf.Decoder;
  import org.apache.sis.internal.netcdf.VariableTest;
 +import org.apache.sis.internal.netcdf.TestData;
  import org.apache.sis.storage.DataStoreException;
  import org.apache.sis.test.DependsOn;
- import org.junit.Test;
- 
- import static org.junit.Assert.*;
 -import org.opengis.test.dataset.TestData;
  
  
  /**


Mime
View raw message