mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ExploreMapFragment.java: fix removeMarker code to correctly find the specified marker (#6325)
Some checks failed
Android CI / Run tests and generate APK (push) Has been cancelled
Details

Browse source 
Before this change, removeMarker() would search for the correct Overlay by doing a linear
search and matching the BaseMarker's Place name with the Overlay's title.
This stopped working once the Overlay's title text was changed to be more user friendly.

This change implements a more robust solution. A map is used to directly associate
BaseMarkers with the matching Overlay. The overlay can now be removed from the
overlay list without using any of the information contained within the BaseMarker
or Overlay.

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
This commit is contained in:
Jason-Whitmore 2025-05-30 20:05:33 -07:00 • committed by GitHub
parent 95b8ac74b9
commit 73f5200c2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
View file

@ -60,7 +60,9 @@ import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Named;
import org.osmdroid.events.MapEventsReceiver;
@ -98,6 +100,7 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
private GeoPoint mapCenter;
private GeoPoint lastMapFocus;
IntentFilter intentFilter = new IntentFilter(MapUtils.NETWORK_INTENT_ACTION);
private Map<BaseMarker, Overlay> baseMarkerOverlayMap;
@Inject
LiveDataConverter liveDataConverter;
@ -788,6 +791,11 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
}
}, getContext());
if (this.baseMarkerOverlayMap == null) {
this.baseMarkerOverlayMap = new HashMap<>();
}
this.baseMarkerOverlayMap.put(nearbyBaseMarker, overlay);
overlay.setFocusItemsOnTap(true);
binding.mapView.getOverlays().add(overlay); // Add the overlay to the map
}
@ -819,24 +827,22 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
* @param nearbyBaseMarker The NearbyBaseMarker object representing the marker to be removed.
*/
private void removeMarker(BaseMarker nearbyBaseMarker) {
if (nearbyBaseMarker == null || nearbyBaseMarker.getPlace().getName() == null) {
if (nearbyBaseMarker == null || nearbyBaseMarker.getPlace().getName() == null ||
baseMarkerOverlayMap == null || !baseMarkerOverlayMap.containsKey(nearbyBaseMarker)) {
return;
}
String target = nearbyBaseMarker.getPlace().getName();
Overlay target = baseMarkerOverlayMap.get(nearbyBaseMarker);
List<Overlay> overlays = binding.mapView.getOverlays();
ItemizedOverlayWithFocus item;
for (int i = 0; i < overlays.size(); i++) {
if (overlays.get(i) instanceof ItemizedOverlayWithFocus) {
item = (ItemizedOverlayWithFocus) overlays.get(i);
OverlayItem overlayItem = item.getItem(0);
Overlay overlay = overlays.get(i);
if (overlayItem.getTitle().equals(target)) {
binding.mapView.getOverlays().remove(i);
binding.mapView.invalidate();
break;
}
if (overlay.equals(target)) {
binding.mapView.getOverlays().remove(i);
binding.mapView.invalidate();
baseMarkerOverlayMap.remove(nearbyBaseMarker);
break;
}
}
}