Implemented load and display nearby places (https://github.com/osmand… #21771
Conversation
| @@ -278,6 +279,7 @@ public void onStop(@NonNull LifecycleOwner owner) { | |||
| localeHelper.checkPreferredLocale(); | |||
| appInitializer.onCreateApplication(); | |||
| osmandMap.getMapLayers().createLayers(osmandMap.getMapView()); | |||
| NearbyPlacesHelper.INSTANCE.init(this); | |||
There was a problem hiding this comment.
Better move to onCreateApplication()
| @@ -138,6 +142,21 @@ public Drawable getIcon(@DrawableRes int id, @ColorRes int colorId) { | |||
| return getDrawable(id, colorId); | |||
| } | |||
|
|
|||
| @Nullable | |||
| public Drawable getRenderingIcon(Context ctx, String fileName, boolean nightMode) { | |||
| @@ -748,4 +767,14 @@ public static void updateStatusBarColor(@NonNull MapActivity activity) { | |||
|
|
|||
| AndroidUiHelper.setStatusBarContentColor(activity.getWindow().getDecorView(), nightModeForContent); | |||
| } | |||
|
|
|||
| public Bitmap getScaledBitmap(@Nullable MapActivity activity, @DrawableRes int drawableId, float scale) { | |||
There was a problem hiding this comment.
better use @UiContext Context instead of activity, if is not necessary
| <ImageView | ||
| android:id="@+id/item_image" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="108dp" |
There was a problem hiding this comment.
Move to dimens for easier support
| @@ -973,6 +973,7 @@ public void onDismiss(@NonNull DialogInterface dialog) { | |||
| fragmentManager.popBackStack(); | |||
| } | |||
| } | |||
| app.getOsmandMap().getMapLayers().getNearbyPlacesLayer().customObjectsDelegate.setCustomMapObjects(null); | |||
There was a problem hiding this comment.
Is this place correct, won`t screen rotation break it? onBackButtonPressed()?
also we could try to use similar logic in NearbyPlacesHelper as in PoiFiltersHelper, without using directly NearbyPlacesLayer
| @@ -60,6 +73,38 @@ private PicassoUtils(@NonNull OsmandApplication app) { | |||
| } | |||
| } | |||
|
|
|||
| public OkHttpClient getUnsafeOkHttpClient() { | |||
There was a problem hiding this comment.
Looks strange, is it needed only in debug builds?
There was a problem hiding this comment.
it is a point of discussion if we need it or there is any more correct way to fix download image issue
| return lastModifiedTime | ||
| } | ||
|
|
||
| fun createSmallPointBitmap(layer: NearbyPlacesLayer): Bitmap { |
There was a problem hiding this comment.
Move bitmaps creation from helper, for example to PointImageUtils
| private final List<Target> imageLoadingTargets = new ArrayList<>(); | ||
|
|
||
|
|
||
| public CustomMapObjects<NearbyPlacePoint> customObjectsDelegate = new OsmandMapLayer.CustomMapObjects<>(); |
There was a problem hiding this comment.
Do we need a separate collection, or we can use data from helper or load it from internet similar to OsmBugsLayer ?
There was a problem hiding this comment.
it is made to have more control of what is shown on the layer
| float x = tileBox.getPixXFromLatLon(lat, lon); | ||
| float y = tileBox.getPixYFromLatLon(lat, lon); | ||
| if (intersects(boundIntersections, x, y, iconSize, iconSize) || nearbyPoint.imageBitmap == null) { | ||
| canvas.drawBitmap(NearbyPlacesHelper.INSTANCE.createSmallPointBitmap(this), x, y, new Paint()); |
There was a problem hiding this comment.
It is discouraged to spam objects creation during drawing, you could store new Paint() as class variable
There was a problem hiding this comment.
Also, we draw many smallPointBitmaps, but they are the same ones, probably better to reuse bitmaps, or create some kind of cache, similar to one in PointImageUtils for opengl & legacy renderers
…subsequent requests and not requestiong by default
| prevMapRect!!, prevZoom!!, | ||
| prevLang!!, loadNearbyPlacesListener).execute() |
| if (bitmap != null) { | ||
| float x = tileBox.getPixXFromLatLon(point.getLatitude(), point.getLongitude()); | ||
| float y = tileBox.getPixYFromLatLon(point.getLatitude(), point.getLongitude()); | ||
| canvas.drawBitmap(cachedSmallIconBitmap, x, y, new Paint()); |
There was a problem hiding this comment.
We do not draw preview images for V1?
| private int smallIconSize; | ||
| private int bigIconSize; | ||
| private int bigIconBorderSize; | ||
| private int smallIconBorderSize; |
There was a problem hiding this comment.
These variables could be moved to images creation in PointImageUtils
| @@ -126,4 +138,55 @@ private PointImageInfo(@NonNull BackgroundType type, @ColorInt int color, | |||
| this.type = type; | |||
| } | |||
| } | |||
| public static Bitmap createSmallPointBitmap(NearbyPlacesLayer layer) { | |||
There was a problem hiding this comment.
we could get all variables here without layer
|
|
||
| import org.apache.commons.logging.Log; | ||
|
|
||
| public class NearbyPlacesFragment extends BaseOsmAndFragment { |
There was a problem hiding this comment.
We need this only for toolbar? better create something similar to QuickSearchToolbarController
| private NearbyPlacesAdapter adapter = null; | ||
| private NearbyPlacesAdapter adapter; | ||
| private ImageView explicitIndicator; | ||
| private boolean expanded; |
There was a problem hiding this comment.
We could store expanded state in preference similar to CollapsableView
|
The first part could be merged for testing, but it needs further improvements & polishing |
…app/OsmAnd-Issues/issues/2662)