Implemented draw image in nearby place marker

osmandapp · Jan 16, 2025 · 0fcc3da · 0fcc3da
1 parent ec35aa3
commit 0fcc3da
Show file tree

Hide file tree

Showing 8 changed files with 202 additions and 634 deletions.
diff --git a/OsmAnd/src/net/osmand/data/NearbyPlacePoint.java b/OsmAnd/src/net/osmand/data/NearbyPlacePoint.java
@@ -1,6 +1,7 @@
 package net.osmand.data;
 
 import android.content.Context;
+import android.graphics.Bitmap;
 
 import androidx.annotation.NonNull;
 
@@ -15,6 +16,7 @@ public class NearbyPlacePoint implements Serializable, LocationPoint {
 	private static final long serialVersionUID = 829654300829771466L;
 
 	public static final BackgroundType DEFAULT_BACKGROUND_TYPE = BackgroundType.CIRCLE;
+	public Bitmap imageBitmap;
 	public String photoTitle;
 	public String wikiTitle;
 	public String poitype;
@@ -123,6 +125,10 @@ public boolean equals(Object o) {
 		}
 
 		NearbyPlacePoint point = (NearbyPlacePoint) o;
+		if(point.imageBitmap != imageBitmap) {
+			return false;
+		}
+
 		if (!Algorithms.stringsEqual(photoTitle, point.photoTitle)) {
 			return false;
 		}

diff --git a/OsmAnd/src/net/osmand/plus/nearbyplaces/NearbyPlacesHelper.kt b/OsmAnd/src/net/osmand/plus/nearbyplaces/NearbyPlacesHelper.kt
@@ -6,10 +6,12 @@ import net.osmand.util.Algorithms
 import net.osmand.util.CollectionUtils
 import net.osmand.wiki.WikiCoreHelper.OsmandApiFeatureData
 import java.util.Collections
+import kotlin.math.min
 
 object NearbyPlacesHelper {
 	private lateinit var app: OsmandApplication
 	private var lastModifiedTime: Long = 0
+	private const val PLACES_LIMIT = 10;
 
 	fun init(app: OsmandApplication) {
 		this.app = app
@@ -24,7 +26,8 @@ object NearbyPlacesHelper {
 			}
 
 			override fun onFinish(result: List<OsmandApiFeatureData>) {
-				dataCollection = result
+				val newListSize = min(result.size, PLACES_LIMIT)
+				dataCollection = result.subList(0, newListSize)
 				updateLastModifiedTime()
 				notifyListeners()
 			}

diff --git a/OsmAnd/src/net/osmand/plus/search/dialogs/QuickSearchHistoryListFragment.java b/OsmAnd/src/net/osmand/plus/search/dialogs/QuickSearchHistoryListFragment.java
@@ -121,7 +121,6 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
 		setupNearByCard(view);
 		NearbyPlacesHelper.INSTANCE.startLoadingNearestPhotos();
 		view.findViewById(R.id.show_all_btn).setOnClickListener(v -> {
-//			app.getOsmandMap().getMapLayers().getNearbyPlacesLayer().setCustomMapObjects(app.getFavoritesHelper().getFavouritePoints());
 			app.getOsmandMap().getMapLayers().getNearbyPlacesLayer().setCustomMapObjects(NearbyPlacesHelper.INSTANCE.getDataCollection());
 		});
 	}

diff --git a/OsmAnd/src/net/osmand/plus/views/layers/ExploreNearbyPlacesLayer.kt b/OsmAnd/src/net/osmand/plus/views/layers/ExploreNearbyPlacesLayer.kt