Files
Europa/Nuvolari/app/lib/features/map/radar_map_screen.dart
T
Alby96andClaude Opus 5 47049b39e7 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>
2026-09-10 12:25:55 +02:00

141 lines
4.6 KiB
Dart

import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:maplibre_gl/maplibre_gl.dart';
import '../../core/config/env.dart';
import '../../core/region/region_config.dart';
import '../../core/region/region_repository.dart';
import '../../l10n/app_localizations.dart';
import 'attribution_bar.dart';
import 'map_style.dart';
/// The radar map.
///
/// Milestone 2 renders the base map, frames it on the region and keeps the
/// attribution visible. The radar image layers and the timeline arrive in
/// milestone 3.
class RadarMapScreen extends ConsumerWidget {
const RadarMapScreen({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final l10n = AppLocalizations.of(context);
final region = ref.watch(regionConfigProvider);
return Scaffold(
appBar: AppBar(title: Text(l10n.appTitle)),
body: switch (region) {
AsyncData(:final value) => _MapWithAttribution(region: value),
AsyncError(:final error) => Center(
child: Padding(
padding: const EdgeInsets.all(24),
child: Text('${l10n.dataUnavailable}\n$error'),
),
),
_ => Center(child: Text(l10n.loading)),
},
);
}
}
class _MapWithAttribution extends StatelessWidget {
const _MapWithAttribution({required this.region});
final RegionConfig region;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context);
final style = MapStyle.forRegion(region);
return Column(
children: [
if (Env.isDemoMode)
MaterialBanner(
content: Text(l10n.demoModeBanner),
actions: const [SizedBox.shrink()],
),
Expanded(
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. 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,
),
),
],
);
}
}
class _RegionMap extends StatelessWidget {
const _RegionMap({required this.region, required this.style});
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;
final zoom = region.map.zoom;
final bounds = region.bounds;
return MapLibreMap(
styleString: style.styleString,
onMapCreated: _frameRegion,
initialCameraPosition: CameraPosition(
target: LatLng(center.latitude, center.longitude),
zoom: zoom.initial,
),
minMaxZoomPreference: MinMaxZoomPreference(zoom.min, zoom.max),
// Panning is confined to the region: this app has data for Piedmont and
// nowhere else, so letting the user drift away would only ever show an
// empty map.
cameraTargetBounds: CameraTargetBounds(
LatLngBounds(
southwest: LatLng(bounds.south, bounds.west),
northeast: LatLng(bounds.north, bounds.east),
),
),
// Kept enabled on top of our own attribution bar: some tile providers
// require the plugin's own attribution control, and a duplicated credit
// is harmless where a missing one is a licence breach.
attributionButtonPosition: AttributionButtonPosition.bottomRight,
compassEnabled: false,
rotateGesturesEnabled: false,
tiltGesturesEnabled: false,
myLocationEnabled: false,
);
}
}