cleanup: MapPosition

This commit is contained in:
Hannes Janetzek 2014-02-15 00:37:20 +01:00
parent c299529ccb
commit c6b27aadf0

View File

@ -20,8 +20,6 @@ import org.oscim.utils.FastMath;
/** A MapPosition Container. */ /** A MapPosition Container. */
public class MapPosition { public class MapPosition {
public final static int MAX_ZOOMLEVEL = 20;
public final static int MIN_ZOOMLEVEL = 2;
/** projected position x 0..1 */ /** projected position x 0..1 */
public double x; public double x;
@ -35,8 +33,7 @@ public class MapPosition {
/** perspective tile */ /** perspective tile */
public float tilt; public float tilt;
// to be removed /** to be removed: FastMath.log2((int) scale) */
// FastMath.log2((int) scale)
public int zoomLevel; public int zoomLevel;
public MapPosition() { public MapPosition() {
@ -121,21 +118,14 @@ public class MapPosition {
@Override @Override
public String toString() { public String toString() {
StringBuilder builder = new StringBuilder(); return new StringBuilder()
builder.append("["); .append("[X:").append(x)
builder.append("X: "); .append(", Y:").append(y)
builder.append(x); .append(", Z:").append(zoomLevel)
builder.append(", Y: "); .append("] lat:")
builder.append(y); .append(MercatorProjection.toLatitude(y))
builder.append(", Z: "); .append(", lon:")
builder.append(zoomLevel); .append(MercatorProjection.toLongitude(x))
builder.append("]"); .toString();
builder.append("\tlat=");
builder.append(MercatorProjection.toLatitude(y));
builder.append(", lon=");
builder.append(MercatorProjection.toLongitude(x));
return builder.toString();
} }
} }