Correct pothole deletion function

MapView/main.py

@@ -37,8 +37,8 @@ class MapViewApp(App):
         self.car_markers = dict()
 
         # додати необхідні змінні
-        self.bump_markers = []
+        self.bump_markers: list[MapMarker] = []
-        self.pothole_markers = []
+        self.pothole_markers: list[MapMarker] = []
 
     def on_start(self):
         """
@@ -103,13 +103,14 @@ class MapViewApp(App):
         if user_id == 1:
             self.mapview.center_on(lat, lon)
 
-    def set_pothole_marker(self, point):
+    def map_lat_lon_to_pothole(self, lat: float, lon: float) -> MapMarker | None:
-        if isinstance(point, dict):
+        click_tolerance = self.mapview.zoom * 10
-            lat = point.get("lat")
+        flt = filter(lambda marker: abs(lat - marker.lat) + abs(lon - marker.lon) < click_tolerance,
-            lon = point.get("lon")
+                     self.pothole_markers)
-        else:
+        return next(flt)
-            lat, lon = point
 
+    def set_pothole_marker(self, point):
+        lat, lon = get_lat_lon(point)
         if lat is None or lon is None:
             return
 
@@ -136,20 +137,15 @@ class MapViewApp(App):
         self.mapview.add_marker(marker)
         self.bump_markers.append(marker)
 
-    def delete_bump_marker(self, point):
+    def delete_pothole_marker(self, point):
         lat, lon = get_lat_lon(point)
         if lat is None or lon is None:
             return
 
-        marker = MapMarker(
+        pothole = self.map_lat_lon_to_pothole(lat, lon)
-            lat=lat,
+        if pothole:
-            lon=lon,
+            self.mapview.remove_marker(pothole)
-            source="images/bump.png"
+            self.pothole_markers.pop(self.pothole_markers.index(pothole))
-        )
-
-        if marker in self.bump_markers:
-            self.mapview.remove_marker(marker)
-            self.bump_markers.pop(self.bump_markers.index(marker))
 
 
     def build(self):