Skip to content

Commit c6af0bd

Browse files
dougborgclaude
andcommitted
Merge feat/osm-service-policy into fix/tile-retry-on-error
Combines per-provider disk caching (PR FoggedLens#128) with error retry via reset stream and silenceExceptions: false (PR FoggedLens#132). Merge conflicts in tile_layer_manager.dart resolved to keep both the multi-provider cache map and the reset stream / retry timer. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2 parents 8952ea1 + 91d221e commit c6af0bd

25 files changed

Lines changed: 1964 additions & 158 deletions

lib/localizations/de.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@
144144
"offlineModeWarning": "Downloads im Offline-Modus deaktiviert. Deaktivieren Sie den Offline-Modus, um neue Bereiche herunterzuladen.",
145145
"areaTooBigMessage": "Zoomen Sie auf mindestens Stufe {} heran, um Offline-Bereiche herunterzuladen. Downloads großer Gebiete können die App zum Absturz bringen.",
146146
"downloadStarted": "Download gestartet! Lade Kacheln und Knoten...",
147-
"downloadFailed": "Download konnte nicht gestartet werden: {}"
147+
"downloadFailed": "Download konnte nicht gestartet werden: {}",
148+
"offlineNotPermitted": "Der {}-Server erlaubt keine Offline-Downloads. Wechseln Sie zu einem Kachelanbieter, der Offline-Nutzung unterstützt (z. B. Bing Maps, Mapbox oder ein selbst gehosteter Kachelserver).",
149+
"currentTileProvider": "aktuelle Kachel"
148150
},
149151
"downloadStarted": {
150152
"title": "Download gestartet",

lib/localizations/en.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Downloads disabled while in offline mode. Disable offline mode to download new areas.",
182182
"areaTooBigMessage": "Zoom in to at least level {} to download offline areas. Large area downloads can cause the app to become unresponsive.",
183183
"downloadStarted": "Download started! Fetching tiles and nodes...",
184-
"downloadFailed": "Failed to start download: {}"
184+
"downloadFailed": "Failed to start download: {}",
185+
"offlineNotPermitted": "The {} server does not permit offline downloads. Switch to a tile provider that allows offline use (e.g., Bing Maps, Mapbox, or a self-hosted tile server).",
186+
"currentTileProvider": "current tile"
185187
},
186188
"downloadStarted": {
187189
"title": "Download Started",

lib/localizations/es.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Descargas deshabilitadas en modo sin conexión. Deshabilite el modo sin conexión para descargar nuevas áreas.",
182182
"areaTooBigMessage": "Amplíe al menos al nivel {} para descargar áreas sin conexión. Las descargas de áreas grandes pueden hacer que la aplicación deje de responder.",
183183
"downloadStarted": "¡Descarga iniciada! Obteniendo mosaicos y nodos...",
184-
"downloadFailed": "Error al iniciar la descarga: {}"
184+
"downloadFailed": "Error al iniciar la descarga: {}",
185+
"offlineNotPermitted": "El servidor {} no permite descargas sin conexión. Cambie a un proveedor de mosaicos que permita el uso sin conexión (p. ej., Bing Maps, Mapbox o un servidor de mosaicos propio).",
186+
"currentTileProvider": "mosaico actual"
185187
},
186188
"downloadStarted": {
187189
"title": "Descarga Iniciada",

lib/localizations/fr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Téléchargements désactivés en mode hors ligne. Désactivez le mode hors ligne pour télécharger de nouvelles zones.",
182182
"areaTooBigMessage": "Zoomez au moins au niveau {} pour télécharger des zones hors ligne. Les téléchargements de grandes zones peuvent rendre l'application non réactive.",
183183
"downloadStarted": "Téléchargement démarré ! Récupération des tuiles et nœuds...",
184-
"downloadFailed": "Échec du démarrage du téléchargement: {}"
184+
"downloadFailed": "Échec du démarrage du téléchargement: {}",
185+
"offlineNotPermitted": "Le serveur {} ne permet pas les téléchargements hors ligne. Passez à un fournisseur de tuiles qui autorise l'utilisation hors ligne (par ex., Bing Maps, Mapbox ou un serveur de tuiles auto-hébergé).",
186+
"currentTileProvider": "tuile actuelle"
185187
},
186188
"downloadStarted": {
187189
"title": "Téléchargement Démarré",

lib/localizations/it.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Download disabilitati in modalità offline. Disabilita la modalità offline per scaricare nuove aree.",
182182
"areaTooBigMessage": "Ingrandisci almeno al livello {} per scaricare aree offline. I download di aree grandi possono rendere l'app non reattiva.",
183183
"downloadStarted": "Download avviato! Recupero tile e nodi...",
184-
"downloadFailed": "Impossibile avviare il download: {}"
184+
"downloadFailed": "Impossibile avviare il download: {}",
185+
"offlineNotPermitted": "Il server {} non consente i download offline. Passa a un fornitore di tile che consenta l'uso offline (ad es., Bing Maps, Mapbox o un server di tile auto-ospitato).",
186+
"currentTileProvider": "tile attuale"
185187
},
186188
"downloadStarted": {
187189
"title": "Download Avviato",

lib/localizations/nl.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Downloads uitgeschakeld in offline modus. Schakel offline modus uit om nieuwe gebieden te downloaden.",
182182
"areaTooBigMessage": "Zoom in tot ten minste niveau {} om offline gebieden te downloaden. Grote gebied downloads kunnen ervoor zorgen dat de app niet meer reageert.",
183183
"downloadStarted": "Download gestart! Tiles en nodes ophalen...",
184-
"downloadFailed": "Download starten mislukt: {}"
184+
"downloadFailed": "Download starten mislukt: {}",
185+
"offlineNotPermitted": "De {}-server staat geen offline downloads toe. Schakel over naar een tegelserver die offline gebruik toestaat (bijv. Bing Maps, Mapbox of een zelf gehoste tegelserver).",
186+
"currentTileProvider": "huidige tegel"
185187
},
186188
"downloadStarted": {
187189
"title": "Download Gestart",

lib/localizations/pl.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Pobieranie wyłączone w trybie offline. Wyłącz tryb offline, aby pobierać nowe obszary.",
182182
"areaTooBigMessage": "Przybliż do co najmniej poziomu {}, aby pobierać obszary offline. Duże pobieranie obszarów może sprawić, że aplikacja przestanie odpowiadać.",
183183
"downloadStarted": "Pobieranie rozpoczęte! Pobieranie kafelków i węzłów...",
184-
"downloadFailed": "Nie udało się rozpocząć pobierania: {}"
184+
"downloadFailed": "Nie udało się rozpocząć pobierania: {}",
185+
"offlineNotPermitted": "Serwer {} nie zezwala na pobieranie offline. Przełącz się na dostawcę kafelków, który obsługuje tryb offline (np. Bing Maps, Mapbox lub samodzielnie hostowany serwer kafelków).",
186+
"currentTileProvider": "bieżący kafelek"
185187
},
186188
"downloadStarted": {
187189
"title": "Pobieranie Rozpoczęte",

lib/localizations/pt.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Downloads desabilitados no modo offline. Desative o modo offline para baixar novas áreas.",
182182
"areaTooBigMessage": "Amplie para pelo menos o nível {} para baixar áreas offline. Downloads de áreas grandes podem tornar o aplicativo não responsivo.",
183183
"downloadStarted": "Download iniciado! Buscando tiles e nós...",
184-
"downloadFailed": "Falha ao iniciar o download: {}"
184+
"downloadFailed": "Falha ao iniciar o download: {}",
185+
"offlineNotPermitted": "O servidor {} não permite downloads offline. Mude para um provedor de tiles que permita uso offline (por ex., Bing Maps, Mapbox ou um servidor de tiles próprio).",
186+
"currentTileProvider": "tile atual"
185187
},
186188
"downloadStarted": {
187189
"title": "Download Iniciado",

lib/localizations/tr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Çevrimdışı moddayken indirmeler devre dışı. Yeni alanları indirmek için çevrimdışı modu devre dışı bırakın.",
182182
"areaTooBigMessage": "Çevrimdışı alanları indirmek için en az {} seviyesine yakınlaştırın. Büyük alan indirmeleri uygulamanın yanıt vermemesine neden olabilir.",
183183
"downloadStarted": "İndirme başladı! Döşemeler ve düğümler getiriliyor...",
184-
"downloadFailed": "İndirme başlatılamadı: {}"
184+
"downloadFailed": "İndirme başlatılamadı: {}",
185+
"offlineNotPermitted": "{} sunucusu çevrimdışı indirmelere izin vermiyor. Çevrimdışı kullanıma izin veren bir döşeme sağlayıcısına geçin (ör. Bing Maps, Mapbox veya kendi barındırdığınız bir döşeme sunucusu).",
186+
"currentTileProvider": "mevcut döşeme"
185187
},
186188
"downloadStarted": {
187189
"title": "İndirme Başladı",

lib/localizations/uk.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@
181181
"offlineModeWarning": "Завантаження вимкнено в офлайн режимі. Вимкніть офлайн режим для завантаження нових областей.",
182182
"areaTooBigMessage": "Збільште масштаб до принаймні рівня {} для завантаження офлайн областей. Великі завантаження областей можуть призвести до того, що додаток перестане відповідати.",
183183
"downloadStarted": "Завантаження почалося! Отримання плиток та вузлів...",
184-
"downloadFailed": "Не вдалося почати завантаження: {}"
184+
"downloadFailed": "Не вдалося почати завантаження: {}",
185+
"offlineNotPermitted": "Сервер {} не дозволяє офлайн-завантаження. Перейдіть на постачальника плиток, який дозволяє офлайн-використання (наприклад, Bing Maps, Mapbox або власний сервер плиток).",
186+
"currentTileProvider": "поточна плитка"
185187
},
186188
"downloadStarted": {
187189
"title": "Завантаження Почалося",

0 commit comments

Comments
 (0)