Skip to content
Snippets Groups Projects
Commit bede7909 authored by Guylaine Prat's avatar Guylaine Prat
Browse files

Update future version to 4.0

parent dfed703b
No related branches found
No related tags found
No related merge requests found
Pipeline #2759 passed
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.orekit</groupId> <groupId>org.orekit</groupId>
<artifactId>rugged</artifactId> <artifactId>rugged</artifactId>
<version>3.1-SNAPSHOT</version> <version>4.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Rugged</name> <name>Rugged</name>
<url>https://www.orekit.org/rugged</url> <url>https://www.orekit.org/rugged</url>
......
...@@ -97,7 +97,7 @@ public class RuggedBuilder { ...@@ -97,7 +97,7 @@ public class RuggedBuilder {
private TileUpdater tileUpdater; private TileUpdater tileUpdater;
/** Flag to tell if the Digital Elevation Model tiles are overlapping. /** Flag to tell if the Digital Elevation Model tiles are overlapping.
* @since X.x */ * @since 4.0 */
private boolean isOverlappingTiles = true; private boolean isOverlappingTiles = true;
/** Constant elevation over ellipsoid (m). /** Constant elevation over ellipsoid (m).
...@@ -317,7 +317,7 @@ public class RuggedBuilder { ...@@ -317,7 +317,7 @@ public class RuggedBuilder {
* @see #getTileUpdater() * @see #getTileUpdater()
* @see #getMaxCachedTiles() * @see #getMaxCachedTiles()
* @see #isOverlappingTiles() * @see #isOverlappingTiles()
* @since X.x * @since 4.0
*/ */
public RuggedBuilder setDigitalElevationModel(final TileUpdater newTileUpdater, final int newMaxCachedTiles, public RuggedBuilder setDigitalElevationModel(final TileUpdater newTileUpdater, final int newMaxCachedTiles,
final boolean newIsOverlappingTiles) { final boolean newIsOverlappingTiles) {
...@@ -341,7 +341,7 @@ public class RuggedBuilder { ...@@ -341,7 +341,7 @@ public class RuggedBuilder {
* Get the flag telling if the DEM tiles are overlapping. * Get the flag telling if the DEM tiles are overlapping.
* @return true if the Digital Elevation Model tiles are overlapping; * @return true if the Digital Elevation Model tiles are overlapping;
* false otherwise. Default = true. * false otherwise. Default = true.
* @since X.x * @since 4.0
*/ */
public boolean isOverlappingTiles() { public boolean isOverlappingTiles() {
return isOverlappingTiles; return isOverlappingTiles;
...@@ -351,7 +351,7 @@ public class RuggedBuilder { ...@@ -351,7 +351,7 @@ public class RuggedBuilder {
* Set the DEM overlapping tiles flag. * Set the DEM overlapping tiles flag.
* @param newIsOverlappingTiles flag to tell if the Digital Elevation Model tiles are overlapping: * @param newIsOverlappingTiles flag to tell if the Digital Elevation Model tiles are overlapping:
* true if overlapping; false otherwise * true if overlapping; false otherwise
* @since X.x * @since 4.0
*/ */
public void setOverlappingTiles(final boolean newIsOverlappingTiles) { public void setOverlappingTiles(final boolean newIsOverlappingTiles) {
this.isOverlappingTiles = newIsOverlappingTiles; this.isOverlappingTiles = newIsOverlappingTiles;
......
...@@ -23,7 +23,7 @@ package org.orekit.rugged.raster; ...@@ -23,7 +23,7 @@ package org.orekit.rugged.raster;
* <p> * <p>
* For Longitude: WESTEXTREME / WEST / EAST / EASTEXTREME * For Longitude: WESTEXTREME / WEST / EAST / EASTEXTREME
* @author Guylaine Prat * @author Guylaine Prat
* @since X.x * @since 4.0
*/ */
public enum EarthHemisphere { public enum EarthHemisphere {
......
...@@ -46,7 +46,7 @@ public class TilesCache<T extends Tile> { ...@@ -46,7 +46,7 @@ public class TilesCache<T extends Tile> {
private final TileUpdater updater; private final TileUpdater updater;
/**Flag to tell if the Digital Elevation Model tiles are overlapping. /**Flag to tell if the Digital Elevation Model tiles are overlapping.
* @since X.x */ * @since 4.0 */
private final boolean isOverlapping; private final boolean isOverlapping;
/** Cache. */ /** Cache. */
...@@ -145,7 +145,7 @@ public class TilesCache<T extends Tile> { ...@@ -145,7 +145,7 @@ public class TilesCache<T extends Tile> {
* @param latitude latitude of the desired tile (rad) * @param latitude latitude of the desired tile (rad)
* @param longitude longitude of the desired tile (rad) * @param longitude longitude of the desired tile (rad)
* @return the tile * @return the tile
* @since X.x * @since 4.0
*/ */
private T createTile(final double latitude, final double longitude) { private T createTile(final double latitude, final double longitude) {
...@@ -173,7 +173,7 @@ public class TilesCache<T extends Tile> { ...@@ -173,7 +173,7 @@ public class TilesCache<T extends Tile> {
* @param longitude ground point longitude (rad) * @param longitude ground point longitude (rad)
* @param pointLocation ground point location with respect to the tile * @param pointLocation ground point location with respect to the tile
* @return zipper tile covering the ground point * @return zipper tile covering the ground point
* @since X.x * @since 4.0
*/ */
private T createZipperTile(final T currentTile, private T createZipperTile(final T currentTile,
final double latitude, final double longitude, final double latitude, final double longitude,
...@@ -253,7 +253,7 @@ public class TilesCache<T extends Tile> { ...@@ -253,7 +253,7 @@ public class TilesCache<T extends Tile> {
* @param zipperLonCols zipper longitude columns * @param zipperLonCols zipper longitude columns
* @param zipperElevations zipper elevations * @param zipperElevations zipper elevations
* @return the zipper tile * @return the zipper tile
* @since X.x * @since 4.0
*/ */
private T initializeZipperTile(final double zipperLatMin, final double zipperLonMin, private T initializeZipperTile(final double zipperLatMin, final double zipperLonMin,
final double zipperLatStep, final double zipperLonStep, final double zipperLatStep, final double zipperLonStep,
...@@ -288,7 +288,7 @@ public class TilesCache<T extends Tile> { ...@@ -288,7 +288,7 @@ public class TilesCache<T extends Tile> {
* @param longitude given longitude (rad) * @param longitude given longitude (rad)
* @param currentTile current tile * @param currentTile current tile
* @return Northern or Southern zipper tile of the current tile (according to latitudeHemisphere) * @return Northern or Southern zipper tile of the current tile (according to latitudeHemisphere)
* @since X.x * @since 4.0
*/ */
private T createZipperNorthOrSouth(final EarthHemisphere latitudeHemisphere, final double longitude, final T currentTile) { private T createZipperNorthOrSouth(final EarthHemisphere latitudeHemisphere, final double longitude, final T currentTile) {
...@@ -409,7 +409,7 @@ public class TilesCache<T extends Tile> { ...@@ -409,7 +409,7 @@ public class TilesCache<T extends Tile> {
* @param latitude given latitude (rad) * @param latitude given latitude (rad)
* @param currentTile current tile * @param currentTile current tile
* @return Western or Eastern zipper tile of the current tile (according to longitudeHemisphere) * @return Western or Eastern zipper tile of the current tile (according to longitudeHemisphere)
* @since X.x * @since 4.0
*/ */
private T createZipperWestOrEast(final EarthHemisphere longitudeHemisphere, final double latitude, final T currentTile) { private T createZipperWestOrEast(final EarthHemisphere longitudeHemisphere, final double latitude, final T currentTile) {
...@@ -474,7 +474,7 @@ public class TilesCache<T extends Tile> { ...@@ -474,7 +474,7 @@ public class TilesCache<T extends Tile> {
* @param latitudeStep latitude step of the tile (rad) * @param latitudeStep latitude step of the tile (rad)
* @param latitudeRows number of rows in latitude * @param latitudeRows number of rows in latitude
* @return latitude index (it may lie outside of the tile!) * @return latitude index (it may lie outside of the tile!)
* @since X.x * @since 4.0
*/ */
private int computeLatitudeIndex(final double latitude, final double latitudeMin, final double latitudeStep, final int latitudeRows) { private int computeLatitudeIndex(final double latitude, final double latitudeMin, final double latitudeStep, final int latitudeRows) {
// Compute the difference in latitude wrt the Southern edge latitude of the tile // Compute the difference in latitude wrt the Southern edge latitude of the tile
...@@ -489,7 +489,7 @@ public class TilesCache<T extends Tile> { ...@@ -489,7 +489,7 @@ public class TilesCache<T extends Tile> {
* @param longitudeStep longitude step of the tile (rad) * @param longitudeStep longitude step of the tile (rad)
* @param longitudeColumns number of columns in longitude * @param longitudeColumns number of columns in longitude
* @return longitude index (it may lie outside of the tile!) * @return longitude index (it may lie outside of the tile!)
* @since X.x * @since 4.0
*/ */
private int computeLongitudeIndex(final double longitude, final double longitudeMin, final double longitudeStep, final int longitudeColumns) { private int computeLongitudeIndex(final double longitude, final double longitudeMin, final double longitudeStep, final int longitudeColumns) {
// Compute the difference in longitude wrt the Western edge longitude of the tile // Compute the difference in longitude wrt the Western edge longitude of the tile
...@@ -509,7 +509,7 @@ public class TilesCache<T extends Tile> { ...@@ -509,7 +509,7 @@ public class TilesCache<T extends Tile> {
* @param zipperLatStep zipper tile latitude step (rad) * @param zipperLatStep zipper tile latitude step (rad)
* @param zipperLonStep zipper tile longitude step (rad) * @param zipperLonStep zipper tile longitude step (rad)
* @return the elevations to fill in the zipper tile between a northern and a southern tiles * @return the elevations to fill in the zipper tile between a northern and a southern tiles
* @since X.x * @since 4.0
*/ */
private double[][] getZipperNorthSouthElevations(final int zipperLonCols, private double[][] getZipperNorthSouthElevations(final int zipperLonCols,
final T northernTile, final T southernTile, final T northernTile, final T southernTile,
...@@ -611,7 +611,7 @@ public class TilesCache<T extends Tile> { ...@@ -611,7 +611,7 @@ public class TilesCache<T extends Tile> {
* @param easternTile the tile which is the eastern * @param easternTile the tile which is the eastern
* @param westernTile the tile which is the western * @param westernTile the tile which is the western
* @return the elevations to fill in the zipper tile between a eastern and a western tiles * @return the elevations to fill in the zipper tile between a eastern and a western tiles
* @since X.x * @since 4.0
*/ */
private double[][] getZipperEastWestElevations(final int zipperLatRows, private double[][] getZipperEastWestElevations(final int zipperLatRows,
final T easternTile, final T westernTile) { final T easternTile, final T westernTile) {
...@@ -642,7 +642,7 @@ public class TilesCache<T extends Tile> { ...@@ -642,7 +642,7 @@ public class TilesCache<T extends Tile> {
* @param longitude ground point longitude (rad) * @param longitude ground point longitude (rad)
* @param currentTile current tile * @param currentTile current tile
* @return the corner zipper tile * @return the corner zipper tile
* @since X.x * @since 4.0
*/ */
private T createCornerZipper(final EarthHemisphere latitudeHemisphere, final EarthHemisphere longitudeHemisphere, private T createCornerZipper(final EarthHemisphere latitudeHemisphere, final EarthHemisphere longitudeHemisphere,
final double latitude, final double longitude, final T currentTile) { final double latitude, final double longitude, final T currentTile) {
...@@ -852,7 +852,7 @@ public class TilesCache<T extends Tile> { ...@@ -852,7 +852,7 @@ public class TilesCache<T extends Tile> {
* @param isSameStepLat flag to tell if latitude steps are the same (true) * @param isSameStepLat flag to tell if latitude steps are the same (true)
* @param isSameStepLon flag to tell if longitude steps are the same (true) * @param isSameStepLon flag to tell if longitude steps are the same (true)
* @return corner zipper tile * @return corner zipper tile
* @since X.x * @since 4.0
*/ */
private T initializeCornerZipperTile(final double zipperLatMin, final double zipperLonMin, private T initializeCornerZipperTile(final double zipperLatMin, final double zipperLonMin,
final double zipperLatStep, final double zipperLonStep, final double zipperLatStep, final double zipperLonStep,
...@@ -1001,7 +1001,7 @@ public class TilesCache<T extends Tile> { ...@@ -1001,7 +1001,7 @@ public class TilesCache<T extends Tile> {
* @param longitudeStep longitude step (rad) * @param longitudeStep longitude step (rad)
* @param longitudeCols longitude columns * @param longitudeCols longitude columns
* @return the tile in intercardinal direction * @return the tile in intercardinal direction
* @since X.x * @since 4.0
*/ */
private T createIntercardinalTile(final EarthHemisphere latitudeHemisphere, private T createIntercardinalTile(final EarthHemisphere latitudeHemisphere,
final double latitudeMin, final double latitudeStep, final int latitudeRows, final double latitudeMin, final double latitudeStep, final int latitudeRows,
...@@ -1054,7 +1054,7 @@ public class TilesCache<T extends Tile> { ...@@ -1054,7 +1054,7 @@ public class TilesCache<T extends Tile> {
* @param currentTileLonStep current tile longitude step (rad) * @param currentTileLonStep current tile longitude step (rad)
* @param currentTileLonCols current tile longitude columns * @param currentTileLonCols current tile longitude columns
* @return corner zipper tile origin point * @return corner zipper tile origin point
* @since X.x * @since 4.0
*/ */
private GeodeticPoint computeCornerZipperOrigin(final double zipperLatStep, final double zipperLonStep, private GeodeticPoint computeCornerZipperOrigin(final double zipperLatStep, final double zipperLonStep,
final EarthHemisphere latitudeHemisphere, final EarthHemisphere latitudeHemisphere,
...@@ -1126,7 +1126,7 @@ public class TilesCache<T extends Tile> { ...@@ -1126,7 +1126,7 @@ public class TilesCache<T extends Tile> {
* @param latitudeStep latitude step (rad) * @param latitudeStep latitude step (rad)
* @param latitudeRows latitude rows * @param latitudeRows latitude rows
* @return North or South tile according to the Earth hemisphere * @return North or South tile according to the Earth hemisphere
* @since X.x * @since 4.0
*/ */
private T createNorthOrSouthTile(final EarthHemisphere latitudeHemisphere, final double longitude, private T createNorthOrSouthTile(final EarthHemisphere latitudeHemisphere, final double longitude,
final double latitudeMin, final double latitudeStep, final int latitudeRows) { final double latitudeMin, final double latitudeStep, final int latitudeRows) {
...@@ -1156,7 +1156,7 @@ public class TilesCache<T extends Tile> { ...@@ -1156,7 +1156,7 @@ public class TilesCache<T extends Tile> {
* @param longitudeStep longitude step (rad) * @param longitudeStep longitude step (rad)
* @param longitudeCols longitude columns * @param longitudeCols longitude columns
* @return East or West tile tile according to the Earth hemisphere * @return East or West tile tile according to the Earth hemisphere
* @since X.x * @since 4.0
*/ */
private T createEastOrWestTile(final EarthHemisphere longitudeHemisphere, final double latitude, private T createEastOrWestTile(final EarthHemisphere longitudeHemisphere, final double latitude,
final double longitudeMin, final double longitudeStep, final int longitudeCols) { final double longitudeMin, final double longitudeStep, final int longitudeCols) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment