Fit the map to the region and keep attribution clear of the gesture bar

Running the app on an emulator for the first time showed two problems that the
unit tests could not have caught, because both are about what the pixels
actually do.

The configured initial zoom of 7.2 puts the viewport entirely inside the
region on a 411dp-wide screen, so the map rendered as a flat expanse of fill
colour with no outline, border or reference point anywhere in view — it read as
a failure to load. A single zoom number cannot frame a region on both a phone
and a tablet, so the camera now fits the region bounds once the map is ready,
which is correct at any screen size. The configured zoom stays as the starting
position before the fit.

The attribution bar sat behind the system gesture pill. A credit that is
covered by the navigation bar is a credit that is not being displayed, which is
the thing ODbL and CC BY-SA actually require, so it now sits inside a SafeArea.

Also records how to run and screenshot the app on the `nuvolari` AVD, and notes
the pre-existing broken `pixel_7_-_api_35` AVD that is holding 4.8 GB.

Verified on the emulator: the region outline is framed with margin, the
attribution bar is clear of the pill, and the Sources screen shows the
disclaimer, all four credits with their licences, the "no licence stated" line
for ARPA and the share-alike note.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
2026-09-10 12:25:55 +02:00
co-authored by Claude Opus 5
parent 71557a02d7
commit 47049b39e7
2 changed files with 68 additions and 9 deletions
@@ -59,12 +59,17 @@ class _MapWithAttribution extends StatelessWidget {
child: _RegionMap(region: region, style: style), child: _RegionMap(region: region, style: style),
), ),
// Outside the map rather than floating over it, so the credit can never // Outside the map rather than floating over it, so the credit can never
// be occluded by a map control or a gesture overlay. // be occluded by a map control. SafeArea keeps it clear of the system
AttributionBar( // gesture bar as well — a credit sitting behind the navigation pill is
// a credit that is not being displayed.
SafeArea(
top: false,
child: AttributionBar(
region: region, region: region,
activeSourceIds: style.attributionIds, activeSourceIds: style.attributionIds,
showBaseMapNotice: style.kind == BaseMapKind.offlineFallback, showBaseMapNotice: style.kind == BaseMapKind.offlineFallback,
), ),
),
], ],
); );
} }
@@ -76,6 +81,29 @@ class _RegionMap extends StatelessWidget {
final RegionConfig region; final RegionConfig region;
final MapStyle style; final MapStyle style;
/// Frames the whole region once the map is ready.
///
/// The configured initial zoom is only a starting point: a single zoom number
/// cannot fit the region on both a small phone and a tablet, and on a 411dp
/// screen zoom 7.2 puts the viewport entirely inside the region, so the user
/// sees a flat expanse with no coastline, border or outline to orient by.
/// Fitting the bounds works on every screen size.
Future<void> _frameRegion(MapLibreMapController controller) async {
final bounds = region.bounds;
await controller.moveCamera(
CameraUpdate.newLatLngBounds(
LatLngBounds(
southwest: LatLng(bounds.south, bounds.west),
northeast: LatLng(bounds.north, bounds.east),
),
left: 16,
top: 16,
right: 16,
bottom: 16,
),
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final center = region.map.center; final center = region.map.center;
@@ -84,6 +112,7 @@ class _RegionMap extends StatelessWidget {
return MapLibreMap( return MapLibreMap(
styleString: style.styleString, styleString: style.styleString,
onMapCreated: _frameRegion,
initialCameraPosition: CameraPosition( initialCameraPosition: CameraPosition(
target: LatLng(center.latitude, center.longitude), target: LatLng(center.latitude, center.longitude),
zoom: zoom.initial, zoom: zoom.initial,
+34 -4
View File
@@ -54,10 +54,11 @@ network. The attribution bar lists only the sources actually rendered — credit
OpenStreetMap while showing the fallback would be a false attribution — and sits below OpenStreetMap while showing the fallback would be a false attribution — and sits below
the map rather than floating over it so no map control can occlude it. the map rather than floating over it so no map control can occlude it.
**Not visually verified.** This machine has no Android device and no emulator image, so **Verified on an emulator** (`nuvolari`, API 36.1, x86_64, GPU host). Running it caught
the map has been proven to build and its logic unit-tested, but nobody has watched it two things the unit tests could not: the configured initial zoom put the viewport
render. Connect a phone over USB or install an emulator system image before trusting entirely inside the region so the map read as a blank expanse, and the attribution bar
the visual result. sat behind the system gesture pill. Both fixed — the camera now fits the region bounds
at runtime, which works on any screen size, and the bar is inside a SafeArea.
## M3 — Animation and timeline 🔨 ## M3 — Animation and timeline 🔨
@@ -130,3 +131,32 @@ draft, store listing copy, Data safety draft, prominent disclosure for location.
| M6 | Firebase project and `google-services.json` | | M6 | Firebase project and `google-services.json` |
| M8 | VPS / object storage endpoint and credentials | | M8 | VPS / object storage endpoint and credentials |
| M9 | Play Console account and upload keystore | | M9 | Play Console account and upload keystore |
---
## Verifying on the emulator
An AVD named `nuvolari` is set up on this machine: API 36.1, `google_apis`, x86_64,
GPU passthrough to the host. It uses a 2 GB data partition and no SD card because disk
is tight.
```bash
# Boot it
"$ANDROID_HOME/emulator/emulator" -avd nuvolari -no-audio -no-boot-anim -gpu host
# Build, install, launch
cd app
flutter build apk --debug
adb install -r build/app/outputs/flutter-apk/app-debug.apk
adb shell am start -n it.nuvolari.app/.MainActivity
# Capture what it looks like
adb exec-out screencap -p > screen.png
```
`flutter run -d emulator-5554` works too and gives hot reload; the steps above are what
a non-interactive session uses.
> An unrelated AVD, `pixel_7_-_api_35`, is present but broken — its system image
> (`android-35/google_apis_playstore`) is not installed, so it cannot boot. It occupies
> about 4.8 GB. It predates this project and has been left alone.