Major State Refactoring

analysis_options.yaml

@@ -16,6 +16,7 @@ linter:
     avoid_dynamic_calls: true
     cancel_subscriptions: true
     close_sinks: true
+    directives_ordering: true
     package_api_docs: true
     prefer_constructors_over_static_methods: true
     prefer_final_in_for_each: true
@@ -25,4 +26,4 @@ linter:
     throw_in_finally: true
     type_annotate_public_apis: true
     unnecessary_statements: true
-    use_named_constants: true
+    use_named_constants: true

example/lib/main.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-
 import 'package:flutter_map_example/pages/animated_map_controller.dart';
 import 'package:flutter_map_example/pages/circle.dart';
 import 'package:flutter_map_example/pages/custom_crs/custom_crs.dart';

example/lib/pages/animated_map_controller.dart

@@ -35,11 +35,12 @@ class AnimatedMapControllerPageState extends State<AnimatedMapControllerPage>
   void _animatedMapMove(LatLng destLocation, double destZoom) {
     // Create some tweens. These serve to split up the transition from one location to another.
     // In our case, we want to split the transition be<tween> our current map center and the destination.
+    final camera = mapController.camera;
     final latTween = Tween<double>(
-        begin: mapController.center.latitude, end: destLocation.latitude);
+        begin: camera.center.latitude, end: destLocation.latitude);
     final lngTween = Tween<double>(
-        begin: mapController.center.longitude, end: destLocation.longitude);
-    final zoomTween = Tween<double>(begin: mapController.zoom, end: destZoom);
+        begin: camera.center.longitude, end: destLocation.longitude);
+    final zoomTween = Tween<double>(begin: camera.zoom, end: destZoom);
 
     // Create a animation controller that has a duration and a TickerProvider.
     final controller = AnimationController(
@@ -161,10 +162,10 @@ class AnimatedMapControllerPageState extends State<AnimatedMapControllerPage>
                         london,
                       ]);
 
-                      mapController.fitBounds(
-                        bounds,
-                        options: const FitBoundsOptions(
-                          padding: EdgeInsets.only(left: 15, right: 15),
+                      mapController.fitCamera(
+                        CameraFit.bounds(
+                          bounds: bounds,
+                          padding: const EdgeInsets.symmetric(horizontal: 15),
                         ),
                       );
                     },
@@ -178,9 +179,10 @@ class AnimatedMapControllerPageState extends State<AnimatedMapControllerPage>
                         london,
                       ]);
 
-                      final centerZoom =
-                          mapController.centerZoomFitBounds(bounds);
-                      _animatedMapMove(centerZoom.center, centerZoom.zoom);
+                      final constrained = CameraFit.bounds(
+                        bounds: bounds,
+                      ).fit(mapController.camera);
+                      _animatedMapMove(constrained.center, constrained.zoom);
                     },
                     child: const Text('Fit Bounds animated'),
                   ),
@@ -190,9 +192,9 @@ class AnimatedMapControllerPageState extends State<AnimatedMapControllerPage>
             Flexible(
               child: FlutterMap(
                 mapController: mapController,
-                options: MapOptions(
-                    center: const LatLng(51.5, -0.09),
-                    zoom: 5,
+                options: const MapOptions(
+                    initialCenter: LatLng(51.5, -0.09),
+                    initialZoom: 5,
                     maxZoom: 10,
                     minZoom: 3),
                 children: [

example/lib/pages/circle.dart

@@ -33,9 +33,9 @@ class CirclePage extends StatelessWidget {
             ),
             Flexible(
               child: FlutterMap(
-                options: MapOptions(
-                  center: const LatLng(51.5, -0.09),
-                  zoom: 11,
+                options: const MapOptions(
+                  initialCenter: LatLng(51.5, -0.09),
+                  initialZoom: 11,
                 ),
                 children: [
                   TileLayer(

example/lib/pages/custom_crs/custom_crs.dart

@@ -128,8 +128,8 @@ class _CustomCrsPageState extends State<CustomCrsPage> {
                 options: MapOptions(
                   // Set the default CRS
                   crs: epsg3413CRS,
-                  center: LatLng(point.x, point.y),
-                  zoom: 3,
+                  initialCenter: LatLng(point.x, point.y),
+                  initialZoom: 3,
                   // Set maxZoom usually scales.length - 1 OR resolutions.length - 1
                   // but not greater
                   maxZoom: maxZoom,

example/lib/pages/epsg3413_crs.dart

@@ -130,8 +130,8 @@ class _EPSG3413PageState extends State<EPSG3413Page> {
               child: FlutterMap(
                 options: MapOptions(
                   crs: epsg3413CRS,
-                  center: const LatLng(90, 0),
-                  zoom: 3,
+                  initialCenter: const LatLng(90, 0),
+                  initialZoom: 3,
                   maxZoom: maxZoom,
                 ),
                 nonRotatedChildren: [

example/lib/pages/epsg4326_crs.dart

@@ -23,11 +23,11 @@ class EPSG4326Page extends StatelessWidget {
             ),
             Flexible(
               child: FlutterMap(
-                options: MapOptions(
+                options: const MapOptions(
                   minZoom: 0,
-                  crs: const Epsg4326(),
-                  center: const LatLng(0, 0),
-                  zoom: 0,
+                  crs: Epsg4326(),
+                  initialCenter: LatLng(0, 0),
+                  initialZoom: 0,
                 ),
                 children: [
                   TileLayer(
@@ -37,7 +37,7 @@ class EPSG4326Page extends StatelessWidget {
                       layers: ['TOPO-OSM-WMS'],
                     ),
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
-                  )
+                  ),
                 ],
               ),
             ),

example/lib/pages/fallback_url.dart

@@ -41,8 +41,8 @@ class FallbackUrlPage extends StatelessWidget {
             Flexible(
               child: FlutterMap(
                 options: MapOptions(
-                  center: center,
-                  zoom: zoom,
+                  initialCenter: center,
+                  initialZoom: zoom,
                   maxZoom: maxZoom,
                   minZoom: minZoom,
                 ),

example/lib/pages/home.dart

@@ -112,11 +112,13 @@ class _HomePageState extends State<HomePage> {
             Flexible(
               child: FlutterMap(
                 options: MapOptions(
-                  center: const LatLng(51.5, -0.09),
-                  zoom: 5,
-                  maxBounds: LatLngBounds(
-                    const LatLng(-90, -180),
-                    const LatLng(90, 180),
+                  initialCenter: const LatLng(51.5, -0.09),
+                  initialZoom: 5,
+                  cameraConstraint: CameraConstraint.contain(
+                    bounds: LatLngBounds(
+                      const LatLng(-90, -180),
+                      const LatLng(90, 180),
+                    ),
                   ),
                 ),
                 nonRotatedChildren: [

example/lib/pages/interactive_test_page.dart

@@ -28,7 +28,7 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
   void onMapEvent(MapEvent mapEvent) {
     if (mapEvent is! MapEventMove && mapEvent is! MapEventRotate) {
       // do not flood console with move and rotate events
-      debugPrint(mapEvent.toString());
+      debugPrint(_eventName(mapEvent));
     }
 
     setState(() {
@@ -59,7 +59,7 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[
                 MaterialButton(
-                  color: InteractiveFlag.hasFlag(flags, InteractiveFlag.drag)
+                  color: InteractiveFlag.hasDrag(flags)
                       ? Colors.greenAccent
                       : Colors.redAccent,
                   onPressed: () {
@@ -70,8 +70,7 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
                   child: const Text('Drag'),
                 ),
                 MaterialButton(
-                  color: InteractiveFlag.hasFlag(
-                          flags, InteractiveFlag.flingAnimation)
+                  color: InteractiveFlag.hasFlingAnimation(flags)
                       ? Colors.greenAccent
                       : Colors.redAccent,
                   onPressed: () {
@@ -82,10 +81,9 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
                   child: const Text('Fling'),
                 ),
                 MaterialButton(
-                  color:
-                      InteractiveFlag.hasFlag(flags, InteractiveFlag.pinchMove)
-                          ? Colors.greenAccent
-                          : Colors.redAccent,
+                  color: InteractiveFlag.hasPinchMove(flags)
+                      ? Colors.greenAccent
+                      : Colors.redAccent,
                   onPressed: () {
                     setState(() {
                       updateFlags(InteractiveFlag.pinchMove);
@@ -99,8 +97,7 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[
                 MaterialButton(
-                  color: InteractiveFlag.hasFlag(
-                          flags, InteractiveFlag.doubleTapZoom)
+                  color: InteractiveFlag.hasDoubleTapZoom(flags)
                       ? Colors.greenAccent
                       : Colors.redAccent,
                   onPressed: () {
@@ -111,7 +108,7 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
                   child: const Text('Double tap zoom'),
                 ),
                 MaterialButton(
-                  color: InteractiveFlag.hasFlag(flags, InteractiveFlag.rotate)
+                  color: InteractiveFlag.hasRotate(flags)
                       ? Colors.greenAccent
                       : Colors.redAccent,
                   onPressed: () {
@@ -122,10 +119,9 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
                   child: const Text('Rotate'),
                 ),
                 MaterialButton(
-                  color:
-                      InteractiveFlag.hasFlag(flags, InteractiveFlag.pinchZoom)
-                          ? Colors.greenAccent
-                          : Colors.redAccent,
+                  color: InteractiveFlag.hasPinchZoom(flags)
+                      ? Colors.greenAccent
+                      : Colors.redAccent,
                   onPressed: () {
                     setState(() {
                       updateFlags(InteractiveFlag.pinchZoom);
@@ -139,7 +135,7 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
               padding: const EdgeInsets.only(top: 8, bottom: 8),
               child: Center(
                 child: Text(
-                  'Current event: ${_latestEvent?.runtimeType ?? "none"}\nSource: ${_latestEvent?.source ?? "none"}',
+                  'Current event: ${_eventName(_latestEvent)}\nSource: ${_latestEvent?.source.name ?? "none"}',
                   textAlign: TextAlign.center,
                 ),
               ),
@@ -148,9 +144,11 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
               child: FlutterMap(
                 options: MapOptions(
                   onMapEvent: onMapEvent,
-                  center: const LatLng(51.5, -0.09),
-                  zoom: 11,
-                  interactiveFlags: flags,
+                  initialCenter: const LatLng(51.5, -0.09),
+                  initialZoom: 11,
+                  interactionOptions: InteractionOptions(
+                    flags: flags,
+                  ),
                 ),
                 children: [
                   TileLayer(
@@ -166,4 +164,49 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
       ),
     );
   }
+
+  String _eventName(MapEvent? event) {
+    switch (event) {
+      case MapEventTap():
+        return 'MapEventTap';
+      case MapEventSecondaryTap():
+        return 'MapEventSecondaryTap';
+      case MapEventLongPress():
+        return 'MapEventLongPress';
+      case MapEventMove():
+        return 'MapEventMove';
+      case MapEventMoveStart():
+        return 'MapEventMoveStart';
+      case MapEventMoveEnd():
+        return 'MapEventMoveEnd';
+      case MapEventFlingAnimation():
+        return 'MapEventFlingAnimation';
+      case MapEventFlingAnimationNotStarted():
+        return 'MapEventFlingAnimationNotStarted';
+      case MapEventFlingAnimationStart():
+        return 'MapEventFlingAnimationStart';
+      case MapEventFlingAnimationEnd():
+        return 'MapEventFlingAnimationEnd';
+      case MapEventDoubleTapZoom():
+        return 'MapEventDoubleTapZoom';
+      case MapEventScrollWheelZoom():
+        return 'MapEventScrollWheelZoom';
+      case MapEventDoubleTapZoomStart():
+        return 'MapEventDoubleTapZoomStart';
+      case MapEventDoubleTapZoomEnd():
+        return 'MapEventDoubleTapZoomEnd';
+      case MapEventRotate():
+        return 'MapEventRotate';
+      case MapEventRotateStart():
+        return 'MapEventRotateStart';
+      case MapEventRotateEnd():
+        return 'MapEventRotateEnd';
+      case MapEventNonRotatedSizeChange():
+        return 'MapEventNonRotatedSizeChange';
+      case null:
+        return 'null';
+      default:
+        return 'Unknown';
+    }
+  }
 }

example/lib/pages/latlng_to_screen_point.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map_example/widgets/drawer.dart';
 import 'package:flutter_map/plugin_api.dart';
+import 'package:flutter_map_example/widgets/drawer.dart';
 import 'package:latlong2/latlong.dart';
 
 class LatLngScreenPointTestPage extends StatefulWidget {
@@ -36,23 +36,24 @@ class _LatLngScreenPointTestPageState extends State<LatLngScreenPointTestPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        appBar: AppBar(title: const Text('LatLng To Screen Point')),
-        drawer: buildDrawer(context, LatLngScreenPointTestPage.route),
-        body: Stack(children: [
+      appBar: AppBar(title: const Text('LatLng To Screen Point')),
+      drawer: buildDrawer(context, LatLngScreenPointTestPage.route),
+      body: Stack(
+        children: [
           Padding(
             padding: const EdgeInsets.all(8),
             child: FlutterMap(
               mapController: _mapController,
               options: MapOptions(
                 onMapEvent: onMapEvent,
                 onTap: (tapPos, latLng) {
-                  final pt1 = _mapController.latLngToScreenPoint(latLng);
+                  final pt1 = _mapController.camera.latLngToScreenPoint(latLng);
                   _textPos = CustomPoint(pt1.x, pt1.y);
                   setState(() {});
                 },
-                center: const LatLng(51.5, -0.09),
-                zoom: 11,
-                rotation: 0,
+                initialCenter: const LatLng(51.5, -0.09),
+                initialZoom: 11,
+                initialRotation: 0,
               ),
               children: [
                 TileLayer(
@@ -68,6 +69,8 @@ class _LatLngScreenPointTestPageState extends State<LatLngScreenPointTestPage> {
               width: 20,
               height: 20,
               child: const FlutterLogo())
-        ]));
+        ],
+      ),
+    );
   }
 }

example/lib/pages/many_markers.dart

@@ -72,10 +72,12 @@ class _ManyMarkersPageState extends State<ManyMarkersPage> {
           Text('$_sliderVal markers'),
           Flexible(
             child: FlutterMap(
-              options: MapOptions(
-                center: const LatLng(50, 20),
-                zoom: 5,
-                interactiveFlags: InteractiveFlag.all - InteractiveFlag.rotate,
+              options: const MapOptions(
+                initialCenter: LatLng(50, 20),
+                initialZoom: 5,
+                interactionOptions: InteractionOptions(
+                  flags: InteractiveFlag.all - InteractiveFlag.rotate,
+                ),
               ),
               children: [
                 TileLayer(