remove mapsforge 0.24 support

12 files changed, 12 insertions, 745 deletions

diff --git a/main/libs/mapsforge-map-0.2.4.jar b/main/libs/mapsforge-map-0.2.4.jar
deleted file mode 100644
index ec9aa4c..0000000
--- a/main/libs/mapsforge-map-0.2.4.jar
+++ /dev/null
diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml
index 676db44..413deea 100644
--- a/main/res/values/changelog_master.xml
+++ b/main/res/values/changelog_master.xml
@@ -26,6 +26,7 @@
     · Fix: Recognize more hyperlinks of opencaching caches\n
     · Fix: Remove empty space in some opencaching logs\n
     · Fix: Allow up navigation when opening the app from a link\n
+    · Removed: No longer support loading mapsforge 0.24 maps\n
     \n
   </string>
 </resources>
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
index 01b10ec..8027808 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
@@ -7,8 +7,6 @@ import cgeo.geocaching.maps.MapProviderFactory;
 import cgeo.geocaching.maps.interfaces.MapItemFactory;
 import cgeo.geocaching.maps.interfaces.MapProvider;
 import cgeo.geocaching.maps.interfaces.MapSource;
-import cgeo.geocaching.maps.mapsforge.v024.MapsforgeMapActivity024;
-import cgeo.geocaching.maps.mapsforge.v024.MapsforgeMapItemFactory024;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.Log;
 
@@ -30,7 +28,6 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
 
     public static final String MAPSFORGE_CYCLEMAP_ID = "MAPSFORGE_CYCLEMAP";
     public static final String MAPSFORGE_MAPNIK_ID = "MAPSFORGE_MAPNIK";
-    private boolean oldMap = false;
     private MapItemFactory mapItemFactory = new MapsforgeMapItemFactory();
 
     private MapsforgeMapProvider() {
@@ -56,13 +53,13 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
             return Collections.emptyList();
         }
 
-        File directory = new File(directoryPath);
+        final File directory = new File(directoryPath);
         if (directory.isDirectory()) {
             try {
-                ArrayList<String> mapFileList = new ArrayList<>();
+                final ArrayList<String> mapFileList = new ArrayList<>();
                 final File[] files = directory.listFiles();
                 if (ArrayUtils.isNotEmpty(files)) {
-                    for (File file : files) {
+                    for (final File file : files) {
                         if (file.getName().endsWith(".map")) {
                             if (MapsforgeMapProvider.isValidMapFile(file.getAbsolutePath())) {
                                 mapFileList.add(file.getAbsolutePath());
@@ -72,69 +69,44 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
                     Collections.sort(mapFileList, String.CASE_INSENSITIVE_ORDER);
                 }
                 return mapFileList;
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 Log.e("MapsforgeMapProvider.getOfflineMaps: ", e);
             }
         }
         return Collections.emptyList();
     }
 
-    public static boolean isValidMapFile(String mapFileIn) {
+    public static boolean isValidMapFile(final String mapFileIn) {
 
         if (StringUtils.isEmpty(mapFileIn)) {
             return false;
         }
 
-        MapDatabase mapDB = new MapDatabase();
-        FileOpenResult result = mapDB.openFile(new File(mapFileIn));
+        final MapDatabase mapDB = new MapDatabase();
+        final FileOpenResult result = mapDB.openFile(new File(mapFileIn));
         mapDB.closeFile();
 
-        boolean isValid = result.isSuccess();
-
-        if (!isValid) {
-            isValid = isMapfile024(mapFileIn);
-        }
-
-        return isValid;
-    }
-
-    private static boolean isMapfile024(String mapFileIn) {
-        return mapFileIn != null && org.mapsforge.android.mapsold.MapDatabase.isValidMapFile(mapFileIn);
+        return result.isSuccess();
     }
 
     @Override
     public boolean isSameActivity(final MapSource source1, final MapSource source2) {
-        return source1 == source2 ||
-                !isMapfile024(Settings.getMapFile()) ||
-                (!(source1 instanceof OfflineMapSource) && !(source2 instanceof OfflineMapSource));
+        return source1 == source2 || (!(source1 instanceof OfflineMapSource) && !(source2 instanceof OfflineMapSource));
     }
 
     @Override
     public Class<? extends Activity> getMapClass() {
-        final MapSource source = Settings.getMapSource();
-        if (source instanceof OfflineMapSource && isMapfile024(Settings.getMapFile())) {
-            oldMap = true;
-            mapItemFactory = new MapsforgeMapItemFactory024();
-            return MapsforgeMapActivity024.class;
-        }
-        oldMap = false;
         mapItemFactory = new MapsforgeMapItemFactory();
         return MapsforgeMapActivity.class;
     }
 
     @Override
     public int getMapViewId() {
-        if (oldMap) {
-            return R.id.mfmap_old;
-        }
         return R.id.mfmap;
     }
 
     @Override
     public int getMapLayoutId() {
-        if (oldMap) {
-            return R.layout.map_mapsforge_old;
-        }
         return R.layout.map_mapsforge;
     }
 
@@ -152,7 +124,7 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
 
         private final String fileName;
 
-        public OfflineMapSource(final String fileName, MapProvider mapProvider, final String name, final MapGeneratorInternal generator) {
+        public OfflineMapSource(final String fileName, final MapProvider mapProvider, final String name, final MapGeneratorInternal generator) {
             super(fileName, mapProvider, name, generator);
             this.fileName = fileName;
         }
@@ -171,7 +143,7 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
         MapProviderFactory.deleteOfflineMapSources();
         final Resources resources = CgeoApplication.getInstance().getResources();
         final List<String> offlineMaps = getOfflineMaps();
-        for (String mapFile : offlineMaps) {
+        for (final String mapFile : offlineMaps) {
             final String mapName = StringUtils.capitalize(StringUtils.substringBeforeLast(new File(mapFile).getName(), "."));
             registerMapSource(new OfflineMapSource(mapFile, this, mapName + " (" + resources.getString(R.string.map_source_osm_offline) + ")", MapGeneratorInternal.DATABASE_RENDERER));
         }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeCacheOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeCacheOverlay.java
deleted file mode 100644
index a8111ed..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeCacheOverlay.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.maps.CachesOverlay;
-import cgeo.geocaching.maps.interfaces.ItemizedOverlayImpl;
-import cgeo.geocaching.maps.interfaces.MapProjectionImpl;
-import cgeo.geocaching.maps.interfaces.MapViewImpl;
-
-import org.mapsforge.android.mapsold.ItemizedOverlay;
-import org.mapsforge.android.mapsold.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 MapsforgeCacheOverlay extends ItemizedOverlay<MapsforgeCacheOverlayItem> implements ItemizedOverlayImpl {
-
-    private CachesOverlay base;
-    private Lock lock = new ReentrantLock();
-
-    public MapsforgeCacheOverlay(Context contextIn, Drawable markerIn) {
-        super(boundCenterBottom(markerIn));
-        base = new CachesOverlay(this, contextIn);
-    }
-
-    @Override
-    public CachesOverlay getBase() {
-        return base;
-    }
-
-    @Override
-    protected MapsforgeCacheOverlayItem createItem(int i) {
-        if (base == null) {
-            return null;
-        }
-
-        return (MapsforgeCacheOverlayItem) 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 MapsforgeMapProjection(projection), drawZoomLevel);
-    }
-
-    @Override
-    public void superPopulate() {
-        populate();
-    }
-
-    @Override
-    public Drawable superBoundCenterBottom(Drawable marker) {
-        return ItemizedOverlay.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();
-    }
-
-    @Override
-    public MapViewImpl getMapViewImpl() {
-        return (MapViewImpl) internalMapView;
-    }
-
-}
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeCacheOverlayItem.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeCacheOverlayItem.java
deleted file mode 100644
index 4e4a358..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeCacheOverlayItem.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.IWaypoint;
-import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl;
-
-import org.mapsforge.android.mapsold.GeoPoint;
-import org.mapsforge.android.mapsold.OverlayItem;
-
-import android.graphics.drawable.Drawable;
-
-public class MapsforgeCacheOverlayItem extends OverlayItem implements CachesOverlayItemImpl {
-    final private IWaypoint coord;
-    final private boolean applyDistanceRule;
-
-    public MapsforgeCacheOverlayItem(IWaypoint coordinate, boolean applyDistanceRule) {
-        super(new GeoPoint(coordinate.getCoords().getLatitudeE6(), coordinate.getCoords().getLongitudeE6()), coordinate.getName(), "");
-
-        this.coord = coordinate;
-        this.applyDistanceRule = applyDistanceRule;
-    }
-
-    @Override
-    public IWaypoint getCoord() {
-        return coord;
-    }
-
-    @Override
-    public Drawable getMarker(int index) {
-        return getMarker();
-    }
-
-    @Override
-    public boolean applyDistanceRule() {
-        return applyDistanceRule;
-    }
-
-}
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeGeoPoint.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeGeoPoint.java
deleted file mode 100644
index 72aceb0..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeGeoPoint.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.location.Geopoint;
-import cgeo.geocaching.maps.interfaces.GeoPointImpl;
-
-import org.mapsforge.android.mapsold.GeoPoint;
-
-public class MapsforgeGeoPoint extends GeoPoint implements GeoPointImpl {
-
-    public MapsforgeGeoPoint(int latitudeE6, int longitudeE6) {
-        super(latitudeE6, longitudeE6);
-    }
-
-    @Override
-    public Geopoint getCoords() {
-        return new Geopoint(getLatitudeE6() / 1e6, getLongitudeE6() / 1e6);
-    }
-}
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java
deleted file mode 100644
index daeb2b8..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.activity.ActivityMixin;
-import cgeo.geocaching.activity.FilteredActivity;
-import cgeo.geocaching.maps.AbstractMap;
-import cgeo.geocaching.maps.CGeoMap;
-import cgeo.geocaching.maps.interfaces.MapActivityImpl;
-
-import org.mapsforge.android.mapsold.MapActivity;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-public class MapsforgeMapActivity024 extends MapActivity implements MapActivityImpl, FilteredActivity {
-
-    private AbstractMap mapBase;
-
-    public MapsforgeMapActivity024() {
-        mapBase = new CGeoMap(this);
-    }
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        mapBase.onCreate(icicle);
-    }
-
-    @Override
-    protected void onSaveInstanceState(final Bundle outState) {
-        mapBase.onSaveInstanceState(outState);
-    }
-
-    @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);
-    }
-
-    @Override
-    public void navigateUp(View view) {
-        ActivityMixin.navigateUp(this);
-    }
-
-    @Override
-    public void showFilterMenu(View view) {
-        // do nothing, the filter bar only shows the global filter
-    }
-}
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapController.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapController.java
deleted file mode 100644
index db33d56..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.maps.interfaces.GeoPointImpl;
-import cgeo.geocaching.maps.interfaces.MapControllerImpl;
-
-import org.mapsforge.android.mapsold.GeoPoint;
-import org.mapsforge.android.mapsold.MapController;
-
-public class MapsforgeMapController implements MapControllerImpl {
-
-    private MapController mapController;
-    private int maxZoomLevel;
-
-    public MapsforgeMapController(MapController mapControllerIn, int maxZoomLevelIn) {
-        mapController = mapControllerIn;
-        maxZoomLevel = maxZoomLevelIn;
-    }
-
-    @Override
-    public void animateTo(GeoPointImpl geoPoint) {
-        mapController.setCenter(castToGeoPointImpl(geoPoint));
-    }
-
-    private static GeoPoint castToGeoPointImpl(GeoPointImpl geoPoint) {
-        assert geoPoint instanceof GeoPoint;
-        return (GeoPoint) geoPoint;
-    }
-
-    @Override
-    public void setCenter(GeoPointImpl geoPoint) {
-        mapController.setCenter(castToGeoPointImpl(geoPoint));
-    }
-
-    /**
-     * Set the map zoom level to mapzoom-1 or maxZoomLevel, whichever is least
-     * mapzoom-1 is used to be compatible with Google Maps zoom levels
-     */
-    @Override
-    public void setZoom(int mapzoom) {
-        // Google Maps and OSM Maps use different zoom levels for the same view.
-        // All OSM Maps zoom levels are offset by 1 so they match Google Maps.
-        mapController.setZoom(Math.min(mapzoom - 1, maxZoomLevel));
-    }
-
-    @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/maps/mapsforge/v024/MapsforgeMapItemFactory024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java
deleted file mode 100644
index 23d94d9..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.IWaypoint;
-import cgeo.geocaching.location.Geopoint;
-import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl;
-import cgeo.geocaching.maps.interfaces.GeoPointImpl;
-import cgeo.geocaching.maps.interfaces.MapItemFactory;
-
-public class MapsforgeMapItemFactory024 implements MapItemFactory {
-
-    @Override
-    public GeoPointImpl getGeoPointBase(final Geopoint coords) {
-        return new MapsforgeGeoPoint(coords.getLatitudeE6(), coords.getLongitudeE6());
-    }
-
-    @Override
-    public CachesOverlayItemImpl getCachesOverlayItem(final IWaypoint coordinate, boolean applyDistanceRule) {
-        return new MapsforgeCacheOverlayItem(coordinate, applyDistanceRule);
-    }
-}
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapProjection.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapProjection.java
deleted file mode 100644
index 9d36b7d..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapProjection.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.maps.interfaces.GeoPointImpl;
-import cgeo.geocaching.maps.interfaces.MapProjectionImpl;
-
-import org.mapsforge.android.mapsold.GeoPoint;
-import org.mapsforge.android.mapsold.Projection;
-
-import android.graphics.Point;
-
-public class MapsforgeMapProjection implements MapProjectionImpl {
-
-    private Projection projection;
-
-    public MapsforgeMapProjection(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/maps/mapsforge/v024/MapsforgeMapView024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java
deleted file mode 100644
index af9b756..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.R;
-import cgeo.geocaching.location.Geopoint;
-import cgeo.geocaching.location.Viewport;
-import cgeo.geocaching.maps.CachesOverlay;
-import cgeo.geocaching.maps.PositionAndScaleOverlay;
-import cgeo.geocaching.maps.interfaces.GeneralOverlay;
-import cgeo.geocaching.maps.interfaces.GeoPointImpl;
-import cgeo.geocaching.maps.interfaces.MapControllerImpl;
-import cgeo.geocaching.maps.interfaces.MapProjectionImpl;
-import cgeo.geocaching.maps.interfaces.MapViewImpl;
-import cgeo.geocaching.maps.interfaces.OnMapDragListener;
-import cgeo.geocaching.settings.Settings;
-import cgeo.geocaching.utils.Log;
-
-import org.eclipse.jdt.annotation.NonNull;
-import org.mapsforge.android.mapsold.GeoPoint;
-import org.mapsforge.android.mapsold.MapDatabase;
-import org.mapsforge.android.mapsold.MapView;
-import org.mapsforge.android.mapsold.MapViewMode;
-import org.mapsforge.android.mapsold.Overlay;
-import org.mapsforge.android.mapsold.Projection;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.MotionEvent;
-import android.widget.Toast;
-public class MapsforgeMapView024 extends MapView implements MapViewImpl {
-    private GestureDetector gestureDetector;
-    private OnMapDragListener onDragListener;
-    private final MapsforgeMapController mapController = new MapsforgeMapController(getController(), getMaxZoomLevel());
-
-    public MapsforgeMapView024(final Context context, final AttributeSet attrs) {
-        super(context, attrs);
-        initialize(context);
-    }
-
-    private void initialize(final Context context) {
-        if (isInEditMode()) {
-            return;
-        }
-        gestureDetector = new GestureDetector(context, new GestureListener());
-    }
-
-    @Override
-    public void draw(@NonNull final Canvas canvas) {
-        try {
-            // Google Maps and OSM Maps use different zoom levels for the same view.
-            // Here we don't want the Google Maps compatible zoom level, but the actual one.
-            if (getActualMapZoomLevel() > 22) { // to avoid too close zoom level (mostly on Samsung Galaxy S series)
-                getController().setZoom(22);
-            }
-
-            super.draw(canvas);
-        } catch (final Exception e) {
-            Log.e("MapsforgeMapView024.draw", e);
-        }
-    }
-
-    @Override
-    public void displayZoomControls(final boolean takeFocus) {
-        // nothing to do here
-    }
-
-    @Override
-    public MapControllerImpl getMapController() {
-        return mapController;
-    }
-
-    @Override
-    @NonNull
-    public GeoPointImpl getMapViewCenter() {
-        final GeoPoint point = getMapCenter();
-        return new MapsforgeGeoPoint(point.getLatitudeE6(), point.getLongitudeE6());
-    }
-
-    @Override
-    public Viewport getViewport() {
-        return new Viewport(getMapViewCenter(), getLatitudeSpan() / 1e6, getLongitudeSpan() / 1e6);
-    }
-
-    @Override
-    public void clearOverlays() {
-        getOverlays().clear();
-    }
-
-    @Override
-    public MapProjectionImpl getMapProjection() {
-        return new MapsforgeMapProjection(getProjection());
-    }
-
-    @Override
-    public CachesOverlay createAddMapOverlay(final Context context, final Drawable drawable) {
-
-        final MapsforgeCacheOverlay ovl = new MapsforgeCacheOverlay(context, drawable);
-        getOverlays().add(ovl);
-        return ovl.getBase();
-    }
-
-    @Override
-    public PositionAndScaleOverlay createAddPositionAndScaleOverlay(final Geopoint coords, final String geocode) {
-        final MapsforgeOverlay ovl = new MapsforgeOverlay(this, coords, geocode);
-        getOverlays().add(ovl);
-        return (PositionAndScaleOverlay) ovl.getBase();
-    }
-
-    @Override
-    public int getLatitudeSpan() {
-
-        int span = 0;
-
-        final Projection projection = getProjection();
-
-        if (projection != null && getHeight() > 0) {
-
-            final GeoPoint low = projection.fromPixels(0, 0);
-            final 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;
-
-        final Projection projection = getProjection();
-
-        if (projection != null && getWidth() > 0) {
-            final GeoPoint low = projection.fromPixels(0, 0);
-            final 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
-    }
-
-    /**
-     * Get the map zoom level which is compatible with Google Maps.
-     *
-     * @return the current map zoom level +1
-     */
-    @Override
-    public int getMapZoomLevel() {
-        // Google Maps and OSM Maps use different zoom levels for the same view.
-        // All OSM Maps zoom levels are offset by 1 so they match Google Maps.
-        return getZoomLevel() + 1;
-    }
-
-    /**
-     * Get the actual map zoom level
-     *
-     * @return the current map zoom level with no adjustments
-     */
-    private int getActualMapZoomLevel() {
-        return getZoomLevel();
-    }
-
-    @Override
-    public void setMapSource() {
-        setMapViewMode(MapViewMode.CANVAS_RENDERER);
-        setMapFile(Settings.getMapFile());
-        if (!MapDatabase.isValidMapFile(Settings.getMapFile())) {
-            Log.e("MapsforgeMapView024: Invalid map file");
-        }
-        Toast.makeText(
-                getContext(),
-                getContext().getResources().getString(R.string.warn_deprecated_mapfile),
-                Toast.LENGTH_LONG)
-                .show();
-    }
-
-    @Override
-    public void repaintRequired(final GeneralOverlay overlay) {
-
-        if (null == overlay) {
-            invalidate();
-        } else {
-            try {
-                final Overlay ovl = (Overlay) overlay.getOverlayImpl();
-
-                if (ovl != null) {
-                    ovl.requestRedraw();
-                }
-
-            } catch (final Exception e) {
-                Log.e("MapsforgeMapView024.repaintRequired", e);
-            }
-        }
-    }
-
-    @Override
-    public void setOnDragListener(final OnMapDragListener onDragListener) {
-        this.onDragListener = onDragListener;
-    }
-
-    @Override
-    public boolean onTouchEvent(final MotionEvent ev) {
-        gestureDetector.onTouchEvent(ev);
-        return super.onTouchEvent(ev);
-    }
-
-    private class GestureListener extends SimpleOnGestureListener {
-        @Override
-        public boolean onDoubleTap(final MotionEvent e) {
-            if (onDragListener != null) {
-                onDragListener.onDrag();
-            }
-            return true;
-        }
-
-        @Override
-        public boolean onScroll(final MotionEvent e1, final MotionEvent e2,
-                final float distanceX, final float distanceY) {
-            if (onDragListener != null) {
-                onDragListener.onDrag();
-            }
-            return super.onScroll(e1, e2, distanceX, distanceY);
-        }
-    }
-
-    @Override
-    public boolean needsInvertedColors() {
-        return false;
-    }
-
-    @Override
-    public boolean hasMapThemes() {
-        // not supported
-        return false;
-    }
-
-    @Override
-    public void setMapTheme() {
-        // not supported
-    }
-}
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOverlay.java
deleted file mode 100644
index fda6dc1..0000000
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOverlay.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package cgeo.geocaching.maps.mapsforge.v024;
-
-import cgeo.geocaching.location.Geopoint;
-import cgeo.geocaching.maps.PositionAndScaleOverlay;
-import cgeo.geocaching.maps.interfaces.GeneralOverlay;
-import cgeo.geocaching.maps.interfaces.MapViewImpl;
-import cgeo.geocaching.maps.interfaces.OverlayImpl;
-
-import org.mapsforge.android.mapsold.Overlay;
-import org.mapsforge.android.mapsold.Projection;
-
-import android.graphics.Canvas;
-import android.graphics.Point;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class MapsforgeOverlay extends Overlay implements OverlayImpl {
-
-    private PositionAndScaleOverlay overlayBase = null;
-    private final Lock lock = new ReentrantLock();
-
-    public MapsforgeOverlay(final MapViewImpl mapView, final Geopoint coords, final String geocode) {
-        overlayBase = new PositionAndScaleOverlay(this, mapView, coords, geocode);
-    }
-
-    @Override
-    protected void drawOverlayBitmap(final Canvas canvas, final Point drawPosition,
-            final Projection projection, final byte drawZoomLevel) {
-
-        if (overlayBase != null) {
-            overlayBase.drawOverlayBitmap(canvas, drawPosition, new MapsforgeMapProjection(projection), drawZoomLevel);
-        }
-    }
-
-    public GeneralOverlay getBase() {
-        return overlayBase;
-    }
-
-    @Override
-    public void lock() {
-        lock.lock();
-    }
-
-    @Override
-    public void unlock() {
-        lock.unlock();
-    }
-
-    @Override
-    public MapViewImpl getMapViewImpl() {
-        return (MapViewImpl) internalMapView;
-    }
-
-}