fix(multilayer-map): recenter map when branch changes (#1182)

* fix(multilayer-map): recenter map when branch changes

* feat(multilayer-map): enhance map zoom functionality and add recenter hook for branch changes

* fix(multilayer-map): handle empty buildings list in branch recenter logic

* fix(multilayer-map): update pending branch recenter logic to use state management

Author: simon-the-shark

lib/features/map_view/controllers/map_controller.dart

@@ -1,6 +1,7 @@
 import "dart:async";
 
 import "package:flutter/material.dart";
+import "package:flutter_map/flutter_map.dart";
 import "package:flutter_map_animations/flutter_map_animations.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 
@@ -10,6 +11,8 @@ import "bottom_sheet_controller.dart";
 import "controllers_set.dart";
 
 class MyMapController<T extends GoogleNavigable> {
+  static const _defaultFitPadding = EdgeInsets.all(24);
+
   final Ref ref;
   final MapControllers<T> mapControllers;
   MyMapController(this.ref, this.mapControllers);
@@ -23,17 +26,45 @@ class MyMapController<T extends GoogleNavigable> {
     }
   }
 
-  Future<void> zoomOnMarker(T item) async {
+  Future<void> zoomOnMarker(T item, {double? zoom}) async {
     if (!item.location.isValidForMap) return;
     final controller = await _controller;
     await controller.animateTo(
       dest: item.location,
-      zoom: MapWidgetConfig.defaultMarkerZoom,
+      zoom: zoom ?? MapWidgetConfig.defaultMarkerZoom,
       offset: Offset(0, -ref.read(bottomSheetControllerProvider).pixelsSafe / 2),
       rotation: 0,
     );
   }
 
+  Future<void> zoomOnItems(
+    Iterable<T> items, {
+    EdgeInsets padding = _defaultFitPadding,
+    double? maxZoom,
+    double? singleItemZoom,
+  }) async {
+    final validItems = items.where((item) => item.location.isValidForMap).toList();
+    if (validItems.isEmpty) return;
+    if (validItems.length == 1) {
+      return zoomOnMarker(validItems.first, zoom: singleItemZoom);
+    }
+
+    final controller = await _controller;
+    await controller.animatedFitCamera(
+      cameraFit: CameraFit.coordinates(
+        coordinates: validItems.map((item) => item.location).toList(),
+        padding: EdgeInsets.fromLTRB(
+          padding.left,
+          padding.top,
+          padding.right,
+          padding.bottom + ref.read(bottomSheetControllerProvider).pixelsSafe,
+        ),
+        maxZoom: maxZoom,
+      ),
+      rotation: 0,
+    );
+  }
+
   Future<void> onMarkerTap(T item) async {
     ref.read(mapControllers.activeMarker.notifier).toggleItem(item);
     ref.read(bottomSheetControllerProvider).resetSafe();

lib/features/map_view/hooks/use_multilayer_branch_recenter.dart

@@ -0,0 +1,70 @@
+import "dart:async";
+
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter/material.dart";
+import "package:flutter_hooks/flutter_hooks.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
+
+import "../../../config/map_view_config.dart";
+import "../../branches/data/model/branch.dart";
+import "../../multilayer_map/data/model/multilayer_item.dart";
+import "../controllers/bottom_sheet_controller.dart";
+import "../controllers/controllers_set.dart";
+
+void useMultilayerBranchRecenter({
+  required WidgetRef ref,
+  required Branch? selectedBranch,
+  required AsyncValue<IList<MultilayerItem>> sourceState,
+  required ActiveMarkerProv<MultilayerItem> activeMarkerProvider,
+  required MapControllerProv<MultilayerItem> mapControllerProvider,
+}) {
+  final lastHandledBranch = useRef<Branch?>(selectedBranch);
+  final pendingBranchRecenter = useState<Branch?>(null);
+
+  useEffect(() {
+    if (selectedBranch == null || lastHandledBranch.value == selectedBranch) return null;
+
+    lastHandledBranch.value = selectedBranch;
+    pendingBranchRecenter.value = selectedBranch;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(activeMarkerProvider.notifier).unselect();
+      ref.read(bottomSheetControllerProvider).resetSafe();
+    });
+    return null;
+  }, [selectedBranch]);
+
+  useEffect(() {
+    final branchToRecenter = pendingBranchRecenter.value;
+    if (branchToRecenter == null) return null;
+
+    switch (sourceState) {
+      case AsyncValue(:final value) when value != null:
+        final buildings = value
+            .whereType<BuildingItem>()
+            .where((item) => item.building.branch == branchToRecenter)
+            .toList();
+        final dataMatchesSelectedBranch = value.whereType<BuildingItem>().every(
+          (item) => item.building.branch == branchToRecenter,
+        );
+
+        if (!dataMatchesSelectedBranch || buildings.isEmpty) return null;
+
+        pendingBranchRecenter.value = null;
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          unawaited(
+            ref
+                .read(mapControllerProvider)
+                .zoomOnItems(
+                  buildings,
+                  padding: const EdgeInsets.fromLTRB(56, 100, 56, 120),
+                  maxZoom: MapWidgetConfig.defaultMarkerZoom - 2,
+                  singleItemZoom: MapWidgetConfig.defaultMarkerZoom - 2,
+                ),
+          );
+        });
+      default:
+        return null;
+    }
+    return null;
+  }, [sourceState, pendingBranchRecenter.value]);
+}

lib/features/map_view/widgets/map_widget.dart

@@ -7,10 +7,13 @@ import "package:hooks_riverpod/hooks_riverpod.dart";
 
 import "../../../config/map_view_config.dart";
 import "../../../theme/app_theme.dart";
+import "../../branches/business/selected_branch_on_map.dart";
+import "../../multilayer_map/data/model/multilayer_item.dart";
 import "../../my_loc_button/presentation/is_following_controller.dart";
 import "../../my_loc_button/presentation/my_loc_layer.dart";
 import "../controllers/controllers_set.dart";
 import "../data/cache.dart";
+import "../hooks/use_multilayer_branch_recenter.dart";
 import "load_animated_controller.dart";
 import "map_atrribution.dart";
 import "map_config.dart";
@@ -22,8 +25,20 @@ class MapWidget<T extends GoogleNavigable> extends HookConsumerWidget {
   const MapWidget(this.semanticsLabel, {super.key});
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final mapControllerProvider = context.mapController<T>();
+
+    if (T == MultilayerItem) {
+      useMultilayerBranchRecenter(
+        ref: ref,
+        selectedBranch: ref.watch(selectedBranchOnMapProvider),
+        sourceState: ref.watch(context.mapSourceRepository<MultilayerItem>()),
+        activeMarkerProvider: context.activeMarkerController<MultilayerItem>(),
+        mapControllerProvider: context.mapController<MultilayerItem>(),
+      );
+    }
+
     return LoadAnimationMapController<T>(
-      myMapController: ref.watch(context.mapController<T>()),
+      myMapController: ref.watch(mapControllerProvider),
       builder: (context, controller) {
         return FlutterMap(
           options: MapOptions(
@@ -38,7 +53,7 @@ class MapWidget<T extends GoogleNavigable> extends HookConsumerWidget {
                     .mapMoved(); // stop following location on user interaction
               }
             },
-            onTap: ref.watch(context.mapController<T>()).onMapBackgroundTap,
+            onTap: ref.watch(mapControllerProvider).onMapBackgroundTap,
           ),
           mapController: controller.mapController,
           children: [

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.2.44+132
+version: 1.2.45+135
 
 environment:
   sdk: ">=3.11.1 <4.0.0"