- started overlays

- started symbol layer
- move renderer and generator out of view package
  - hopefully the last big refactoring for a while...
- improve perspective, plane should be more far away to decrease foreshortening

src/org/oscim/core/MapPosition.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2010, 2011, 2012 mapsforge.org
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.core;
+
+import android.opengl.Matrix;
+
+/**
+ * A MapPosition Container.
+ */
+public class MapPosition {
+
+	public double lon;
+	public double lat;
+
+	public byte zoomLevel;
+	public float scale;
+	public float angle;
+	public float tilt;
+
+	public double x;
+	public double y;
+
+	public float[] viewMatrix;
+	public float[] rotateMatrix;
+
+	public MapPosition() {
+		this.zoomLevel = (byte) 1;
+		this.scale = 1;
+		this.lat = 0;
+		this.lon = 0;
+		this.angle = 0;
+		this.x = MercatorProjection.longitudeToPixelX(this.lon, zoomLevel);
+		this.y = MercatorProjection.latitudeToPixelY(this.lat, zoomLevel);
+	}
+
+	// FIXME remove this here
+	public void init() {
+		viewMatrix = new float[16];
+		Matrix.setIdentityM(viewMatrix, 0);
+
+		rotateMatrix = new float[16];
+		Matrix.setIdentityM(rotateMatrix, 0);
+	}
+
+	/**
+	 * @param geoPoint
+	 *            the map position.
+	 * @param zoomLevel
+	 *            the zoom level.
+	 * @param scale
+	 *            ...
+	 */
+	public MapPosition(GeoPoint geoPoint, byte zoomLevel, float scale) {
+		this.zoomLevel = zoomLevel;
+		this.scale = scale;
+		this.lat = geoPoint.getLatitude();
+		this.lon = geoPoint.getLongitude();
+		this.angle = 0;
+		this.x = MercatorProjection.longitudeToPixelX(this.lon, zoomLevel);
+		this.y = MercatorProjection.latitudeToPixelY(this.lat, zoomLevel);
+	}
+
+	public MapPosition(double latitude, double longitude, byte zoomLevel, float scale,
+			float angle) {
+		this.zoomLevel = zoomLevel;
+		this.scale = scale;
+		this.lat = latitude;
+		this.lon = longitude;
+		this.angle = angle;
+		this.x = MercatorProjection.longitudeToPixelX(longitude, zoomLevel);
+		this.y = MercatorProjection.latitudeToPixelY(latitude, zoomLevel);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("MapPosition [");
+		builder.append("lat=");
+		builder.append(this.lat);
+		builder.append(", lon=");
+		builder.append(this.lon);
+		builder.append(", zoomLevel=");
+		builder.append(this.zoomLevel);
+		builder.append("]");
+		return builder.toString();
+	}
+}

src/org/oscim/core/MercatorProjection.java

@@ -14,7 +14,6 @@
  */
 package org.oscim.core;
 
-import org.oscim.view.MapPosition;
 
 /**
  * An implementation of the spherical Mercator projection.

src/org/oscim/core/WebMercator.java

@@ -24,7 +24,8 @@ public class WebMercator {
 	 */
 	public static final String NAME = "SphericalMercator";
 
-	private static final double f900913 = 20037508.342789244;
+	// earth radius * pi, roughly
+	public static final double f900913 = 20037508.342789244;
 	private static final double f900913_2 = 20037508.342789244 * 2;
 
 	/**