Skip to content
Snippets Groups Projects
Commit 7499ac3f authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Removed AbastractTile. 

Specialized tiles should directly extend SimpleTile.
parent 1685e4b8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
rugged-core/src/main/java/org/orekit/rugged/core/dem/AbstractTile.java deleted 100644 → 0
+ 0
− 213
View file @ 1685e4b8
/* Copyright 2013-2014 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* CS 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.orekit.rugged.core.dem;
import org.apache.commons.math3.util.FastMath;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.api.RuggedMessages;
/** Partial implementation of a {@link Tile}.
* @author Luc Maisonobe
*/
public abstract class AbstractTile implements Tile {
/** Minimum latitude. */
private double minLatitude;
/** Minimum longitude. */
private double minLongitude;
/** Step in latitude (size of one raster element). */
private double latitudeStep;
/** Step in longitude (size of one raster element). */
private double longitudeStep;
/** Number of latitude rows. */
private int latitudeRows;
/** Number of longitude columns. */
private int longitudeColumns;
/** Minimum elevation. */
private double minElevation;
/** Maximum elevation. */
private double maxElevation;
/** Simple constructor.
* <p>
* Creates an empty tile.
* </p>
*/
public AbstractTile() {
}
/** {@inheritDoc} */
@Override
public void setGeometry(final double minLatitude, final double minLongitude,
final double latitudeStep, final double longitudeStep,
final int latitudeRows, final int longitudeColumns) {
this.minLatitude = minLatitude;
this.minLongitude = minLongitude;
this.latitudeStep = latitudeStep;
this.longitudeStep = longitudeStep;
this.latitudeRows = latitudeRows;
this.longitudeColumns = longitudeColumns;
this.minElevation = Double.POSITIVE_INFINITY;
this.maxElevation = Double.NEGATIVE_INFINITY;
doSetGeometry(minLatitude, minLongitude, latitudeStep, longitudeStep, latitudeRows, longitudeColumns);
}
/** Set the tile global geometry.
* <p>
* This method is called by {@link #setGeometry(double, double, double,
* double, int, int)} after boilerplate processing has been performed.
* </p>
* @param minLatitude minimum latitude
* @param minLongitude minimum longitude
* @param latitudeStep step in latitude (size of one raster element)
* @param longitudeStep step in longitude (size of one raster element)
* @param latitudeRows number of latitude rows
* @param longitudeColumns number of longitude columns
*/
protected abstract void doSetGeometry(double minLatitude, double minLongitude,
double latitudeStep, double longitudeStep,
int latitudeRows, int longitudeColumns);
/** {@inheritDoc} */
@Override
public void tileUpdateCompleted() throws RuggedException {
// do nothing by default
}
/** {@inheritDoc} */
@Override
public double getMinimumLatitude() {
return minLatitude;
}
/** {@inheritDoc} */
@Override
public double getMinimumLongitude() {
return minLongitude;
}
/** {@inheritDoc} */
@Override
public double getLatitudeStep() {
return latitudeStep;
}
/** {@inheritDoc} */
@Override
public double getLongitudeStep() {
return longitudeStep;
}
/** {@inheritDoc} */
@Override
public int getLatitudeRows() {
return latitudeRows;
}
/** {@inheritDoc} */
@Override
public int getLongitudeColumns() {
return longitudeColumns;
}
/** {@inheritDoc} */
@Override
public double getMinElevation() {
return minElevation;
}
/** {@inheritDoc} */
@Override
public double getMaxElevation() {
return maxElevation;
}
/** {@inheritDoc} */
@Override
public void setElevation(final int latitudeIndex, final int longitudeIndex,
final double elevation) throws RuggedException {
checkIndices(latitudeIndex, longitudeIndex);
minElevation = FastMath.min(minElevation, elevation);
maxElevation = FastMath.max(maxElevation, elevation);
doSetElevation(latitudeIndex, longitudeIndex, elevation);
}
/** Set the elevation for one raster element.
* <p>
* This method is called by {@link #setElevation(int, int, double)} after
* boilerplate processing has been performed, including indices checks.
* </p>
* @param latitudeIndex index of latitude (row index)
* @param longitudeIndex index of longitude (column index)
* @param elevation elevation (m)
* @exception RuggedException if indices are out of bound
*/
protected abstract void doSetElevation(int latitudeIndex, int longitudeIndex, double elevation)
throws RuggedException;
/** {@inheritDoc} */
@Override
public double getElevationAtIndices(int latitudeIndex, int longitudeIndex)
throws RuggedException {
checkIndices(latitudeIndex, longitudeIndex);
return doGetElevationAtIndices(latitudeIndex, longitudeIndex);
}
/** Get the elevation of an exact grid point.
* <p>
* This method is called by {@link #getElevationAtIndices(int, int)} after
* boilerplate processing has been performed, including indices checks.
* </p>
* @param latitudeIndex
* @param longitudeIndex
* @return elevation
*/
protected abstract double doGetElevationAtIndices(int latitudeIndex, int longitudeIndex)
throws RuggedException;
/** {@inheritDoc} */
@Override
public boolean covers(final double latitude, final double longitude) {
final int latitudeIndex = (int) FastMath.floor((latitude - minLatitude) / latitudeStep);
final int longitudeIndex = (int) FastMath.floor((longitude - minLongitude) / longitudeStep);
return latitudeIndex >= 0 && latitudeIndex < latitudeRows &&
longitudeIndex >= 0 && longitudeIndex < longitudeColumns;
}
/** Check indices.
* @param latitudeIndex
* @param longitudeIndex
* @exception IllegalArgumentException if indices are out of bound
*/
private void checkIndices(int latitudeIndex, int longitudeIndex)
throws RuggedException {
if (latitudeIndex < 0 || latitudeIndex >= latitudeRows ||
longitudeIndex < 0 || longitudeIndex >= longitudeColumns) {
throw new RuggedException(RuggedMessages.OUT_OF_TILE_INDICES,
latitudeIndex, longitudeIndex,
latitudeRows - 1, longitudeColumns - 1);
}
}
}
rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTile.java
+ 125
− 8
View file @ 7499ac3f
......@@ -16,12 +16,40 @@
*/
package org.orekit.rugged.core.dem;
import org.apache.commons.math3.util.FastMath;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.api.RuggedMessages;
/** Simple implementation of a {@link Tile}.
* @see SimpleTileFactory
* @author Luc Maisonobe
*/
public class SimpleTile extends AbstractTile {
public class SimpleTile implements Tile {
/** Minimum latitude. */
private double minLatitude;
/** Minimum longitude. */
private double minLongitude;
/** Step in latitude (size of one raster element). */
private double latitudeStep;
/** Step in longitude (size of one raster element). */
private double longitudeStep;
/** Number of latitude rows. */
private int latitudeRows;
/** Number of longitude columns. */
private int longitudeColumns;
/** Minimum elevation. */
private double minElevation;
/** Maximum elevation. */
private double maxElevation;
/** Elevation array. */
private double[] elevations;
......@@ -31,28 +59,117 @@ public class SimpleTile extends AbstractTile {
* Creates an empty tile.
* </p>
*/
SimpleTile() {
protected SimpleTile() {
}
/** {@inheritDoc} */
@Override
protected void doSetGeometry(final double minLatitude, final double minLongitude,
final double latitudeStep, final double longitudeStep,
final int latitudeRows, final int longitudeColumns) {
public void setGeometry(final double minLatitude, final double minLongitude,
final double latitudeStep, final double longitudeStep,
final int latitudeRows, final int longitudeColumns) {
this.minLatitude = minLatitude;
this.minLongitude = minLongitude;
this.latitudeStep = latitudeStep;
this.longitudeStep = longitudeStep;
this.latitudeRows = latitudeRows;
this.longitudeColumns = longitudeColumns;
this.minElevation = Double.POSITIVE_INFINITY;
this.maxElevation = Double.NEGATIVE_INFINITY;
this.elevations = new double[latitudeRows * longitudeColumns];
}
/** {@inheritDoc} */
@Override
protected void doSetElevation(final int latitudeIndex, final int longitudeIndex,
final double elevation) {
public void tileUpdateCompleted() throws RuggedException {
// do nothing by default
}
/** {@inheritDoc} */
@Override
public double getMinimumLatitude() {
return minLatitude;
}
/** {@inheritDoc} */
@Override
public double getMinimumLongitude() {
return minLongitude;
}
/** {@inheritDoc} */
@Override
public double getLatitudeStep() {
return latitudeStep;
}
/** {@inheritDoc} */
@Override
public double getLongitudeStep() {
return longitudeStep;
}
/** {@inheritDoc} */
@Override
public int getLatitudeRows() {
return latitudeRows;
}
/** {@inheritDoc} */
@Override
public int getLongitudeColumns() {
return longitudeColumns;
}
/** {@inheritDoc} */
@Override
public double getMinElevation() {
return minElevation;
}
/** {@inheritDoc} */
@Override
public double getMaxElevation() {
return maxElevation;
}
/** {@inheritDoc} */
@Override
public void setElevation(final int latitudeIndex, final int longitudeIndex,
final double elevation) throws RuggedException {
checkIndices(latitudeIndex, longitudeIndex);
minElevation = FastMath.min(minElevation, elevation);
maxElevation = FastMath.max(maxElevation, elevation);
elevations[latitudeIndex * getLongitudeColumns() + longitudeIndex] = elevation;
}
/** {@inheritDoc} */
@Override
protected double doGetElevationAtIndices(int latitudeIndex, int longitudeIndex) {
public double getElevationAtIndices(int latitudeIndex, int longitudeIndex) {
return elevations[latitudeIndex * getLongitudeColumns() + longitudeIndex];
}
/** {@inheritDoc} */
@Override
public boolean covers(final double latitude, final double longitude) {
final int latitudeIndex = (int) FastMath.floor((latitude - minLatitude) / latitudeStep);
final int longitudeIndex = (int) FastMath.floor((longitude - minLongitude) / longitudeStep);
return latitudeIndex >= 0 && latitudeIndex < latitudeRows &&
longitudeIndex >= 0 && longitudeIndex < longitudeColumns;
}
/** Check indices.
* @param latitudeIndex
* @param longitudeIndex
* @exception IllegalArgumentException if indices are out of bound
*/
private void checkIndices(int latitudeIndex, int longitudeIndex)
throws RuggedException {
if (latitudeIndex < 0 || latitudeIndex >= latitudeRows ||
longitudeIndex < 0 || longitudeIndex >= longitudeColumns) {
throw new RuggedException(RuggedMessages.OUT_OF_TILE_INDICES,
latitudeIndex, longitudeIndex,
latitudeRows - 1, longitudeColumns - 1);
}
}
}
rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
+ 2
− 27
View file @ 7499ac3f
......@@ -17,17 +17,14 @@
package org.orekit.rugged.core.duvenhage;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.core.dem.AbstractTile;
import org.orekit.rugged.core.dem.SimpleTile;
import org.orekit.rugged.core.dem.Tile;
/** Simple implementation of a {@link Tile} with a min/max kd tree.
* @see MinMaxTreeTileFactory
* @author Luc Maisonobe
*/
public class MinMaxTreeTile extends AbstractTile {
/** Elevation array. */
private double[] elevations;
public class MinMaxTreeTile extends SimpleTile {
/** Simple constructor.
* <p>
......@@ -37,14 +34,6 @@ public class MinMaxTreeTile extends AbstractTile {
MinMaxTreeTile() {
}
/** {@inheritDoc} */
@Override
protected void doSetGeometry(final double minLatitude, final double minLongitude,
final double latitudeStep, final double longitudeStep,
final int latitudeRows, final int longitudeColumns) {
this.elevations = new double[latitudeRows * longitudeColumns];
}
/** {@inheritDoc} */
@Override
public void tileUpdateCompleted() throws RuggedException {
......@@ -52,18 +41,4 @@ public class MinMaxTreeTile extends AbstractTile {
throw RuggedException.createInternalError(null);
}
/** {@inheritDoc} */
@Override
protected void doSetElevation(final int latitudeIndex, final int longitudeIndex,
final double elevation) {
elevations[latitudeIndex * getLongitudeColumns() + longitudeIndex] = elevation;
}
/** {@inheritDoc} */
@Override
protected double doGetElevationAtIndices(int latitudeIndex, int longitudeIndex) {
return elevations[latitudeIndex * getLongitudeColumns() + longitudeIndex];
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment