From 02b29c7584d9d13ef31109af89e8c67dd3967700 Mon Sep 17 00:00:00 2001 From: Emux Date: Thu, 28 Sep 2017 20:12:04 +0300 Subject: [PATCH] Samples improvements #32 --- .../res/drawable-hdpi/marker_green.png | Bin 0 -> 3242 bytes .../res/drawable-hdpi/marker_red.png | Bin 0 -> 3621 bytes .../res/drawable-mdpi/marker_green.png | Bin 0 -> 1944 bytes .../res/drawable-mdpi/marker_red.png | Bin 0 -> 2188 bytes .../test/AtlasMarkerOverlayActivity.java | 10 ++-------- .../test/ClusterMarkerOverlayActivity.java | 2 +- .../android/test/MarkerOverlayActivity.java | 16 ++++++---------- .../oscim/android/test/PoiSearchActivity.java | 18 ++++++++++++------ .../oscim/android/canvas/AndroidGraphics.java | 4 ++-- 9 files changed, 23 insertions(+), 27 deletions(-) create mode 100644 vtm-android-example/res/drawable-hdpi/marker_green.png create mode 100644 vtm-android-example/res/drawable-hdpi/marker_red.png create mode 100644 vtm-android-example/res/drawable-mdpi/marker_green.png create mode 100644 vtm-android-example/res/drawable-mdpi/marker_red.png diff --git a/vtm-android-example/res/drawable-hdpi/marker_green.png b/vtm-android-example/res/drawable-hdpi/marker_green.png new file mode 100644 index 0000000000000000000000000000000000000000..f970f29600819fe9b6af39b2ed7f4e762cd1988f GIT binary patch literal 3242 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 O0000 inputMap = new LinkedHashMap<>(); diff --git a/vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java b/vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java index 64af7cd6..bd7eafd9 100644 --- a/vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java @@ -48,7 +48,7 @@ public class ClusterMarkerOverlayActivity extends MarkerOverlayActivity { mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); - Bitmap bitmapPoi = drawableToBitmap(getResources(), R.drawable.marker_poi); + Bitmap bitmapPoi = drawableToBitmap(getResources().getDrawable(R.drawable.marker_poi)); MarkerSymbol symbol; if (BILLBOARDS) symbol = new MarkerSymbol(bitmapPoi, MarkerSymbol.HotspotPlace.BOTTOM_CENTER); diff --git a/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java b/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java index e24774fa..e095aab5 100644 --- a/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java @@ -17,7 +17,6 @@ */ package org.oscim.android.test; -import android.graphics.drawable.Drawable; import android.widget.Toast; import org.oscim.backend.canvas.Bitmap; @@ -59,21 +58,18 @@ public class MarkerOverlayActivity extends SimpleMapActivity mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); - /* directly load bitmap from resources */ - Bitmap bitmap = drawableToBitmap(getResources(), R.drawable.marker_poi); - + Bitmap bitmapPoi = drawableToBitmap(getResources().getDrawable(R.drawable.marker_poi)); MarkerSymbol symbol; if (BILLBOARDS) - symbol = new MarkerSymbol(bitmap, HotspotPlace.BOTTOM_CENTER); + symbol = new MarkerSymbol(bitmapPoi, HotspotPlace.BOTTOM_CENTER); else - symbol = new MarkerSymbol(bitmap, HotspotPlace.CENTER, false); + symbol = new MarkerSymbol(bitmapPoi, HotspotPlace.CENTER, false); - /* another option: use some bitmap drawable */ - Drawable d = getResources().getDrawable(R.drawable.marker_focus); + Bitmap bitmapFocus = drawableToBitmap(getResources().getDrawable(R.drawable.marker_focus)); if (BILLBOARDS) - mFocusMarker = new MarkerSymbol(drawableToBitmap(d), HotspotPlace.BOTTOM_CENTER); + mFocusMarker = new MarkerSymbol(bitmapFocus, HotspotPlace.BOTTOM_CENTER); else - mFocusMarker = new MarkerSymbol(drawableToBitmap(d), HotspotPlace.CENTER, false); + mFocusMarker = new MarkerSymbol(bitmapFocus, HotspotPlace.CENTER, false); mMarkerLayer = new ItemizedLayer<>(mMap, new ArrayList(), symbol, this); mMap.layers().add(mMarkerLayer); diff --git a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java index f7f9ba86..4831df76 100644 --- a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java @@ -62,6 +62,8 @@ public class PoiSearchActivity extends MapsforgeMapActivity implements ItemizedL private static final String POI_CATEGORY = "Restaurants"; private static final int SELECT_POI_FILE = MapsforgeMapActivity.SELECT_THEME_FILE + 1; + private ItemizedLayer mMarkerLayer; + public static class PoiFilePicker extends FilePicker { public PoiFilePicker() { setFileDisplayFilter(new FilterByFileExtension(".poi")); @@ -98,6 +100,11 @@ public class PoiSearchActivity extends MapsforgeMapActivity implements ItemizedL } POI_FILE = intent.getStringExtra(FilePicker.SELECTED_FILE); + + Bitmap bitmap = drawableToBitmap(getResources().getDrawable(R.drawable.marker_green)); + MarkerSymbol symbol = new MarkerSymbol(bitmap, MarkerSymbol.HotspotPlace.BOTTOM_CENTER); + mMarkerLayer = new ItemizedLayer<>(mMap, new ArrayList(), symbol, this); + mMap.layers().add(mMarkerLayer); } } @@ -121,6 +128,9 @@ public class PoiSearchActivity extends MapsforgeMapActivity implements ItemizedL @Override public boolean onGesture(Gesture g, MotionEvent e) { if (g instanceof Gesture.LongPress) { + // Clear overlays + mMarkerLayer.removeAllItems(); + mMap.render(); // POI search new PoiSearchTask(PoiSearchActivity.this, POI_CATEGORY).execute(mMap.getBoundingBox(0)); return true; @@ -146,7 +156,7 @@ public class PoiSearchActivity extends MapsforgeMapActivity implements ItemizedL persistenceManager = AndroidPoiPersistenceManagerFactory.getPoiPersistenceManager(POI_FILE); PoiCategoryManager categoryManager = persistenceManager.getCategoryManager(); PoiCategoryFilter categoryFilter = new ExactMatchPoiCategoryFilter(); - categoryFilter.addCategory(categoryManager.getPoiCategoryByTitle(this.category)); + categoryFilter.addCategory(categoryManager.getPoiCategoryByTitle(category)); org.mapsforge.core.model.BoundingBox bb = new org.mapsforge.core.model.BoundingBox( params[0].getMinLatitude(), params[0].getMinLongitude(), params[0].getMaxLatitude(), params[0].getMaxLongitude()); @@ -173,14 +183,10 @@ public class PoiSearchActivity extends MapsforgeMapActivity implements ItemizedL } // Overlay POI - Bitmap bitmap = drawableToBitmap(getResources(), R.drawable.marker_poi); - MarkerSymbol symbol = new MarkerSymbol(bitmap, MarkerSymbol.HotspotPlace.CENTER); - ItemizedLayer markerLayer = new ItemizedLayer<>(mMap, new ArrayList(), symbol, PoiSearchActivity.this); - mMap.layers().add(markerLayer); List pts = new ArrayList<>(); for (PointOfInterest pointOfInterest : pointOfInterests) pts.add(new MarkerItem(pointOfInterest.getName(), "", new GeoPoint(pointOfInterest.getLatitude(), pointOfInterest.getLongitude()))); - markerLayer.addItems(pts); + mMarkerLayer.addItems(pts); mMap.render(); } } diff --git a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java index 44bbdc12..c97bbf52 100644 --- a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java +++ b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java @@ -1,6 +1,6 @@ /* * Copyright 2010, 2011, 2012 mapsforge.org - * Copyright 2016 devemux86 + * Copyright 2016-2017 devemux86 * Copyright 2017 Longri * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). @@ -102,7 +102,7 @@ public final class AndroidGraphics extends CanvasAdapter { } public static Bitmap drawableToBitmap(Resources res, int resId) { - return new AndroidBitmap(res.openRawResource(resId)); + return drawableToBitmap(res.getDrawable(resId)); } /**