243-fix-crash-when-no-location-permission (maplibre#244)

This fixes maplibre#243. --------- Co-authored-by: Julian Bissekkou <[email protected]>
JanikoNaber · Aug 23, 2023 · 1fbd253 · 1fbd253
1 parent 6110d1d
commit 1fbd253
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 19 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -10,6 +10,7 @@ import 'package:location/location.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:maplibre_gl_example/get_map_informations.dart';
 import 'package:maplibre_gl_example/given_bounds.dart';
+import 'package:maplibre_gl_example/no_location_permission_page.dart';
 
 import 'animate_camera.dart';
 import 'annotation_order_maps.dart';
@@ -54,6 +55,7 @@ final List<ExamplePage> _allPages = <ExamplePage>[
   const Sources(),
   const GivenBoundsPage(),
   const GetMapInfoPage(),
+  const NoLocationPermissionPage(),
 ];
 
 class MapsDemo extends StatefulWidget {
@@ -64,11 +66,6 @@ class MapsDemo extends StatefulWidget {
 }
 
 class _MapsDemoState extends State<MapsDemo> {
-  @override
-  void initState() {
-    super.initState();
-  }
-
   /// Determine the android version of the phone and turn off HybridComposition
   /// on older sdk versions to improve performance for these
   ///
@@ -86,7 +83,7 @@ class _MapsDemoState extends State<MapsDemo> {
   }
 
   void _pushPage(BuildContext context, ExamplePage page) async {
-    if (!kIsWeb) {
+    if (!kIsWeb && page.needsLocationPermission) {
       final location = Location();
       final hasPermissions = await location.hasPermission();
       if (hasPermissions != PermissionStatus.granted) {

diff --git a/example/lib/map_ui.dart b/example/lib/map_ui.dart
@@ -70,11 +70,6 @@ class MapUiBodyState extends State<MapUiBody> {
   List<Object>? _featureQueryFilter;
   Fill? _selectedFill;
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   void _onMapChanged() {
     setState(() {
       _extractMapInfo();

diff --git a/example/lib/no_location_permission_page.dart b/example/lib/no_location_permission_page.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:maplibre_gl/mapbox_gl.dart';
+
+import 'page.dart';
+
+class NoLocationPermissionPage extends ExamplePage {
+  const NoLocationPermissionPage({super.key})
+      : super(
+          const Icon(Icons.gps_off),
+          'Using a map without user location/permission',
+          needsLocationPermission: false,
+        );
+
+  @override
+  Widget build(BuildContext context) {
+    return const NoLocationPermissionBody();
+  }
+}
+
+class NoLocationPermissionBody extends StatefulWidget {
+  const NoLocationPermissionBody({super.key});
+
+  @override
+  State<NoLocationPermissionBody> createState() =>
+      _NoLocationPermissionBodyState();
+}
+
+class _NoLocationPermissionBodyState extends State<NoLocationPermissionBody> {
+  @override
+  Widget build(BuildContext context) {
+    return MaplibreMap(
+      initialCameraPosition: const CameraPosition(
+        target: LatLng(-33.852, 151.211),
+        zoom: 11.0,
+      ),
+      styleString: '''{
+        "version": 8,
+        "sources": {
+          "OSM": {
+            "type": "raster",
+            "tiles": [
+              "https://a.tile.openstreetmap.org/{z}/{x}/{y}.png",
+              "https://b.tile.openstreetmap.org/{z}/{x}/{y}.png",
+              "https://c.tile.openstreetmap.org/{z}/{x}/{y}.png"
+            ],
+            "tileSize": 256,
+            "attribution": "© OpenStreetMap contributors",
+            "maxzoom": 18
+          }
+        },
+        "layers": [
+          {
+            "id": "OSM-layer",
+            "source": "OSM",
+            "type": "raster"
+          }
+        ]
+      }''',
+    );
+  }
+}
diff --git a/example/lib/page.dart b/example/lib/page.dart
@@ -5,8 +5,14 @@
 import 'package:flutter/material.dart';
 
 abstract class ExamplePage extends StatelessWidget {
-  const ExamplePage(this.leading, this.title, {super.key});
+  const ExamplePage(
+    this.leading,
+    this.title, {
+    this.needsLocationPermission = true,
+    super.key,
+  });
 
   final Widget leading;
   final String title;
+  final bool needsLocationPermission;
 }
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -156,10 +156,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
+      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "4.0.17"
   js:
     dependency: transitive
     description:

diff --git a/lib/src/mapbox_map.dart b/lib/src/mapbox_map.dart
@@ -28,7 +28,7 @@ class MaplibreMap extends StatefulWidget {
     this.trackCameraPosition = false,
     this.myLocationEnabled = false,
     this.myLocationTrackingMode = MyLocationTrackingMode.None,
-    this.myLocationRenderMode = MyLocationRenderMode.COMPASS,
+    this.myLocationRenderMode = MyLocationRenderMode.NORMAL,
     this.logoViewMargins,
     this.compassViewPosition,
     this.compassViewMargins,
@@ -55,7 +55,13 @@ class MaplibreMap extends StatefulWidget {
     ],
     this.useDelayedDisposal,
     this.useHybridCompositionOverride,
-  })  : assert(annotationOrder.length <= 4),
+  })  : assert(
+          myLocationRenderMode != MyLocationRenderMode.NORMAL
+              ? myLocationEnabled
+              : true,
+          "$myLocationRenderMode requires [myLocationEnabled] set to true.",
+        ),
+        assert(annotationOrder.length <= 4),
         assert(annotationConsumeTapEvents.length > 0),
         super(key: key);
 

diff --git a/pubspec.lock b/pubspec.lock
@@ -55,10 +55,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
+      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "4.0.17"
   js:
     dependency: transitive
     description:
@@ -161,4 +161,4 @@ packages:
     version: "6.2.2"
 sdks:
   dart: ">=3.0.0-0 <4.0.0"
-  flutter: ">=2.0.0"
+  flutter: ">=2.8.1"