fix tools

website/src/lib/components/map/gpx-layer/gpx-layer.ts

@@ -10,14 +10,7 @@ import {
     ListFileItem,
     ListRootItem,
 } from '$lib/components/file-list/file-list';
-import {
-    getClosestLinePoint,
-    getElevation,
-    resetCursor,
-    setGrabbingCursor,
-    setPointerCursor,
-    setScissorsCursor,
-} from '$lib/utils';
+import { getClosestLinePoint, getElevation } from '$lib/utils';
 import { selectedWaypoint } from '$lib/components/toolbar/tools/waypoint/waypoint';
 import { MapPin, Square } from 'lucide-static';
 import { getSymbolKey, symbols } from '$lib/assets/symbols';
@@ -28,6 +21,7 @@ import { currentTool, Tool } from '$lib/components/toolbar/tools';
 import { fileActionManager } from '$lib/logic/file-action-manager';
 import { fileActions } from '$lib/logic/file-actions';
 import { splitAs } from '$lib/components/toolbar/tools/scissors/scissors';
+import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
 
 const colors = [
     '#ff0000',
@@ -335,12 +329,12 @@ export class GPXLayer {
                         e.stopPropagation();
                     });
                     marker.on('dragstart', () => {
-                        setGrabbingCursor();
+                        mapCursor.notify(MapCursorState.WAYPOINT_DRAGGING, true);
                         marker.getElement().style.cursor = 'grabbing';
                         waypointPopup?.hide();
                     });
                     marker.on('dragend', (e) => {
-                        resetCursor();
+                        mapCursor.notify(MapCursorState.WAYPOINT_DRAGGING, false);
                         marker.getElement().style.cursor = '';
                         getElevation([marker._waypoint]).then((ele) => {
                             fileActionManager.applyToFile(this.fileId, (file) => {
@@ -431,14 +425,15 @@ export class GPXLayer {
                 new ListTrackSegmentItem(this.fileId, trackIndex, segmentIndex)
             )
         ) {
-            setScissorsCursor();
+            mapCursor.notify(MapCursorState.SCISSORS, true);
         } else {
-            setPointerCursor();
+            mapCursor.notify(MapCursorState.LAYER_HOVER, true);
         }
     }
 
     layerOnMouseLeave() {
-        resetCursor();
+        mapCursor.notify(MapCursorState.SCISSORS, false);
+        mapCursor.notify(MapCursorState.LAYER_HOVER, false);
     }
 
     layerOnMouseMove(e: any) {

website/src/lib/components/map/street-view-control/Google.ts

@@ -1,4 +1,4 @@
-import { resetCursor, setCrosshairCursor } from '$lib/utils';
+import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
 import type mapboxgl from 'mapbox-gl';
 
 export class GoogleRedirect {
@@ -13,7 +13,7 @@ export class GoogleRedirect {
         if (this.enabled) return;
 
         this.enabled = true;
-        setCrosshairCursor();
+        mapCursor.notify(MapCursorState.STREET_VIEW_CROSSHAIR, true);
         this.map.on('click', this.openStreetView);
     }
 
@@ -21,11 +21,11 @@ export class GoogleRedirect {
         if (!this.enabled) return;
 
         this.enabled = false;
-        resetCursor();
+        mapCursor.notify(MapCursorState.STREET_VIEW_CROSSHAIR, false);
         this.map.off('click', this.openStreetView);
     }
 
-    openStreetView(e) {
+    openStreetView(e: mapboxgl.MapMouseEvent) {
         window.open(
             `https://www.google.com/maps/@?api=1&map_action=pano&viewpoint=${e.lngLat.lat},${e.lngLat.lng}`
         );

website/src/lib/components/map/street-view-control/Mapillary.ts

@@ -1,7 +1,7 @@
 import mapboxgl, { type LayerSpecification, type VectorSourceSpecification } from 'mapbox-gl';
 import { Viewer, type ViewerBearingEvent } from 'mapillary-js/dist/mapillary.module';
 import 'mapillary-js/dist/mapillary.css';
-import { resetCursor, setPointerCursor } from '$lib/utils';
+import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
 
 const mapillarySource: VectorSourceSpecification = {
     type: 'vector',
@@ -140,10 +140,10 @@ export class MapillaryLayer {
         this.viewer.resize();
         this.viewer.moveTo(e.features[0].properties.id);
 
-        setPointerCursor();
+        mapCursor.notify(MapCursorState.MAPILLARY_HOVER, true);
     }
 
     onMouseLeave() {
-        resetCursor();
+        mapCursor.notify(MapCursorState.MAPILLARY_HOVER, false);
     }
 }