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 dff7ab60bc17cf7220dcd7b35dacc52df6a5a214
Merge: 6b507d7cbd a143312778
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Oct 13 22:00:55 2022 +0200
Merge branch 'geoapi-3.1'
.../apache/sis/gui/coverage/CoverageCanvas.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureList.java | 3 +-
.../java/org/apache/sis/gui/map/MapCanvas.java | 3 +-
.../java/org/apache/sis/gui/map/StatusBar.java | 2 +-
.../org/apache/sis/gui/map/ValuesUnderCursor.java | 4 +-
.../apache/sis/coverage/grid/DimensionReducer.java | 2 +-
.../apache/sis/coverage/grid/GridCoverage2D.java | 4 +-
.../sis/coverage/grid/GridCoverageProcessor.java | 32 ++++-
.../apache/sis/coverage/grid/GridDerivation.java | 12 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 31 +++--
.../org/apache/sis/coverage/grid/GridGeometry.java | 49 ++++++--
.../sis/coverage/grid/ResampledGridCoverage.java | 7 +-
.../apache/sis/coverage/grid/SliceGeometry.java | 8 +-
.../sis/coverage/grid/TranslatedGridCoverage.java | 2 +-
.../internal/coverage/j2d/ColorModelFactory.java | 53 ++++++--
.../sis/internal/coverage/j2d/ColorModelType.java | 17 ++-
.../sis/internal/coverage/j2d/ColorsForRange.java | 31 ++++-
.../internal/coverage/j2d/DeferredProperty.java | 2 +-
.../sis/internal/coverage/j2d/package-info.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 8 +-
.../apache/sis/coverage/grid/GridGeometryTest.java | 22 ++--
.../coverage/grid/ResampledGridCoverageTest.java | 2 +-
.../coverage/grid/TranslatedGridCoverageTest.java | 2 +-
.../iso/extent/DefaultGeographicBoundingBox.java | 2 +-
.../org/apache/sis/metadata/sql/Citations.sql | 6 +-
.../main/java/org/apache/sis/portrayal/Canvas.java | 2 +-
.../referencing/GeodeticObjectBuilder.java | 137 +++++++++++++++++----
.../referencing/provider/AlbersEqualArea.java | 2 +-
.../referencing/provider/CassiniSoldner.java | 2 +-
.../sis/internal/referencing/provider/ESRI.java | 13 +-
.../provider/HyperbolicCassiniSoldner.java | 2 +-
.../provider/LambertAzimuthalEqualArea.java | 2 +-
.../LambertAzimuthalEqualAreaSpherical.java | 2 +-
.../internal/referencing/provider/Mollweide.java | 3 +
.../internal/referencing/provider/Molodensky.java | 2 +-
.../provider/ObliqueMercatorTwoPoints.java | 2 +-
.../provider/ObliqueMercatorTwoPointsCenter.java | 2 +-
.../internal/referencing/provider/Polyconic.java | 2 +-
.../referencing/provider/SatelliteTracking.java | 4 +
.../internal/referencing/provider/Sinusoidal.java | 3 +
.../main/java/org/apache/sis/referencing/CRS.java | 26 +++-
.../factory/CommonAuthorityFactory.java | 2 +-
.../factory/GeodeticAuthorityFactory.java | 4 +-
.../operation/transform/InterpolatedTransform.java | 8 +-
.../referencing/GeodeticObjectBuilderTest.java | 61 +++++++++
.../java/org/apache/sis/referencing/CRSTest.java | 36 +++---
.../sis/test/suite/ReferencingTestSuite.java | 1 +
.../org/apache/sis/internal/util/AbstractMap.java | 2 +-
.../main/java/org/apache/sis/util/Exceptions.java | 24 ++--
.../sis/util/collection/BackingStoreException.java | 3 +-
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml | 8 +-
.../apache/sis/internal/earth/netcdf/GCOM_C.java | 68 +++++++---
.../apache/sis/internal/earth/netcdf/GCOM_W.java | 4 +-
.../apache/sis/storage/landsat/MetadataReader.java | 2 +-
.../org/apache/sis/internal/netcdf/Convention.java | 6 +-
.../java/org/apache/sis/internal/netcdf/Node.java | 29 +++--
.../apache/sis/internal/netcdf/RasterResource.java | 25 ++--
.../org/apache/sis/internal/netcdf/Variable.java | 6 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 4 +-
.../sis/storage/netcdf/NetcdfStoreProvider.java | 20 ++-
.../apache/sis/internal/netcdf/VariableTest.java | 4 +-
.../sis/internal/storage/StoreUtilities.java | 6 +
.../sis/internal/storage/image/WritableStore.java | 2 +-
64 files changed, 634 insertions(+), 207 deletions(-)
diff --cc
application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
index da16811fc3,f3d57a34c3..db83419008
---
a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
+++
b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
@@@ -22,6 -22,8 +22,7 @@@ import java.util.Collections
import java.util.Spliterator;
import javafx.application.Platform;
import javafx.collections.ObservableListBase;
+ import javafx.concurrent.Worker;
-import org.opengis.feature.Feature;
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.internal.gui.BackgroundThreads;
import org.apache.sis.internal.util.UnmodifiableArrayList;
diff --cc
core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
index fe8bf53828,9d0f41cfba..08aacebb5a
---
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
@@@ -597,8 -634,9 +597,8 @@@ public class GridExtent implements Seri
*
* @return the number of dimensions.
*
- * @see #reduceDimension(int[])
+ * @see #selectDimensions(int[])
*/
- @Override
public final int getDimension() {
return coordinates.length >>> 1;
}
diff --cc
core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java
index 0000000000,f914360b5a..ad6c4e63d4
mode 000000,100644..100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java
@@@ -1,0 -1,61 +1,61 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package org.apache.sis.internal.referencing;
+
+ import java.util.function.BiConsumer;
+ import org.opengis.util.FactoryException;
+ import org.opengis.referencing.cs.AxisDirection;
+ import org.opengis.referencing.crs.ProjectedCRS;
+ import org.opengis.parameter.ParameterValueGroup;
+ import org.apache.sis.measure.Units;
+ import org.apache.sis.test.TestCase;
+ import org.junit.Test;
+
+ import static org.junit.Assert.*;
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
++import static org.apache.sis.test.Assert.assertAxisDirectionsEqual;
+
+
+ /**
+ * Tests {@link GeodeticObjectBuilder}.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.3
+ * @since 1.3
+ * @module
+ */
+ public final strictfp class GeodeticObjectBuilderTest extends TestCase {
+ /**
+ * Tests {@link GeodeticObjectBuilder#changeConversion(String,
BiConsumer)}.
+ *
+ * @throws FactoryException if an operation method name is not supported.
+ */
+ @Test
+ public void testChangeConversion() throws FactoryException {
+ final GeodeticObjectBuilder b = new GeodeticObjectBuilder();
+ assertSame(b, b.setConversionName("Dummy projection"));
+ assertSame(b, b.setConversionMethod("Popular Visualisation Pseudo
Mercator"));
+ assertSame(b, b.setParameter("Longitude of natural origin", 40,
Units.DEGREE));
+ assertSame(b, b.setParameter("Scale factor at natural origin", 0.5,
Units.UNITY));
+ assertSame(b, b.changeConversion("Mercator (Spherical)", null));
+ final ProjectedCRS crs =
b.setNormalizedAxisOrder(true).createProjectedCRS();
+ final ParameterValueGroup p =
crs.getConversionFromBase().getParameterValues();
+ assertEquals(40, p.parameter("Longitude of natural
origin").doubleValue(), STRICT);
+ assertEquals(0.5, p.parameter("Scale factor at natural
origin").doubleValue(), STRICT);
+ assertAxisDirectionsEqual("baseCRS",
crs.getBaseCRS().getCoordinateSystem(),
+ AxisDirection.EAST, AxisDirection.NORTH);
+ }
+ }
