Merge branch 'master' into fix/retain-children-coordinates

Author: JaffaKetchup

.github/workflows/branch.yml

@@ -94,7 +94,7 @@ jobs:
         run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
       - name: Archive Artifact
         if: ${{ matrix.sdk == '' }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: apk-build
           path: example/build/app/outputs/apk/release
@@ -129,7 +129,7 @@ jobs:
         working-directory: .
       - name: Archive Artifact
         if: ${{ matrix.sdk == '' }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: exe-build
           path: windowsTemp/WindowsApplication.exe
@@ -156,7 +156,7 @@ jobs:
       - name: Build Web Application
         run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
       - name: Archive Artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: ${{ matrix.sdk == '' }}
         with:
           name: web-build

.github/workflows/master.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Build Android Application
         run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
       - name: Archive Artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: apk-build
           path: example/build/app/outputs/apk/release
@@ -82,7 +82,7 @@ jobs:
         run: iscc "windowsApplicationInstallerSetup.iss"
         working-directory: .
       - name: Archive Artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: exe-build
           path: windowsTemp/WindowsApplication.exe
@@ -107,7 +107,7 @@ jobs:
       - name: Build Web Application
         run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
       - name: Archive Artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: web-build
           path: example/build/web

lib/src/gestures/map_interactive_viewer.dart

@@ -420,6 +420,10 @@ class MapInteractiveViewerState extends State<MapInteractiveViewer>
   }
 
   void _onPointerMove(PointerMoveEvent event) {
+    if (_options.onPointerMove != null) {
+      final latLng = _camera.offsetToCrs(event.localPosition);
+      _options.onPointerMove!(event, latLng);
+    }
     if (!_ckrTriggered.value) return;
 
     final baseSetNorth =

lib/src/map/options/options.dart

@@ -40,6 +40,12 @@ typedef PointerHoverCallback = void Function(
   LatLng point,
 );
 
+/// Callback to notify when the map registers a pointer move event.
+typedef PointerMoveCallback = void Function(
+  PointerMoveEvent event,
+  LatLng point,
+);
+
 /// Callback that gets called when the viewport of the map changes.
 ///
 /// {@macro map_position.has_gesture}
@@ -109,6 +115,16 @@ class MapOptions {
   /// down (e.g. mouse pointers, but not most touch pointers)
   final PointerHoverCallback? onPointerHover;
 
+  /// Called when a pointer is down and moves.
+  ///
+  /// If used while dragging the map, this may emit the same point as by
+  /// [onPositionChanged], but might not due to map pixel snapping or a slight
+  /// delay, or any other disconnect between the pointer and map camera.
+  ///
+  /// Prefer using [onPositionChanged], unless this is specifically required,
+  /// such as obtaining the pointer position while the map camera is 'locked'.
+  final PointerMoveCallback? onPointerMove;
+
   /// This callback fires when the [MapCamera] data has changed. This gets
   /// called if the zoom level, or map center changes.
   final PositionCallback? onPositionChanged;
@@ -158,6 +174,7 @@ class MapOptions {
     this.onPointerUp,
     this.onPointerCancel,
     this.onPointerHover,
+    this.onPointerMove,
     this.onPositionChanged,
     this.onMapEvent,
     this.onMapReady,