You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/02/19 09:50:41 UTC
[sis] 02/02: Move `WraparoundAdjustment` to public API.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 2cdd8ef1d5268c2f87eae5e4584ea9e31fe3ce9e
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Feb 19 10:46:36 2022 +0100
Move `WraparoundAdjustment` to public API.
---
.../java/org/apache/sis/coverage/grid/GridDerivation.java | 1 +
.../java/org/apache/sis/coverage/grid/GridDerivationTest.java | 2 +-
.../test/java/org/apache/sis/test/suite/FeatureTestSuite.java | 1 -
.../java/org/apache/sis/geometry}/WraparoundAdjustment.java | 11 +++--------
.../org/apache/sis/geometry}/WraparoundAdjustmentTest.java | 4 +---
.../java/org/apache/sis/test/suite/ReferencingTestSuite.java | 1 +
6 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
index 012d716..0ec274e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
@@ -38,6 +38,7 @@ import org.apache.sis.internal.referencing.DirectPositionView;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.Envelopes;
+import org.apache.sis.geometry.WraparoundAdjustment;
import org.apache.sis.internal.feature.Resources;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.resources.Errors;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
index 9573e5c..54d27cf 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
@@ -60,7 +60,7 @@ import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
* @since 1.0
* @module
*/
-@DependsOn({GridGeometryTest.class, WraparoundAdjustmentTest.class})
+@DependsOn(GridGeometryTest.class)
public final strictfp class GridDerivationTest extends TestCase {
/**
* Tests {@link GridDerivation#subgrid(Envelope, double...)} using only the
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
index 190d833..eaa9d26 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
@@ -108,7 +108,6 @@ import org.junit.runners.Suite;
org.apache.sis.coverage.SampleDimensionTest.class,
org.apache.sis.coverage.SampleRangeFormatTest.class,
org.apache.sis.coverage.grid.PixelTranslationTest.class,
- org.apache.sis.coverage.grid.WraparoundAdjustmentTest.class,
org.apache.sis.coverage.grid.GridOrientationTest.class,
org.apache.sis.coverage.grid.GridExtentTest.class,
org.apache.sis.coverage.grid.GridGeometryTest.class,
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/WraparoundAdjustment.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundAdjustment.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/coverage/grid/WraparoundAdjustment.java
rename to core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundAdjustment.java
index a089757..94aed8e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/WraparoundAdjustment.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundAdjustment.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.coverage.grid;
+package org.apache.sis.geometry;
import org.opengis.geometry.DirectPosition;
import org.opengis.geometry.Envelope;
@@ -29,11 +29,6 @@ import org.opengis.metadata.extent.GeographicBoundingBox;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.CRS;
import org.apache.sis.math.MathFunctions;
-import org.apache.sis.geometry.Envelopes;
-import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.geometry.GeneralDirectPosition;
-import org.apache.sis.geometry.ImmutableEnvelope;
-import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.internal.metadata.ReferencingServices;
import org.apache.sis.internal.referencing.ReferencingUtilities;
import org.apache.sis.internal.referencing.WraparoundApplicator;
@@ -53,10 +48,10 @@ import org.apache.sis.util.Utilities;
*
* @author Martin Desruisseaux (Geomatys)
* @version 1.2
- * @since 1.0
+ * @since 1.2
* @module
*/
-final class WraparoundAdjustment {
+public class WraparoundAdjustment {
/**
* The region inside which a given Area Of Interest (AOI) or Point Of Interest (POI) should be located.
* This domain is specified at construction time and does not change.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/WraparoundAdjustmentTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
similarity index 98%
rename from core/sis-feature/src/test/java/org/apache/sis/coverage/grid/WraparoundAdjustmentTest.java
rename to core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
index 48e4bec..09c45fe 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/WraparoundAdjustmentTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.coverage.grid;
+package org.apache.sis.geometry;
import org.opengis.geometry.Envelope;
import org.opengis.geometry.DirectPosition;
@@ -23,8 +23,6 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.crs.DefaultProjectedCRS;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
-import org.apache.sis.geometry.DirectPosition2D;
-import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.test.TestCase;
import org.junit.Test;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
index c10aaea..22a2526 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
@@ -291,6 +291,7 @@ import org.junit.BeforeClass;
org.apache.sis.internal.referencing.ServicesForMetadataTest.class,
org.apache.sis.internal.referencing.EllipsoidalHeightCombinerTest.class,
org.apache.sis.geometry.CoordinateFormatTest.class,
+ org.apache.sis.geometry.WraparoundAdjustmentTest.class,
org.apache.sis.test.integration.CoordinateReferenceSystemTest.class,
org.apache.sis.test.integration.CoordinateOperationTest.class,
org.apache.sis.test.integration.DatumShiftTest.class,