Revize 14588cb6

fixed keys and indices

re #9741

frontend/src/features/TrackingTool/trackingToolUtils.ts

@@ -1 +1 @@
 
 import L, { LatLngTuple, PointExpression } from 'leaflet'
 import { CatalogItemDto } from '../../swagger/data-contracts'
+import generateUuid from '../../utils/id/uuidGenerator'
 
 // For more comprehensive code alias CatalogItemDto[] as path variant
 export type PathVariant = MapPoint[]
@@ -14 +15 @@
 
 // Represents a point on the map - wrapper for CatalogItemDto to make it easier to work with
 export interface MapPoint {
-    id: string // unique id for react
+    id: string // unique id to identify the point on the map
+    reactId: string // unique id to identify item in React - e.g. rendering in a list
     idx: number,
     addToPath: boolean, // whether to add the point to the path
     catalogItem: CatalogItemDto,
@@ -65 +67 @@
     [MapPointType.FromCoordinates]: createMapMarkerSvg('#21972D'),
 }
 
-const iconAnchor = [25, 25] as PointExpression
-const iconSize = [40, 40] as PointExpression
+const iconAnchor = [22, 22] as PointExpression
+const iconSize = [35, 35] as PointExpression
 
 const mapMarkers = {
     [MapPointType.LocalCatalog]: L.icon({
@@ -104 +106 @@
             .map((item) => item.catalogItem.longitude ?? 0)
             .reduce((a, b) => a + b, 0) / displayableItems.length,
     ]
-}
+}
+
+export const setMapPointIds = (pathVariant: PathVariant): PathVariant => pathVariant.map(mapPoint => {
+    // Get identifier - either catalog item identifier is used or generate a new UUID if the point does not have uuid
+    // - e.g. is not from the catalog
+    mapPoint.id = mapPoint.catalogItem.id ? mapPoint.catalogItem.id : generateUuid()
+    return mapPoint
+})