Narrow scope to radar, and put the app on a real OpenStreetMap base map
Drops forecasts, lightning, the home-screen widget and advertising. What remains is radar on a map, the official ARPA alert bulletin, and rain notifications. The base map is now OpenFreeMap's Positron style: real OpenStreetMap vector tiles with no API key, no registration, no request limits and commercial use permitted. Every other free tier — MapTiler, Stadia, Jawg, Thunderforest — needs a key, which is a secret to manage, a quota to outgrow and a signup to complete before anyone can build the project, and the map is the one thing the app cannot work without. Positron rather than Liberty or Bright because the radar overlay has to be the loudest thing on screen, and a desaturated grey base is built to sit under data. Its style JSON carries no `attribution` field, so MapLibre displays no credits by itself. The app renders them from the region config instead: the two mandatory credits, OpenStreetMap and OpenMapTiles, go in the always-visible bar, and OpenFreeMap's own credit — optional by their terms — is listed on the Sources screen with the rest. The bundled offline style is still reachable with MAP_STYLE_URL=offline, and still claims no base map attribution, because crediting OpenStreetMap while showing it would be a false claim. Radar-DPC stays the source. ARPA Piemonte's own radar remains a disabled stub for two reasons that belong to the project owner, not to the code: the real-time access link is only issued by email, and the open-data page states the data is "gratuiti" and nothing else. Free of charge is not a licence, and rendering those volumes into frames served from a CDN is redistribution. Both questions go in the same email. An earlier draft of the docs recorded ARPA radar as CC BY 4.0; the source page does not support that, so the claim is removed rather than carried forward. The documentation is updated throughout rather than annotated: CLAUDE.md gains an explicit scope boundary, data-sources drops MET Norway and ISTAT and gains the base map, licenses records that free of charge is not a licence, privacy loses the whole advertising section, and the roadmap is renumbered so the backend worker is next — until it exists, DpcRadarSource has nothing to read. licenses.md keeps Open-Meteo and Blitzortung listed as excluded even though the features that would have used them are gone: both are non-commercial-only, ads are a plausible future, and neither should be adopted on the grounds that there are none today. Verified: analyze clean, 130 tests passing, and on the emulator the radar overlay sits correctly over Piedmont on real OSM tiles with Turin, Milan and Genoa labelled, the age reads "Aggiornato 4 minuti fa", and the Sources screen lists all five credits with their licences. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -42,7 +42,6 @@ void main() {
|
||||
|
||||
expect(l10n.appTitle, 'Nuvolari');
|
||||
expect(l10n.navRadar, 'Radar');
|
||||
expect(l10n.navForecast, 'Previsioni');
|
||||
expect(l10n.navAlerts, 'Allerte');
|
||||
});
|
||||
|
||||
|
||||
@@ -124,12 +124,13 @@ void main() {
|
||||
}
|
||||
});
|
||||
|
||||
// Radar-DPC is CC BY-SA and OpenStreetMap is ODbL: both credits are legal
|
||||
// obligations, not decoration, so their absence must fail the build.
|
||||
// Radar-DPC is CC BY-SA, OpenStreetMap is ODbL and OpenMapTiles requires a
|
||||
// credit for the tiles: all three are legal obligations, not decoration, so
|
||||
// their absence must fail the build.
|
||||
test('carries the mandatory attributions', () {
|
||||
final ids = config.attributions.map((a) => a.id).toSet();
|
||||
|
||||
expect(ids, containsAll(<String>['dpc', 'osm']));
|
||||
expect(ids, containsAll(<String>['dpc', 'osm', 'openmaptiles']));
|
||||
|
||||
final dpc = config.attributions.firstWhere((a) => a.id == 'dpc');
|
||||
expect(dpc.license, 'CC BY-SA');
|
||||
|
||||
@@ -21,10 +21,6 @@ Map<String, Object?> validDocument() => <String, Object?>{
|
||||
'product': 'VMI',
|
||||
'frameIntervalMinutes': 5,
|
||||
},
|
||||
'forecast': <String, Object?>{
|
||||
'defaultAdapter': 'metno',
|
||||
'availableAdapters': <String>['metno'],
|
||||
},
|
||||
'alerts': <String, Object?>{
|
||||
'defaultAdapter': 'arpaCap',
|
||||
'availableAdapters': <String>['arpaCap'],
|
||||
@@ -68,7 +64,6 @@ void main() {
|
||||
expect(config.radar.defaultAdapter, RadarAdapter.mock);
|
||||
expect(config.radar.product, 'VMI');
|
||||
expect(config.radar.frameInterval, const Duration(minutes: 5));
|
||||
expect(config.forecast.defaultAdapter, ForecastAdapter.metno);
|
||||
expect(config.alerts.defaultAdapter, AlertAdapter.arpaCap);
|
||||
expect(config.alertZones, hasLength(1));
|
||||
expect(config.attributions, hasLength(1));
|
||||
|
||||
@@ -95,28 +95,48 @@ void main() {
|
||||
});
|
||||
|
||||
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', () {
|
||||
// The test binary is built with no --dart-define, so MAP_STYLE_URL is empty
|
||||
// and the free key-less base map is what must come back.
|
||||
test('defaults to OpenFreeMap when nothing is configured', () {
|
||||
final style = MapStyle.forRegion(region);
|
||||
|
||||
expect(style.kind, BaseMapKind.offlineFallback);
|
||||
expect(style.styleString, startsWith('{'));
|
||||
expect(style.kind, BaseMapKind.openFreeMap);
|
||||
expect(style.styleString, MapStyle.openFreeMapStyleUrl);
|
||||
expect(style.styleString, startsWith('https://'));
|
||||
});
|
||||
|
||||
// OpenMapTiles and OpenStreetMap are mandatory credits for these tiles.
|
||||
// OpenFreeMap's own credit is optional by their terms and lives on the
|
||||
// Sources screen instead of the always-visible bar.
|
||||
test('the default base map owes the OpenMapTiles and OSM credits', () {
|
||||
final ids = MapStyle.forRegion(region).attributionIds;
|
||||
|
||||
expect(ids, containsAll(<String>['openmaptiles', 'osm']));
|
||||
expect(ids, isNot(contains('openfreemap')));
|
||||
});
|
||||
|
||||
test('a custom style URL owes the same credits', () {
|
||||
const custom = MapStyle(
|
||||
kind: BaseMapKind.custom,
|
||||
styleString: 'https://example.invalid/style.json',
|
||||
);
|
||||
|
||||
expect(
|
||||
custom.attributionIds,
|
||||
containsAll(<String>['openmaptiles', 'osm']),
|
||||
);
|
||||
});
|
||||
|
||||
// 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',
|
||||
test('the offline fallback claims no base map attribution', () {
|
||||
final fallback = MapStyle(
|
||||
kind: BaseMapKind.offlineFallback,
|
||||
styleString: MapStyle.buildFallbackStyle(region),
|
||||
);
|
||||
|
||||
expect(configured.attributionIds, contains('osm'));
|
||||
expect(fallback.attributionIds, isEmpty);
|
||||
expect(fallback.styleString, startsWith('{'));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -69,6 +69,14 @@ void main() {
|
||||
await tester.pumpWidget(wrap(const SourcesScreen(), region));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// Below the fold in the test viewport once the base-map credits are listed.
|
||||
await tester.scrollUntilVisible(
|
||||
find.text('Dati derivati'),
|
||||
200,
|
||||
scrollable: find.byType(Scrollable).first,
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Dati derivati'), findsOneWidget);
|
||||
expect(find.textContaining('CC BY-SA'), findsWidgets);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user