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

Merge branch 'android_marker'

Browse Source
This commit is contained in:
Hannes Janetzek
2014-01-27 15:16:53 +01:00
parent 8eb6377a69 ffce767615
commit c49618a653
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vtm-android-app

Submodule vtm-android-app updated: 88d1b3ea76...3b8538de3c

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

7
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.MarkerSymbol;
import android.content.res.Resources;
import android.graphics.Bitmap.Config;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
@@ -90,14 +89,10 @@ public final class AndroidGraphics extends CanvasAdapter {
return new AndroidBitmap(bitmap);
}
public static MarkerSymbol makeMarker(Resources res, int id, HotspotPlace place) {
public static MarkerSymbol makeMarker(Drawable drawable, HotspotPlace place) {
if (place == null)
place = HotspotPlace.CENTER;
Drawable drawable = res.getDrawable(id);
return new MarkerSymbol(drawableToBitmap(drawable), place);
}
}