project/shved-SCRUM-110-hole-deleting #36

Merged
Vladislav merged 15 commits from project/shved-SCRUM-110-hole-deleting into dev 2026-03-27 20:18:00 +02:00
Showing only changes of commit 6850454711 - Show all commits

View File

@@ -106,7 +106,11 @@ class MapViewApp(App):
def map_lat_lon_to_marker(self, lat: float, lon: float) -> MapMarker | None: def map_lat_lon_to_marker(self, lat: float, lon: float) -> MapMarker | None:
flt = filter(lambda marker: lon == marker.lat and lat == marker.lon, self.pothole_markers + self.bump_markers) flt = filter(lambda marker: lon == marker.lat and lat == marker.lon, self.pothole_markers + self.bump_markers)
try:
return next(flt) return next(flt)
except StopIteration as e:
return None
def set_pothole_marker(self, point): def set_pothole_marker(self, point):
lat, lon = get_lat_lon(point) lat, lon = get_lat_lon(point)
@@ -148,15 +152,15 @@ class MapViewApp(App):
clicked_marker = self.map_lat_lon_to_marker(clicked_marker_data.latitude, clicked_marker_data.longitude) clicked_marker = self.map_lat_lon_to_marker(clicked_marker_data.latitude, clicked_marker_data.longitude)
if clicked_marker == None:
return
self.mapview.remove_marker(clicked_marker) self.mapview.remove_marker(clicked_marker)
pothole_index = self.pothole_markers.index(clicked_marker) if clicked_marker in self.pothole_markers:
bump_index = self.bump_markers.index(clicked_marker) self.pothole_markers.pop(self.pothole_markers.index(clicked_marker))
elif clicked_marker in self.bump_markers:
if pothole_marker >= 0: self.bump_markers.pop(self.bump_markers.index(clicked_marker))
self.pothole_markers.pop(pothole_index)
elif bump_index >= 0:
self.bump_markers.pop(bump_index)
def on_touch_down(self, widget, touch): def on_touch_down(self, widget, touch):
if touch.button == "right": if touch.button == "right":