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:
@@ -59,11 +59,16 @@ class _MapWithAttribution extends StatelessWidget {
|
||||
child: _RegionMap(region: region, style: style),
|
||||
),
|
||||
// Outside the map rather than floating over it, so the credit can never
|
||||
// be occluded by a map control or a gesture overlay.
|
||||
AttributionBar(
|
||||
region: region,
|
||||
activeSourceIds: style.attributionIds,
|
||||
showBaseMapNotice: style.kind == BaseMapKind.offlineFallback,
|
||||
// be occluded by a map control. SafeArea keeps it clear of the system
|
||||
// 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,
|
||||
activeSourceIds: style.attributionIds,
|
||||
showBaseMapNotice: style.kind == BaseMapKind.offlineFallback,
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
@@ -76,6 +81,29 @@ class _RegionMap extends StatelessWidget {
|
||||
final RegionConfig region;
|
||||
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
|
||||
Widget build(BuildContext context) {
|
||||
final center = region.map.center;
|
||||
@@ -84,6 +112,7 @@ class _RegionMap extends StatelessWidget {
|
||||
|
||||
return MapLibreMap(
|
||||
styleString: style.styleString,
|
||||
onMapCreated: _frameRegion,
|
||||
initialCameraPosition: CameraPosition(
|
||||
target: LatLng(center.latitude, center.longitude),
|
||||
zoom: zoom.initial,
|
||||
|
||||
Reference in New Issue
Block a user