From 4962e2b73ddae781827af7449e148058ee747541 Mon Sep 17 00:00:00 2001
From: Luc Maisonobe <luc@orekit.org>
Date: Thu, 22 May 2014 17:21:19 +0200
Subject: [PATCH] Moved TileUpdate to raster package.
---
.../main/java/org/orekit/rugged/geotiff/AsterTileUpdater.java | 4 ++--
src/main/java/org/orekit/rugged/api/Rugged.java | 1 +
.../org/orekit/rugged/intersection/BasicScanAlgorithm.java | 2 +-
.../rugged/intersection/duvenhage/DuvenhageAlgorithm.java | 2 +-
src/main/java/org/orekit/rugged/raster/Tile.java | 1 -
.../java/org/orekit/rugged/{api => raster}/TileUpdater.java | 4 +++-
src/main/java/org/orekit/rugged/raster/TilesCache.java | 1 -
.../java/org/orekit/rugged/{api => raster}/UpdatableTile.java | 4 +++-
src/test/java/org/orekit/rugged/api/RuggedTest.java | 1 +
.../org/orekit/rugged/intersection/AbstractAlgorithmTest.java | 2 +-
.../orekit/rugged/intersection/BasicScanAlgorithmTest.java | 2 +-
.../rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java | 2 +-
.../orekit/rugged/raster/CheckedPatternElevationUpdater.java | 2 --
.../java/org/orekit/rugged/raster/CliffsElevationUpdater.java | 2 --
.../java/org/orekit/rugged/raster/RandomLandscapeUpdater.java | 2 --
.../orekit/rugged/raster/VolcanicConeElevationUpdater.java | 2 --
16 files changed, 15 insertions(+), 19 deletions(-)
rename src/main/java/org/orekit/rugged/{api => raster}/TileUpdater.java (95%)
rename src/main/java/org/orekit/rugged/{api => raster}/UpdatableTile.java (96%)
diff --git a/geotiff/src/main/java/org/orekit/rugged/geotiff/AsterTileUpdater.java b/geotiff/src/main/java/org/orekit/rugged/geotiff/AsterTileUpdater.java
index 87542898..93e2c83e 100644
--- a/geotiff/src/main/java/org/orekit/rugged/geotiff/AsterTileUpdater.java
+++ b/geotiff/src/main/java/org/orekit/rugged/geotiff/AsterTileUpdater.java
@@ -36,8 +36,8 @@ import org.apache.commons.imaging.formats.tiff.constants.GeoTiffTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.apache.commons.math3.util.FastMath;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.api.UpdatableTile;
+import org.orekit.rugged.raster.TileUpdater;
+import org.orekit.rugged.raster.UpdatableTile;
/** Digital Elevation Model Updater using Aster data.
* @author Luc Maisonobe
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index 86b9a2a1..b8b1db70 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -43,6 +43,7 @@ import org.orekit.rugged.intersection.BasicScanAlgorithm;
import org.orekit.rugged.intersection.IgnoreDEMAlgorithm;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.intersection.duvenhage.DuvenhageAlgorithm;
+import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
diff --git a/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
index dd6b6a76..99e2cc4c 100644
--- a/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
@@ -24,10 +24,10 @@ import org.apache.commons.math3.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.raster.SimpleTile;
import org.orekit.rugged.raster.SimpleTileFactory;
import org.orekit.rugged.raster.Tile;
+import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.TilesCache;
import org.orekit.rugged.utils.ExtendedEllipsoid;
diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
index f406aef4..1429fdcd 100644
--- a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
@@ -22,9 +22,9 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.api.RuggedMessages;
-import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.raster.Tile;
+import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.TilesCache;
import org.orekit.rugged.utils.ExtendedEllipsoid;
diff --git a/src/main/java/org/orekit/rugged/raster/Tile.java b/src/main/java/org/orekit/rugged/raster/Tile.java
index 75e3ddc9..21d5547e 100644
--- a/src/main/java/org/orekit/rugged/raster/Tile.java
+++ b/src/main/java/org/orekit/rugged/raster/Tile.java
@@ -19,7 +19,6 @@ package org.orekit.rugged.raster;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.UpdatableTile;
/** Interface representing a raster tile.
* @author Luc Maisonobe
diff --git a/src/main/java/org/orekit/rugged/api/TileUpdater.java b/src/main/java/org/orekit/rugged/raster/TileUpdater.java
similarity index 95%
rename from src/main/java/org/orekit/rugged/api/TileUpdater.java
rename to src/main/java/org/orekit/rugged/raster/TileUpdater.java
index dd225359..c283f253 100644
--- a/src/main/java/org/orekit/rugged/api/TileUpdater.java
+++ b/src/main/java/org/orekit/rugged/raster/TileUpdater.java
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.api;
+package org.orekit.rugged.raster;
+
+import org.orekit.rugged.api.RuggedException;
/** Interface used to update Digital Elevation Model tiles.
* <p>
diff --git a/src/main/java/org/orekit/rugged/raster/TilesCache.java b/src/main/java/org/orekit/rugged/raster/TilesCache.java
index d3f74c98..66584fb8 100644
--- a/src/main/java/org/orekit/rugged/raster/TilesCache.java
+++ b/src/main/java/org/orekit/rugged/raster/TilesCache.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.List;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.raster.Tile.Location;
/** Cache for Digital Elevation Model {@link Tile tiles}.
diff --git a/src/main/java/org/orekit/rugged/api/UpdatableTile.java b/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
similarity index 96%
rename from src/main/java/org/orekit/rugged/api/UpdatableTile.java
rename to src/main/java/org/orekit/rugged/raster/UpdatableTile.java
index 706a89eb..e296930d 100644
--- a/src/main/java/org/orekit/rugged/api/UpdatableTile.java
+++ b/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.api;
+package org.orekit.rugged.raster;
+
+import org.orekit.rugged.api.RuggedException;
/** Interface representing one tile of a raster Digital Elevation Model.
* @author Luc Maisonobe
diff --git a/src/test/java/org/orekit/rugged/api/RuggedTest.java b/src/test/java/org/orekit/rugged/api/RuggedTest.java
index 3214bc10..51b9ff55 100644
--- a/src/test/java/org/orekit/rugged/api/RuggedTest.java
+++ b/src/test/java/org/orekit/rugged/api/RuggedTest.java
@@ -66,6 +66,7 @@ import org.orekit.propagation.analytical.KeplerianPropagator;
import org.orekit.propagation.numerical.NumericalPropagator;
import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.rugged.raster.RandomLandscapeUpdater;
+import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.VolcanicConeElevationUpdater;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScalesFactory;
diff --git a/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
index eb0b0ecd..b19a9d20 100644
--- a/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
@@ -38,11 +38,11 @@ import org.orekit.frames.Transform;
import org.orekit.orbits.CartesianOrbit;
import org.orekit.propagation.SpacecraftState;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.intersection.duvenhage.MinMaxTreeTile;
import org.orekit.rugged.intersection.duvenhage.MinMaxTreeTileFactory;
import org.orekit.rugged.raster.CliffsElevationUpdater;
+import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.VolcanicConeElevationUpdater;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.time.AbsoluteDate;
diff --git a/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
index f67a9372..c2ecee4d 100644
--- a/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
@@ -17,9 +17,9 @@
package org.orekit.rugged.intersection;
-import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.intersection.BasicScanAlgorithm;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
+import org.orekit.rugged.raster.TileUpdater;
public class BasicScanAlgorithmTest extends AbstractAlgorithmTest {
diff --git a/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
index e2f8871a..8c5bc03b 100644
--- a/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
@@ -22,10 +22,10 @@ import org.junit.Test;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.intersection.AbstractAlgorithmTest;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.intersection.duvenhage.DuvenhageAlgorithm;
+import org.orekit.rugged.raster.TileUpdater;
public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
diff --git a/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
index 8f9ba3aa..440bb92d 100644
--- a/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
@@ -18,8 +18,6 @@ package org.orekit.rugged.raster;
import org.apache.commons.math3.util.FastMath;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.api.UpdatableTile;
public class CheckedPatternElevationUpdater implements TileUpdater {
diff --git a/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
index 4f31e7a0..63aab374 100644
--- a/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
@@ -19,8 +19,6 @@ package org.orekit.rugged.raster;
import org.apache.commons.math3.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.api.UpdatableTile;
public class CliffsElevationUpdater implements TileUpdater {
diff --git a/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
index b3c5f28f..40c43b85 100644
--- a/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
@@ -23,8 +23,6 @@ import org.apache.commons.math3.random.Well19937a;
import org.apache.commons.math3.util.ArithmeticUtils;
import org.apache.commons.math3.util.FastMath;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.api.UpdatableTile;
public class RandomLandscapeUpdater implements TileUpdater {
diff --git a/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
index 63198a60..70be7682 100644
--- a/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
@@ -19,8 +19,6 @@ package org.orekit.rugged.raster;
import org.apache.commons.math3.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.api.UpdatableTile;
import org.orekit.utils.Constants;
public class VolcanicConeElevationUpdater implements TileUpdater {
--
GitLab