move Android specific code to 'android' package

src/org/oscim/android/Compass.java

@@ -12,7 +12,9 @@
  * 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.view;
+package org.oscim.android;
+
+import org.oscim.view.MapView;
 
 import android.content.Context;
 import android.hardware.Sensor;
@@ -54,12 +56,12 @@ public class Compass {
 		mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
 	}
 
-	void enable() {
+	public void enable() {
 		mSensorManager.registerListener(mListener, mSensor,
 				SensorManager.SENSOR_DELAY_UI);
 	}
 
-	void disable() {
+	public void disable() {
 		mSensorManager.unregisterListener(mListener);
 		mMapView.getMapViewPosition().setRotation(0);
 	}

src/org/oscim/android/MapActivity.java

@@ -12,10 +12,11 @@
  * 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.view;
+package org.oscim.android;
 
 import org.oscim.core.GeoPoint;
 import org.oscim.core.MapPosition;
+import org.oscim.view.MapView;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -98,7 +99,7 @@ public abstract class MapActivity extends Activity {
 	 * @param mapView
 	 *            the calling MapView.
 	 */
-	final void registerMapView(MapView mapView) {
+	public final void registerMapView(MapView mapView) {
 		mMapView = mapView;
 
 		SharedPreferences sharedPreferences = getSharedPreferences(PREFERENCES_FILE,

src/org/oscim/android/MapZoomControls.java

@@ -1,3 +1,4 @@
+package org.oscim.android;
 ///*
 // * Copyright 2010, 2011, 2012 mapsforge.org
 // *

src/org/oscim/view/MapView.java

@@ -17,6 +17,8 @@ package org.oscim.view;
 
 import java.util.List;
 
+import org.oscim.android.Compass;
+import org.oscim.android.MapActivity;
 import org.oscim.core.BoundingBox;
 import org.oscim.core.GeoPoint;
 import org.oscim.core.MapPosition;
@@ -151,7 +153,8 @@ public class MapView extends RelativeLayout {
 
 		//mLayerManager.add(new GenericOverlay(this, new GridRenderLayer(this)));
 		mLayerManager.add(new BuildingOverlay(this, baseLayer.getTileLayer()));
-		mLayerManager.add(new LabelLayer(this, baseLayer.getTileLayer()));
+		LabelLayer ll = new LabelLayer(this, baseLayer.getTileLayer());
+		mLayerManager.add(ll);
 
 		return baseLayer;
 	}
@@ -166,7 +169,7 @@ public class MapView extends RelativeLayout {
 		return null;
 	}
 
-	void destroy() {
+	public void destroy() {
 		mLayerManager.destroy();
 	}
 
@@ -177,7 +180,7 @@ public class MapView extends RelativeLayout {
 
 	private boolean mPausing = false;
 
-	void onPause() {
+	public void onPause() {
 		mPausing = true;
 
 		if (this.mCompassEnabled)
@@ -185,7 +188,7 @@ public class MapView extends RelativeLayout {
 
 	}
 
-	void onResume() {
+	public void onResume() {
 		if (this.mCompassEnabled)
 			mCompass.enable();
 

src/org/oscim/view/MapViewPosition.java

@@ -567,7 +567,7 @@ public class MapViewPosition {
 		mAbsY = MercatorProjection.latitudeToY(latitude);
 	}
 
-	synchronized void setMapPosition(MapPosition mapPosition) {
+	public synchronized void setMapPosition(MapPosition mapPosition) {
 		setZoomLevelLimit(mapPosition.zoomLevel);
 		mAbsX = mapPosition.x;
 		mAbsY = mapPosition.y;