aboutsummaryrefslogtreecommitdiffstats
path: root/src/cgeo/geocaching/mapsforge
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgeo/geocaching/mapsforge')
-rw-r--r--src/cgeo/geocaching/mapsforge/mfCacheOverlay.java7
-rw-r--r--src/cgeo/geocaching/mapsforge/mfMapFactory.java5
-rw-r--r--src/cgeo/geocaching/mapsforge/mfUsersOverlay.java9
3 files changed, 10 insertions, 11 deletions
diff --git a/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java b/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java
index a7665cb..6333133 100644
--- a/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java
+++ b/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java
@@ -1,7 +1,6 @@
package cgeo.geocaching.mapsforge;
import org.mapsforge.android.maps.ItemizedOverlay;
-import org.mapsforge.android.maps.MapView;
import org.mapsforge.android.maps.Projection;
import android.content.Context;
@@ -23,7 +22,7 @@ public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implemen
super(boundCenterBottom(markerIn));
base = new cgMapOverlay(settingsIn, this, contextIn, fromDetailIn);
}
-
+
@Override
public cgMapOverlay getBase() {
return base;
@@ -49,7 +48,7 @@ public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implemen
protected boolean onTap(int arg0) {
if (base == null)
return false;
-
+
return base.onTap(arg0);
}
@@ -58,7 +57,7 @@ public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implemen
Projection projection, byte drawZoomLevel) {
base.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
}
-
+
@Override
public void superPopulate() {
populate();
diff --git a/src/cgeo/geocaching/mapsforge/mfMapFactory.java b/src/cgeo/geocaching/mapsforge/mfMapFactory.java
index 2031187..fa665ec 100644
--- a/src/cgeo/geocaching/mapsforge/mfMapFactory.java
+++ b/src/cgeo/geocaching/mapsforge/mfMapFactory.java
@@ -1,5 +1,6 @@
package cgeo.geocaching.mapsforge;
+import android.app.Activity;
import android.content.Context;
import cgeo.geocaching.R;
import cgeo.geocaching.cgCoord;
@@ -14,7 +15,7 @@ import cgeo.geocaching.mapinterfaces.UserOverlayItemImpl;
public class mfMapFactory implements MapFactory{
@Override
- public Class getMapClass() {
+ public Class<?extends Activity> getMapClass() {
return mfMapActivity.class;
}
@@ -38,7 +39,7 @@ public class mfMapFactory implements MapFactory{
mfOverlay baseOvl = new mfOverlay(ovlIn);
return baseOvl;
}
-
+
@Override
public CacheOverlayItemImpl getCacheOverlayItem(cgCoord coordinate, String type) {
mfCacheOverlayItem baseItem = new mfCacheOverlayItem(coordinate, type);
diff --git a/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java b/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java
index 64ccc37..8f3ba04 100644
--- a/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java
+++ b/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java
@@ -1,7 +1,6 @@
package cgeo.geocaching.mapsforge;
import org.mapsforge.android.maps.ItemizedOverlay;
-import org.mapsforge.android.maps.MapView;
import org.mapsforge.android.maps.Projection;
import android.content.Context;
@@ -21,7 +20,7 @@ public class mfUsersOverlay extends ItemizedOverlay<mfUsersOverlayItem> implemen
super(boundCenter(markerIn));
base = new cgUsersOverlay(this, contextIn);
}
-
+
@Override
public cgUsersOverlay getBase() {
return base;
@@ -47,14 +46,14 @@ public class mfUsersOverlay extends ItemizedOverlay<mfUsersOverlayItem> implemen
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);
}
@@ -91,7 +90,7 @@ public class mfUsersOverlay extends ItemizedOverlay<mfUsersOverlayItem> implemen
@Override
public void superDrawOverlayBitmap(Canvas canvas, Point drawPosition,
MapProjectionImpl projection, byte drawZoomLevel) {
-
+
super.drawOverlayBitmap(canvas, drawPosition, (Projection) projection.getImpl(), drawZoomLevel);
}