Gesture fixes

example/lib/map_ui.dart

@@ -5,6 +5,7 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+import 'package:collection/collection.dart';
 import 'package:mapbox_gl/mapbox_gl.dart';
 
 import 'main.dart';
@@ -61,6 +62,7 @@ class MapUiBodyState extends State<MapUiBody> {
   ];
   bool _rotateGesturesEnabled = true;
   bool _scrollGesturesEnabled = true;
+  bool? _doubleClickToZoomEnabled;
   bool _tiltGesturesEnabled = true;
   bool _zoomGesturesEnabled = true;
   bool _myLocationEnabled = true;
@@ -214,6 +216,28 @@ class MapUiBodyState extends State<MapUiBody> {
     );
   }
 
+  Widget _doubleClickToZoomToggler() {
+    final stateInfo = _doubleClickToZoomEnabled == null
+        ? "disable"
+        : _doubleClickToZoomEnabled!
+            ? 'unset'
+            : 'enable';
+    return TextButton(
+      child: Text('$stateInfo double click to zoom'),
+      onPressed: () {
+        setState(() {
+          if (_doubleClickToZoomEnabled == null) {
+            _doubleClickToZoomEnabled = false;
+          } else if (!_doubleClickToZoomEnabled!) {
+            _doubleClickToZoomEnabled = true;
+          } else {
+            _doubleClickToZoomEnabled = null;
+          }
+        });
+      },
+    );
+  }
+
   Widget _tiltToggler() {
     return TextButton(
       child: Text('${_tiltGesturesEnabled ? 'disable' : 'enable'} tilt'),
@@ -282,10 +306,11 @@ class MapUiBodyState extends State<MapUiBody> {
   }
 
   _drawFill(List<dynamic> features) async {
-    Map<String, dynamic> feature = features[0];
-    if (feature['geometry']['type'] == 'Polygon') {
-      var coordinates = feature['geometry']['coordinates'];
-      List<List<LatLng>> geometry = coordinates
+    Map<String, dynamic>? feature =
+        features.firstWhereOrNull((f) => f['geometry']['type'] == 'Polygon');
+
+    if (feature != null) {
+      List<List<LatLng>> geometry = feature['geometry']['coordinates']
           .map(
               (ll) => ll.map((l) => LatLng(l[1], l[0])).toList().cast<LatLng>())
           .toList()
@@ -317,6 +342,7 @@ class MapUiBodyState extends State<MapUiBody> {
       scrollGesturesEnabled: _scrollGesturesEnabled,
       tiltGesturesEnabled: _tiltGesturesEnabled,
       zoomGesturesEnabled: _zoomGesturesEnabled,
+      doubleClickZoomEnabled: _doubleClickToZoomEnabled,
       myLocationEnabled: _myLocationEnabled,
       myLocationTrackingMode: _myLocationTrackingMode,
       myLocationRenderMode: MyLocationRenderMode.GPS,
@@ -365,15 +391,7 @@ class MapUiBodyState extends State<MapUiBody> {
       },
     );
 
-    final List<Widget> listViewChildren = <Widget>[
-      Center(
-        child: SizedBox(
-          width: _mapExpanded ? null : 300.0,
-          height: 200.0,
-          child: mapboxMap,
-        ),
-      ),
-    ];
+    final List<Widget> listViewChildren = <Widget>[];
 
     if (mapController != null) {
       listViewChildren.addAll(
@@ -393,6 +411,7 @@ class MapUiBodyState extends State<MapUiBody> {
           _zoomBoundsToggler(),
           _rotateToggler(),
           _scrollToggler(),
+          _doubleClickToZoomToggler(),
           _tiltToggler(),
           _zoomToggler(),
           _myLocationToggler(),
@@ -401,8 +420,22 @@ class MapUiBodyState extends State<MapUiBody> {
         ],
       );
     }
-    return ListView(
-      children: listViewChildren,
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Center(
+          child: SizedBox(
+            width: _mapExpanded ? null : 300.0,
+            height: 200.0,
+            child: mapboxMap,
+          ),
+        ),
+        Expanded(
+          child: ListView(
+            children: listViewChildren,
+          ),
+        )
+      ],
     );
   }
 

lib/mapbox_gl.dart

@@ -13,6 +13,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:collection/collection.dart';
 import 'package:mapbox_gl_platform_interface/mapbox_gl_platform_interface.dart';
 
 export 'package:mapbox_gl_platform_interface/mapbox_gl_platform_interface.dart'

lib/src/mapbox_map.dart

@@ -24,6 +24,7 @@ class MapboxMap extends StatefulWidget {
     this.scrollGesturesEnabled = true,
     this.zoomGesturesEnabled = true,
     this.tiltGesturesEnabled = true,
+    this.doubleClickZoomEnabled,
     this.trackCameraPosition = false,
     this.myLocationEnabled = false,
     this.myLocationTrackingMode = MyLocationTrackingMode.None,
@@ -115,6 +116,12 @@ class MapboxMap extends StatefulWidget {
   /// True if the map view should respond to tilt gestures.
   final bool tiltGesturesEnabled;
 
+  /// Set to true to forcefully disable/enable if map should respond to double
+  /// click to zoom.
+  ///
+  /// This takes presedence over zoomGesturesEnabled. Only supported for web.
+  final bool? doubleClickZoomEnabled;
+
   /// True if you want to be notified of map camera movements by the MapboxMapController. Default is false.
   ///
   /// If this is set to true and the user pans/zooms/rotates the map, MapboxMapController (which is a ChangeNotifier)
@@ -311,11 +318,12 @@ class _MapboxMapOptions {
     this.cameraTargetBounds,
     this.styleString,
     this.minMaxZoomPreference,
-    this.rotateGesturesEnabled,
-    this.scrollGesturesEnabled,
-    this.tiltGesturesEnabled,
+    required this.rotateGesturesEnabled,
+    required this.scrollGesturesEnabled,
+    required this.tiltGesturesEnabled,
+    required this.zoomGesturesEnabled,
+    required this.doubleClickZoomEnabled,
     this.trackCameraPosition,
-    this.zoomGesturesEnabled,
     this.myLocationEnabled,
     this.myLocationTrackingMode,
     this.myLocationRenderMode,
@@ -337,6 +345,8 @@ class _MapboxMapOptions {
       tiltGesturesEnabled: map.tiltGesturesEnabled,
       trackCameraPosition: map.trackCameraPosition,
       zoomGesturesEnabled: map.zoomGesturesEnabled,
+      doubleClickZoomEnabled:
+          map.doubleClickZoomEnabled ?? map.zoomGesturesEnabled,
       myLocationEnabled: map.myLocationEnabled,
       myLocationTrackingMode: map.myLocationTrackingMode,
       myLocationRenderMode: map.myLocationRenderMode,
@@ -356,15 +366,17 @@ class _MapboxMapOptions {
 
   final MinMaxZoomPreference? minMaxZoomPreference;
 
-  final bool? rotateGesturesEnabled;
+  final bool rotateGesturesEnabled;
 
-  final bool? scrollGesturesEnabled;
+  final bool scrollGesturesEnabled;
 
-  final bool? tiltGesturesEnabled;
+  final bool tiltGesturesEnabled;
 
-  final bool? trackCameraPosition;
+  final bool zoomGesturesEnabled;
+
+  final bool doubleClickZoomEnabled;
 
-  final bool? zoomGesturesEnabled;
+  final bool? trackCameraPosition;
 
   final bool? myLocationEnabled;
 
@@ -382,6 +394,14 @@ class _MapboxMapOptions {
 
   final Point? attributionButtonMargins;
 
+  final _gestureGroup = {
+    'rotateGesturesEnabled',
+    'scrollGesturesEnabled',
+    'tiltGesturesEnabled',
+    'zoomGesturesEnabled',
+    'doubleClickZoomEnabled'
+  };
+
   Map<String, dynamic> toMap() {
     final Map<String, dynamic> optionsMap = <String, dynamic>{};
 
@@ -403,10 +423,13 @@ class _MapboxMapOptions {
     addIfNonNull('cameraTargetBounds', cameraTargetBounds?.toJson());
     addIfNonNull('styleString', styleString);
     addIfNonNull('minMaxZoomPreference', minMaxZoomPreference?.toJson());
+
     addIfNonNull('rotateGesturesEnabled', rotateGesturesEnabled);
     addIfNonNull('scrollGesturesEnabled', scrollGesturesEnabled);
     addIfNonNull('tiltGesturesEnabled', tiltGesturesEnabled);
     addIfNonNull('zoomGesturesEnabled', zoomGesturesEnabled);
+    addIfNonNull('doubleClickZoomEnabled', doubleClickZoomEnabled);
+
     addIfNonNull('trackCameraPosition', trackCameraPosition);
     addIfNonNull('myLocationEnabled', myLocationEnabled);
     addIfNonNull('myLocationTrackingMode', myLocationTrackingMode?.index);
@@ -422,8 +445,22 @@ class _MapboxMapOptions {
 
   Map<String, dynamic> updatesMap(_MapboxMapOptions newOptions) {
     final Map<String, dynamic> prevOptionsMap = toMap();
-    return newOptions.toMap()
-      ..removeWhere(
-          (String key, dynamic value) => prevOptionsMap[key] == value);
+    final newOptionsMap = newOptions.toMap();
+
+    // if any gesture is updated also all other gestures have to the saved to
+    // the update
+
+    final gesturesRequireUpdate =
+        _gestureGroup.any((key) => newOptionsMap[key] != prevOptionsMap[key]);
+
+    return newOptionsMap
+      ..removeWhere((String key, dynamic value) {
+        if (_gestureGroup.contains(key)) return !gesturesRequireUpdate;
+        final oldValue = prevOptionsMap[key];
+        if (oldValue is List && value is List) {
+          return listEquals(oldValue, value);
+        }
+        return oldValue == value;
+      });
   }
 }

mapbox_gl_web/lib/src/convert.dart

@@ -26,21 +26,23 @@ class Convert {
       sink.setMinMaxZoomPreference(options['minMaxZoomPreference'][0],
           options['minMaxZoomPreference'][1]);
     }
-    if (options.containsKey('rotateGesturesEnabled')) {
-      sink.setRotateGesturesEnabled(options['rotateGesturesEnabled']);
-    }
-    if (options.containsKey('scrollGesturesEnabled')) {
-      sink.setScrollGesturesEnabled(options['scrollGesturesEnabled']);
-    }
-    if (options.containsKey('tiltGesturesEnabled')) {
-      sink.setTiltGesturesEnabled(options['tiltGesturesEnabled']);
+    if (options['rotateGesturesEnabled'] != null &&
+        options['scrollGesturesEnabled'] != null &&
+        options['tiltGesturesEnabled'] != null &&
+        options['zoomGesturesEnabled'] != null &&
+        options['doubleClickZoomEnabled'] != null) {
+      sink.setGestures(
+          rotateGesturesEnabled: options['rotateGesturesEnabled'],
+          scrollGesturesEnabled: options['scrollGesturesEnabled'],
+          tiltGesturesEnabled: options['tiltGesturesEnabled'],
+          zoomGesturesEnabled: options['zoomGesturesEnabled'],
+          doubleClickZoomEnabled: options['doubleClickZoomEnabled']);
     }
+
     if (options.containsKey('trackCameraPosition')) {
       sink.setTrackCameraPosition(options['trackCameraPosition']);
     }
-    if (options.containsKey('zoomGesturesEnabled')) {
-      sink.setZoomGesturesEnabled(options['zoomGesturesEnabled']);
-    }
+
     if (options.containsKey('myLocationEnabled')) {
       sink.setMyLocationEnabled(options['myLocationEnabled']);
     }