diff options
Diffstat (limited to 'main/src/cgeo/geocaching/maps/mapsforge')
8 files changed, 0 insertions, 339 deletions
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java index 0df7894..10fcb03 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java @@ -3,13 +3,9 @@ package cgeo.geocaching.maps.mapsforge; import cgeo.geocaching.IWaypoint; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.go4cache.Go4CacheUser; import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl; import cgeo.geocaching.maps.interfaces.GeoPointImpl; import cgeo.geocaching.maps.interfaces.MapItemFactory; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import android.content.Context; public class MapsforgeMapItemFactory implements MapItemFactory { @@ -23,9 +19,4 @@ public class MapsforgeMapItemFactory implements MapItemFactory { return new MapsforgeCacheOverlayItem(coordinate, type); } - @Override - public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, Go4CacheUser userOne) { - return new MapsforgeOtherCachersOverlayItem(context, userOne); - } - } diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java index c24a798..3dd58a7 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java @@ -5,7 +5,6 @@ import cgeo.geocaching.Settings; import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.maps.CachesOverlay; import cgeo.geocaching.maps.MapProviderFactory; -import cgeo.geocaching.maps.OtherCachersOverlay; import cgeo.geocaching.maps.PositionOverlay; import cgeo.geocaching.maps.ScaleOverlay; import cgeo.geocaching.maps.interfaces.GeneralOverlay; @@ -108,13 +107,6 @@ public class MapsforgeMapView extends MapView implements MapViewImpl { } @Override - public OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn) { - MapsforgeOtherCachersOverlay ovl = new MapsforgeOtherCachersOverlay(context, markerIn); - getOverlays().add(ovl); - return ovl.getBase(); - } - - @Override public PositionOverlay createAddPositionOverlay(Activity activity) { MapsforgeOverlay ovl = new MapsforgeOverlay(activity, overlayType.PositionOverlay); getOverlays().add(ovl); diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlay.java deleted file mode 100644 index 66aa13e..0000000 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlay.java +++ /dev/null @@ -1,120 +0,0 @@ -package cgeo.geocaching.maps.mapsforge; - -import cgeo.geocaching.maps.OtherCachersOverlay; -import cgeo.geocaching.maps.interfaces.ItemizedOverlayImpl; -import cgeo.geocaching.maps.interfaces.MapProjectionImpl; -import cgeo.geocaching.maps.interfaces.MapViewImpl; - -import org.mapsforge.android.maps.Projection; -import org.mapsforge.android.maps.overlay.ItemizedOverlay; - -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 MapsforgeOtherCachersOverlay extends ItemizedOverlay<MapsforgeOtherCachersOverlayItem> implements ItemizedOverlayImpl { - - private OtherCachersOverlay base; - private Lock lock = new ReentrantLock(); - - public MapsforgeOtherCachersOverlay(Context contextIn, Drawable markerIn) { - super(boundCenter(markerIn)); - base = new OtherCachersOverlay(this, contextIn); - } - - @Override - public OtherCachersOverlay getBase() { - return base; - } - - @Override - protected MapsforgeOtherCachersOverlayItem createItem(int i) { - if (base == null) { - return null; - } - - return (MapsforgeOtherCachersOverlayItem) 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 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(); - } - - @Override - public MapViewImpl getMapViewImpl() { - return (MapViewImpl) internalMapView; - } - -}
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlayItem.java deleted file mode 100644 index f80664e..0000000 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlayItem.java +++ /dev/null @@ -1,32 +0,0 @@ -package cgeo.geocaching.maps.mapsforge; - -import cgeo.geocaching.go4cache.Go4CacheUser; -import cgeo.geocaching.maps.OtherCachersOverlayItem; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import org.mapsforge.android.maps.overlay.OverlayItem; -import org.mapsforge.core.GeoPoint; - -import android.content.Context; -import android.graphics.drawable.Drawable; - -public class MapsforgeOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl { - private final OtherCachersOverlayItem item; - - public MapsforgeOtherCachersOverlayItem(Context context, Go4CacheUser user) { - super(new GeoPoint(user.getCoords().getLatitudeE6(), user.getCoords().getLongitudeE6()), user.getUsername(), ""); - item = new OtherCachersOverlayItem(context, user); - } - - @Override - public Drawable getMarker(int state) { - Drawable marker = item.getMarker(); - setMarker(marker); - return marker; - } - - @Override - public Go4CacheUser getUser() { - return item.getUser(); - } -} diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java index 863cbca..5c64592 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java @@ -3,13 +3,9 @@ package cgeo.geocaching.maps.mapsforge.v024; import cgeo.geocaching.IWaypoint; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.go4cache.Go4CacheUser; import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl; import cgeo.geocaching.maps.interfaces.GeoPointImpl; import cgeo.geocaching.maps.interfaces.MapItemFactory; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import android.content.Context; public class MapsforgeMapItemFactory024 implements MapItemFactory { @@ -22,10 +18,4 @@ public class MapsforgeMapItemFactory024 implements MapItemFactory { public CachesOverlayItemImpl getCachesOverlayItem(final IWaypoint coordinate, final CacheType type) { return new MapsforgeCacheOverlayItem(coordinate, type); } - - @Override - public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, Go4CacheUser userOne) { - return new MapsforgeOtherCachersOverlayItem(context, userOne); - } - } diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java index e53d976..a459804 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java @@ -4,7 +4,6 @@ import cgeo.geocaching.R; import cgeo.geocaching.Settings; import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.maps.CachesOverlay; -import cgeo.geocaching.maps.OtherCachersOverlay; import cgeo.geocaching.maps.PositionOverlay; import cgeo.geocaching.maps.ScaleOverlay; import cgeo.geocaching.maps.interfaces.GeneralOverlay; @@ -103,13 +102,6 @@ public class MapsforgeMapView024 extends MapView implements MapViewImpl { } @Override - public OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn) { - MapsforgeOtherCachersOverlay ovl = new MapsforgeOtherCachersOverlay(context, markerIn); - getOverlays().add(ovl); - return ovl.getBase(); - } - - @Override public PositionOverlay createAddPositionOverlay(Activity activity) { MapsforgeOverlay ovl = new MapsforgeOverlay(activity, overlayType.PositionOverlay); getOverlays().add(ovl); diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlay.java deleted file mode 100644 index 64ce8b0..0000000 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlay.java +++ /dev/null @@ -1,120 +0,0 @@ -package cgeo.geocaching.maps.mapsforge.v024; - -import cgeo.geocaching.maps.OtherCachersOverlay; -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 MapsforgeOtherCachersOverlay extends ItemizedOverlay<MapsforgeOtherCachersOverlayItem> implements ItemizedOverlayImpl { - - private OtherCachersOverlay base; - private Lock lock = new ReentrantLock(); - - public MapsforgeOtherCachersOverlay(Context contextIn, Drawable markerIn) { - super(boundCenter(markerIn)); - base = new OtherCachersOverlay(this, contextIn); - } - - @Override - public OtherCachersOverlay getBase() { - return base; - } - - @Override - protected MapsforgeOtherCachersOverlayItem createItem(int i) { - if (base == null) { - return null; - } - - return (MapsforgeOtherCachersOverlayItem) 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 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(); - } - - @Override - public MapViewImpl getMapViewImpl() { - return (MapViewImpl) internalMapView; - } - -}
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlayItem.java deleted file mode 100644 index ec38500..0000000 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlayItem.java +++ /dev/null @@ -1,32 +0,0 @@ -package cgeo.geocaching.maps.mapsforge.v024; - -import cgeo.geocaching.go4cache.Go4CacheUser; -import cgeo.geocaching.maps.OtherCachersOverlayItem; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import org.mapsforge.android.mapsold.GeoPoint; -import org.mapsforge.android.mapsold.OverlayItem; - -import android.content.Context; -import android.graphics.drawable.Drawable; - -public class MapsforgeOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl { - private final OtherCachersOverlayItem item; - - public MapsforgeOtherCachersOverlayItem(Context context, Go4CacheUser user) { - super(new GeoPoint(user.getCoords().getLatitudeE6(), user.getCoords().getLongitudeE6()), user.getUsername(), ""); - item = new OtherCachersOverlayItem(context, user); - } - - @Override - public Drawable getMarker(int state) { - Drawable marker = item.getMarker(); - setMarker(marker); - return marker; - } - - @Override - public Go4CacheUser getUser() { - return item.getUser(); - } -} |