multi!: rewrite gesture handling

example/lib/main.dart

@@ -7,8 +7,8 @@ import 'package:flutter_map_example/pages/custom_crs/custom_crs.dart';
 import 'package:flutter_map_example/pages/epsg3413_crs.dart';
 import 'package:flutter_map_example/pages/epsg4326_crs.dart';
 import 'package:flutter_map_example/pages/fallback_url_page.dart';
+import 'package:flutter_map_example/pages/gestures_page.dart';
 import 'package:flutter_map_example/pages/home.dart';
-import 'package:flutter_map_example/pages/interactive_test_page.dart';
 import 'package:flutter_map_example/pages/latlng_to_screen_point.dart';
 import 'package:flutter_map_example/pages/many_circles.dart';
 import 'package:flutter_map_example/pages/many_markers.dart';
@@ -76,7 +76,7 @@ class MyApp extends StatelessWidget {
         TileLoadingErrorHandle.route: (context) =>
             const TileLoadingErrorHandle(),
         TileBuilderPage.route: (context) => const TileBuilderPage(),
-        InteractiveFlagsPage.route: (context) => const InteractiveFlagsPage(),
+        GesturesPage.route: (context) => const GesturesPage(),
         ManyMarkersPage.route: (context) => const ManyMarkersPage(),
         StatefulMarkersPage.route: (context) => const StatefulMarkersPage(),
         MapInsideListViewPage.route: (context) => const MapInsideListViewPage(),

example/lib/pages/custom_crs/custom_crs.dart

@@ -133,7 +133,7 @@ class CustomCrsPageState extends State<CustomCrsPage> {
                   // Set maxZoom usually scales.length - 1 OR resolutions.length - 1
                   // but not greater
                   maxZoom: maxZoom,
-                  onTap: (tapPosition, p) => setState(() {
+                  onTap: (_, p) => setState(() {
                     initText = 'You clicked at';
                     point = proj4.Point(x: p.latitude, y: p.longitude);
                   }),

example/lib/pages/interactive_test_page.dart → example/lib/pages/gestures_page.dart

@@ -4,50 +4,50 @@ import 'package:flutter_map_example/misc/tile_providers.dart';
 import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart';
 import 'package:latlong2/latlong.dart';
 
-class InteractiveFlagsPage extends StatefulWidget {
-  static const String route = '/interactive_flags_page';
+class GesturesPage extends StatefulWidget {
+  static const String route = '/enabled_gestures_page';
 
-  const InteractiveFlagsPage({super.key});
+  const GesturesPage({super.key});
 
   @override
-  State createState() => _InteractiveFlagsPageState();
+  State createState() => _GesturesPageState();
 }
 
-class _InteractiveFlagsPageState extends State<InteractiveFlagsPage> {
+class _GesturesPageState extends State<GesturesPage> {
   static const availableFlags = {
     'Movement': {
       InteractiveFlag.drag: 'Drag',
-      InteractiveFlag.flingAnimation: 'Fling',
-      InteractiveFlag.pinchMove: 'Pinch',
+      InteractiveFlag.twoFingerMove: 'Two finger drag',
     },
     'Zooming': {
-      InteractiveFlag.pinchZoom: 'Pinch',
+      InteractiveFlag.twoFingerZoom: 'Pinch',
       InteractiveFlag.scrollWheelZoom: 'Scroll',
-      InteractiveFlag.doubleTapZoom: 'Double tap',
-      InteractiveFlag.doubleTapDragZoom: '+ drag',
+      InteractiveFlag.doubleTapZoomIn: 'Double tap',
+      InteractiveFlag.doubleTapDragZoom: 'Double tap+drag',
+      InteractiveFlag.trackpadZoom: 'Touchpad zoom',
     },
     'Rotation': {
-      InteractiveFlag.rotate: 'Twist',
+      InteractiveFlag.twoFingerRotate: 'Twist',
+      InteractiveFlag.keyTriggerDragRotate: 'CTRL+Drag',
     },
   };
 
-  int flags = InteractiveFlag.drag | InteractiveFlag.pinchZoom;
-  bool keyboardCursorRotate = false;
+  int flags = InteractiveFlag.drag | InteractiveFlag.twoFingerZoom;
 
   MapEvent? _latestEvent;
 
   @override
   Widget build(BuildContext context) {
     final screenWidth = MediaQuery.sizeOf(context).width;
     return Scaffold(
-      appBar: AppBar(title: const Text('Interactive Flags')),
-      drawer: const MenuDrawer(InteractiveFlagsPage.route),
+      appBar: AppBar(title: const Text('Input gestures')),
+      drawer: const MenuDrawer(GesturesPage.route),
       body: Padding(
         padding: const EdgeInsets.all(8),
         child: Column(
           children: [
             Flex(
-              direction: screenWidth >= 600 ? Axis.horizontal : Axis.vertical,
+              direction: screenWidth >= 750 ? Axis.horizontal : Axis.vertical,
               mainAxisSize: MainAxisSize.max,
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: availableFlags.entries
@@ -75,22 +75,10 @@ class _InteractiveFlagsPageState extends State<InteractiveFlagsPage> {
                                       setState(() => flags |= e.key);
                                     },
                                   ),
-                                  Text(e.value),
+                                  Text(e.value, textAlign: TextAlign.center),
                                 ],
                               ),
                             ),
-                            if (category.key == 'Rotation') ...[
-                              Column(
-                                children: [
-                                  Checkbox.adaptive(
-                                    value: keyboardCursorRotate,
-                                    onChanged: (enabled) => setState(
-                                        () => keyboardCursorRotate = enabled!),
-                                  ),
-                                  const Text('Cursor & CTRL'),
-                                ],
-                              ),
-                            ]
                           ].interleave(const SizedBox(width: 12)).toList()
                             ..removeLast(),
                         )
@@ -117,18 +105,11 @@ class _InteractiveFlagsPageState extends State<InteractiveFlagsPage> {
             Expanded(
               child: FlutterMap(
                 options: MapOptions(
-                  onMapEvent: (evt) => setState(() => _latestEvent = evt),
+                  onMapEvent: (event) => setState(() => _latestEvent = event),
                   initialCenter: const LatLng(51.5, -0.09),
                   initialZoom: 11,
                   interactionOptions: InteractionOptions(
-                    flags: flags,
-                    cursorKeyboardRotationOptions:
-                        CursorKeyboardRotationOptions(
-                      isKeyTrigger: (key) =>
-                          keyboardCursorRotate &&
-                          CursorKeyboardRotationOptions.defaultTriggerKeys
-                              .contains(key),
-                    ),
+                    gestures: MapGestures.bitfield(flags),
                   ),
                 ),
                 children: [openStreetMapTileLayer],
@@ -178,6 +159,12 @@ class _InteractiveFlagsPageState extends State<InteractiveFlagsPage> {
         return 'MapEventRotateEnd';
       case MapEventNonRotatedSizeChange():
         return 'MapEventNonRotatedSizeChange';
+      case MapEventSecondaryLongPress():
+        return 'MapEventSecondaryLongPress';
+      case MapEventTertiaryTap():
+        return 'MapEventTertiaryTap';
+      case MapEventTertiaryLongPress():
+        return 'MapEventTertiaryLongPress';
       case null:
         return 'null';
       default:

example/lib/pages/latlng_to_screen_point.dart

@@ -48,7 +48,10 @@ class _LatLngToScreenPointPageState extends State<LatLngToScreenPointPage> {
               initialCenter: const LatLng(51.5, -0.09),
               initialZoom: 11,
               interactionOptions: const InteractionOptions(
-                flags: ~InteractiveFlag.doubleTapZoom,
+                gestures: MapGestures.all(
+                  doubleTapZoomIn: false,
+                  doubleTapDragZoom: false,
+                ),
               ),
               onTap: (_, latLng) {
                 final point = mapController.camera

example/lib/pages/markers.dart

@@ -119,10 +119,14 @@ class _MarkerPageState extends State<MarkerPage> {
               options: MapOptions(
                 initialCenter: const LatLng(51.5, -0.09),
                 initialZoom: 5,
-                onTap: (_, p) => setState(() => customMarkers.add(buildPin(p))),
+                onTap: (_, p) {
+                  setState(() => customMarkers.add(buildPin(p)));
+                },
                 interactionOptions: const InteractionOptions(
-                  flags: ~InteractiveFlag.doubleTapZoom,
-                ),
+                    gestures: MapGestures.all(
+                  doubleTapDragZoom: false,
+                  doubleTapZoomIn: false,
+                )),
               ),
               children: [
                 openStreetMapTileLayer,

example/lib/pages/secondary_tap.dart

@@ -23,7 +23,7 @@ class SecondaryTapPage extends StatelessWidget {
           Flexible(
             child: FlutterMap(
               options: MapOptions(
-                onSecondaryTap: (tapPos, latLng) {
+                onSecondaryTap: (_, latLng) {
                   ScaffoldMessenger.maybeOf(context)?.showSnackBar(
                     SnackBar(content: Text('Secondary tap at $latLng')),
                   );

example/lib/widgets/drawer/menu_drawer.dart

@@ -7,8 +7,8 @@ import 'package:flutter_map_example/pages/custom_crs/custom_crs.dart';
 import 'package:flutter_map_example/pages/epsg3413_crs.dart';
 import 'package:flutter_map_example/pages/epsg4326_crs.dart';
 import 'package:flutter_map_example/pages/fallback_url_page.dart';
+import 'package:flutter_map_example/pages/gestures_page.dart';
 import 'package:flutter_map_example/pages/home.dart';
-import 'package:flutter_map_example/pages/interactive_test_page.dart';
 import 'package:flutter_map_example/pages/latlng_to_screen_point.dart';
 import 'package:flutter_map_example/pages/many_circles.dart';
 import 'package:flutter_map_example/pages/many_markers.dart';
@@ -114,8 +114,8 @@ class MenuDrawer extends StatelessWidget {
             currentRoute: currentRoute,
           ),
           MenuItemWidget(
-            caption: 'Interactive Flags',
-            routeName: InteractiveFlagsPage.route,
+            caption: 'Map Gestures',
+            routeName: GesturesPage.route,
             currentRoute: currentRoute,
           ),
           const Divider(),

lib/flutter_map.dart

@@ -18,11 +18,6 @@ library flutter_map;
 
 export 'package:flutter_map/src/geo/crs.dart' hide CrsWithStaticTransformation;
 export 'package:flutter_map/src/geo/latlng_bounds.dart';
-export 'package:flutter_map/src/gestures/interactive_flag.dart';
-export 'package:flutter_map/src/gestures/latlng_tween.dart';
-export 'package:flutter_map/src/gestures/map_events.dart';
-export 'package:flutter_map/src/gestures/multi_finger_gesture.dart';
-export 'package:flutter_map/src/gestures/positioned_tap_detector_2.dart';
 export 'package:flutter_map/src/layer/attribution_layer/rich/animation.dart';
 export 'package:flutter_map/src/layer/attribution_layer/rich/source.dart';
 export 'package:flutter_map/src/layer/attribution_layer/rich/widget.dart';
@@ -51,11 +46,14 @@ export 'package:flutter_map/src/layer/tile_layer/tile_update_transformer.dart';
 export 'package:flutter_map/src/map/camera/camera.dart';
 export 'package:flutter_map/src/map/camera/camera_constraint.dart';
 export 'package:flutter_map/src/map/camera/camera_fit.dart';
+export 'package:flutter_map/src/map/controller/events/map_event_source.dart';
+export 'package:flutter_map/src/map/controller/events/map_events.dart';
 export 'package:flutter_map/src/map/controller/map_controller.dart';
 export 'package:flutter_map/src/map/controller/map_controller_impl.dart';
-export 'package:flutter_map/src/map/options/cursor_keyboard_rotation.dart';
-export 'package:flutter_map/src/map/options/interaction.dart';
-export 'package:flutter_map/src/map/options/options.dart';
+export 'package:flutter_map/src/map/gestures/latlng_tween.dart';
+export 'package:flutter_map/src/map/options/interaction_options.dart';
+export 'package:flutter_map/src/map/options/map_gestures.dart';
+export 'package:flutter_map/src/map/options/map_options.dart';
 export 'package:flutter_map/src/map/widget.dart';
 export 'package:flutter_map/src/misc/bounds.dart';
 export 'package:flutter_map/src/misc/extensions.dart';