#179, Map refactor, renaming classes

11 files changed, 0 insertions, 859 deletions

diff --git a/main/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java b/main/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java
deleted file mode 100644
index 1bfc102..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.cgSettings;
-import cgeo.geocaching.mapcommon.cgMapOverlay;
-import cgeo.geocaching.mapinterfaces.ItemizedOverlayImpl;
-import cgeo.geocaching.mapinterfaces.MapProjectionImpl;
-import cgeo.geocaching.mapinterfaces.MapViewImpl;
-
-import org.mapsforge.android.maps.ItemizedOverlay;
-import org.mapsforge.android.maps.Projection;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Point;
-import android.graphics.drawable.Drawable;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implements ItemizedOverlayImpl {
-
-    private cgMapOverlay base;
-    private Lock lock = new ReentrantLock();
-
-    public mfCacheOverlay(cgSettings settingsIn, Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
-        super(boundCenterBottom(markerIn));
-        base = new cgMapOverlay(settingsIn, this, contextIn, fromDetailIn);
-    }
-
-    @Override
-    public cgMapOverlay getBase() {
-        return base;
-    }
-
-    @Override
-    protected mfCacheOverlayItem createItem(int i) {
-        if (base == null)
-            return null;
-
-        return (mfCacheOverlayItem) base.createItem(i);
-    }
-
-    @Override
-    public int size() {
-        if (base == null)
-            return 0;
-
-        return base.size();
-    }
-
-    @Override
-    protected boolean onTap(int arg0) {
-        if (base == null)
-            return false;
-
-        return base.onTap(arg0);
-    }
-
-    @Override
-    protected void drawOverlayBitmap(Canvas canvas, Point drawPosition,
-            Projection projection, byte drawZoomLevel) {
-        base.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
-    }
-
-    @Override
-    public void superPopulate() {
-        populate();
-    }
-
-    @Override
-    public Drawable superBoundCenter(Drawable markerIn) {
-        return super.boundCenter(markerIn);
-    }
-
-    @Override
-    public Drawable superBoundCenterBottom(Drawable marker) {
-        return super.boundCenterBottom(marker);
-    }
-
-    @Override
-    public void superSetLastFocusedItemIndex(int i) {
-        // nothing to do
-    }
-
-    @Override
-    public boolean superOnTap(int index) {
-        return super.onTap(index);
-    }
-
-    @Override
-    public void superDraw(Canvas canvas, MapViewImpl mapView, boolean shadow) {
-        // nothing to do here...
-    }
-
-    @Override
-    public void superDrawOverlayBitmap(Canvas canvas, Point drawPosition,
-            MapProjectionImpl projection, byte drawZoomLevel) {
-        super.drawOverlayBitmap(canvas, drawPosition, (Projection) projection.getImpl(), drawZoomLevel);
-    }
-
-    @Override
-    public void lock() {
-        lock.lock();
-    }
-
-    @Override
-    public void unlock() {
-        lock.unlock();
-    }
-
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfCacheOverlayItem.java b/main/src/cgeo/geocaching/mapsforge/mfCacheOverlayItem.java
deleted file mode 100644
index 038b29b..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfCacheOverlayItem.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.cgCoord;
-import cgeo.geocaching.mapinterfaces.CacheOverlayItemImpl;
-
-import org.mapsforge.android.maps.GeoPoint;
-import org.mapsforge.android.maps.OverlayItem;
-
-import android.graphics.drawable.Drawable;
-
-public class mfCacheOverlayItem extends OverlayItem implements CacheOverlayItemImpl {
-    private String cacheType = null;
-    private cgCoord coord;
-
-    public mfCacheOverlayItem(cgCoord coordinate, String type) {
-        super(new GeoPoint(coordinate.coords.getLatitudeE6(), coordinate.coords.getLongitudeE6()), coordinate.name, "");
-
-        this.cacheType = type;
-        this.coord = coordinate;
-    }
-
-    public cgCoord getCoord() {
-        return coord;
-    }
-
-    public String getType() {
-        return cacheType;
-    }
-
-    @Override
-    public Drawable getMarker(int index) {
-        return getMarker();
-    }
-
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfGeoPoint.java b/main/src/cgeo/geocaching/mapsforge/mfGeoPoint.java
deleted file mode 100644
index 905d3bf..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfGeoPoint.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.mapinterfaces.GeoPointImpl;
-
-import org.mapsforge.android.maps.GeoPoint;
-
-public class mfGeoPoint extends GeoPoint implements GeoPointImpl {
-
-    public mfGeoPoint(int latitudeE6, int longitudeE6) {
-        super(latitudeE6, longitudeE6);
-    }
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfMapActivity.java b/main/src/cgeo/geocaching/mapsforge/mfMapActivity.java
deleted file mode 100644
index 79ff290..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfMapActivity.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.mapcommon.MapBase;
-import cgeo.geocaching.mapcommon.cgeomap;
-import cgeo.geocaching.mapinterfaces.ActivityImpl;
-
-import org.mapsforge.android.maps.MapActivity;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-public class mfMapActivity extends MapActivity implements ActivityImpl {
-
-    private MapBase mapBase;
-
-    public mfMapActivity() {
-        mapBase = new cgeomap(this);
-    }
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        mapBase.onCreate(icicle);
-    }
-
-    @Override
-    protected void onDestroy() {
-        mapBase.onDestroy();
-    }
-
-    @Override
-    protected void onPause() {
-        mapBase.onPause();
-    }
-
-    @Override
-    protected void onResume() {
-        mapBase.onResume();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        return mapBase.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return mapBase.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        return mapBase.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    protected void onStop() {
-        mapBase.onStop();
-    }
-
-    @Override
-    public void superOnCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public boolean superOnCreateOptionsMenu(Menu menu) {
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public void superOnDestroy() {
-        super.onDestroy();
-    }
-
-    @Override
-    public boolean superOnOptionsItemSelected(MenuItem item) {
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void superOnResume() {
-        super.onResume();
-    }
-
-    @Override
-    public void superOnStop() {
-        super.onStop();
-    }
-
-    @Override
-    public void superOnPause() {
-        super.onPause();
-    }
-
-    @Override
-    public boolean superOnPrepareOptionsMenu(Menu menu) {
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    // close activity and open homescreen
-    public void goHome(View view) {
-        mapBase.goHome(view);
-    }
-
-    // open manual entry
-    public void goManual(View view) {
-        mapBase.goManual(view);
-    }
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfMapController.java b/main/src/cgeo/geocaching/mapsforge/mfMapController.java
deleted file mode 100644
index f31d9b2..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfMapController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.mapinterfaces.GeoPointImpl;
-import cgeo.geocaching.mapinterfaces.MapControllerImpl;
-
-import org.mapsforge.android.maps.GeoPoint;
-import org.mapsforge.android.maps.MapController;
-
-public class mfMapController implements MapControllerImpl {
-
-    private MapController mapController;
-    private int maxZoomLevel;
-
-    public mfMapController(MapController mapControllerIn, int maxZoomLevelIn) {
-        mapController = mapControllerIn;
-        maxZoomLevel = maxZoomLevelIn;
-    }
-
-    @Override
-    public void animateTo(GeoPointImpl geoPoint) {
-        mapController.setCenter((GeoPoint) geoPoint);
-    }
-
-    @Override
-    public void setCenter(GeoPointImpl geoPoint) {
-        mapController.setCenter((GeoPoint) geoPoint);
-    }
-
-    @Override
-    public void setZoom(int mapzoom) {
-        int mfzoom = mapzoom - 1;
-        if (mfzoom > maxZoomLevel) {
-            mfzoom = maxZoomLevel;
-        }
-        mapController.setZoom(mfzoom);
-    }
-
-    @Override
-    public void zoomToSpan(int latSpanE6, int lonSpanE6) {
-
-        if (latSpanE6 != 0 && lonSpanE6 != 0) {
-            // calculate zoomlevel
-            int distDegree = Math.max(latSpanE6, lonSpanE6);
-            int zoomLevel = (int) Math.floor(Math.log(360.0 * 1e6 / distDegree) / Math.log(2));
-            mapController.setZoom(zoomLevel + 1);
-        }
-    }
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfMapFactory.java b/main/src/cgeo/geocaching/mapsforge/mfMapFactory.java
deleted file mode 100644
index 7e41951..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfMapFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.R;
-import cgeo.geocaching.cgCoord;
-import cgeo.geocaching.cgUser;
-import cgeo.geocaching.geopoint.Geopoint;
-import cgeo.geocaching.mapinterfaces.CacheOverlayItemImpl;
-import cgeo.geocaching.mapinterfaces.GeoPointImpl;
-import cgeo.geocaching.mapinterfaces.MapFactory;
-import cgeo.geocaching.mapinterfaces.UserOverlayItemImpl;
-
-import android.app.Activity;
-import android.content.Context;
-
-public class mfMapFactory implements MapFactory {
-
-    @Override
-    public Class<? extends Activity> getMapClass() {
-        return mfMapActivity.class;
-    }
-
-    @Override
-    public int getMapViewId() {
-        return R.id.mfmap;
-    }
-
-    @Override
-    public int getMapLayoutId() {
-        return R.layout.mfmap;
-    }
-
-    @Override
-    public GeoPointImpl getGeoPointBase(final Geopoint coords) {
-        return new mfGeoPoint(coords.getLatitudeE6(), coords.getLongitudeE6());
-    }
-
-    @Override
-    public CacheOverlayItemImpl getCacheOverlayItem(cgCoord coordinate, String type) {
-        mfCacheOverlayItem baseItem = new mfCacheOverlayItem(coordinate, type);
-        return baseItem;
-    }
-
-    @Override
-    public UserOverlayItemImpl getUserOverlayItemBase(Context context, cgUser userOne) {
-        mfUsersOverlayItem baseItem = new mfUsersOverlayItem(context, userOne);
-        return baseItem;
-    }
-
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfMapProjection.java b/main/src/cgeo/geocaching/mapsforge/mfMapProjection.java
deleted file mode 100644
index f3e6dc1..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfMapProjection.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.mapinterfaces.GeoPointImpl;
-import cgeo.geocaching.mapinterfaces.MapProjectionImpl;
-
-import org.mapsforge.android.maps.GeoPoint;
-import org.mapsforge.android.maps.Projection;
-
-import android.graphics.Point;
-
-public class mfMapProjection implements MapProjectionImpl {
-
-    private Projection projection;
-
-    public mfMapProjection(Projection projectionIn) {
-        projection = projectionIn;
-    }
-
-    @Override
-    public void toPixels(GeoPointImpl leftGeo, Point left) {
-        projection.toPixels((GeoPoint) leftGeo, left);
-    }
-
-    @Override
-    public Object getImpl() {
-        return projection;
-    }
-
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfMapView.java b/main/src/cgeo/geocaching/mapsforge/mfMapView.java
deleted file mode 100644
index a4d1e40..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfMapView.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.cgSettings;
-import cgeo.geocaching.mapcommon.cgMapMyOverlay;
-import cgeo.geocaching.mapcommon.cgMapOverlay;
-import cgeo.geocaching.mapcommon.cgOverlayScale;
-import cgeo.geocaching.mapcommon.cgUsersOverlay;
-import cgeo.geocaching.mapinterfaces.GeoPointImpl;
-import cgeo.geocaching.mapinterfaces.MapControllerImpl;
-import cgeo.geocaching.mapinterfaces.MapProjectionImpl;
-import cgeo.geocaching.mapinterfaces.MapViewImpl;
-import cgeo.geocaching.mapinterfaces.OnDragListener;
-import cgeo.geocaching.mapinterfaces.OverlayBase;
-import cgeo.geocaching.mapinterfaces.OverlayImpl;
-import cgeo.geocaching.mapinterfaces.OverlayImpl.overlayType;
-
-import org.mapsforge.android.maps.GeoPoint;
-import org.mapsforge.android.maps.MapDatabase;
-import org.mapsforge.android.maps.MapView;
-import org.mapsforge.android.maps.MapViewMode;
-import org.mapsforge.android.maps.Overlay;
-import org.mapsforge.android.maps.Projection;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.MotionEvent;
-
-public class mfMapView extends MapView implements MapViewImpl {
-    private GestureDetector gestureDetector;
-    private OnDragListener onDragListener;
-
-    public mfMapView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        gestureDetector = new GestureDetector(context, new GestureListener());
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        try {
-            if (getMapZoomLevel() >= 22) { // to avoid too close zoom level (mostly on Samsung Galaxy S series)
-                getController().setZoom(22);
-            }
-
-            super.draw(canvas);
-        } catch (Exception e) {
-            Log.e(cgSettings.tag, "cgMapView.draw: " + e.toString());
-        }
-    }
-
-    @Override
-    public void displayZoomControls(boolean takeFocus) {
-        // nothing to do here
-    }
-
-    @Override
-    public MapControllerImpl getMapController() {
-        return new mfMapController(getController(), getMaxZoomLevel());
-    }
-
-    @Override
-    public GeoPointImpl getMapViewCenter() {
-        GeoPoint point = getMapCenter();
-        return new mfGeoPoint(point.getLatitudeE6(), point.getLongitudeE6());
-    }
-
-    @Override
-    public void addOverlay(OverlayImpl ovl) {
-        getOverlays().add((Overlay) ovl);
-    }
-
-    @Override
-    public void clearOverlays() {
-        getOverlays().clear();
-    }
-
-    @Override
-    public MapProjectionImpl getMapProjection() {
-        return new mfMapProjection(getProjection());
-    }
-
-    @Override
-    public cgMapOverlay createAddMapOverlay(cgSettings settings,
-            Context context, Drawable drawable, boolean fromDetailIntent) {
-
-        mfCacheOverlay ovl = new mfCacheOverlay(settings, context, drawable, fromDetailIntent);
-        getOverlays().add(ovl);
-        return ovl.getBase();
-    }
-
-    @Override
-    public cgUsersOverlay createAddUsersOverlay(Context context, Drawable markerIn) {
-        mfUsersOverlay ovl = new mfUsersOverlay(context, markerIn);
-        getOverlays().add(ovl);
-        return ovl.getBase();
-    }
-
-    @Override
-    public cgMapMyOverlay createAddPositionOverlay(Activity activity,
-            cgSettings settingsIn) {
-        mfOverlay ovl = new mfOverlay(activity, settingsIn, overlayType.PositionOverlay);
-        getOverlays().add(ovl);
-        return (cgMapMyOverlay) ovl.getBase();
-    }
-
-    @Override
-    public cgOverlayScale createAddScaleOverlay(Activity activity,
-            cgSettings settingsIn) {
-        mfOverlay ovl = new mfOverlay(activity, settingsIn, overlayType.ScaleOverlay);
-        getOverlays().add(ovl);
-        return (cgOverlayScale) ovl.getBase();
-    }
-
-    @Override
-    public int getLatitudeSpan() {
-
-        int span = 0;
-
-        Projection projection = getProjection();
-
-        if (projection != null && getHeight() > 0) {
-
-            GeoPoint low = projection.fromPixels(0, 0);
-            GeoPoint high = projection.fromPixels(0, getHeight());
-
-            if (low != null && high != null) {
-                span = Math.abs(high.getLatitudeE6() - low.getLatitudeE6());
-            }
-        }
-
-        return span;
-    }
-
-    @Override
-    public int getLongitudeSpan() {
-
-        int span = 0;
-
-        Projection projection = getProjection();
-
-        if (projection != null && getWidth() > 0) {
-            GeoPoint low = projection.fromPixels(0, 0);
-            GeoPoint high = projection.fromPixels(getWidth(), 0);
-
-            if (low != null && high != null) {
-                span = Math.abs(high.getLongitudeE6() - low.getLongitudeE6());
-            }
-        }
-
-        return span;
-    }
-
-    @Override
-    public void preLoad() {
-        // Nothing to do here
-    }
-
-    @Override
-    public int getMapZoomLevel() {
-        return getZoomLevel() + 1;
-    }
-
-    @Override
-    public boolean needsScaleOverlay() {
-        return false;
-    }
-
-    @Override
-    public void setBuiltinScale(boolean b) {
-        setScaleBar(b);
-    }
-
-    @Override
-    public void setMapSource(cgSettings settings) {
-
-        switch (settings.mapSource) {
-            case mapsforgeOsmarender:
-                setMapViewMode(MapViewMode.OSMARENDER_TILE_DOWNLOAD);
-                break;
-            case mapsforgeCycle:
-                setMapViewMode(MapViewMode.OPENCYCLEMAP_TILE_DOWNLOAD);
-                break;
-            case mapsforgeOffline:
-                if (MapDatabase.isValidMapFile(settings.getMapFile())) {
-                    setMapViewMode(MapViewMode.CANVAS_RENDERER);
-                    super.setMapFile(settings.getMapFile());
-                } else {
-                    setMapViewMode(MapViewMode.MAPNIK_TILE_DOWNLOAD);
-                }
-                break;
-            default:
-                setMapViewMode(MapViewMode.MAPNIK_TILE_DOWNLOAD);
-        }
-    }
-
-    @Override
-    public void repaintRequired(OverlayBase overlay) {
-
-        try {
-            mfOverlay ovl = (mfOverlay) overlay.getOverlayImpl();
-
-            if (ovl != null) {
-                ovl.requestRedraw();
-            }
-
-        } catch (Exception e) {
-            Log.e(cgSettings.tag, "mfMapView.repaintRequired: " + e.toString());
-        }
-    }
-
-    @Override
-    public void setOnDragListener(OnDragListener onDragListener) {
-        this.onDragListener = onDragListener;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        gestureDetector.onTouchEvent(ev);
-        return super.onTouchEvent(ev);
-    }
-
-    private class GestureListener extends SimpleOnGestureListener {
-        @Override
-        public boolean onDoubleTap(MotionEvent e) {
-            if (onDragListener != null) {
-                onDragListener.onDrag();
-            }
-            return true;
-        }
-
-        @Override
-        public boolean onScroll(MotionEvent e1, MotionEvent e2,
-                float distanceX, float distanceY) {
-            if (onDragListener != null) {
-                onDragListener.onDrag();
-            }
-            return super.onScroll(e1, e2, distanceX, distanceY);
-        }
-    }
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfOverlay.java b/main/src/cgeo/geocaching/mapsforge/mfOverlay.java
deleted file mode 100644
index 69ec499..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfOverlay.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.cgSettings;
-import cgeo.geocaching.mapcommon.cgMapMyOverlay;
-import cgeo.geocaching.mapcommon.cgOverlayScale;
-import cgeo.geocaching.mapinterfaces.OverlayBase;
-import cgeo.geocaching.mapinterfaces.OverlayImpl;
-
-import org.mapsforge.android.maps.Overlay;
-import org.mapsforge.android.maps.Projection;
-
-import android.app.Activity;
-import android.graphics.Canvas;
-import android.graphics.Point;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class mfOverlay extends Overlay implements OverlayImpl {
-
-    private OverlayBase overlayBase = null;
-    private Lock lock = new ReentrantLock();
-
-    public mfOverlay(Activity activityIn, cgSettings settingsIn, OverlayImpl.overlayType ovlType) {
-
-        switch (ovlType) {
-            case PositionOverlay:
-                overlayBase = new cgMapMyOverlay(settingsIn, activityIn, this);
-                break;
-            case ScaleOverlay:
-                overlayBase = new cgOverlayScale(activityIn, settingsIn, this);
-        }
-    }
-
-    @Override
-    protected void drawOverlayBitmap(Canvas canvas, Point drawPosition,
-            Projection projection, byte drawZoomLevel) {
-
-        if (overlayBase != null) {
-            overlayBase.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
-        }
-    }
-
-    public OverlayBase getBase() {
-        return overlayBase;
-    }
-
-    @Override
-    public void lock() {
-        lock.lock();
-    }
-
-    @Override
-    public void unlock() {
-        lock.unlock();
-    }
-}
diff --git a/main/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java b/main/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java
deleted file mode 100644
index 06b9f3e..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.mapcommon.cgUsersOverlay;
-import cgeo.geocaching.mapinterfaces.ItemizedOverlayImpl;
-import cgeo.geocaching.mapinterfaces.MapProjectionImpl;
-import cgeo.geocaching.mapinterfaces.MapViewImpl;
-
-import org.mapsforge.android.maps.ItemizedOverlay;
-import org.mapsforge.android.maps.Projection;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Point;
-import android.graphics.drawable.Drawable;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class mfUsersOverlay extends ItemizedOverlay<mfUsersOverlayItem> implements ItemizedOverlayImpl {
-
-    private cgUsersOverlay base;
-    private Lock lock = new ReentrantLock();
-
-    public mfUsersOverlay(Context contextIn, Drawable markerIn) {
-        super(boundCenter(markerIn));
-        base = new cgUsersOverlay(this, contextIn);
-    }
-
-    @Override
-    public cgUsersOverlay getBase() {
-        return base;
-    }
-
-    @Override
-    protected mfUsersOverlayItem createItem(int i) {
-        if (base == null)
-            return null;
-
-        return (mfUsersOverlayItem) base.createItem(i);
-    }
-
-    @Override
-    public int size() {
-        if (base == null)
-            return 0;
-
-        return base.size();
-    }
-
-    @Override
-    protected boolean onTap(int arg0) {
-        if (base == null)
-            return false;
-
-        return base.onTap(arg0);
-    }
-
-    @Override
-    protected void drawOverlayBitmap(Canvas canvas, Point drawPosition,
-            Projection projection, byte drawZoomLevel) {
-
-        base.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
-    }
-
-    @Override
-    public void superPopulate() {
-        populate();
-    }
-
-    @Override
-    public Drawable superBoundCenter(Drawable markerIn) {
-        return super.boundCenter(markerIn);
-    }
-
-    @Override
-    public Drawable superBoundCenterBottom(Drawable marker) {
-        return super.boundCenterBottom(marker);
-    }
-
-    @Override
-    public void superSetLastFocusedItemIndex(int i) {
-        // Nothing to do here
-    }
-
-    @Override
-    public boolean superOnTap(int index) {
-        return super.onTap(index);
-    }
-
-    @Override
-    public void superDraw(Canvas canvas, MapViewImpl mapView, boolean shadow) {
-        // Nothing to do here
-    }
-
-    @Override
-    public void superDrawOverlayBitmap(Canvas canvas, Point drawPosition,
-            MapProjectionImpl projection, byte drawZoomLevel) {
-
-        super.drawOverlayBitmap(canvas, drawPosition, (Projection) projection.getImpl(), drawZoomLevel);
-    }
-
-    @Override
-    public void lock() {
-        lock.lock();
-    }
-
-    @Override
-    public void unlock() {
-        lock.unlock();
-    }
-
-}
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/mapsforge/mfUsersOverlayItem.java b/main/src/cgeo/geocaching/mapsforge/mfUsersOverlayItem.java
deleted file mode 100644
index d53a863..0000000
--- a/main/src/cgeo/geocaching/mapsforge/mfUsersOverlayItem.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cgeo.geocaching.mapsforge;
-
-import cgeo.geocaching.R;
-import cgeo.geocaching.cgUser;
-import cgeo.geocaching.mapinterfaces.UserOverlayItemImpl;
-
-import org.mapsforge.android.maps.GeoPoint;
-import org.mapsforge.android.maps.OverlayItem;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-public class mfUsersOverlayItem extends OverlayItem implements UserOverlayItemImpl {
-    private Context context = null;
-    private cgUser user = null;
-
-    public mfUsersOverlayItem(Context contextIn, cgUser userIn) {
-        super(new GeoPoint((int) (userIn.coords.getLatitudeE6()), userIn.coords.getLongitudeE6()), userIn.username, "");
-
-        context = contextIn;
-        user = userIn;
-    }
-
-    @Override
-    public Drawable getMarker(int state) {
-        Drawable marker = null;
-
-        if (user != null && user.located != null && user.located.getTime() >= (System.currentTimeMillis() - (20 * 60 * 1000))) {
-            marker = context.getResources().getDrawable(R.drawable.user_location_active);
-        } else {
-            marker = context.getResources().getDrawable(R.drawable.user_location);
-        }
-
-        marker.setBounds(0, 0, marker.getIntrinsicWidth(), marker.getIntrinsicHeight());
-        marker.setAlpha(190);
-        setMarker(marker);
-
-        return marker;
-    }
-
-    public cgUser getUser() {
-        return user;
-    }
-}