Skip to content

stop automatic autocenter in favour of manual icon #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YurkoWasHere wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

stop automatic autocenter in favour of manual icon #242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions macless_haystack/lib/map/map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,18 @@ class _AccessoryMapState extends State<AccessoryMap> {
locationModel.addListener(listener);
cancelLocationUpdates = () => locationModel.removeListener(listener);

// Fit map if accessories change?
// Fit map once when the first accessory locations are loaded
void accessoryListener() {
if (accessoryRegistry.accessories
.any((accessory) => accessory.lastLocation != null)) {
cancelAccessoryUpdates?.call();
fitToContent(accessoryRegistry.accessories, locationModel.here);
}
}

accessoryRegistry.addListener(accessoryListener);
cancelAccessoryUpdates =
() => accessoryRegistry.removeListener(accessoryListener);
}

@override
Expand All @@ -60,9 +71,12 @@ class _AccessoryMapState extends State<AccessoryMap> {
cancelAccessoryUpdates?.call();
}

void fitToContent(List<Accessory> accessories, LatLng? hereLocation) async {
// Delay to prevent race conditions
await Future.delayed(const Duration(milliseconds: 500));
void fitToContent(List<Accessory> accessories, LatLng? hereLocation,
{bool delayed = true}) async {
if (delayed) {
// Delay to prevent race conditions
await Future.delayed(const Duration(milliseconds: 500));
}

List<LatLng> points = [];
if (hereLocation != null) {
Expand All @@ -89,11 +103,9 @@ class _AccessoryMapState extends State<AccessoryMap> {
return Consumer2<AccessoryRegistry, LocationModel>(builder:
(BuildContext context, AccessoryRegistry accessoryRegistry,
LocationModel locationModel, Widget? child) {
// Zoom map to fit all accessories on first accessory update
var accessories = accessoryRegistry.accessories;
fitToContent(accessories, locationModel.here);

return FlutterMap(
final map = FlutterMap(
mapController: _mapController,
options: MapOptions(
initialCenter: locationModel.here ?? const LatLng(51.1657, 10.4515),
Expand Down Expand Up @@ -190,6 +202,24 @@ class _AccessoryMapState extends State<AccessoryMap> {
]),
],
);

return Stack(
children: [
map,
Positioned(
right: 12,
bottom: 12,
child: FloatingActionButton.small(
heroTag: null,
tooltip: 'Fit all accessories',
onPressed: () => fitToContent(
accessories, locationModel.here,
delayed: false),
child: const Icon(Icons.zoom_out_map),
),
),
],
);
});
}
}