Add the region map, permanent attribution and the Sources screen
Puts a MapLibre map on screen framed on the region, with the credit obligations that come with showing third-party data satisfied structurally rather than by remembering to add a label. The base map style comes from MAP_STYLE_URL, and with no key configured the app generates a fallback style from the region's own bounding box: a flat background and the extent outline, no network sources at all. That keeps a fresh clone runnable offline without pulling in a boundary dataset that would carry its own licence, and it deliberately looks like a placeholder so it is not mistaken for a finished map. Attribution is driven by what is actually rendered. The bar lists the credits for the active sources only, because crediting OpenStreetMap while showing the fallback style would be a false attribution, and it says plainly when no base map is configured. It sits below the map rather than floating over it so no map control or gesture overlay can occlude a credit that the ODbL and CC BY-SA terms require to be visible. The Sources screen leads with the independence disclaimer, before the sources it qualifies, so a reader who stops after the first screenful has still seen it. Sources with no stated licence — ARPA publishes none for the alert bulletin — say so explicitly rather than being shown bare or given an invented one. A separate note explains that the rendered radar frames inherit CC BY-SA from the DPC source data. Also declares the INTERNET permission in the main manifest: Flutter injects it into the debug and profile manifests only, so a release build would otherwise fail every request on device. Verified: analyze clean, 66 tests passing, appbundle builds with the native MapLibre plugin. Not verified visually — this machine has no Android device or emulator image, so nobody has watched the map render. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,122 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:nuvolari/core/region/region_config.dart';
|
||||
import 'package:nuvolari/features/map/map_style.dart';
|
||||
|
||||
void main() {
|
||||
late RegionConfig region;
|
||||
|
||||
setUpAll(() {
|
||||
region = RegionConfig.parse(
|
||||
File('assets/regions/piemonte.json').readAsStringSync(),
|
||||
);
|
||||
});
|
||||
|
||||
group('MapStyle.buildFallbackStyle', () {
|
||||
late Map<String, Object?> style;
|
||||
|
||||
setUp(() {
|
||||
style = jsonDecode(
|
||||
MapStyle.buildFallbackStyle(region),
|
||||
) as Map<String, Object?>;
|
||||
});
|
||||
|
||||
test('is a valid MapLibre style document', () {
|
||||
expect(style['version'], 8);
|
||||
expect(style['sources'], isA<Map<String, Object?>>());
|
||||
expect(style['layers'], isA<List<Object?>>());
|
||||
});
|
||||
|
||||
// The whole point of the fallback is that it works with no network at all,
|
||||
// so a style that referenced a tile server would defeat it.
|
||||
test('references no network sources', () {
|
||||
final encoded = jsonEncode(style);
|
||||
|
||||
expect(encoded, isNot(contains('http://')));
|
||||
expect(encoded, isNot(contains('https://')));
|
||||
|
||||
final sources = style['sources']! as Map<String, Object?>;
|
||||
for (final source in sources.values) {
|
||||
expect((source! as Map<String, Object?>)['type'], 'geojson');
|
||||
}
|
||||
});
|
||||
|
||||
test('draws the region extent as a closed ring', () {
|
||||
final source =
|
||||
(style['sources']! as Map<String, Object?>)['region-extent']!
|
||||
as Map<String, Object?>;
|
||||
final geometry =
|
||||
(source['data']! as Map<String, Object?>)['geometry']!
|
||||
as Map<String, Object?>;
|
||||
final ring =
|
||||
(geometry['coordinates']! as List<Object?>).first! as List<Object?>;
|
||||
|
||||
expect(geometry['type'], 'Polygon');
|
||||
// Five points: four corners plus the repeated first point that closes it.
|
||||
expect(ring, hasLength(5));
|
||||
expect(ring.first, equals(ring.last));
|
||||
});
|
||||
|
||||
test('the ring matches the region bounding box', () {
|
||||
final source =
|
||||
(style['sources']! as Map<String, Object?>)['region-extent']!
|
||||
as Map<String, Object?>;
|
||||
final geometry =
|
||||
(source['data']! as Map<String, Object?>)['geometry']!
|
||||
as Map<String, Object?>;
|
||||
final ring =
|
||||
(geometry['coordinates']! as List<Object?>).first! as List<Object?>;
|
||||
|
||||
final longitudes = <double>[];
|
||||
final latitudes = <double>[];
|
||||
for (final point in ring) {
|
||||
final pair = point! as List<Object?>;
|
||||
longitudes.add((pair[0]! as num).toDouble());
|
||||
latitudes.add((pair[1]! as num).toDouble());
|
||||
}
|
||||
|
||||
expect(longitudes.reduce((a, b) => a < b ? a : b), region.bounds.west);
|
||||
expect(longitudes.reduce((a, b) => a > b ? a : b), region.bounds.east);
|
||||
expect(latitudes.reduce((a, b) => a < b ? a : b), region.bounds.south);
|
||||
expect(latitudes.reduce((a, b) => a > b ? a : b), region.bounds.north);
|
||||
});
|
||||
|
||||
test('has a background layer beneath the region layers', () {
|
||||
final layers = (style['layers']! as List<Object?>)
|
||||
.map((layer) => (layer! as Map<String, Object?>)['id'])
|
||||
.toList();
|
||||
|
||||
expect(layers.first, 'background');
|
||||
expect(layers, contains('region-extent-fill'));
|
||||
expect(layers, contains('region-extent-outline'));
|
||||
});
|
||||
});
|
||||
|
||||
group('MapStyle.forRegion', () {
|
||||
// The test process is built without --dart-define, so MAP_STYLE_URL is
|
||||
// empty and the fallback is what must come back.
|
||||
test('falls back when no style URL is configured', () {
|
||||
final style = MapStyle.forRegion(region);
|
||||
|
||||
expect(style.kind, BaseMapKind.offlineFallback);
|
||||
expect(style.styleString, startsWith('{'));
|
||||
});
|
||||
|
||||
// Crediting OpenStreetMap while showing a style that contains no OSM data
|
||||
// would be a false attribution, so the fallback owes nothing.
|
||||
test('the fallback claims no base map attribution', () {
|
||||
expect(MapStyle.forRegion(region).attributionIds, isEmpty);
|
||||
});
|
||||
|
||||
test('a configured base map owes the OpenStreetMap credit', () {
|
||||
const configured = MapStyle(
|
||||
kind: BaseMapKind.configured,
|
||||
styleString: 'https://example.invalid/style.json',
|
||||
);
|
||||
|
||||
expect(configured.attributionIds, contains('osm'));
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:nuvolari/core/region/region_config.dart';
|
||||
import 'package:nuvolari/core/region/region_repository.dart';
|
||||
import 'package:nuvolari/features/map/attribution_bar.dart';
|
||||
import 'package:nuvolari/features/sources/sources_screen.dart';
|
||||
import 'package:nuvolari/l10n/app_localizations.dart';
|
||||
|
||||
RegionConfig loadPiemonte() =>
|
||||
RegionConfig.parse(File('assets/regions/piemonte.json').readAsStringSync());
|
||||
|
||||
Widget wrap(Widget child, RegionConfig region) => ProviderScope(
|
||||
overrides: [regionConfigProvider.overrideWith((ref) async => region)],
|
||||
child: MaterialApp(
|
||||
locale: const Locale('it'),
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: child,
|
||||
),
|
||||
);
|
||||
|
||||
void main() {
|
||||
late RegionConfig region;
|
||||
|
||||
setUpAll(() {
|
||||
region = loadPiemonte();
|
||||
});
|
||||
|
||||
group('SourcesScreen', () {
|
||||
testWidgets('lists every configured source with its licence', (
|
||||
tester,
|
||||
) async {
|
||||
await tester.pumpWidget(wrap(const SourcesScreen(), region));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
for (final attribution in region.attributions) {
|
||||
expect(
|
||||
find.text(attribution.text),
|
||||
findsOneWidget,
|
||||
reason: '${attribution.id} is missing from the Sources screen',
|
||||
);
|
||||
}
|
||||
|
||||
expect(find.textContaining('CC BY-SA'), findsWidgets);
|
||||
expect(find.textContaining('ODbL'), findsWidgets);
|
||||
});
|
||||
|
||||
// ARPA publishes no licence for the alert bulletin. Showing an invented one
|
||||
// would be worse than showing none, so the screen must say so explicitly.
|
||||
testWidgets('says when a source states no licence', (tester) async {
|
||||
await tester.pumpWidget(wrap(const SourcesScreen(), region));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Nessuna licenza dichiarata dalla fonte'), findsWidgets);
|
||||
});
|
||||
|
||||
testWidgets('shows the independence disclaimer', (tester) async {
|
||||
await tester.pumpWidget(wrap(const SourcesScreen(), region));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('App non ufficiale'), findsOneWidget);
|
||||
expect(find.textContaining('indipendente'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('explains the share-alike obligation', (tester) async {
|
||||
await tester.pumpWidget(wrap(const SourcesScreen(), region));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Dati derivati'), findsOneWidget);
|
||||
expect(find.textContaining('CC BY-SA'), findsWidgets);
|
||||
});
|
||||
|
||||
testWidgets('links the official bulletin', (tester) async {
|
||||
await tester.pumpWidget(wrap(const SourcesScreen(), region));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// The button sits below the fold in the test viewport.
|
||||
await tester.scrollUntilVisible(
|
||||
find.text('Bollettino ufficiale Arpa Piemonte'),
|
||||
200,
|
||||
scrollable: find.byType(Scrollable).first,
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Bollettino ufficiale Arpa Piemonte'), findsOneWidget);
|
||||
});
|
||||
});
|
||||
|
||||
group('AttributionBar', () {
|
||||
testWidgets('shows only the sources currently on screen', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
wrap(
|
||||
Scaffold(
|
||||
body: AttributionBar(
|
||||
region: region,
|
||||
activeSourceIds: const {'osm'},
|
||||
),
|
||||
),
|
||||
region,
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.textContaining('OpenStreetMap'), findsOneWidget);
|
||||
expect(find.textContaining('Radar-DPC'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('says when no base map is configured', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
wrap(
|
||||
Scaffold(
|
||||
body: AttributionBar(
|
||||
region: region,
|
||||
activeSourceIds: const {},
|
||||
showBaseMapNotice: true,
|
||||
),
|
||||
),
|
||||
region,
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.textContaining('Mappa base non configurata'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('opens the Sources screen when tapped', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
wrap(
|
||||
Scaffold(
|
||||
body: AttributionBar(
|
||||
region: region,
|
||||
activeSourceIds: const {'osm', 'dpc'},
|
||||
),
|
||||
),
|
||||
region,
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(find.byType(AttributionBar));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.byType(SourcesScreen), findsOneWidget);
|
||||
expect(find.text('App non ufficiale'), findsOneWidget);
|
||||
});
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user