From 26410e5a077d08439383f58b45fb2b7638164ab9 Mon Sep 17 00:00:00 2001
From: Inga <inga-lovinde@noreply.oomza.cutegay.software>
Date: Thu, 16 Nov 2023 19:21:01 +0000
Subject: [PATCH] support for markers removal

---
 src/routePlanner/index.tsx   | 27 +++++++++++++++++++++++----
 src/routePlanner/map.tsx     |  8 ++++++--
 src/routePlanner/markers.tsx |  7 +++++--
 src/routePlanner/types.ts    |  6 ++++++
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/routePlanner/index.tsx b/src/routePlanner/index.tsx
index 9edde40..69bf26d 100644
--- a/src/routePlanner/index.tsx
+++ b/src/routePlanner/index.tsx
@@ -8,13 +8,32 @@ import { nanoid } from 'nanoid';
 
 export const RoutePlanner = () => {
     const [markers, setMarkers] = useState<Marker[]>([]);
+
+    const onMarkerRemove = useMemo(
+        () => (keyToRemove: string) =>
+            setMarkers((markers) =>
+                markers
+                    .filter(({ key }) => key !== keyToRemove)
+                    .map((marker, i) => ({ ...marker, index: i + 1 })),
+            ),
+        [],
+    );
+
     const onMapClick = useMemo(
-        () => (coordinates: Coordinates) =>
+        () => (coordinates: Coordinates) => {
+            const key = nanoid(10);
+            const remove = () => onMarkerRemove(key);
             setMarkers((markers) => [
                 ...markers,
-                { coordinates, key: nanoid(10) },
-            ]),
-        [],
+                {
+                    key,
+                    index: markers.length + 1,
+                    remove,
+                    coordinates,
+                },
+            ]);
+        },
+        [onMarkerRemove],
     );
 
     return (
diff --git a/src/routePlanner/map.tsx b/src/routePlanner/map.tsx
index d71bda0..8483081 100644
--- a/src/routePlanner/map.tsx
+++ b/src/routePlanner/map.tsx
@@ -71,8 +71,9 @@ export const MapComponent = ({ markers, onMapClick }: InternalMapProps) => {
         }
 
         layers.push(
-            ...markers.flatMap((marker, i) => {
+            ...markers.flatMap((marker) => {
                 const circle = leaflet.circleMarker(marker.coordinates, {
+                    bubblingMouseEvents: false,
                     color: 'black',
                     fill: true,
                     fillOpacity: 100,
@@ -84,11 +85,13 @@ export const MapComponent = ({ markers, onMapClick }: InternalMapProps) => {
                             permanent: true,
                             direction: 'center',
                             className: 'text',
-                            content: `${i + 1}`,
+                            content: `${marker.index}`,
                         },
                         circle,
                     )
                     .setLatLng(marker.coordinates);
+
+                circle.on('click', marker.remove);
                 return [circle, tooltip];
             }),
         );
@@ -100,6 +103,7 @@ export const MapComponent = ({ markers, onMapClick }: InternalMapProps) => {
         return () => {
             for (const layer of layers) {
                 layer.removeFrom(map);
+                layer.remove();
             }
         };
     }, [mapRef, markers]);
diff --git a/src/routePlanner/markers.tsx b/src/routePlanner/markers.tsx
index e5369fd..a087e05 100644
--- a/src/routePlanner/markers.tsx
+++ b/src/routePlanner/markers.tsx
@@ -7,8 +7,11 @@ export const MarkersComponent = ({ markers }: InternalProps) => {
         <>
             <h3>Markers</h3>
             <ol>
-                {markers.map(({ key }, i) => (
-                    <li key={key}>{`Waypoint ${i + 1}`}</li>
+                {markers.map((marker) => (
+                    <li key={marker.key}>
+                        {`Waypoint ${marker.index}`}
+                        <button onClick={marker.remove}>🗑️</button>
+                    </li>
                 ))}
             </ol>
         </>
diff --git a/src/routePlanner/types.ts b/src/routePlanner/types.ts
index eab1cd0..cc618f6 100644
--- a/src/routePlanner/types.ts
+++ b/src/routePlanner/types.ts
@@ -4,6 +4,8 @@ export type Coordinates = LatLng;
 
 export type Marker = {
     key: string;
+    remove: () => void;
+    index: number;
     coordinates: Coordinates;
 };
 
@@ -14,3 +16,7 @@ export type InternalProps = {
 export type InternalMapProps = InternalProps & {
     onMapClick: (coordinates: Coordinates) => void;
 };
+
+export type MarkerListElementProps = {
+    marker: Marker;
+};