xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove old Android.makeMarker()

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-27 15:08:05 +01:00
parent 9ec72aabe3
commit ffce767615
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtm-android-app

@ -1 +1 @@
Subproject commit 88d1b3ea76cab934393c6953313b715bdc68ecf4 Subproject commit 3b8538de3c77017f26466bbbf8460b468e59ff21

6
vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java
View File

@ -30,6 +30,7 @@ import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerItem.HotspotPlace; import org.oscim.layers.marker.MarkerItem.HotspotPlace;
import org.oscim.layers.marker.MarkerSymbol; import org.oscim.layers.marker.MarkerSymbol;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Toast; import android.widget.Toast;
@ -44,9 +45,8 @@ public class MarkerOverlayActivity extends MapActivity implements OnItemGestureL
mMapView = (MapView) findViewById(R.id.mapView); mMapView = (MapView) findViewById(R.id.mapView);
registerMapView(mMapView); registerMapView(mMapView);
MarkerSymbol symbol = AndroidGraphics.makeMarker(getResources(), Drawable d = getResources().getDrawable(R.drawable.marker_poi);
R.drawable.marker_poi, MarkerSymbol symbol = AndroidGraphics.makeMarker(d, HotspotPlace.CENTER);
HotspotPlace.CENTER);
ItemizedIconLayer<MarkerItem> markerLayer = ItemizedIconLayer<MarkerItem> markerLayer =
new ItemizedIconLayer<MarkerItem>(mMap, new ArrayList<MarkerItem>(), new ItemizedIconLayer<MarkerItem>(mMap, new ArrayList<MarkerItem>(),

5
vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
View File

@ -26,7 +26,6 @@ import org.oscim.backend.canvas.Paint;
import org.oscim.layers.marker.MarkerItem.HotspotPlace; import org.oscim.layers.marker.MarkerItem.HotspotPlace;
import org.oscim.layers.marker.MarkerSymbol; import org.oscim.layers.marker.MarkerSymbol;
import android.content.res.Resources;
import android.graphics.Bitmap.Config; import android.graphics.Bitmap.Config;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@ -90,10 +89,6 @@ public final class AndroidGraphics extends CanvasAdapter {
return new AndroidBitmap(bitmap); return new AndroidBitmap(bitmap);
} }
public static MarkerSymbol makeMarker(Resources res, int id, HotspotPlace place) {
return makeMarker(res.getDrawable(id), place);
}
public static MarkerSymbol makeMarker(Drawable drawable, HotspotPlace place) { public static MarkerSymbol makeMarker(Drawable drawable, HotspotPlace place) {
if (place == null) if (place == null)
place = HotspotPlace.CENTER; place = HotspotPlace.CENTER;