devibe changelog

operator profiles - import, reorderable
typo
2026-04-02 10:10:22 +02:00 · 2026-03-23 13:15:26 -05:00 · 2026-03-23 12:58:50 -05:00 · 2026-03-23 11:45:13 -05:00 · 2026-03-15 14:31:39 -05:00 · 2026-03-14 18:11:43 -05:00
47 changed files with 2343 additions and 551 deletions
--- a/11
+++ b/11
@@ -1,11 +0,0 @@
---
-An alternative approach to addressing this issue could be adjusting the `optionsBuilder` logic to avoid returning any suggestions when the input text field is empty, rather than guarding `onFieldSubmitted`. For instance:
-
-```dart
-optionsBuilder: (TextEditingValue textEditingValue) {
-  if (textEditingValue.text.isEmpty) return <String>[];
-  return suggestions.where((s) => s.contains(textEditingValue.text));
-}
-```
-
-This ensures that the `RawAutocomplete` widget doesn't offer any options to auto-select on submission when the field is cleared, potentially simplifying the implementation and avoiding the need for additional boolean flags (`guardOnSubmitted`). This pattern can be seen in some implementations "in the wild."
--- a/assets/changelog.json
+++ b/assets/changelog.json
@@ -1,4 +1,30 @@
 {
+  "2.10.1": {
+    "content": [
+      "• Operator profiles are now reorderable",
+      "• Support operator profile import via deflockapp:// links",
+      "• Makes operator profile UI consistent with device profiles"
+    ]
+  },
+  "2.10.0": {
+    "content": [
+      "• Simplified profile FOVs; there is now only a checkbox for '360'",
+    ]
+  },
+  "2.9.2": {
+    "content": [
+      "• Moved 'About OpenStreetMap' section from OSM Account page to Settings > About for better organization",
+      "• Added 'Clear Caches' option to tile provider menus - easily free up storage space by clearing cached tiles for specific providers",
+      "• Enhanced node deletion workflow - users can now provide an informative reason when deleting surveillance devices",
+      "• Added 'Report issue with OSM base map' link in About screen help section - easily report issues with the underlying OpenStreetMap data"
+    ]
+  },
+  "2.9.1": {
+    "content": [
+      "• When hitting node render limit, only render nodes closest to center of viewport.",
+      "• Moved to our own infrastructure for Overpass and routing services, with automatic fallback to public servers."
+    ]
+  },
  "2.9.0": {
    "content": [
      "• Caching, tile retries, offline areas, now working properly. Map imagery should load correctly."
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -20,7 +20,5 @@
  <string>????</string>
  <key>CFBundleVersion</key>
  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>13.0</string>
 </dict>
 </plist>
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -2,12 +2,15 @@ import Flutter
 import UIKit

@main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
  override func application(
    _ application: UIApplication,
    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
  }
+
+  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+  }
 }
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,72 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
+<dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>DeFlock</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>deflockapp</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>None</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>deflockapp</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>https</string>
+	</array>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>This app optionally uses your location to center the map on your current position and provide proximity alerts for nearby surveillance devices. These features are entirely optional.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app optionally uses your location to show nearby cameras by centering the map on your location.</string>
+	<key>UIApplicationSceneManifest</key>
 	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>$(DEVELOPMENT_LANGUAGE)</string>
-		<key>CFBundleDisplayName</key>
-		<string>DeFlock</string>
-		<key>CFBundleExecutable</key>
-		<string>$(EXECUTABLE_NAME)</string>
-		<key>CFBundleIdentifier</key>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleName</key>
-		<string>deflockapp</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>$(FLUTTER_BUILD_NAME)</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleVersion</key>
-		<string>$(FLUTTER_BUILD_NUMBER)</string>
-		<key>LSRequiresIPhoneOS</key>
-		<true/>
-		<key>NSLocationWhenInUseUsageDescription</key>
-		<string>This app optionally uses your location to show nearby cameras by centering the map on your location.</string>
-		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-		<string>This app optionally uses your location to center the map on your current position and provide proximity alerts for nearby surveillance devices. These features are entirely optional.</string>
-		<key>UILaunchStoryboardName</key>
-		<string>LaunchScreen</string>
-		<key>UIMainStoryboardFile</key>
-		<string>Main</string>
-		<key>UISupportedInterfaceOrientations</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UISupportedInterfaceOrientations~ipad</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true/>
-		<key>UIApplicationSupportsIndirectInputEvents</key>
-		<true/>
-		<!-- OAuth2 redirect handler -->
-		<key>CFBundleURLTypes</key>
-		<array>
-			<dict>
-				<key>CFBundleTypeRole</key>
-				<string>None</string>
-				<key>CFBundleURLSchemes</key>
-				<array>
-					<string>deflockapp</string>
-				</array>
-			</dict>
-		</array>
-		<!-- (Optional) allow opening the system browser and returning -->
-		<key>LSApplicationQueriesSchemes</key>
-		<array>
-			<string>https</string>
-		</array>
-		<key>UIStatusBarHidden</key>
+		<key>UIApplicationSupportsMultipleScenes</key>
 		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
 	</dict>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIStatusBarHidden</key>
+	<false/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
 </plist>
--- a/lib/app_state.dart
+++ b/lib/app_state.dart
@@ -414,6 +414,11 @@ class AppState extends ChangeNotifier {
  void deleteProfile(NodeProfile p) {
    _profileState.deleteProfile(p);
  }
+
+  /// Reload all profiles from storage (useful after migrations modify stored profiles)
+  Future<void> reloadProfiles() async {
+    await _profileState.reloadFromStorage();
+  }
  
  // Callback when a profile is deleted - clear any stale session references
  void _onProfileDeleted(NodeProfile deletedProfile) {
@@ -437,6 +442,10 @@ class AppState extends ChangeNotifier {
    _operatorProfileState.deleteProfile(p);
  }

+  void reorderOperatorProfiles(int oldIndex, int newIndex) {
+    _operatorProfileState.reorderProfiles(oldIndex, newIndex);
+  }
+
  // ---------- Session Methods ----------
  void startAddSession() {
    _sessionState.startAddSession(enabledProfiles);
@@ -581,8 +590,8 @@ class AppState extends ChangeNotifier {
    }
  }

-  void deleteNode(OsmNode node) {
-    _uploadQueueState.addFromNodeDeletion(node, uploadMode: uploadMode);
+  void deleteNode(OsmNode node, {String? changesetComment}) {
+    _uploadQueueState.addFromNodeDeletion(node, uploadMode: uploadMode, changesetComment: changesetComment);
    _startUploader();
  }

@@ -717,6 +726,11 @@ class AppState extends ChangeNotifier {
    await _settingsState.deleteTileProvider(providerId);
  }

+  /// Clear all tile caches for a specific provider
+  Future<void> clearTileProviderCaches(String providerId) async {
+    await _settingsState.clearTileProviderCaches(providerId);
+  }
+
  /// Set follow-me mode
  Future<void> setFollowMeMode(FollowMeMode mode) async {
    await _settingsState.setFollowMeMode(mode);
--- a/lib/dev_config.dart
+++ b/lib/dev_config.dart
@@ -64,9 +64,6 @@ const Duration kChangesetCloseMaxRetryDelay = Duration(minutes: 5);  // Cap at 5
 const Duration kChangesetAutoCloseTimeout = Duration(minutes: 59); // Give up and trust OSM auto-close
 const double kChangesetCloseBackoffMultiplier = 2.0;

-// Navigation routing configuration
-const Duration kNavigationRoutingTimeout = Duration(seconds: 90); // HTTP timeout for routing requests
-
 // Overpass API configuration
 const Duration kOverpassQueryTimeout = Duration(seconds: 45); // Timeout for Overpass API queries (was 25s hardcoded)

@@ -85,6 +82,9 @@ const bool kEnableNodeEdits = true; // Set to false to temporarily disable node
 // Node extraction features - set to false to hide extract functionality for constrained nodes
 const bool kEnableNodeExtraction = false; // Set to true to enable extract from way/relation feature (WIP)

+// Profile FOV features - set to false to restrict profiles to 360° FOV only
+const bool kEnableNon360FOVs = false; // Set to true to allow custom FOV values in profiles
+
 /// Navigation availability: only dev builds, and only when online
 bool enableNavigationFeatures({required bool offlineMode}) {
  return kEnableNavigationFeatures && !offlineMode;
@@ -93,7 +93,7 @@ bool enableNavigationFeatures({required bool offlineMode}) {
 // Marker/node interaction
 const int kNodeMinZoomLevel = 10; // Minimum zoom to show nodes (Overpass)
 const int kOsmApiMinZoomLevel = 13; // Minimum zoom for OSM API bbox queries (sandbox mode)
-const int kMinZoomForNodeEditingSheets = 15; // Minimum zoom to open add/edit node sheets
+const int kMinZoomForNodeEditingSheets = 16; // Minimum zoom to open add/edit node sheets
 const int kMinZoomForOfflineDownload = 10; // Minimum zoom to download offline areas (prevents large area crashes)
 const Duration kMarkerTapTimeout = Duration(milliseconds: 250);
 const Duration kDebounceCameraRefresh = Duration(milliseconds: 500);
@@ -131,7 +131,7 @@ const int kProximityAlertMaxDistance = 1600; // meters
 const Duration kProximityAlertCooldown = Duration(minutes: 10); // Cooldown between alerts for same node

 // Node proximity warning configuration (for new/edited nodes that are too close to existing ones)
-const double kNodeProximityWarningDistance = 15.0; // meters - distance threshold to show warning
+const double kNodeProximityWarningDistance = 50.0; // meters - distance threshold to show warning

 // Positioning tutorial configuration
 const double kPositioningTutorialBlurSigma = 3.0; // Blur strength for sheet overlay
@@ -139,7 +139,7 @@ const double kPositioningTutorialMinMovementMeters = 1.0; // Minimum map movemen

 // Navigation route planning configuration
 const double kNavigationMinRouteDistance = 100.0; // meters - minimum distance between start and end points
-const double kNavigationDistanceWarningThreshold = 20000.0; // meters - distance threshold for timeout warning (30km)
+const double kNavigationDistanceWarningThreshold = 300000.0; // meters - distance threshold for timeout warning (30km)

 // Node display configuration
 const int kDefaultMaxNodes = 500; // Default maximum number of nodes to render on the map at once
--- a/lib/localizations/de.json
+++ b/lib/localizations/de.json
@@ -95,7 +95,9 @@
    "editQueuedForUpload": "Knotenbearbeitung zum Upload eingereiht",
    "deleteQueuedForUpload": "Knoten-Löschung zum Upload eingereiht",
    "confirmDeleteTitle": "Knoten löschen",
-    "confirmDeleteMessage": "Sind Sie sicher, dass Sie Knoten #{} löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden."
+    "confirmDeleteMessage": "Sind Sie sicher, dass Sie Knoten #{} löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.",
+    "deleteReasonLabel": "Grund für Löschung (Optional)",
+    "deleteReasonHint": "z.B. Gerät entfernt, falsche Position, Duplikat..."
  },
  "addNode": {
    "profile": "Profil",
@@ -247,6 +249,9 @@
    "addProvider": "Anbieter Hinzufügen",
    "deleteProvider": "Anbieter Löschen",
    "deleteProviderConfirm": "Sind Sie sicher, dass Sie \"{}\" löschen möchten?",
+    "clearCaches": "Caches Leeren",
+    "clearCachesConfirm": "Alle Kachel-Caches für \"{}\" löschen? Dies wird Speicherplatz freigeben, aber die Kacheln müssen beim Betrachten dieser Bereiche erneut heruntergeladen werden.",
+    "cachesCleared": "Caches für \"{}\" geleert",
    "providerName": "Anbieter-Name",
    "providerNameHint": "z.B. Benutzerdefinierte Karten GmbH",
    "providerNameRequired": "Anbieter-Name ist erforderlich",
@@ -319,6 +324,8 @@
    "fovHint": "Sichtfeld in Grad (leer lassen für Standard)",
    "fovSubtitle": "Kamera-Sichtfeld - verwendet für Kegelbreite und Bereichsübertragungsformat",
    "fovInvalid": "Sichtfeld muss zwischen 1 und 360 Grad liegen",
+    "fov360": "360° Sichtfeld",
+    "fov360Subtitle": "Kamera hat 360-Grad omnidirektionales Sichtfeld",
    "submittable": "Übertragbar",
    "submittableSubtitle": "Ob dieses Profil für Kamera-Übertragungen verwendet werden kann",
    "osmTags": "OSM-Tags",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Versorgungsgenehmigungsdaten, die auf potenzielle Installationsstandorte für Überwachungsinfrastruktur hinweisen",
    "dataSourceCredit": "Datensammlung und -hosting bereitgestellt von alprwatch.org",
    "minimumDistance": "Mindestabstand zu echten Geräten",
-    "minimumDistanceSubtitle": "Verdächtige Standorte innerhalb von {}m vorhandener Überwachungsgeräte ausblenden",
+    "minimumDistanceSubtitle": "Verdächtige Standorte innerhalb von {} vorhandener Überwachungsgeräte ausblenden",
    "updating": "Verdächtige Standorte werden aktualisiert",
    "downloadingAndProcessing": "Daten werden heruntergeladen und verarbeitet...",
    "updateSuccess": "Verdächtige Standorte erfolgreich aktualisiert",
--- a/lib/localizations/en.json
+++ b/lib/localizations/en.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "Node edit queued for upload",
    "deleteQueuedForUpload": "Node deletion queued for upload",
    "confirmDeleteTitle": "Delete Node",
-    "confirmDeleteMessage": "Are you sure you want to delete node #{}? This action cannot be undone."
+    "confirmDeleteMessage": "Are you sure you want to delete node #{}? This action cannot be undone.",
+    "deleteReasonLabel": "Reason for Deletion (Optional)",
+    "deleteReasonHint": "e.g., device removed, incorrect location, duplicate..."
  },
  "addNode": {
    "profile": "Profile",
@@ -282,8 +284,11 @@
    "needsApiKey": "Needs API key",
    "editProvider": "Edit Provider",
    "addProvider": "Add Provider",
-    "deleteProvider": "Delete Provider",
+    "deleteProvider": "Delete Provider", 
    "deleteProviderConfirm": "Are you sure you want to delete \"{}\"?",
+    "clearCaches": "Clear Caches",
+    "clearCachesConfirm": "Clear all tile caches for \"{}\"? This will free up storage space but tiles will need to be downloaded again when viewing those areas.",
+    "cachesCleared": "Caches cleared for \"{}\"",
    "providerName": "Provider Name",
    "providerNameHint": "e.g., Custom Maps Inc.",
    "providerNameRequired": "Provider name is required",
@@ -356,6 +361,8 @@
    "fovHint": "FOV in degrees (leave empty for default)",
    "fovSubtitle": "Camera field of view - used for cone width and range submission format",
    "fovInvalid": "FOV must be between 1 and 360 degrees",
+    "fov360": "360 FOV",
+    "fov360Subtitle": "Camera has 360-degree omnidirectional field of view",
    "submittable": "Submittable",
    "submittableSubtitle": "Whether this profile can be used for camera submissions",
    "osmTags": "OSM Tags",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Utility permit data indicating potential surveillance infrastructure installation sites",
    "dataSourceCredit": "Data collection and hosting provided by alprwatch.org",
    "minimumDistance": "Minimum Distance from Real Nodes",
-    "minimumDistanceSubtitle": "Hide suspected locations within {}m of existing surveillance devices",
+    "minimumDistanceSubtitle": "Hide suspected locations within {} of existing surveillance devices",
    "updating": "Updating Suspected Locations",
    "downloadingAndProcessing": "Downloading and processing data...",
    "updateSuccess": "Suspected locations updated successfully",
--- a/lib/localizations/es.json
+++ b/lib/localizations/es.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "Edición de nodo en cola para subir",
    "deleteQueuedForUpload": "Eliminación de nodo en cola para subir",
    "confirmDeleteTitle": "Eliminar Nodo",
-    "confirmDeleteMessage": "¿Estás seguro de que quieres eliminar el nodo #{}? Esta acción no se puede deshacer."
+    "confirmDeleteMessage": "¿Estás seguro de que quieres eliminar el nodo #{}? Esta acción no se puede deshacer.",
+    "deleteReasonLabel": "Razón para Eliminación (Opcional)",
+    "deleteReasonHint": "ej. dispositivo removido, ubicación incorrecta, duplicado..."
  },
  "addNode": {
    "profile": "Perfil",
@@ -284,6 +286,9 @@
    "addProvider": "Agregar Proveedor",
    "deleteProvider": "Eliminar Proveedor",
    "deleteProviderConfirm": "¿Está seguro de que desea eliminar \"{}\"?",
+    "clearCaches": "Limpiar Caché",
+    "clearCachesConfirm": "¿Limpiar todo el caché de mosaicos para \"{}\"? Esto liberará espacio de almacenamiento pero los mosaicos deberán descargarse nuevamente al ver esas áreas.",
+    "cachesCleared": "Caché limpiado para \"{}\"",
    "providerName": "Nombre del Proveedor",
    "providerNameHint": "ej., Mapas Personalizados Inc.",
    "providerNameRequired": "El nombre del proveedor es requerido",
@@ -356,6 +361,8 @@
    "fovHint": "Campo de visión en grados (dejar vacío para el predeterminado)",
    "fovSubtitle": "Campo de visión de la cámara - usado para el ancho del cono y formato de envío por rango",
    "fovInvalid": "El campo de visión debe estar entre 1 y 360 grados",
+    "fov360": "Campo de Visión 360°",
+    "fov360Subtitle": "La cámara tiene un campo de visión omnidireccional de 360 grados",
    "submittable": "Envíable",
    "submittableSubtitle": "Si este perfil puede usarse para envíos de cámaras",
    "osmTags": "Etiquetas OSM",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Datos de permisos de servicios públicos que indican posibles sitios de instalación de infraestructura de vigilancia",
    "dataSourceCredit": "Recopilación y alojamiento de datos proporcionado por alprwatch.org",
    "minimumDistance": "Distancia Mínima de Nodos Reales",
-    "minimumDistanceSubtitle": "Ocultar ubicaciones sospechosas dentro de {}m de dispositivos de vigilancia existentes",
+    "minimumDistanceSubtitle": "Ocultar ubicaciones sospechosas dentro de {} de dispositivos de vigilancia existentes",
    "updating": "Actualizando Ubicaciones Sospechosas",
    "downloadingAndProcessing": "Descargando y procesando datos...",
    "updateSuccess": "Ubicaciones sospechosas actualizadas exitosamente",
--- a/lib/localizations/fr.json
+++ b/lib/localizations/fr.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "Modification de nœud mise en file pour envoi",
    "deleteQueuedForUpload": "Suppression de nœud mise en file pour envoi",
    "confirmDeleteTitle": "Supprimer le Nœud",
-    "confirmDeleteMessage": "Êtes-vous sûr de vouloir supprimer le nœud #{} ? Cette action ne peut pas être annulée."
+    "confirmDeleteMessage": "Êtes-vous sûr de vouloir supprimer le nœud #{} ? Cette action ne peut pas être annulée.",
+    "deleteReasonLabel": "Raison de Suppression (Optionnel)",
+    "deleteReasonHint": "ex. appareil retiré, emplacement incorrect, doublon..."
  },
  "addNode": {
    "profile": "Profil",
@@ -284,6 +286,9 @@
    "addProvider": "Ajouter Fournisseur",
    "deleteProvider": "Supprimer Fournisseur",
    "deleteProviderConfirm": "Êtes-vous sûr de vouloir supprimer \"{}\"?",
+    "clearCaches": "Vider les Caches",
+    "clearCachesConfirm": "Vider tous les caches de tuiles pour \"{}\"? Cela libérera de l'espace de stockage mais les tuiles devront être téléchargées à nouveau lors de la consultation de ces zones.",
+    "cachesCleared": "Caches vidés pour \"{}\"",
    "providerName": "Nom du Fournisseur",
    "providerNameHint": "ex., Cartes Personnalisées Inc.",
    "providerNameRequired": "Le nom du fournisseur est requis",
@@ -356,6 +361,8 @@
    "fovHint": "Champ de vision en degrés (laisser vide pour la valeur par défaut)",
    "fovSubtitle": "Champ de vision de la caméra - utilisé pour la largeur du cône et le format de soumission par plage",
    "fovInvalid": "Le champ de vision doit être entre 1 et 360 degrés",
+    "fov360": "Champ de Vision 360°",
+    "fov360Subtitle": "La caméra a un champ de vision omnidirectionnel de 360 degrés",
    "submittable": "Soumissible",
    "submittableSubtitle": "Si ce profil peut être utilisé pour les soumissions de caméras",
    "osmTags": "Balises OSM",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Données de permis de services publics indiquant des sites d'installation potentiels d'infrastructure de surveillance",
    "dataSourceCredit": "Collecte et hébergement des données fournis par alprwatch.org",
    "minimumDistance": "Distance Minimale des Nœuds Réels",
-    "minimumDistanceSubtitle": "Masquer les emplacements suspects dans un rayon de {}m des dispositifs de surveillance existants",
+    "minimumDistanceSubtitle": "Masquer les emplacements suspects dans un rayon de {} des dispositifs de surveillance existants",
    "updating": "Mise à Jour des Emplacements Suspects",
    "downloadingAndProcessing": "Téléchargement et traitement des données...",
    "updateSuccess": "Emplacements suspects mis à jour avec succès",
--- a/lib/localizations/it.json
+++ b/lib/localizations/it.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "Modifica nodo in coda per il caricamento",
    "deleteQueuedForUpload": "Eliminazione nodo in coda per il caricamento",
    "confirmDeleteTitle": "Elimina Nodo",
-    "confirmDeleteMessage": "Sei sicuro di voler eliminare il nodo #{}? Questa azione non può essere annullata."
+    "confirmDeleteMessage": "Sei sicuro di voler eliminare il nodo #{}? Questa azione non può essere annullata.",
+    "deleteReasonLabel": "Motivo per Eliminazione (Opzionale)",
+    "deleteReasonHint": "es. dispositivo rimosso, posizione errata, duplicato..."
  },
  "addNode": {
    "profile": "Profilo",
@@ -284,6 +286,9 @@
    "addProvider": "Aggiungi Fornitore",
    "deleteProvider": "Elimina Fornitore",
    "deleteProviderConfirm": "Sei sicuro di voler eliminare \"{}\"?",
+    "clearCaches": "Svuota Cache",
+    "clearCachesConfirm": "Svuotare tutte le cache delle tessere per \"{}\"? Questo libererà spazio di archiviazione ma le tessere dovranno essere scaricate nuovamente quando si visualizzano quelle aree.",
+    "cachesCleared": "Cache svuotate per \"{}\"",
    "providerName": "Nome Fornitore",
    "providerNameHint": "es., Mappe Personalizzate Inc.",
    "providerNameRequired": "Il nome del fornitore è obbligatorio",
@@ -356,6 +361,8 @@
    "fovHint": "Campo visivo in gradi (lasciare vuoto per il valore predefinito)",
    "fovSubtitle": "Campo visivo della telecamera - utilizzato per la larghezza del cono e il formato di invio per intervallo",
    "fovInvalid": "Il campo visivo deve essere tra 1 e 360 gradi",
+    "fov360": "Campo Visivo 360°",
+    "fov360Subtitle": "La telecamera ha un campo visivo omnidirezionale di 360 gradi",
    "submittable": "Inviabile",
    "submittableSubtitle": "Se questo profilo può essere usato per invii di telecamere",
    "osmTags": "Tag OSM",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Dati dei permessi dei servizi pubblici che indicano potenziali siti di installazione di infrastrutture di sorveglianza",
    "dataSourceCredit": "Raccolta e hosting dei dati forniti da alprwatch.org",
    "minimumDistance": "Distanza Minima dai Nodi Reali",
-    "minimumDistanceSubtitle": "Nascondi posizioni sospette entro {}m dai dispositivi di sorveglianza esistenti",
+    "minimumDistanceSubtitle": "Nascondi posizioni sospette entro {} dai dispositivi di sorveglianza esistenti",
    "updating": "Aggiornamento Posizioni Sospette",
    "downloadingAndProcessing": "Scaricamento e elaborazione dati...",
    "updateSuccess": "Posizioni sospette aggiornate con successo",
--- a/lib/localizations/nl.json
+++ b/lib/localizations/nl.json
@@ -131,8 +131,10 @@
    "queuedForUpload": "Node in wachtrij geplaatst voor upload",
    "editQueuedForUpload": "Node bewerking in wachtrij geplaatst voor upload",
    "deleteQueuedForUpload": "Node verwijdering in wachtrij geplaatst voor upload",
-    "confirmDeleteTitle": "Verwijder Node",
-    "confirmDeleteMessage": "Weet u zeker dat u node #{} wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt."
+    "confirmDeleteTitle": "Verwijder Node", 
+    "confirmDeleteMessage": "Weet u zeker dat u node #{} wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
+    "deleteReasonLabel": "Reden voor Verwijdering (Optioneel)",
+    "deleteReasonHint": "bijv. apparaat verwijderd, onjuiste locatie, duplicaat..."
  },
  "addNode": {
    "profile": "Profiel",
@@ -284,6 +286,9 @@
    "addProvider": "Voeg Provider Toe",
    "deleteProvider": "Verwijder Provider",
    "deleteProviderConfirm": "Weet u zeker dat u \"{}\" wilt verwijderen?",
+    "clearCaches": "Cache Wissen",
+    "clearCachesConfirm": "Alle tegelcaches wissen voor \"{}\"? Dit zal opslagruimte vrijmaken maar tegels moeten opnieuw worden gedownload bij het bekijken van die gebieden.",
+    "cachesCleared": "Caches gewist voor \"{}\"",
    "providerName": "Provider Naam",
    "providerNameHint": "bijv., Aangepaste Kaarten B.V.",
    "providerNameRequired": "Provider naam is vereist",
@@ -356,6 +361,8 @@
    "fovHint": "FOV in graden (laat leeg voor standaard)",
    "fovSubtitle": "Camera gezichtsveld - gebruikt voor kegel breedte en bereik inzending formaat",
    "fovInvalid": "FOV moet tussen 1 en 360 graden zijn",
+    "fov360": "360° Gezichtsveld",
+    "fov360Subtitle": "Camera heeft een 360-graden omnidirectioneel gezichtsveld",
    "submittable": "Indienbaar",
    "submittableSubtitle": "Of dit profiel gebruikt kan worden voor camera inzendingen",
    "osmTags": "OSM Tags",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Nutsbedrijf vergunning data die mogelijke surveillance infrastructuur installatie sites aangeeft",
    "dataSourceCredit": "Gegevens verzameling en hosting geleverd door alprwatch.org",
    "minimumDistance": "Minimum Afstand van Echte Nodes",
-    "minimumDistanceSubtitle": "Verberg verdachte locaties binnen {}m van bestaande surveillance apparaten",
+    "minimumDistanceSubtitle": "Verberg verdachte locaties binnen {} van bestaande surveillance apparaten",
    "updating": "Verdachte Locaties Bijwerken",
    "downloadingAndProcessing": "Data downloaden en verwerken...",
    "updateSuccess": "Verdachte locaties succesvol bijgewerkt",
--- a/lib/localizations/pl.json
+++ b/lib/localizations/pl.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "Edycja węzła umieszczona w kolejce do przesłania",
    "deleteQueuedForUpload": "Usuwanie węzła umieszczone w kolejce do przesłania",
    "confirmDeleteTitle": "Usuń Węzeł",
-    "confirmDeleteMessage": "Czy na pewno chcesz usunąć węzeł #{}? Tej akcji nie można cofnąć."
+    "confirmDeleteMessage": "Czy na pewno chcesz usunąć węzeł #{}? Tej akcji nie można cofnąć.",
+    "deleteReasonLabel": "Powód Usunięcia (Opcjonalny)",
+    "deleteReasonHint": "np. urządzenie usunięte, nieprawidłowa lokalizacja, duplikat..."
  },
  "addNode": {
    "profile": "Profil",
@@ -284,6 +286,9 @@
    "addProvider": "Dodaj Dostawcę",
    "deleteProvider": "Usuń Dostawcę",
    "deleteProviderConfirm": "Czy na pewno chcesz usunąć \"{}\"?",
+    "clearCaches": "Wyczyść Cache",
+    "clearCachesConfirm": "Wyczyścić wszystkie cache kafelków dla \"{}\"? To zwolni miejsce na dysku, ale kafelki będą musiały zostać ponownie pobrane podczas przeglądania tych obszarów.",
+    "cachesCleared": "Cache wyczyszczone dla \"{}\"",
    "providerName": "Nazwa Dostawcy",
    "providerNameHint": "np., Niestandardowe Mapy Sp. z o.o.",
    "providerNameRequired": "Nazwa dostawcy jest wymagana",
@@ -356,6 +361,8 @@
    "fovHint": "FOV w stopniach (zostaw puste dla domyślnego)",
    "fovSubtitle": "Pole widzenia kamery - używane dla szerokości stożka i formatu zgłaszania zasięgu",
    "fovInvalid": "FOV musi być między 1 a 360 stopniami",
+    "fov360": "Pole Widzenia 360°",
+    "fov360Subtitle": "Kamera ma wielokierunkowe pole widzenia o zasięgu 360 stopni",
    "submittable": "Możliwy do Zgłoszenia",
    "submittableSubtitle": "Czy ten profil może być używany do zgłoszeń kamer",
    "osmTags": "Tagi OSM",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Dane pozwoleń użyteczności publicznej wskazujące potencjalne miejsca instalacji infrastruktury nadzoru",
    "dataSourceCredit": "Zbieranie danych i hosting zapewnione przez alprwatch.org",
    "minimumDistance": "Minimalna Odległość od Rzeczywistych Węzłów",
-    "minimumDistanceSubtitle": "Ukryj podejrzane lokalizacje w promieniu {}m od istniejących urządzeń nadzoru",
+    "minimumDistanceSubtitle": "Ukryj podejrzane lokalizacje w promieniu {} od istniejących urządzeń nadzoru",
    "updating": "Aktualizowanie Podejrzanych Lokalizacji",
    "downloadingAndProcessing": "Pobieranie i przetwarzanie danych...",
    "updateSuccess": "Podejrzane lokalizacje zaktualizowane pomyślnie",
--- a/lib/localizations/pt.json
+++ b/lib/localizations/pt.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "Edição de nó na fila para envio",
    "deleteQueuedForUpload": "Exclusão de nó na fila para envio",
    "confirmDeleteTitle": "Excluir Nó",
-    "confirmDeleteMessage": "Tem certeza de que deseja excluir o nó #{}? Esta ação não pode ser desfeita."
+    "confirmDeleteMessage": "Tem certeza de que deseja excluir o nó #{}? Esta ação não pode ser desfeita.",
+    "deleteReasonLabel": "Motivo para Exclusão (Opcional)",
+    "deleteReasonHint": "ex. dispositivo removido, localização incorreta, duplicado..."
  },
  "addNode": {
    "profile": "Perfil",
@@ -284,6 +286,9 @@
    "addProvider": "Adicionar Provedor",
    "deleteProvider": "Excluir Provedor",
    "deleteProviderConfirm": "Tem certeza de que deseja excluir \"{}\"?",
+    "clearCaches": "Limpar Caches",
+    "clearCachesConfirm": "Limpar todos os caches de mapas para \"{}\"? Isso liberará espaço de armazenamento, mas os mapas precisarão ser baixados novamente ao visualizar essas áreas.",
+    "cachesCleared": "Caches limpos para \"{}\"",
    "providerName": "Nome do Provedor",
    "providerNameHint": "ex., Mapas Personalizados Inc.",
    "providerNameRequired": "Nome do provedor é obrigatório",
@@ -356,6 +361,8 @@
    "fovHint": "Campo de visão em graus (deixar vazio para o padrão)",
    "fovSubtitle": "Campo de visão da câmera - usado para largura do cone e formato de envio por intervalo",
    "fovInvalid": "Campo de visão deve estar entre 1 e 360 graus",
+    "fov360": "Campo de Visão 360°",
+    "fov360Subtitle": "A câmera tem um campo de visão omnidirecional de 360 graus",
    "submittable": "Enviável",
    "submittableSubtitle": "Se este perfil pode ser usado para envios de câmeras",
    "osmTags": "Tags OSM",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Dados de licenças de serviços públicos indicando possíveis locais de instalação de infraestrutura de vigilância",
    "dataSourceCredit": "Coleta e hospedagem de dados fornecidas por alprwatch.org",
    "minimumDistance": "Distância Mínima de Nós Reais",
-    "minimumDistanceSubtitle": "Ocultar localizações suspeitas dentro de {}m de dispositivos de vigilância existentes",
+    "minimumDistanceSubtitle": "Ocultar localizações suspeitas dentro de {} de dispositivos de vigilância existentes",
    "updating": "Atualizando Localizações Suspeitas",
    "downloadingAndProcessing": "Baixando e processando dados...",
    "updateSuccess": "Localizações suspeitas atualizadas com sucesso",
--- a/lib/localizations/tr.json
+++ b/lib/localizations/tr.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "Düğüm düzenlemesi yükleme için sıraya alındı",
    "deleteQueuedForUpload": "Düğüm silme işlemi yükleme için sıraya alındı",
    "confirmDeleteTitle": "Düğümü Sil",
-    "confirmDeleteMessage": "#{} düğümünü silmek istediğinizden emin misiniz? Bu işlem geri alınamaz."
+    "confirmDeleteMessage": "#{} düğümünü silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.",
+    "deleteReasonLabel": "Silme Nedeni (İsteğe Bağlı)",
+    "deleteReasonHint": "örn. cihaz kaldırıldı, yanlış konum, duplikat..."
  },
  "addNode": {
    "profile": "Profil",
@@ -284,6 +286,9 @@
    "addProvider": "Sağlayıcı Ekle",
    "deleteProvider": "Sağlayıcıyı Sil",
    "deleteProviderConfirm": "\"{}\" silmek istediğinizden emin misiniz?",
+    "clearCaches": "Önbellekleri Temizle",
+    "clearCachesConfirm": "\"{}\" için tüm döşeme önbelleklerini temizle? Bu depolama alanını boşaltacak ancak bu alanları görüntülerken döşemelerin tekrar indirilmesi gerekecek.",
+    "cachesCleared": "\"{}\" için önbellekler temizlendi",
    "providerName": "Sağlayıcı Adı",
    "providerNameHint": "örn., Özel Haritalar A.Ş.",
    "providerNameRequired": "Sağlayıcı adı gerekli",
@@ -356,6 +361,8 @@
    "fovHint": "FOV derece cinsinden (varsayılan için boş bırakın)",
    "fovSubtitle": "Kamera görüş alanı - koni genişliği ve aralık gönderim formatı için kullanılır",
    "fovInvalid": "FOV 1 ile 360 derece arasında olmalıdır",
+    "fov360": "360° Görüş Alanı",
+    "fov360Subtitle": "Kamera 360 derece çok yönlü görüş alanına sahiptir",
    "submittable": "Gönderilebilir",
    "submittableSubtitle": "Bu profilin kamera gönderimlerinde kullanılıp kullanılamayacağı",
    "osmTags": "OSM Etiketleri",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Potansiyel gözetleme altyapısı kurulum sitelerini gösteren altyapı izin verileri",
    "dataSourceCredit": "Veri toplama ve barındırma alprwatch.org tarafından sağlanır",
    "minimumDistance": "Gerçek Düğümlerden Minimum Mesafe",
-    "minimumDistanceSubtitle": "Mevcut gözetleme cihazlarının {}m yakınındaki şüpheli konumları gizle",
+    "minimumDistanceSubtitle": "Mevcut gözetleme cihazlarının {} yakınındaki şüpheli konumları gizle",
    "updating": "Şüpheli Konumlar Güncelleniyor",
    "downloadingAndProcessing": "Veri indiriliyor ve işleniyor...",
    "updateSuccess": "Şüpheli konumlar başarıyla güncellendi",
--- a/lib/localizations/uk.json
+++ b/lib/localizations/uk.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "Редагування вузла поставлено в чергу для завантаження",
    "deleteQueuedForUpload": "Видалення вузла поставлено в чергу для завантаження",
    "confirmDeleteTitle": "Видалити Вузол",
-    "confirmDeleteMessage": "Ви впевнені, що хочете видалити вузол #{}? Цю дію не можна скасувати."
+    "confirmDeleteMessage": "Ви впевнені, що хочете видалити вузол #{}? Цю дію не можна скасувати.",
+    "deleteReasonLabel": "Причина Видалення (Опціонально)",
+    "deleteReasonHint": "наприклад пристрій видалено, неправильне розташування, дублікат..."
  },
  "addNode": {
    "profile": "Профіль",
@@ -284,6 +286,9 @@
    "addProvider": "Додати Постачальника",
    "deleteProvider": "Видалити Постачальника",
    "deleteProviderConfirm": "Ви впевнені, що хочете видалити \"{}\"?",
+    "clearCaches": "Очистити Кеш",
+    "clearCachesConfirm": "Очистити всі кеші тайлів для \"{}\"? Це звільнить місце на диску, але тайли доведеться знову завантажити при перегляді цих областей.",
+    "cachesCleared": "Кеш очищено для \"{}\"",
    "providerName": "Назва Постачальника",
    "providerNameHint": "напр., Кастомні Карти ТОВ",
    "providerNameRequired": "Назва постачальника обов'язкова",
@@ -356,6 +361,8 @@
    "fovHint": "FOV в градусах (залиште порожнім для значення за замовчуванням)",
    "fovSubtitle": "Поле зору камери - використовується для ширини конуса та формату подання діапазону",
    "fovInvalid": "FOV повинно бути між 1 і 360 градусами",
+    "fov360": "Поле Зору 360°",
+    "fov360Subtitle": "Камера має всенаправлене поле зору на 360 градусів",
    "submittable": "Можна Подавати",
    "submittableSubtitle": "Чи можна використовувати цей профіль для подань камер",
    "osmTags": "OSM Теги",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "Дані дозволів комунальних служб, що вказують на потенційні сайти встановлення інфраструктури спостереження",
    "dataSourceCredit": "Збір даних та хостинг надається alprwatch.org",
    "minimumDistance": "Мінімальна Відстань від Реальних Вузлів",
-    "minimumDistanceSubtitle": "Приховати підозрілі локації в межах {}м від існуючих пристроїв спостереження",
+    "minimumDistanceSubtitle": "Приховати підозрілі локації в межах {} від існуючих пристроїв спостереження",
    "updating": "Оновлення Підозрілих Локацій",
    "downloadingAndProcessing": "Завантаження та обробка даних...",
    "updateSuccess": "Підозрілі локації успішно оновлено",
--- a/lib/localizations/zh.json
+++ b/lib/localizations/zh.json
@@ -132,7 +132,9 @@
    "editQueuedForUpload": "节点编辑已排队上传",
    "deleteQueuedForUpload": "节点删除已排队上传",
    "confirmDeleteTitle": "删除节点",
-    "confirmDeleteMessage": "您确定要删除节点 #{} 吗？此操作无法撤销。"
+    "confirmDeleteMessage": "您确定要删除节点 #{} 吗？此操作无法撤销。",
+    "deleteReasonLabel": "删除原因（可选）",
+    "deleteReasonHint": "例如：设备已移除、位置错误、重复..."
  },
  "addNode": {
    "profile": "配置文件",
@@ -284,6 +286,9 @@
    "addProvider": "添加提供商",
    "deleteProvider": "删除提供商",
    "deleteProviderConfirm": "您确定要删除 \"{}\" 吗？",
+    "clearCaches": "清除缓存",
+    "clearCachesConfirm": "清除 \"{}\" 的所有瓦片缓存？这将释放存储空间，但在查看这些区域时需要重新下载瓦片。",
+    "cachesCleared": "已清除 \"{}\" 的缓存",
    "providerName": "提供商名称",
    "providerNameHint": "例如，自定义地图公司",
    "providerNameRequired": "提供商名称为必填项",
@@ -356,6 +361,8 @@
    "fovHint": "视场角度数（留空使用默认值）",
    "fovSubtitle": "摄像头视场角 - 用于锥体宽度和范围提交格式",
    "fovInvalid": "视场角必须在1到360度之间",
+    "fov360": "360°视场角",
+    "fov360Subtitle": "摄像头具有360度全方向视场角",
    "submittable": "可提交",
    "submittableSubtitle": "此配置文件是否可用于摄像头提交",
    "osmTags": "OSM 标签",
@@ -519,7 +526,7 @@
    "dataSourceDescription": "公用事业许可数据，表明潜在的监控基础设施安装站点",
    "dataSourceCredit": "数据收集和托管由 alprwatch.org 提供",
    "minimumDistance": "与真实节点的最小距离",
-    "minimumDistanceSubtitle": "隐藏现有监控设备{}米范围内的疑似位置",
+    "minimumDistanceSubtitle": "隐藏现有监控设备{}范围内的疑似位置",
    "updating": "正在更新疑似位置",
    "downloadingAndProcessing": "正在下载和处理数据...",
    "updateSuccess": "疑似位置更新成功",
--- a/lib/migrations.dart
+++ b/lib/migrations.dart
@@ -6,6 +6,7 @@ import 'app_state.dart';
 import 'services/profile_service.dart';
 import 'services/suspected_location_cache.dart';
 import 'widgets/nuclear_reset_dialog.dart';
+import 'dev_config.dart';

 /// One-time migrations that run when users upgrade to specific versions.
 /// Each migration function is named after the version where it should run.
@@ -142,6 +143,52 @@ class OneTimeMigrations {
    }
  }

+  /// Clear non-360 FOV values from all profiles (v2.10.0)
+  static Future<void> migrate_2_10_0(AppState appState) async {
+    try {
+      // Only perform this migration if non-360 FOVs are disabled
+      if (kEnableNon360FOVs) {
+        debugPrint('[Migration] 2.10.0: Non-360 FOVs enabled, skipping FOV cleanup');
+        return;
+      }
+
+      // Load all profiles from storage
+      final profiles = await ProfileService().load();
+      bool anyProfileChanged = false;
+      int profilesCleared = 0;
+
+      // Clear non-360 FOV values from all profiles
+      final updatedProfiles = profiles.map((profile) {
+        if (profile.fov != null) {
+          // Use approximation to handle floating point precision issues
+          final fovValue = profile.fov!;
+          final is360 = (fovValue - 360.0).abs() < 0.01; // Within 0.01 degrees of 360
+          
+          if (!is360) {
+            debugPrint('[Migration] 2.10.0: Clearing FOV $fovValue from profile: ${profile.name}');
+            anyProfileChanged = true;
+            profilesCleared++;
+            return profile.copyWith(fov: null);
+          }
+        }
+        return profile;
+      }).toList();
+
+      // Save updated profiles back to storage if any changes were made
+      if (anyProfileChanged) {
+        await ProfileService().save(updatedProfiles);
+        await appState.reloadProfiles();
+        debugPrint('[Migration] 2.10.0: Cleared FOV from $profilesCleared profiles');
+      }
+
+      debugPrint('[Migration] 2.10.0 completed: cleared non-360 FOV values from profiles');
+    } catch (e, stackTrace) {
+      debugPrint('[Migration] 2.10.0 ERROR: Failed to clear non-360 FOV values: $e');
+      debugPrint('[Migration] 2.10.0 ERROR: Stack trace: $stackTrace');
+      // Don't rethrow - this is non-critical, FOV restrictions will still apply going forward
+    }
+  }
+
  /// Get the migration function for a specific version
  static Future<void> Function(AppState)? getMigrationForVersion(String version) {
    switch (version) {
@@ -157,6 +204,8 @@ class OneTimeMigrations {
        return migrate_2_1_0;
      case '2.7.3':
        return migrate_2_7_3;
+      case '2.10.0':
+        return migrate_2_10_0;
      default:
        return null;
    }
--- a/lib/screens/about_screen.dart
+++ b/lib/screens/about_screen.dart
@@ -1,6 +1,9 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
+import '../dev_config.dart';
 import '../services/localization_service.dart';
+import '../services/nuclear_reset_service.dart';
 import '../widgets/welcome_dialog.dart';
 import '../widgets/submission_guide_dialog.dart';

@@ -76,10 +79,20 @@ class AboutScreen extends StatelessWidget {
                textAlign: TextAlign.center,
              ),
              const SizedBox(height: 24),
+              // About OpenStreetMap section
+              _buildAboutOSMSection(context),
+              const SizedBox(height: 24),
              // Information dialogs section
              _buildDialogButtons(context),
              const SizedBox(height: 24),
              _buildHelpLinks(context),
+              
+              // Dev-only nuclear reset button at very bottom
+              if (kDebugMode || kEnableDevelopmentModes) ...[
+                const SizedBox(height: 32),
+                _buildDevNuclearResetButton(context),
+                const SizedBox(height: 16),
+              ],
            ],
          ),
        ),
@@ -96,6 +109,8 @@ class AboutScreen extends StatelessWidget {
        const SizedBox(height: 8),
        _buildLinkText(context, 'Privacy Policy', 'https://deflock.me/privacy'),
        const SizedBox(height: 8),
+        _buildLinkText(context, 'Report issue with OSM base map', 'https://www.openstreetmap.org/fixthemap'),
+        const SizedBox(height: 8),
        _buildLinkText(context, 'DeFlock Discord', 'https://discord.gg/aV7v4R3sKT'),
        const SizedBox(height: 8),
        _buildLinkText(context, 'Source Code', 'https://github.com/FoggedLens/deflock-app'),
@@ -121,6 +136,39 @@ class AboutScreen extends StatelessWidget {
    );
  }

+  Widget _buildAboutOSMSection(BuildContext context) {
+    final locService = LocalizationService.instance;
+    
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              locService.t('auth.aboutOSM'),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            Text(
+              locService.t('auth.aboutOSMDescription'),
+              style: Theme.of(context).textTheme.bodyMedium,
+            ),
+            const SizedBox(height: 16),
+            SizedBox(
+              width: double.infinity,
+              child: OutlinedButton.icon(
+                onPressed: () => _launchUrl('https://openstreetmap.org', context),
+                icon: const Icon(Icons.open_in_new),
+                label: Text(locService.t('auth.visitOSM')),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
  Widget _buildDialogButtons(BuildContext context) {
    final locService = LocalizationService.instance;
    
@@ -165,5 +213,231 @@ class AboutScreen extends StatelessWidget {
    );
  }

+  /// Dev-only nuclear reset button (only visible in debug mode)
+  Widget _buildDevNuclearResetButton(BuildContext context) {
+    return Card(
+      color: Theme.of(context).colorScheme.errorContainer.withValues(alpha: 0.1),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(
+                  Icons.developer_mode,
+                  color: Theme.of(context).colorScheme.primary,
+                  size: 20,
+                ),
+                const SizedBox(width: 8),
+                Text(
+                  'Developer Tools',
+                  style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                    color: Theme.of(context).colorScheme.primary,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            Text(
+              'These tools are only available in debug mode for development and troubleshooting.',
+              style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.7),
+              ),
+            ),
+            const SizedBox(height: 16),
+              SizedBox(
+                width: double.infinity,
+                child: OutlinedButton.icon(
+                  onPressed: () => _showNuclearResetConfirmation(context),
+                  icon: const Icon(Icons.delete_forever, color: Colors.red),
+                  label: const Text(
+                    'Nuclear Reset (Clear All Data)',
+                    style: TextStyle(color: Colors.red),
+                  ),
+                  style: OutlinedButton.styleFrom(
+                    side: const BorderSide(color: Colors.red),
+                  ),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  /// Show confirmation dialog for nuclear reset
+  Future<void> _showNuclearResetConfirmation(BuildContext context) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      barrierDismissible: false,
+      builder: (context) => AlertDialog(
+        title: const Row(
+          children: [
+            Icon(Icons.warning, color: Colors.red),
+            SizedBox(width: 8),
+            Text('Nuclear Reset'),
+          ],
+        ),
+        content: const Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'This will completely clear ALL app data:',
+              style: TextStyle(fontWeight: FontWeight.w500),
+            ),
+            SizedBox(height: 12),
+            Text('• All settings and preferences'),
+            Text('• OAuth login credentials'),
+            Text('• Custom profiles and operators'),
+            Text('• Upload queue and cached data'),
+            Text('• Downloaded offline areas'),
+            Text('• Everything else'),
+            SizedBox(height: 16),
+            Text(
+              'The app will behave exactly like a fresh install after this operation.',
+              style: TextStyle(
+                fontWeight: FontWeight.w500,
+                color: Colors.red,
+              ),
+            ),
+            SizedBox(height: 12),
+            Text(
+              'This action cannot be undone.',
+              style: TextStyle(fontWeight: FontWeight.bold),
+            ),
+          ],
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(false),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(true),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+            child: const Text('Nuclear Reset'),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed == true && context.mounted) {
+      await _performNuclearReset(context);
+    }
+  }
+
+  /// Perform the nuclear reset operation
+  Future<void> _performNuclearReset(BuildContext context) async {
+    // Show progress dialog
+    if (!context.mounted) return;
+    
+    showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (context) => const AlertDialog(
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            CircularProgressIndicator(),
+            SizedBox(height: 16),
+            Text('Clearing all app data...'),
+          ],
+        ),
+      ),
+    );
+
+    try {
+      // Perform the nuclear reset
+      await NuclearResetService.clearEverything();
+      
+      if (!context.mounted) return;
+      
+      // Close progress dialog
+      Navigator.of(context).pop();
+      
+      // Show completion dialog
+      await showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder: (context) => AlertDialog(
+          title: const Row(
+            children: [
+              Icon(Icons.check_circle, color: Colors.green),
+              SizedBox(width: 8),
+              Text('Reset Complete'),
+            ],
+          ),
+          content: const Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                'All app data has been cleared successfully.',
+                style: TextStyle(fontWeight: FontWeight.w500),
+              ),
+              SizedBox(height: 12),
+              Text(
+                'Please close and restart the app to continue with a fresh state.',
+                style: TextStyle(fontWeight: FontWeight.w500),
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(),
+              child: const Text('OK'),
+            ),
+          ],
+        ),
+      );
+    } catch (e) {
+      if (!context.mounted) return;
+      
+      // Close progress dialog if it's still open
+      Navigator.of(context).pop();
+      
+      // Show error dialog
+      await showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: const Row(
+            children: [
+              Icon(Icons.error, color: Colors.red),
+              SizedBox(width: 8),
+              Text('Reset Failed'),
+            ],
+          ),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const Text(
+                'An error occurred during the nuclear reset:',
+                style: TextStyle(fontWeight: FontWeight.w500),
+              ),
+              const SizedBox(height: 12),
+              Text(
+                e.toString(),
+                style: const TextStyle(fontFamily: 'monospace'),
+              ),
+              const SizedBox(height: 12),
+              const Text(
+                'Some data may have been partially cleared. You may want to manually clear app data through device settings.',
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(),
+              child: const Text('OK'),
+            ),
+          ],
+        ),
+      );
+    }
+  }

 }
--- a/lib/screens/operator_profile_editor.dart
+++ b/lib/screens/operator_profile_editor.dart
@@ -155,8 +155,13 @@ class _OperatorProfileEditorState extends State<OperatorProfileEditor> {
    
    final tagMap = <String, String>{};
    for (final e in _tags) {
-      if (e.key.trim().isEmpty) continue; // Skip only if key is empty
-      tagMap[e.key.trim()] = e.value.trim(); // Allow empty values for refinement
+      final key = e.key.trim();
+      final value = e.value.trim();
+      
+      // Skip if key is empty OR value is empty (no empty values for operator profiles)
+      if (key.isEmpty || value.isEmpty) continue;
+      
+      tagMap[key] = value;
    }
    
    final newProfile = widget.profile.copyWith(
--- a/lib/screens/osm_account_screen.dart
+++ b/lib/screens/osm_account_screen.dart
@@ -195,50 +195,9 @@ class _OSMAccountScreenState extends State<OSMAccountScreen> {
                    child: UploadModeSection(),
                  ),
                ),
-                const SizedBox(height: 16),
+              const SizedBox(height: 16),
              ],
              
-              // Information Section
-              Card(
-                child: Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        locService.t('auth.aboutOSM'),
-                        style: Theme.of(context).textTheme.titleMedium,
-                      ),
-                      const SizedBox(height: 8),
-                      Text(
-                        locService.t('auth.aboutOSMDescription'),
-                        style: Theme.of(context).textTheme.bodyMedium,
-                      ),
-                      const SizedBox(height: 16),
-                      SizedBox(
-                        width: double.infinity,
-                        child: OutlinedButton.icon(
-                          onPressed: () async {
-                            final url = Uri.parse('https://openstreetmap.org');
-                            if (await canLaunchUrl(url)) {
-                              await launchUrl(url, mode: LaunchMode.externalApplication);
-                            } else {
-                              if (context.mounted) {
-                                ScaffoldMessenger.of(context).showSnackBar(
-                                  SnackBar(content: Text(locService.t('advancedEdit.couldNotOpenOSMWebsite'))),
-                                );
-                              }
-                            }
-                          },
-                          icon: const Icon(Icons.open_in_new),
-                          label: Text(locService.t('auth.visitOSM')),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-              
              // Account deletion section - only show when logged in and not in simulate mode
              if (appState.isLoggedIn && appState.uploadMode != UploadMode.simulate) ...[
                const SizedBox(height: 16),
--- a/lib/screens/profile_editor.dart
+++ b/lib/screens/profile_editor.dart
@@ -6,6 +6,7 @@ import '../models/node_profile.dart';
 import '../app_state.dart';
 import '../services/localization_service.dart';
 import '../widgets/nsi_tag_value_field.dart';
+import '../dev_config.dart';

 class ProfileEditor extends StatefulWidget {
  const ProfileEditor({super.key, required this.profile});
@@ -22,6 +23,7 @@ class _ProfileEditorState extends State<ProfileEditor> {
  late bool _requiresDirection;
  late bool _submittable;
  late TextEditingController _fovCtrl;
+  late bool _is360Fov;

  static const _defaultTags = [
    MapEntry('man_made', 'surveillance'),
@@ -41,6 +43,7 @@ class _ProfileEditorState extends State<ProfileEditor> {
    _requiresDirection = widget.profile.requiresDirection;
    _submittable = widget.profile.submittable;
    _fovCtrl = TextEditingController(text: widget.profile.fov?.toString() ?? '');
+    _is360Fov = widget.profile.fov == 360.0;

    if (widget.profile.tags.isEmpty) {
      // New profile → start with sensible defaults
@@ -94,28 +97,68 @@ class _ProfileEditorState extends State<ProfileEditor> {
              ),
              const SizedBox(height: 16),
              if (widget.profile.editable) ...[
-                CheckboxListTile(
-                  title: Text(locService.t('profileEditor.requiresDirection')),
-                  subtitle: Text(locService.t('profileEditor.requiresDirectionSubtitle')),
-                  value: _requiresDirection,
-                  onChanged: (value) => setState(() => _requiresDirection = value ?? true),
-                  controlAffinity: ListTileControlAffinity.leading,
-                ),
-                if (_requiresDirection) Padding(
-                  padding: const EdgeInsets.only(left: 16, right: 16, bottom: 8),
-                  child: TextField(
-                    controller: _fovCtrl,
-                    keyboardType: TextInputType.number,
-                    decoration: InputDecoration(
-                      labelText: locService.t('profileEditor.fov'),
-                      hintText: locService.t('profileEditor.fovHint'),
-                      helperText: locService.t('profileEditor.fovSubtitle'),
-                      errorText: _validateFov(),
-                      suffixText: '°',
-                    ),
-                    onChanged: (value) => setState(() {}), // Trigger validation
+                // Direction and FOV configuration - show different UI based on dev config
+                if (kEnableNon360FOVs) ...[
+                  // Old UI: direction required + optional custom FOV text field (development mode)
+                  CheckboxListTile(
+                    title: Text(locService.t('profileEditor.requiresDirection')),
+                    subtitle: Text(locService.t('profileEditor.requiresDirectionSubtitle')),
+                    value: _requiresDirection,
+                    onChanged: (value) => setState(() => _requiresDirection = value ?? true),
+                    controlAffinity: ListTileControlAffinity.leading,
                  ),
-                ),
+                  if (_requiresDirection) Padding(
+                    padding: const EdgeInsets.only(left: 16, right: 16, bottom: 8),
+                    child: TextField(
+                      controller: _fovCtrl,
+                      keyboardType: TextInputType.number,
+                      decoration: InputDecoration(
+                        labelText: locService.t('profileEditor.fov'),
+                        hintText: locService.t('profileEditor.fovHint'),
+                        helperText: locService.t('profileEditor.fovSubtitle'),
+                        errorText: _validateFov(),
+                        suffixText: '°',
+                      ),
+                      onChanged: (value) => setState(() {}), // Trigger validation
+                    ),
+                  ),
+                ] else ...[
+                  // New UI: mutually exclusive direction vs 360° FOV checkboxes (production mode)
+                  CheckboxListTile(
+                    title: Text(locService.t('profileEditor.requiresDirection')),
+                    subtitle: Text(locService.t('profileEditor.requiresDirectionSubtitle')),
+                    value: _requiresDirection,
+                    onChanged: widget.profile.editable 
+                        ? (value) {
+                            setState(() {
+                              _requiresDirection = value ?? false;
+                              // Make mutually exclusive with 360° FOV
+                              if (_requiresDirection) {
+                                _is360Fov = false;
+                              }
+                            });
+                          }
+                        : null,
+                    controlAffinity: ListTileControlAffinity.leading,
+                  ),
+                  CheckboxListTile(
+                    title: Text(locService.t('profileEditor.fov360')),
+                    subtitle: Text(locService.t('profileEditor.fov360Subtitle')),
+                    value: _is360Fov,
+                    onChanged: widget.profile.editable 
+                        ? (value) {
+                            setState(() {
+                              _is360Fov = value ?? false;
+                              // Make mutually exclusive with direction requirement
+                              if (_is360Fov) {
+                                _requiresDirection = false;
+                              }
+                            });
+                          }
+                        : null,
+                    controlAffinity: ListTileControlAffinity.leading,
+                  ),
+                ],
                CheckboxListTile(
                  title: Text(locService.t('profileEditor.submittable')),
                  subtitle: Text(locService.t('profileEditor.submittableSubtitle')),
@@ -199,6 +242,9 @@ class _ProfileEditorState extends State<ProfileEditor> {
  }

  String? _validateFov() {
+    // Only validate when using text field mode
+    if (!kEnableNon360FOVs) return null;
+    
    final text = _fovCtrl.text.trim();
    if (text.isEmpty) return null; // Optional field
    
@@ -219,14 +265,21 @@ class _ProfileEditorState extends State<ProfileEditor> {
      return;
    }

-    // Validate FOV if provided
-    if (_validateFov() != null) {
+    // Validate FOV if using text field mode
+    if (kEnableNon360FOVs && _validateFov() != null) {
      return; // Don't save if FOV validation fails
    }

-    // Parse FOV
-    final fovText = _fovCtrl.text.trim();
-    final fov = fovText.isEmpty ? null : double.tryParse(fovText);
+    // Parse FOV based on dev config mode
+    double? fov;
+    if (kEnableNon360FOVs) {
+      // Old mode: parse from text field
+      final fovText = _fovCtrl.text.trim();
+      fov = fovText.isEmpty ? null : double.tryParse(fovText);
+    } else {
+      // New mode: use checkbox state
+      fov = _is360Fov ? 360.0 : null;
+    }
    
    final tagMap = <String, String>{};
    for (final e in _tags) {
--- a/lib/screens/settings/sections/operator_profiles_section.dart
+++ b/lib/screens/settings/sections/operator_profiles_section.dart
@@ -54,47 +54,64 @@ class OperatorProfilesSection extends StatelessWidget {
                ),
              )
            else
-              ...appState.operatorProfiles.map(
-                (p) => ListTile(
-                  title: Text(p.name),
-                  subtitle: Text(locService.t('operatorProfiles.tagsCount', params: [p.tags.length.toString()])),
-                  trailing: PopupMenuButton(
-                    itemBuilder: (context) => [
-                      PopupMenuItem(
-                        value: 'edit',
-                        child: Row(
-                          children: [
-                            const Icon(Icons.edit),
-                            const SizedBox(width: 8),
-                            Text(locService.t('actions.edit')),
-                          ],
-                        ),
+              ReorderableListView.builder(
+                shrinkWrap: true,
+                physics: const NeverScrollableScrollPhysics(),
+                itemCount: appState.operatorProfiles.length,
+                onReorder: (oldIndex, newIndex) {
+                  appState.reorderOperatorProfiles(oldIndex, newIndex);
+                },
+                itemBuilder: (context, index) {
+                  final p = appState.operatorProfiles[index];
+                  return ListTile(
+                    key: ValueKey(p.id),
+                    leading: ReorderableDragStartListener(
+                      index: index,
+                      child: const Icon(
+                        Icons.drag_handle,
+                        color: Colors.grey,
                      ),
-                      PopupMenuItem(
-                        value: 'delete',
-                        child: Row(
-                          children: [
-                            const Icon(Icons.delete, color: Colors.red),
-                            const SizedBox(width: 8),
-                            Text(locService.t('operatorProfiles.deleteOperatorProfile'), style: const TextStyle(color: Colors.red)),
-                          ],
-                        ),
-                      ),
-                    ],
-                    onSelected: (value) {
-                      if (value == 'edit') {
-                        Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                            builder: (_) => OperatorProfileEditor(profile: p),
+                    ),
+                    title: Text(p.name),
+                    subtitle: Text(locService.t('operatorProfiles.tagsCount', params: [p.tags.length.toString()])),
+                    trailing: PopupMenuButton(
+                      itemBuilder: (context) => [
+                        PopupMenuItem(
+                          value: 'edit',
+                          child: Row(
+                            children: [
+                              const Icon(Icons.edit),
+                              const SizedBox(width: 8),
+                              Text(locService.t('actions.edit')),
+                            ],
                          ),
-                        );
-                      } else if (value == 'delete') {
-                        _showDeleteProfileDialog(context, p);
-                      }
-                    },
-                  ),
-                ),
+                        ),
+                        PopupMenuItem(
+                          value: 'delete',
+                          child: Row(
+                            children: [
+                              const Icon(Icons.delete, color: Colors.red),
+                              const SizedBox(width: 8),
+                              Text(locService.t('operatorProfiles.deleteOperatorProfile'), style: const TextStyle(color: Colors.red)),
+                            ],
+                          ),
+                        ),
+                      ],
+                      onSelected: (value) {
+                        if (value == 'edit') {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (_) => OperatorProfileEditor(profile: p),
+                            ),
+                          );
+                        } else if (value == 'delete') {
+                          _showDeleteProfileDialog(context, p);
+                        }
+                      },
+                    ),
+                  );
+                },
              ),
          ],
        );
--- a/lib/screens/settings/sections/tile_provider_section.dart
+++ b/lib/screens/settings/sections/tile_provider_section.dart
@@ -104,6 +104,9 @@ class TileProviderSection extends StatelessWidget {
                    case 'edit':
                      _editProvider(context, provider);
                      break;
+                    case 'clear_cache':
+                      _clearProviderCaches(context, provider);
+                      break;
                    case 'delete':
                      _deleteProvider(context, provider);
                      break;
@@ -120,6 +123,16 @@ class TileProviderSection extends StatelessWidget {
                      ],
                    ),
                  ),
+                  PopupMenuItem(
+                    value: 'clear_cache',
+                    child: Row(
+                      children: [
+                        const Icon(Icons.clear_all),
+                        const SizedBox(width: 8),
+                        Text(locService.t('tileProviders.clearCaches')),
+                      ],
+                    ),
+                  ),
                  PopupMenuItem(
                    value: 'delete',
                    child: Row(
@@ -154,6 +167,37 @@ class TileProviderSection extends StatelessWidget {
    );
  }

+  void _clearProviderCaches(BuildContext context, TileProvider provider) {
+    final locService = LocalizationService.instance;
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(locService.t('tileProviders.clearCaches')),
+        content: Text(locService.t('tileProviders.clearCachesConfirm', params: [provider.name])),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: Text(locService.t('actions.cancel')),
+          ),
+          TextButton(
+            onPressed: () async {
+              Navigator.of(context).pop();
+              await context.read<AppState>().clearTileProviderCaches(provider.id);
+              if (context.mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(locService.t('tileProviders.cachesCleared', params: [provider.name])),
+                  ),
+                );
+              }
+            },
+            child: Text(locService.t('tileProviders.clearCaches')),
+          ),
+        ],
+      ),
+    );
+  }
+
  void _deleteProvider(BuildContext context, TileProvider provider) {
    final locService = LocalizationService.instance;
    showDialog(
--- a/lib/services/changelog_service.dart
+++ b/lib/services/changelog_service.dart
@@ -225,10 +225,22 @@ class ChangelogService {
      versionsNeedingMigration.add('1.6.3');
    }
    
+    if (needsMigration(lastSeenVersion, currentVersion, '1.8.0')) {
+      versionsNeedingMigration.add('1.8.0');
+    }
+    
+    if (needsMigration(lastSeenVersion, currentVersion, '2.1.0')) {
+      versionsNeedingMigration.add('2.1.0');
+    }
+    
    if (needsMigration(lastSeenVersion, currentVersion, '2.7.3')) {
      versionsNeedingMigration.add('2.7.3');
    }
    
+    if (needsMigration(lastSeenVersion, currentVersion, '2.10.0')) {
+      versionsNeedingMigration.add('2.10.0');
+    }
+    
    // Future versions can be added here
    // if (needsMigration(lastSeenVersion, currentVersion, '2.0.0')) {
    //   versionsNeedingMigration.add('2.0.0');
--- a/lib/services/deep_link_service.dart
+++ b/lib/services/deep_link_service.dart
@@ -3,8 +3,11 @@ import 'package:app_links/app_links.dart';
 import 'package:flutter/material.dart';

 import '../models/node_profile.dart';
+import '../models/operator_profile.dart';
 import 'profile_import_service.dart';
+import 'operator_profile_import_service.dart';
 import '../screens/profile_editor.dart';
+import '../screens/operator_profile_editor.dart';

 class DeepLinkService {
  static final DeepLinkService _instance = DeepLinkService._internal();
@@ -86,8 +89,16 @@ class DeepLinkService {
    }
  }
  
-  /// Handle profile add deep link: `deflockapp://profiles/add?p=<base64>`
+  /// Handle profile add deep link: `deflockapp://profiles/add?p=<base64>` or `deflockapp://profiles/add?op=<base64>`
  void _handleAddProfileLink(Uri uri) {
+    // Check for operator profile parameter first
+    final operatorBase64Data = uri.queryParameters['op'];
+    if (operatorBase64Data != null && operatorBase64Data.isNotEmpty) {
+      _handleOperatorProfileImport(operatorBase64Data);
+      return;
+    }
+    
+    // Otherwise check for device profile parameter
    final base64Data = uri.queryParameters['p'];
    
    if (base64Data == null || base64Data.isEmpty) {
@@ -107,6 +118,20 @@ class DeepLinkService {
    _navigateToProfileEditor(profile);
  }
  
+  /// Handle operator profile import from deep link
+  void _handleOperatorProfileImport(String base64Data) {
+    // Parse operator profile from base64
+    final operatorProfile = OperatorProfileImportService.parseProfileFromBase64(base64Data);
+    
+    if (operatorProfile == null) {
+      _showError('Invalid operator profile data');
+      return;
+    }
+    
+    // Navigate to operator profile editor with the imported profile
+    _navigateToOperatorProfileEditor(operatorProfile);
+  }
+  
  /// Navigate to profile editor with pre-filled profile data
  void _navigateToProfileEditor(NodeProfile profile) {
    final context = _navigatorKey?.currentContext;
@@ -124,6 +149,23 @@ class DeepLinkService {
    );
  }
  
+  /// Navigate to operator profile editor with pre-filled operator profile data
+  void _navigateToOperatorProfileEditor(OperatorProfile operatorProfile) {
+    final context = _navigatorKey?.currentContext;
+    
+    if (context == null) {
+      debugPrint('[DeepLinkService] No navigator context available');
+      return;
+    }
+    
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (_) => OperatorProfileEditor(profile: operatorProfile),
+      ),
+    );
+  }
+  
  /// Show error message to user
  void _showError(String message) {
    final context = _navigatorKey?.currentContext;
--- a/lib/services/operator_profile_import_service.dart
+++ b/lib/services/operator_profile_import_service.dart
@@ -0,0 +1,100 @@
+import 'dart:convert';
+import 'package:flutter/foundation.dart';
+import 'package:uuid/uuid.dart';
+
+import '../models/operator_profile.dart';
+
+class OperatorProfileImportService {
+  // Maximum size for base64 encoded profile data (approx 50KB decoded)
+  static const int maxBase64Length = 70000;
+  
+  /// Parse and validate an operator profile from a base64-encoded JSON string
+  /// Returns null if parsing/validation fails
+  static OperatorProfile? parseProfileFromBase64(String base64Data) {
+    try {
+      // Basic size validation before expensive decode
+      if (base64Data.length > maxBase64Length) {
+        debugPrint('[OperatorProfileImportService] Base64 data too large: ${base64Data.length} characters');
+        return null;
+      }
+
+      // Decode base64
+      final jsonBytes = base64Decode(base64Data);
+      final jsonString = utf8.decode(jsonBytes);
+      
+      // Parse JSON
+      final jsonData = jsonDecode(jsonString) as Map<String, dynamic>;
+      
+      // Validate and sanitize the profile data
+      final sanitizedProfile = _validateAndSanitizeProfile(jsonData);
+      return sanitizedProfile;
+      
+    } catch (e) {
+      debugPrint('[OperatorProfileImportService] Failed to parse profile from base64: $e');
+      return null;
+    }
+  }
+  
+  /// Validate operator profile structure and sanitize all string values
+  static OperatorProfile? _validateAndSanitizeProfile(Map<String, dynamic> data) {
+    try {
+      // Extract and sanitize required fields
+      final name = _sanitizeString(data['name']);
+      if (name == null || name.isEmpty) {
+        debugPrint('[OperatorProfileImportService] Operator profile name is required');
+        return null;
+      }
+      
+      // Extract and sanitize tags
+      final tagsData = data['tags'];
+      if (tagsData is! Map<String, dynamic>) {
+        debugPrint('[OperatorProfileImportService] Operator profile tags must be a map');
+        return null;
+      }
+      
+      final sanitizedTags = <String, String>{};
+      for (final entry in tagsData.entries) {
+        final key = _sanitizeString(entry.key);
+        final value = _sanitizeString(entry.value);
+        
+        if (key != null && key.isNotEmpty) {
+          // Allow empty values for refinement purposes
+          sanitizedTags[key] = value ?? '';
+        }
+      }
+      
+      if (sanitizedTags.isEmpty) {
+        debugPrint('[OperatorProfileImportService] Operator profile must have at least one valid tag');
+        return null;
+      }
+      
+      return OperatorProfile(
+        id: const Uuid().v4(), // Always generate new ID for imported profiles
+        name: name,
+        tags: sanitizedTags,
+      );
+      
+    } catch (e) {
+      debugPrint('[OperatorProfileImportService] Failed to validate operator profile: $e');
+      return null;
+    }
+  }
+  
+  /// Sanitize a string value by trimming and removing potentially harmful characters
+  static String? _sanitizeString(dynamic value) {
+    if (value == null) return null;
+    
+    final str = value.toString().trim();
+    
+    // Remove control characters and limit length
+    final sanitized = str.replaceAll(RegExp(r'[\x00-\x1F\x7F]'), '');
+    
+    // Limit length to prevent abuse
+    const maxLength = 500;
+    if (sanitized.length > maxLength) {
+      return sanitized.substring(0, maxLength);
+    }
+    
+    return sanitized;
+  }
+}
--- a/lib/services/overpass_service.dart
+++ b/lib/services/overpass_service.dart
@@ -8,97 +8,106 @@ import '../models/node_profile.dart';
 import '../models/osm_node.dart';
 import '../dev_config.dart';
 import 'http_client.dart';
+import 'service_policy.dart';

-/// Simple Overpass API client with proper HTTP retry logic.
+/// Simple Overpass API client with retry and fallback logic.
 /// Single responsibility: Make requests, handle network errors, return data.
 class OverpassService {
-  static const String _endpoint = 'https://overpass-api.de/api/interpreter';
+  static const String defaultEndpoint = 'https://overpass.deflock.org/api/interpreter';
+  static const String fallbackEndpoint = 'https://overpass-api.de/api/interpreter';
+  static const _policy = ResiliencePolicy(
+    maxRetries: 3,
+    httpTimeout: Duration(seconds: 45),
+  );
+
  final http.Client _client;
+  /// Optional override endpoint. When null, uses [defaultEndpoint].
+  final String? _endpointOverride;

-  OverpassService({http.Client? client}) : _client = client ?? UserAgentClient();
+  OverpassService({http.Client? client, String? endpoint})
+      : _client = client ?? UserAgentClient(),
+        _endpointOverride = endpoint;

+  /// Resolve the primary endpoint: constructor override or default.
+  String get _primaryEndpoint => _endpointOverride ?? defaultEndpoint;

-  /// Fetch surveillance nodes from Overpass API with proper retry logic.
+  /// Fetch surveillance nodes from Overpass API with retry and fallback.
  /// Throws NetworkError for retryable failures, NodeLimitError for area splitting.
  Future<List<OsmNode>> fetchNodes({
    required LatLngBounds bounds,
    required List<NodeProfile> profiles,
-    int maxRetries = 3,
+    ResiliencePolicy? policy,
  }) async {
    if (profiles.isEmpty) return [];
-    
+
    final query = _buildQuery(bounds, profiles);
-    
-    for (int attempt = 0; attempt <= maxRetries; attempt++) {
-      try {
-        debugPrint('[OverpassService] Attempt ${attempt + 1}/${maxRetries + 1} for ${profiles.length} profiles');
-        
-        final response = await _client.post(
-          Uri.parse(_endpoint),
-          body: {'data': query},
-        ).timeout(kOverpassQueryTimeout);
-        
-        if (response.statusCode == 200) {
-          return _parseResponse(response.body);
-        }
-        
-        // Check for specific error types
-        final errorBody = response.body;
-        
-        // Node limit error - caller should split area
-        if (response.statusCode == 400 && 
-            (errorBody.contains('too many nodes') && errorBody.contains('50000'))) {
-          debugPrint('[OverpassService] Node limit exceeded, area should be split');
-          throw NodeLimitError('Query exceeded 50k node limit');
-        }
-        
-        // Timeout error - also try splitting (complex query)
-        if (errorBody.contains('timeout') || 
-            errorBody.contains('runtime limit exceeded') ||
-            errorBody.contains('Query timed out')) {
-          debugPrint('[OverpassService] Query timeout, area should be split');
-          throw NodeLimitError('Query timed out - area too complex');
-        }
-        
-        // Rate limit - throw immediately, don't retry
-        if (response.statusCode == 429 ||
-            errorBody.contains('rate limited') ||
-            errorBody.contains('too many requests')) {
-          debugPrint('[OverpassService] Rate limited by Overpass');
-          throw RateLimitError('Rate limited by Overpass API');
-        }
-        
-        // Other HTTP errors - retry with backoff
-        if (attempt < maxRetries) {
-          final delay = Duration(milliseconds: (200 * (1 << attempt)).clamp(200, 5000));
-          debugPrint('[OverpassService] HTTP ${response.statusCode} error, retrying in ${delay.inMilliseconds}ms');
-          await Future.delayed(delay);
-          continue;
-        }
-        
-        throw NetworkError('HTTP ${response.statusCode}: $errorBody');
-        
-      } catch (e) {
-        // Handle specific error types without retry
-        if (e is NodeLimitError || e is RateLimitError) {
-          rethrow;
-        }
-        
-        // Network/timeout errors - retry with backoff
-        if (attempt < maxRetries) {
-          final delay = Duration(milliseconds: (200 * (1 << attempt)).clamp(200, 5000));
-          debugPrint('[OverpassService] Network error ($e), retrying in ${delay.inMilliseconds}ms');
-          await Future.delayed(delay);
-          continue;
-        }
-        
-        throw NetworkError('Network error after $maxRetries retries: $e');
-      }
-    }
-    
-    throw NetworkError('Max retries exceeded');
+    final endpoint = _primaryEndpoint;
+    final canFallback = _endpointOverride == null;
+    final effectivePolicy = policy ?? _policy;
+
+    return executeWithFallback<List<OsmNode>>(
+      primaryUrl: endpoint,
+      fallbackUrl: canFallback ? fallbackEndpoint : null,
+      execute: (url) => _attemptFetch(url, query, effectivePolicy),
+      classifyError: _classifyError,
+      policy: effectivePolicy,
+    );
  }
-  
+
+  /// Single POST + parse attempt (no retry logic — handled by executeWithFallback).
+  Future<List<OsmNode>> _attemptFetch(String endpoint, String query, ResiliencePolicy policy) async {
+    debugPrint('[OverpassService] POST $endpoint');
+
+    try {
+      final response = await _client.post(
+        Uri.parse(endpoint),
+        body: {'data': query},
+      ).timeout(policy.httpTimeout);
+
+      if (response.statusCode == 200) {
+        return _parseResponse(response.body);
+      }
+
+      final errorBody = response.body;
+
+      // Node limit error - caller should split area
+      if (response.statusCode == 400 &&
+          (errorBody.contains('too many nodes') && errorBody.contains('50000'))) {
+        debugPrint('[OverpassService] Node limit exceeded, area should be split');
+        throw NodeLimitError('Query exceeded 50k node limit');
+      }
+
+      // Timeout error - also try splitting (complex query)
+      if (errorBody.contains('timeout') ||
+          errorBody.contains('runtime limit exceeded') ||
+          errorBody.contains('Query timed out')) {
+        debugPrint('[OverpassService] Query timeout, area should be split');
+        throw NodeLimitError('Query timed out - area too complex');
+      }
+
+      // Rate limit
+      if (response.statusCode == 429 ||
+          errorBody.contains('rate limited') ||
+          errorBody.contains('too many requests')) {
+        debugPrint('[OverpassService] Rate limited by Overpass');
+        throw RateLimitError('Rate limited by Overpass API');
+      }
+
+      throw NetworkError('HTTP ${response.statusCode}: $errorBody');
+    } catch (e) {
+      if (e is NodeLimitError || e is RateLimitError || e is NetworkError) {
+        rethrow;
+      }
+      throw NetworkError('Network error: $e');
+    }
+  }
+
+  static ErrorDisposition _classifyError(Object error) {
+    if (error is NodeLimitError) return ErrorDisposition.abort;
+    if (error is RateLimitError) return ErrorDisposition.fallback;
+    return ErrorDisposition.retry;
+  }
+
  /// Build Overpass QL query for given bounds and profiles
  String _buildQuery(LatLngBounds bounds, List<NodeProfile> profiles) {
    final nodeClauses = profiles.map((profile) {
@@ -107,7 +116,7 @@ class OverpassService {
          .where((entry) => entry.value.trim().isNotEmpty)
          .map((entry) => '["${entry.key}"="${entry.value}"]')
          .join();
-      
+
      return 'node$tagFilters(${bounds.southWest.latitude},${bounds.southWest.longitude},${bounds.northEast.latitude},${bounds.northEast.longitude});';
    }).join('\n  ');

@@ -119,38 +128,38 @@ class OverpassService {
 out body;
 (
  way(bn);
-  rel(bn);  
+  rel(bn);
 );
 out skel;
 ''';
  }
-  
+
  /// Parse Overpass JSON response into OsmNode objects
  List<OsmNode> _parseResponse(String responseBody) {
    final data = jsonDecode(responseBody) as Map<String, dynamic>;
    final elements = data['elements'] as List<dynamic>;
-    
+
    final nodeElements = <Map<String, dynamic>>[];
    final constrainedNodeIds = <int>{};
-    
+
    // First pass: collect surveillance nodes and identify constrained nodes
    for (final element in elements.whereType<Map<String, dynamic>>()) {
      final type = element['type'] as String?;
-      
+
      if (type == 'node') {
        nodeElements.add(element);
      } else if (type == 'way' || type == 'relation') {
        // Mark referenced nodes as constrained
-        final refs = element['nodes'] as List<dynamic>? ?? 
+        final refs = element['nodes'] as List<dynamic>? ??
                     element['members']?.where((m) => m['type'] == 'node').map((m) => m['ref']) ?? [];
-        
+
        for (final ref in refs) {
          final nodeId = ref is int ? ref : int.tryParse(ref.toString());
          if (nodeId != null) constrainedNodeIds.add(nodeId);
        }
      }
    }
-    
+
    // Second pass: create OsmNode objects
    final nodes = nodeElements.map((element) {
      final nodeId = element['id'] as int;
@@ -161,7 +170,7 @@ out skel;
        isConstrained: constrainedNodeIds.contains(nodeId),
      );
    }).toList();
-    
+
    debugPrint('[OverpassService] Parsed ${nodes.length} nodes, ${constrainedNodeIds.length} constrained');
    return nodes;
  }
@@ -189,4 +198,4 @@ class NetworkError extends Error {
  NetworkError(this.message);
  @override
  String toString() => 'NetworkError: $message';
-}
+}
--- a/lib/services/profile_import_service.dart
+++ b/lib/services/profile_import_service.dart
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:uuid/uuid.dart';

 import '../models/node_profile.dart';
+import '../dev_config.dart';

 class ProfileImportService {
  // Maximum size for base64 encoded profile data (approx 50KB decoded)
@@ -72,13 +73,17 @@ class ProfileImportService {
      final requiresDirection = data['requiresDirection'] ?? true;
      final submittable = data['submittable'] ?? true;
      
-      // Parse FOV if provided
+      // Parse FOV if provided, applying restrictions based on dev config
      double? fov;
      if (data['fov'] != null) {
        if (data['fov'] is num) {
          final fovValue = (data['fov'] as num).toDouble();
          if (fovValue > 0 && fovValue <= 360) {
-            fov = fovValue;
+            // If non-360 FOVs are disabled, only allow 360° FOV
+            if (kEnableNon360FOVs || fovValue == 360.0) {
+              fov = fovValue;
+            }
+            // Otherwise, clear non-360 FOV values (set fov to null)
          }
        }
      }
--- a/lib/services/provider_tile_cache_manager.dart
+++ b/lib/services/provider_tile_cache_manager.dart
@@ -61,10 +61,13 @@ class ProviderTileCacheManager {
  /// Delete a specific provider's cache directory and remove the store.
  static Future<void> deleteCache(String providerId, String tileTypeId) async {
    final key = '$providerId/$tileTypeId';
-    final store = _stores.remove(key);
+    final store = _stores[key];
    if (store != null) {
+      // Use the store's clear method to properly reset its internal state
      await store.clear();
+      // Don't remove from registry - let it be reused with clean state
    } else if (_baseCacheDir != null) {
+      // Fallback for stores not in registry
      final cacheDir = Directory(p.join(_baseCacheDir!, providerId, tileTypeId));
      if (await cacheDir.exists()) {
        await cacheDir.delete(recursive: true);
--- a/lib/services/provider_tile_cache_store.dart
+++ b/lib/services/provider_tile_cache_store.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';

@@ -27,6 +28,10 @@ class ProviderTileCacheStore implements MapCachingProvider {
  /// [putTile] call to avoid blocking construction.
  int? _estimatedSize;

+  /// Semaphore to limit concurrent file I/O operations and prevent
+  /// "too many open files" errors during heavy tile loading.
+  static final _ioSemaphore = _Semaphore(20); // Max 20 concurrent file operations
+
  /// Throttle: don't re-scan more than once per minute.
  DateTime? _lastPruneCheck;

@@ -52,9 +57,16 @@ class ProviderTileCacheStore implements MapCachingProvider {
    final metaFile = File(p.join(cacheDirectory, '$key.meta'));

    try {
-      final bytes = await tileFile.readAsBytes();
-      final metaJson = json.decode(await metaFile.readAsString())
-          as Map<String, dynamic>;
+      // Use semaphore to limit concurrent file I/O operations
+      final result = await _ioSemaphore.execute(() async {
+        final bytes = await tileFile.readAsBytes();
+        final metaJson = json.decode(await metaFile.readAsString())
+            as Map<String, dynamic>;
+        return (bytes: bytes, metaJson: metaJson);
+      });
+      
+      final bytes = result.bytes;
+      final metaJson = result.metaJson;

      final metadata = CachedMapTileMetadata(
        staleAt: DateTime.fromMillisecondsSinceEpoch(
@@ -120,10 +132,13 @@ class ProviderTileCacheStore implements MapCachingProvider {

    // Write .tile before .meta: if we crash between the two writes, the
    // read path's both-must-exist check sees a miss rather than an orphan .meta.
-    if (bytes != null) {
-      await tileFile.writeAsBytes(bytes);
-    }
-    await metaFile.writeAsString(metaJson);
+    // Use semaphore to limit concurrent file I/O and prevent "too many open files" errors.
+    await _ioSemaphore.execute(() async {
+      if (bytes != null) {
+        await tileFile.writeAsBytes(bytes);
+      }
+      await metaFile.writeAsString(metaJson);
+    });

    // Reset size estimate so it resyncs from disk on next check.
    // This avoids drift from overwrites where the old size isn't subtracted.
@@ -250,14 +265,19 @@ class ProviderTileCacheStore implements MapCachingProvider {
        final metaFile = File(p.join(cacheDirectory, '$key.meta'));

        try {
-          await entry.file.delete();
-          freedBytes += entry.stat.size;
+          final deletedBytes = await _ioSemaphore.execute(() async {
+            await entry.file.delete();
+            var bytes = entry.stat.size;
+            if (await metaFile.exists()) {
+              final metaStat = await metaFile.stat();
+              await metaFile.delete();
+              bytes += metaStat.size;
+            }
+            return bytes;
+          });
+          
+          freedBytes += deletedBytes;
          evictedKeys.add(key);
-          if (await metaFile.exists()) {
-            final metaStat = await metaFile.stat();
-            await metaFile.delete();
-            freedBytes += metaStat.size;
-          }
        } catch (e) {
          debugPrint('[ProviderTileCacheStore] Failed to evict $key: $e');
        }
@@ -313,3 +333,44 @@ class ProviderTileCacheStore implements MapCachingProvider {
  @visibleForTesting
  Future<void> forceEviction() => _evictIfNeeded();
 }
+
+/// Simple semaphore to limit concurrent operations and prevent resource exhaustion.
+class _Semaphore {
+  final int maxCount;
+  int _currentCount;
+  final Queue<Completer<void>> _waitQueue = Queue<Completer<void>>();
+
+  _Semaphore(this.maxCount) : _currentCount = maxCount;
+
+  /// Acquire a permit. Returns a Future that completes when a permit is available.
+  Future<void> acquire() {
+    if (_currentCount > 0) {
+      _currentCount--;
+      return Future.value();
+    } else {
+      final completer = Completer<void>();
+      _waitQueue.add(completer);
+      return completer.future;
+    }
+  }
+
+  /// Release a permit, potentially unblocking a waiting operation.
+  void release() {
+    if (_waitQueue.isNotEmpty) {
+      final completer = _waitQueue.removeFirst();
+      completer.complete();
+    } else {
+      _currentCount++;
+    }
+  }
+
+  /// Execute a function while holding a permit.
+  Future<T> execute<T>(Future<T> Function() operation) async {
+    await acquire();
+    try {
+      return await operation();
+    } finally {
+      release();
+    }
+  }
+}
--- a/lib/services/routing_service.dart
+++ b/lib/services/routing_service.dart
@@ -5,20 +5,20 @@ import 'package:latlong2/latlong.dart';
 import 'package:shared_preferences/shared_preferences.dart';

 import '../app_state.dart';
-import '../dev_config.dart';
 import 'http_client.dart';
+import 'service_policy.dart';

 class RouteResult {
  final List<LatLng> waypoints;
  final double distanceMeters;
  final double durationSeconds;
-  
+
  const RouteResult({
    required this.waypoints,
    required this.distanceMeters,
    required this.durationSeconds,
  });
-  
+
  @override
  String toString() {
    return 'RouteResult(waypoints: ${waypoints.length}, distance: ${(distanceMeters/1000).toStringAsFixed(1)}km, duration: ${(durationSeconds/60).toStringAsFixed(1)}min)';
@@ -26,14 +26,27 @@ class RouteResult {
 }

 class RoutingService {
-  static const String _baseUrl = 'https://alprwatch.org/api/v1/deflock/directions';
-  final http.Client _client;
+  static const String defaultUrl = 'https://api.dontgetflocked.com/api/v1/deflock/directions';
+  static const String fallbackUrl = 'https://alprwatch.org/api/v1/deflock/directions';
+  static const _policy = ResiliencePolicy(
+    maxRetries: 1,
+    httpTimeout: Duration(seconds: 30),
+  );

-  RoutingService({http.Client? client}) : _client = client ?? UserAgentClient();
+  final http.Client _client;
+  /// Optional override URL. When null, uses [defaultUrl].
+  final String? _baseUrlOverride;
+
+  RoutingService({http.Client? client, String? baseUrl})
+      : _client = client ?? UserAgentClient(),
+        _baseUrlOverride = baseUrl;

  void close() => _client.close();

-  // Calculate route between two points using alprwatch
+  /// Resolve the primary URL to use: constructor override or default.
+  String get _primaryUrl => _baseUrlOverride ?? defaultUrl;
+
+  // Calculate route between two points
  Future<RouteResult> calculateRoute({
    required LatLng start,
    required LatLng end,
@@ -53,8 +66,7 @@ class RoutingService {
        'tags': tags,
      };
    }).toList();
-    
-    final uri = Uri.parse(_baseUrl);
+
    final params = {
      'start': {
        'longitude': start.longitude,
@@ -66,11 +78,25 @@ class RoutingService {
      },
      'avoidance_distance': avoidanceDistance,
      'enabled_profiles': enabledProfiles,
-      'show_exclusion_zone': false, // for debugging: if true, returns a GeoJSON Feature MultiPolygon showing what areas are avoided in calculating the route
+      'show_exclusion_zone': false,
    };
-    
-    debugPrint('[RoutingService] alprwatch request: $uri $params');
-    
+
+    final primaryUrl = _primaryUrl;
+    final canFallback = _baseUrlOverride == null;
+
+    return executeWithFallback<RouteResult>(
+      primaryUrl: primaryUrl,
+      fallbackUrl: canFallback ? fallbackUrl : null,
+      execute: (url) => _postRoute(url, params),
+      classifyError: _classifyError,
+      policy: _policy,
+    );
+  }
+
+  Future<RouteResult> _postRoute(String url, Map<String, dynamic> params) async {
+    final uri = Uri.parse(url);
+    debugPrint('[RoutingService] POST $uri');
+
    try {
      final response = await _client.post(
        uri,
@@ -78,7 +104,7 @@ class RoutingService {
          'Content-Type': 'application/json'
        },
        body: json.encode(params)
-      ).timeout(kNavigationRoutingTimeout);
+      ).timeout(_policy.httpTimeout);

      if (response.statusCode != 200) {
        if (kDebugMode) {
@@ -91,24 +117,25 @@ class RoutingService {
              : body;
          debugPrint('[RoutingService] Error response body ($maxLen char max): $truncated');
        }
-        throw RoutingException('HTTP ${response.statusCode}: ${response.reasonPhrase}');
+        throw RoutingException('HTTP ${response.statusCode}: ${response.reasonPhrase}',
+            statusCode: response.statusCode);
      }
-      
+
      final data = json.decode(response.body) as Map<String, dynamic>;
-      debugPrint('[RoutingService] alprwatch response data: $data');
-      
-      // Check alprwatch response status
+      debugPrint('[RoutingService] response data: $data');
+
+      // Check response status
      final ok = data['ok'] as bool? ?? false;
      if ( ! ok ) {
        final message = data['error'] as String? ?? 'Unknown routing error';
-        throw RoutingException('alprwatch error: $message');
+        throw RoutingException('API error: $message', isApiError: true);
      }
-      
+
      final route = data['result']['route'] as Map<String, dynamic>?;
      if (route == null) {
-        throw RoutingException('No route found between these points');
+        throw RoutingException('No route found between these points', isApiError: true);
      }
-     
+
      final waypoints = (route['coordinates'] as List<dynamic>?)
        ?.map((inner) {
          final pair = inner as List<dynamic>;
@@ -116,19 +143,19 @@ class RoutingService {
          final lng = (pair[0] as num).toDouble();
          final lat = (pair[1] as num).toDouble();
          return LatLng(lat, lng);
-      }).whereType<LatLng>().toList() ?? []; 
+      }).whereType<LatLng>().toList() ?? [];
      final distance = (route['distance'] as num?)?.toDouble() ?? 0.0;
      final duration = (route['duration'] as num?)?.toDouble() ?? 0.0;
-      
+
      final result = RouteResult(
        waypoints: waypoints,
        distanceMeters: distance,
        durationSeconds: duration,
      );
-      
+
      debugPrint('[RoutingService] Route calculated: $result');
      return result;
-      
+
    } catch (e) {
      debugPrint('[RoutingService] Route calculation failed: $e');
      if (e is RoutingException) {
@@ -138,13 +165,26 @@ class RoutingService {
      }
    }
  }
+
+  static ErrorDisposition _classifyError(Object error) {
+    if (error is! RoutingException) return ErrorDisposition.retry;
+    if (error.isApiError) return ErrorDisposition.abort;
+    final status = error.statusCode;
+    if (status != null && status >= 400 && status < 500) {
+      if (status == 429) return ErrorDisposition.fallback;
+      return ErrorDisposition.abort;
+    }
+    return ErrorDisposition.retry;
+  }
 }

 class RoutingException implements Exception {
  final String message;
-  
-  const RoutingException(this.message);
-  
+  final int? statusCode;
+  final bool isApiError;
+
+  const RoutingException(this.message, {this.statusCode, this.isApiError = false});
+
  @override
  String toString() => 'RoutingException: $message';
 }
--- a/lib/services/service_policy.dart
+++ b/lib/services/service_policy.dart
@@ -152,11 +152,10 @@ class ServicePolicy {
      'attributionUrl: $attributionUrl)';
 }

-/// Resolves URLs and tile providers to their applicable [ServicePolicy].
+/// Resolves service URLs to their applicable [ServicePolicy].
 ///
 /// Built-in patterns cover all OSMF official services and common third-party
-/// tile providers. Custom overrides can be registered for self-hosted endpoints
-/// via [registerCustomPolicy].
+/// tile providers. Falls back to permissive defaults for unrecognized hosts.
 class ServicePolicyResolver {
  /// Host → ServiceType mapping for known services.
  static final Map<String, ServiceType> _hostPatterns = {
@@ -166,6 +165,7 @@ class ServicePolicyResolver {
    'tile.openstreetmap.org': ServiceType.osmTileServer,
    'nominatim.openstreetmap.org': ServiceType.nominatim,
    'overpass-api.de': ServiceType.overpass,
+    'overpass.deflock.org': ServiceType.overpass,
    'taginfo.openstreetmap.org': ServiceType.tagInfo,
    'tiles.virtualearth.net': ServiceType.bingTiles,
    'api.mapbox.com': ServiceType.mapboxTiles,
@@ -183,25 +183,14 @@ class ServicePolicyResolver {
    ServiceType.custom: const ServicePolicy(),
  };

-  /// Custom host overrides registered at runtime (for self-hosted services).
-  static final Map<String, ServicePolicy> _customOverrides = {};
-
  /// Resolve a URL to its applicable [ServicePolicy].
  ///
-  /// Checks custom overrides first, then built-in host patterns. Falls back
-  /// to [ServicePolicy.custom] for unrecognized hosts.
+  /// Checks built-in host patterns. Falls back to [ServicePolicy.custom]
+  /// for unrecognized hosts.
  static ServicePolicy resolve(String url) {
    final host = _extractHost(url);
    if (host == null) return const ServicePolicy();

-    // Check custom overrides first (exact or subdomain matching)
-    for (final entry in _customOverrides.entries) {
-      if (host == entry.key || host.endsWith('.${entry.key}')) {
-        return entry.value;
-      }
-    }
-
-    // Check built-in patterns (support subdomain matching)
    for (final entry in _hostPatterns.entries) {
      if (host == entry.key || host.endsWith('.${entry.key}')) {
        return _policies[entry.value] ?? const ServicePolicy();
@@ -218,14 +207,6 @@ class ServicePolicyResolver {
    final host = _extractHost(url);
    if (host == null) return ServiceType.custom;

-    // Check custom overrides first — a registered custom policy means
-    // the host is treated as ServiceType.custom with custom rules.
-    for (final entry in _customOverrides.entries) {
-      if (host == entry.key || host.endsWith('.${entry.key}')) {
-        return ServiceType.custom;
-      }
-    }
-
    for (final entry in _hostPatterns.entries) {
      if (host == entry.key || host.endsWith('.${entry.key}')) {
        return entry.value;
@@ -239,29 +220,6 @@ class ServicePolicyResolver {
  static ServicePolicy resolveByType(ServiceType type) =>
      _policies[type] ?? const ServicePolicy();

-  /// Register a custom policy override for a host pattern.
-  ///
-  /// Use this to configure self-hosted services:
-  /// ```dart
-  /// ServicePolicyResolver.registerCustomPolicy(
-  ///   'tiles.myserver.com',
-  ///   ServicePolicy.custom(allowsOffline: true, maxConcurrent: 20),
-  /// );
-  /// ```
-  static void registerCustomPolicy(String hostPattern, ServicePolicy policy) {
-    _customOverrides[hostPattern] = policy;
-  }
-
-  /// Remove a custom policy override.
-  static void removeCustomPolicy(String hostPattern) {
-    _customOverrides.remove(hostPattern);
-  }
-
-  /// Clear all custom policy overrides (useful for testing).
-  static void clearCustomPolicies() {
-    _customOverrides.clear();
-  }
-
  /// Extract the host from a URL or URL template.
  static String? _extractHost(String url) {
    // Handle URL templates like 'https://tile.openstreetmap.org/{z}/{x}/{y}.png'
@@ -283,6 +241,95 @@ class ServicePolicyResolver {
  }
 }

+/// How the retry/fallback engine should handle an error.
+enum ErrorDisposition {
+  /// Stop immediately. Don't retry, don't try fallback. (400, business logic)
+  abort,
+  /// Don't retry same server, but DO try fallback endpoint. (429 rate limit)
+  fallback,
+  /// Retry with backoff against same server, then fallback if exhausted. (5xx, network)
+  retry,
+}
+
+/// Retry and fallback configuration for resilient HTTP services.
+class ResiliencePolicy {
+  final int maxRetries;
+  final Duration httpTimeout;
+  final Duration _retryBackoffBase;
+  final int _retryBackoffMaxMs;
+
+  const ResiliencePolicy({
+    this.maxRetries = 1,
+    this.httpTimeout = const Duration(seconds: 30),
+    Duration retryBackoffBase = const Duration(milliseconds: 200),
+    int retryBackoffMaxMs = 5000,
+  })  : _retryBackoffBase = retryBackoffBase,
+        _retryBackoffMaxMs = retryBackoffMaxMs;
+
+  Duration retryDelay(int attempt) {
+    final ms = (_retryBackoffBase.inMilliseconds * (1 << attempt))
+        .clamp(0, _retryBackoffMaxMs);
+    return Duration(milliseconds: ms);
+  }
+}
+
+/// Execute a request with retry and fallback logic.
+///
+/// 1. Tries [execute] against [primaryUrl] up to `policy.maxRetries + 1` times.
+/// 2. On each failure, calls [classifyError] to determine disposition:
+///    - [ErrorDisposition.abort]: rethrows immediately
+///    - [ErrorDisposition.fallback]: skips retries, tries fallback (if available)
+///    - [ErrorDisposition.retry]: retries with backoff, then fallback if exhausted
+/// 3. If [fallbackUrl] is non-null and primary failed with a non-abort error,
+///    repeats the retry loop against the fallback.
+Future<T> executeWithFallback<T>({
+  required String primaryUrl,
+  required String? fallbackUrl,
+  required Future<T> Function(String url) execute,
+  required ErrorDisposition Function(Object error) classifyError,
+  ResiliencePolicy policy = const ResiliencePolicy(),
+}) async {
+  try {
+    return await _executeWithRetries(primaryUrl, execute, classifyError, policy);
+  } catch (e) {
+    // _executeWithRetries rethrows abort/fallback/exhausted-retry errors.
+    // Re-classify only to distinguish abort (which must not fall back) from
+    // fallback/retry-exhausted (which should). This is the one intentional
+    // re-classification — _executeWithRetries cannot short-circuit past the
+    // outer try/catch.
+    if (classifyError(e) == ErrorDisposition.abort) rethrow;
+    if (fallbackUrl == null) rethrow;
+    debugPrint('[Resilience] Primary failed ($e), trying fallback');
+    return _executeWithRetries(fallbackUrl, execute, classifyError, policy);
+  }
+}
+
+Future<T> _executeWithRetries<T>(
+  String url,
+  Future<T> Function(String url) execute,
+  ErrorDisposition Function(Object error) classifyError,
+  ResiliencePolicy policy,
+) async {
+  for (int attempt = 0; attempt <= policy.maxRetries; attempt++) {
+    try {
+      return await execute(url);
+    } catch (e) {
+      final disposition = classifyError(e);
+      if (disposition == ErrorDisposition.abort) rethrow;
+      if (disposition == ErrorDisposition.fallback) rethrow; // caller handles fallback
+      // disposition == retry
+      if (attempt < policy.maxRetries) {
+        final delay = policy.retryDelay(attempt);
+        debugPrint('[Resilience] Attempt ${attempt + 1} failed, retrying in ${delay.inMilliseconds}ms');
+        await Future.delayed(delay);
+        continue;
+      }
+      rethrow; // retries exhausted, let caller try fallback
+    }
+  }
+  throw StateError('Unreachable'); // loop always returns or throws
+}
+
 /// Reusable per-service rate limiter and concurrency controller.
 ///
 /// Enforces the rate limits and concurrency constraints defined in each
--- a/lib/state/navigation_state.dart
+++ b/lib/state/navigation_state.dart
@@ -250,11 +250,11 @@ class NavigationState extends ChangeNotifier {
    _calculateRoute();
  }
  
-  /// Calculate route using alprwatch
+  /// Calculate route via RoutingService (primary + fallback endpoints).
  void _calculateRoute() {
    if (_routeStart == null || _routeEnd == null) return;

-    debugPrint('[NavigationState] Calculating route with alprwatch...');
+    debugPrint('[NavigationState] Calculating route...');
    _isCalculating = true;
    _routingError = null;
    notifyListeners();
@@ -271,7 +271,7 @@ class NavigationState extends ChangeNotifier {
      _showingOverview = true;
      _provisionalPinLocation = null; // Hide provisional pin
      
-      debugPrint('[NavigationState] alprwatch route calculated: ${routeResult.toString()}');
+      debugPrint('[NavigationState] Route calculated: ${routeResult.toString()}');
      notifyListeners();
      
    }).catchError((error) {
--- a/lib/state/operator_profile_state.dart
+++ b/lib/state/operator_profile_state.dart
@@ -1,12 +1,16 @@
 import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';

 import '../models/operator_profile.dart';
 import '../services/operator_profile_service.dart';

 class OperatorProfileState extends ChangeNotifier {
+  static const String _profileOrderPrefsKey = 'operator_profile_order';
+  
  final List<OperatorProfile> _profiles = [];
+  List<String> _customOrder = []; // List of profile IDs in user's preferred order

-  List<OperatorProfile> get profiles => List.unmodifiable(_profiles);
+  List<OperatorProfile> get profiles => List.unmodifiable(_getOrderedProfiles());

  Future<void> init({bool addDefaults = false}) async {
    _profiles.addAll(await OperatorProfileService().load());
@@ -16,6 +20,10 @@ class OperatorProfileState extends ChangeNotifier {
      _profiles.addAll(OperatorProfile.getDefaults());
      await OperatorProfileService().save(_profiles);
    }
+    
+    // Load custom order from prefs
+    final prefs = await SharedPreferences.getInstance();
+    _customOrder = prefs.getStringList(_profileOrderPrefsKey) ?? [];
  }

  void addOrUpdateProfile(OperatorProfile p) {
@@ -34,4 +42,56 @@ class OperatorProfileState extends ChangeNotifier {
    OperatorProfileService().save(_profiles);
    notifyListeners();
  }
+
+  // Reorder profiles (for drag-and-drop in settings)
+  void reorderProfiles(int oldIndex, int newIndex) {
+    final orderedProfiles = _getOrderedProfiles();
+    
+    // Standard Flutter reordering logic
+    if (oldIndex < newIndex) {
+      newIndex -= 1;
+    }
+    final item = orderedProfiles.removeAt(oldIndex);
+    orderedProfiles.insert(newIndex, item);
+    
+    // Update custom order with new sequence
+    _customOrder = orderedProfiles.map((p) => p.id).toList();
+    _saveCustomOrder();
+    notifyListeners();
+  }
+  
+  // Get profiles in custom order, with unordered profiles at the end
+  List<OperatorProfile> _getOrderedProfiles() {
+    if (_customOrder.isEmpty) {
+      return List.from(_profiles);
+    }
+    
+    final ordered = <OperatorProfile>[];
+    final profilesById = {for (final p in _profiles) p.id: p};
+    
+    // Add profiles in custom order
+    for (final id in _customOrder) {
+      final profile = profilesById[id];
+      if (profile != null) {
+        ordered.add(profile);
+        profilesById.remove(id);
+      }
+    }
+    
+    // Add any remaining profiles that weren't in the custom order
+    ordered.addAll(profilesById.values);
+    
+    return ordered;
+  }
+  
+  // Save custom order to disk
+  Future<void> _saveCustomOrder() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setStringList(_profileOrderPrefsKey, _customOrder);
+    } catch (e) {
+      // Fail gracefully in tests or if SharedPreferences isn't available
+      debugPrint('[OperatorProfileState] Failed to save custom order: $e');
+    }
+  }
 }
--- a/lib/state/profile_state.dart
+++ b/lib/state/profile_state.dart
@@ -57,6 +57,28 @@ class ProfileState extends ChangeNotifier {
    _customOrder = prefs.getStringList(_profileOrderPrefsKey) ?? [];
  }

+  /// Reload all profiles from storage (useful after migrations modify stored profiles)
+  Future<void> reloadFromStorage() async {
+    // Preserve enabled state by ID
+    final enabledIds = _enabled.map((p) => p.id).toSet();
+    
+    // Clear and reload profiles
+    _profiles.clear();
+    _profiles.addAll(await ProfileService().load());
+    
+    // Restore enabled state for profiles that still exist
+    _enabled.clear();
+    _enabled.addAll(_profiles.where((p) => enabledIds.contains(p.id)));
+    
+    // Safety: Always have at least one enabled profile
+    if (_enabled.isEmpty && _profiles.isNotEmpty) {
+      final builtIn = _profiles.firstWhere((profile) => profile.builtin, orElse: () => _profiles.first);
+      _enabled.add(builtIn);
+    }
+    
+    notifyListeners();
+  }
+
  void toggleProfile(NodeProfile p, bool e) {
    if (e) {
      _enabled.add(p);
--- a/lib/state/settings_state.dart
+++ b/lib/state/settings_state.dart
@@ -4,6 +4,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:collection/collection.dart';

 import '../models/tile_provider.dart';
+import '../services/provider_tile_cache_manager.dart';
 import '../dev_config.dart';
 import '../keys.dart';

@@ -332,6 +333,17 @@ class SettingsState extends ChangeNotifier {
    notifyListeners();
  }

+  /// Clear all tile caches for a specific provider
+  Future<void> clearTileProviderCaches(String providerId) async {
+    final provider = _tileProviders.firstWhereOrNull((p) => p.id == providerId);
+    if (provider == null) return;
+    
+    // Clear cache for each tile type in this provider
+    for (final tileType in provider.tileTypes) {
+      await ProviderTileCacheManager.deleteCache(providerId, tileType.id);
+    }
+  }
+
  /// Set follow-me mode
  Future<void> setFollowMeMode(FollowMeMode mode) async {
    if (_followMeMode != mode) {
--- a/lib/state/upload_queue_state.dart
+++ b/lib/state/upload_queue_state.dart
@@ -253,12 +253,12 @@ class UploadQueueState extends ChangeNotifier {
  }

  // Add a node deletion to the upload queue
-  void addFromNodeDeletion(OsmNode node, {required UploadMode uploadMode}) {
+  void addFromNodeDeletion(OsmNode node, {required UploadMode uploadMode, String? changesetComment}) {
    final upload = PendingUpload(
      coord: node.coord,
      direction: node.directionDeg.isNotEmpty ? node.directionDeg.first : 0, // Direction not used for deletions but required for API
      profile: null, // No profile needed for deletions - just delete by node ID
-      changesetComment: 'Delete a surveillance node', // Default comment for deletions  
+      changesetComment: changesetComment ?? 'Delete a surveillance node', // Use provided comment or default
      uploadMode: uploadMode,
      operation: UploadOperation.delete,
      originalNodeId: node.id,
--- a/lib/widgets/map/map_data_manager.dart
+++ b/lib/widgets/map/map_data_manager.dart
@@ -10,6 +10,13 @@ import '../../dev_config.dart';
 /// Manages data fetching, filtering, and node limit logic for the map.
 /// Handles profile changes, zoom level restrictions, and node rendering limits.
 class MapDataManager {
+  final List<OsmNode> Function(LatLngBounds bounds) _getNodesForBounds;
+
+  MapDataManager({
+    List<OsmNode> Function(LatLngBounds bounds)? getNodesForBounds,
+  }) : _getNodesForBounds = getNodesForBounds ??
+           ((bounds) => NodeProviderWithCache.instance.getCachedNodesForBounds(bounds));
+
  // Track node limit state for parent notification
  bool _lastNodeLimitState = false;

@@ -51,28 +58,42 @@ class MapDataManager {
    List<OsmNode> allNodes;
    List<OsmNode> nodesToRender;
    bool isLimitActive = false;
-    
+    int validNodesCount = 0;
+
    if (currentZoom >= minZoom) {
      // Above minimum zoom - get cached nodes with expanded bounds to prevent edge blinking
      if (mapBounds != null) {
        final expandedBounds = _expandBounds(mapBounds, kNodeRenderingBoundsExpansion);
-        allNodes = NodeProviderWithCache.instance.getCachedNodesForBounds(expandedBounds);
+        allNodes = _getNodesForBounds(expandedBounds);
      } else {
        allNodes = <OsmNode>[];
      }
-      
+
      // Filter out invalid coordinates before applying limit
      final validNodes = allNodes.where((node) {
        return (node.coord.latitude != 0 || node.coord.longitude != 0) &&
-               node.coord.latitude.abs() <= 90 && 
+               node.coord.latitude.abs() <= 90 &&
               node.coord.longitude.abs() <= 180;
      }).toList();
-      
-      // Apply rendering limit to prevent UI lag
-      if (validNodes.length > maxNodes) {
+      validNodesCount = validNodes.length;
+
+      // Apply rendering limit to prevent UI lag.
+      // Sort by distance from viewport center so the most visible nodes
+      // always make the cut, preventing gaps that shift as you pan.
+      if (validNodesCount > maxNodes) {
+        final bounds = mapBounds!;
+        final centerLat = (bounds.north + bounds.south) / 2;
+        final centerLng = (bounds.east + bounds.west) / 2;
+        validNodes.sort((a, b) {
+          final distA = (a.coord.latitude - centerLat) * (a.coord.latitude - centerLat) +
+                        (a.coord.longitude - centerLng) * (a.coord.longitude - centerLng);
+          final distB = (b.coord.latitude - centerLat) * (b.coord.latitude - centerLat) +
+                        (b.coord.longitude - centerLng) * (b.coord.longitude - centerLng);
+          final cmp = distA.compareTo(distB);
+          return cmp != 0 ? cmp : a.id.compareTo(b.id);
+        });
        nodesToRender = validNodes.take(maxNodes).toList();
        isLimitActive = true;
-        debugPrint('[MapDataManager] Node limit active: rendering ${nodesToRender.length} of ${validNodes.length} devices');
      } else {
        nodesToRender = validNodes;
        isLimitActive = false;
@@ -87,6 +108,9 @@ class MapDataManager {
    // Notify parent if limit state changed (for button disabling)
    if (isLimitActive != _lastNodeLimitState) {
      _lastNodeLimitState = isLimitActive;
+      if (isLimitActive) {
+        debugPrint('[MapDataManager] Node limit active: rendering ${nodesToRender.length} of $validNodesCount valid devices');
+      }
      // Schedule callback after build completes to avoid setState during build
      WidgetsBinding.instance.addPostFrameCallback((_) {
        onNodeLimitChanged?.call(isLimitActive);
@@ -97,11 +121,7 @@ class MapDataManager {
      allNodes: allNodes,
      nodesToRender: nodesToRender,
      isLimitActive: isLimitActive,
-      validNodesCount: isLimitActive ? allNodes.where((node) {
-        return (node.coord.latitude != 0 || node.coord.longitude != 0) &&
-               node.coord.latitude.abs() <= 90 && 
-               node.coord.longitude.abs() <= 180;
-      }).length : 0,
+      validNodesCount: isLimitActive ? validNodesCount : 0,
    );
  }

--- a/lib/widgets/node_tag_sheet.dart
+++ b/lib/widgets/node_tag_sheet.dart
@@ -65,30 +65,17 @@ class NodeTagSheet extends StatelessWidget {
        }

        void deleteNode() async {
-          final shouldDelete = await showDialog<bool>(
+          final result = await showDialog<({bool confirmed, String comment})>(
            context: context,
-            builder: (BuildContext context) {
-              return AlertDialog(
-                title: Text(locService.t('node.confirmDeleteTitle')),
-                content: Text(locService.t('node.confirmDeleteMessage', params: [node.id.toString()])),
-                actions: [
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(false),
-                    child: Text(locService.cancel),
-                  ),
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(true),
-                    style: TextButton.styleFrom(foregroundColor: Colors.red),
-                    child: Text(locService.t('actions.delete')),
-                  ),
-                ],
-              );
-            },
+            builder: (BuildContext context) => _DeleteNodeDialog(
+              nodeId: node.id.toString(),
+              locService: locService,
+            ),
          );

-          if (shouldDelete == true && context.mounted) {
+          if ((result?.confirmed ?? false) && context.mounted) {
            Navigator.pop(context); // Close this sheet first
-            appState.deleteNode(node);
+            appState.deleteNode(node, changesetComment: result!.comment);
            ScaffoldMessenger.of(context).showSnackBar(
              SnackBar(content: Text(locService.t('node.deleteQueuedForUpload'))),
            );
@@ -260,4 +247,80 @@ class NodeTagSheet extends StatelessWidget {
      },
    );
  }
+}
+
+class _DeleteNodeDialog extends StatefulWidget {
+  final String nodeId;
+  final LocalizationService locService;
+
+  const _DeleteNodeDialog({
+    required this.nodeId,
+    required this.locService,
+  });
+
+  @override
+  State<_DeleteNodeDialog> createState() => _DeleteNodeDialogState();
+}
+
+class _DeleteNodeDialogState extends State<_DeleteNodeDialog> {
+  late final TextEditingController _commentController;
+
+  @override
+  void initState() {
+    super.initState();
+    _commentController = TextEditingController();
+  }
+
+  @override
+  void dispose() {
+    _commentController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(widget.locService.t('node.confirmDeleteTitle')),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(widget.locService.t('node.confirmDeleteMessage', params: [widget.nodeId])),
+          const SizedBox(height: 16),
+          Text(
+            widget.locService.t('node.deleteReasonLabel'),
+            style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+          ),
+          const SizedBox(height: 8),
+          TextField(
+            controller: _commentController,
+            decoration: InputDecoration(
+              hintText: widget.locService.t('node.deleteReasonHint'),
+              border: const OutlineInputBorder(),
+              isDense: true,
+            ),
+            maxLines: 2,
+            textCapitalization: TextCapitalization.sentences,
+          ),
+        ],
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop((confirmed: false, comment: '')),
+          child: Text(widget.locService.cancel),
+        ),
+        TextButton(
+          onPressed: () {
+            final comment = _commentController.text.trim();
+            final finalComment = comment.isEmpty 
+                ? 'Delete a surveillance node'
+                : 'Delete a surveillance node: $comment';
+            Navigator.of(context).pop((confirmed: true, comment: finalComment));
+          },
+          style: TextButton.styleFrom(foregroundColor: Colors.red),
+          child: Text(widget.locService.t('actions.delete')),
+        ),
+      ],
+    );
+  }
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -77,10 +77,10 @@ packages:
    dependency: transitive
    description:
      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
  checked_yaml:
    dependency: transitive
    description:
@@ -564,18 +564,18 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.17"
+    version: "0.12.19"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
  meta:
    dependency: transitive
    description:
@@ -929,10 +929,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.7"
+    version: "0.7.10"
  timezone:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: deflockapp
 description: Map public surveillance infrastructure with OpenStreetMap
 publish_to: "none"
-version: 2.9.0+51   # The thing after the + is the version code, incremented with each release
+version: 2.10.1+55   # The thing after the + is the version code, incremented with each release

 environment:
  sdk: ">=3.10.3 <4.0.0"   # Resolved dependency floor (Dart 3.10.3 = Flutter 3.38+)
--- a/test/services/overpass_service_test.dart
+++ b/test/services/overpass_service_test.dart
@@ -7,6 +7,7 @@ import 'package:mocktail/mocktail.dart';

 import 'package:deflockapp/models/node_profile.dart';
 import 'package:deflockapp/services/overpass_service.dart';
+import 'package:deflockapp/services/service_policy.dart';

 class MockHttpClient extends Mock implements http.Client {}

@@ -36,6 +37,7 @@ void main() {

  setUp(() {
    mockClient = MockHttpClient();
+    // Initialize OverpassService with a mock HTTP client for testing
    service = OverpassService(client: mockClient);
  });

@@ -246,9 +248,9 @@ void main() {
      stubErrorResponse(
          400, 'Error: too many nodes (limit is 50000) in query');

-      expect(
+      await expectLater(
        () => service.fetchNodes(
-            bounds: bounds, profiles: profiles, maxRetries: 0),
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
        throwsA(isA<NodeLimitError>()),
      );
    });
@@ -256,9 +258,9 @@ void main() {
    test('response with "timeout" throws NodeLimitError', () async {
      stubErrorResponse(400, 'runtime error: timeout in query execution');

-      expect(
+      await expectLater(
        () => service.fetchNodes(
-            bounds: bounds, profiles: profiles, maxRetries: 0),
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
        throwsA(isA<NodeLimitError>()),
      );
    });
@@ -267,9 +269,9 @@ void main() {
        () async {
      stubErrorResponse(400, 'runtime limit exceeded');

-      expect(
+      await expectLater(
        () => service.fetchNodes(
-            bounds: bounds, profiles: profiles, maxRetries: 0),
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
        throwsA(isA<NodeLimitError>()),
      );
    });
@@ -277,9 +279,9 @@ void main() {
    test('HTTP 429 throws RateLimitError', () async {
      stubErrorResponse(429, 'Too Many Requests');

-      expect(
+      await expectLater(
        () => service.fetchNodes(
-            bounds: bounds, profiles: profiles, maxRetries: 0),
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
        throwsA(isA<RateLimitError>()),
      );
    });
@@ -287,9 +289,9 @@ void main() {
    test('response with "rate limited" throws RateLimitError', () async {
      stubErrorResponse(503, 'You are rate limited');

-      expect(
+      await expectLater(
        () => service.fetchNodes(
-            bounds: bounds, profiles: profiles, maxRetries: 0),
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
        throwsA(isA<RateLimitError>()),
      );
    });
@@ -298,9 +300,9 @@ void main() {
        () async {
      stubErrorResponse(500, 'Internal Server Error');

-      expect(
+      await expectLater(
        () => service.fetchNodes(
-            bounds: bounds, profiles: profiles, maxRetries: 0),
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
        throwsA(isA<NetworkError>()),
      );
    });
@@ -313,4 +315,178 @@ void main() {
      verifyNever(() => mockClient.post(any(), body: any(named: 'body')));
    });
  });
+
+  group('fallback behavior', () {
+    test('falls back to overpass-api.de on NetworkError after retries', () async {
+      int callCount = 0;
+      when(() => mockClient.post(any(), body: any(named: 'body')))
+          .thenAnswer((invocation) async {
+        callCount++;
+        final uri = invocation.positionalArguments[0] as Uri;
+
+        if (uri.host == 'overpass.deflock.org') {
+          return http.Response('Internal Server Error', 500);
+        }
+        // Fallback succeeds
+        return http.Response(
+          jsonEncode({
+            'elements': [
+              {
+                'type': 'node',
+                'id': 1,
+                'lat': 38.9,
+                'lon': -77.0,
+                'tags': {'man_made': 'surveillance'},
+              },
+            ]
+          }),
+          200,
+        );
+      });
+
+      final nodes = await service.fetchNodes(
+          bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0));
+
+      expect(nodes, hasLength(1));
+      // primary (1 attempt, 0 retries) + fallback (1 attempt) = 2
+      expect(callCount, equals(2));
+    });
+
+    test('does NOT fallback on NodeLimitError', () async {
+      when(() => mockClient.post(any(), body: any(named: 'body')))
+          .thenAnswer((_) async => http.Response(
+                'Error: too many nodes (limit is 50000) in query',
+                400,
+              ));
+
+      await expectLater(
+        () => service.fetchNodes(
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
+        throwsA(isA<NodeLimitError>()),
+      );
+
+      // Only one call — no fallback (abort disposition)
+      verify(() => mockClient.post(any(), body: any(named: 'body')))
+          .called(1);
+    });
+
+    test('RateLimitError triggers fallback without retrying primary', () async {
+      int callCount = 0;
+      when(() => mockClient.post(any(), body: any(named: 'body')))
+          .thenAnswer((invocation) async {
+        callCount++;
+        final uri = invocation.positionalArguments[0] as Uri;
+
+        if (uri.host == 'overpass.deflock.org') {
+          return http.Response('Too Many Requests', 429);
+        }
+        // Fallback succeeds
+        return http.Response(
+          jsonEncode({
+            'elements': [
+              {
+                'type': 'node',
+                'id': 1,
+                'lat': 38.9,
+                'lon': -77.0,
+                'tags': {'man_made': 'surveillance'},
+              },
+            ]
+          }),
+          200,
+        );
+      });
+
+      final nodes = await service.fetchNodes(
+          bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 2));
+
+      expect(nodes, hasLength(1));
+      // 1 primary (no retry on fallback disposition) + 1 fallback = 2
+      expect(callCount, equals(2));
+    });
+
+    test('primary fails then fallback also fails -> error propagated', () async {
+      when(() => mockClient.post(any(), body: any(named: 'body')))
+          .thenAnswer((_) async =>
+              http.Response('Internal Server Error', 500));
+
+      await expectLater(
+        () => service.fetchNodes(
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
+        throwsA(isA<NetworkError>()),
+      );
+
+      // primary + fallback
+      verify(() => mockClient.post(any(), body: any(named: 'body')))
+          .called(2);
+    });
+
+    test('does NOT fallback when using custom endpoint', () async {
+      final customService = OverpassService(
+        client: mockClient,
+        endpoint: 'https://custom.example.com/api/interpreter',
+      );
+
+      when(() => mockClient.post(any(), body: any(named: 'body')))
+          .thenAnswer((_) async =>
+              http.Response('Internal Server Error', 500));
+
+      await expectLater(
+        () => customService.fetchNodes(
+            bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 0)),
+        throwsA(isA<NetworkError>()),
+      );
+
+      // Only one call - no fallback with custom endpoint
+      verify(() => mockClient.post(any(), body: any(named: 'body')))
+          .called(1);
+    });
+
+    test('retries exhaust before fallback kicks in', () async {
+      int callCount = 0;
+      when(() => mockClient.post(any(), body: any(named: 'body')))
+          .thenAnswer((invocation) async {
+        callCount++;
+        final uri = invocation.positionalArguments[0] as Uri;
+
+        if (uri.host == 'overpass.deflock.org') {
+          return http.Response('Server Error', 500);
+        }
+        // Fallback succeeds
+        return http.Response(
+          jsonEncode({
+            'elements': [
+              {
+                'type': 'node',
+                'id': 1,
+                'lat': 38.9,
+                'lon': -77.0,
+                'tags': {'man_made': 'surveillance'},
+              },
+            ]
+          }),
+          200,
+        );
+      });
+
+      final nodes = await service.fetchNodes(
+          bounds: bounds, profiles: profiles, policy: const ResiliencePolicy(maxRetries: 2));
+
+      expect(nodes, hasLength(1));
+      // 3 primary attempts (1 + 2 retries) + 1 fallback = 4
+      expect(callCount, equals(4));
+    });
+  });
+
+  group('default endpoints', () {
+    test('default endpoint is overpass.deflock.org', () {
+      expect(OverpassService.defaultEndpoint,
+          equals('https://overpass.deflock.org/api/interpreter'));
+    });
+
+    test('fallback endpoint is overpass-api.de', () {
+      expect(OverpassService.fallbackEndpoint,
+          equals('https://overpass-api.de/api/interpreter'));
+    });
+  });
 }
--- a/test/services/routing_service_test.dart
+++ b/test/services/routing_service_test.dart
@@ -41,6 +41,30 @@ void main() {
    AppState.instance = MockAppState();
  });

+  /// Helper: stub a successful routing response
+  void stubSuccessResponse() {
+    when(() => mockClient.post(
+          any(),
+          headers: any(named: 'headers'),
+          body: any(named: 'body'),
+        )).thenAnswer((_) async => http.Response(
+          json.encode({
+            'ok': true,
+            'result': {
+              'route': {
+                'coordinates': [
+                  [-77.0, 38.9],
+                  [-77.1, 39.0],
+                ],
+                'distance': 1000.0,
+                'duration': 600.0,
+              },
+            },
+          }),
+          200,
+        ));
+  }
+
  group('RoutingService', () {
    test('empty tags are filtered from request body', () async {
      // Profile with empty tag values (like builtin-flock has camera:mount: '')
@@ -57,29 +81,7 @@ void main() {
      ];
      when(() => mockAppState.enabledProfiles).thenReturn(profiles);

-      // Capture the request body
-      when(() => mockClient.post(
-            any(),
-            headers: any(named: 'headers'),
-            body: any(named: 'body'),
-          )).thenAnswer((invocation) async {
-        return http.Response(
-          json.encode({
-            'ok': true,
-            'result': {
-              'route': {
-                'coordinates': [
-                  [-77.0, 38.9],
-                  [-77.1, 39.0],
-                ],
-                'distance': 1000.0,
-                'duration': 600.0,
-              },
-            },
-          }),
-          200,
-        );
-      });
+      stubSuccessResponse();

      await service.calculateRoute(start: start, end: end);

@@ -147,7 +149,7 @@ void main() {
            reasonPhrase: 'Bad Request',
          ));

-      expect(
+      await expectLater(
        () => service.calculateRoute(start: start, end: end),
        throwsA(isA<RoutingException>().having(
          (e) => e.message,
@@ -166,7 +168,7 @@ void main() {
            body: any(named: 'body'),
          )).thenThrow(http.ClientException('Connection refused'));

-      expect(
+      await expectLater(
        () => service.calculateRoute(start: start, end: end),
        throwsA(isA<RoutingException>().having(
          (e) => e.message,
@@ -176,7 +178,7 @@ void main() {
      );
    });

-    test('API-level error surfaces alprwatch message', () async {
+    test('API-level error surfaces message', () async {
      when(() => mockAppState.enabledProfiles).thenReturn([]);

      when(() => mockClient.post(
@@ -191,7 +193,7 @@ void main() {
            200,
          ));

-      expect(
+      await expectLater(
        () => service.calculateRoute(start: start, end: end),
        throwsA(isA<RoutingException>().having(
          (e) => e.message,
@@ -201,4 +203,299 @@ void main() {
      );
    });
  });
+
+  group('fallback behavior', () {
+    test('falls back to secondary on server error (500) after retries', () async {
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      int callCount = 0;
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((invocation) async {
+        callCount++;
+        final uri = invocation.positionalArguments[0] as Uri;
+
+        if (uri.host == 'api.dontgetflocked.com') {
+          return http.Response('Internal Server Error', 500,
+              reasonPhrase: 'Internal Server Error');
+        }
+        // Fallback succeeds
+        return http.Response(
+          json.encode({
+            'ok': true,
+            'result': {
+              'route': {
+                'coordinates': [
+                  [-77.0, 38.9],
+                  [-77.1, 39.0],
+                ],
+                'distance': 5000.0,
+                'duration': 300.0,
+              },
+            },
+          }),
+          200,
+        );
+      });
+
+      final result = await service.calculateRoute(start: start, end: end);
+      expect(result.distanceMeters, equals(5000.0));
+      // 2 primary attempts (1 + 1 retry) + 1 fallback = 3
+      expect(callCount, equals(3));
+    });
+
+    test('falls back on 502 (GraphHopper unavailable) after retries', () async {
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      int callCount = 0;
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((invocation) async {
+        callCount++;
+        final uri = invocation.positionalArguments[0] as Uri;
+        if (uri.host == 'api.dontgetflocked.com') {
+          return http.Response('Bad Gateway', 502, reasonPhrase: 'Bad Gateway');
+        }
+        return http.Response(
+          json.encode({
+            'ok': true,
+            'result': {
+              'route': {
+                'coordinates': [[-77.0, 38.9]],
+                'distance': 100.0,
+                'duration': 60.0,
+              },
+            },
+          }),
+          200,
+        );
+      });
+
+      final result = await service.calculateRoute(start: start, end: end);
+      expect(result.distanceMeters, equals(100.0));
+      // 2 primary attempts + 1 fallback = 3
+      expect(callCount, equals(3));
+    });
+
+    test('falls back on network error after retries', () async {
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      int callCount = 0;
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((invocation) async {
+        callCount++;
+        final uri = invocation.positionalArguments[0] as Uri;
+        if (uri.host == 'api.dontgetflocked.com') {
+          throw http.ClientException('Connection refused');
+        }
+        return http.Response(
+          json.encode({
+            'ok': true,
+            'result': {
+              'route': {
+                'coordinates': [[-77.0, 38.9]],
+                'distance': 100.0,
+                'duration': 60.0,
+              },
+            },
+          }),
+          200,
+        );
+      });
+
+      final result = await service.calculateRoute(start: start, end: end);
+      expect(result.distanceMeters, equals(100.0));
+      // 2 primary attempts + 1 fallback = 3
+      expect(callCount, equals(3));
+    });
+
+    test('429 triggers fallback without retrying primary', () async {
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      int callCount = 0;
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((invocation) async {
+        callCount++;
+        final uri = invocation.positionalArguments[0] as Uri;
+        if (uri.host == 'api.dontgetflocked.com') {
+          return http.Response('Too Many Requests', 429,
+              reasonPhrase: 'Too Many Requests');
+        }
+        return http.Response(
+          json.encode({
+            'ok': true,
+            'result': {
+              'route': {
+                'coordinates': [[-77.0, 38.9]],
+                'distance': 200.0,
+                'duration': 120.0,
+              },
+            },
+          }),
+          200,
+        );
+      });
+
+      final result = await service.calculateRoute(start: start, end: end);
+      expect(result.distanceMeters, equals(200.0));
+      // 1 primary (no retry on 429/fallback disposition) + 1 fallback = 2
+      expect(callCount, equals(2));
+    });
+
+    test('does NOT fallback on 400 (validation error)', () async {
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((_) async => http.Response(
+            'Bad Request: missing start', 400,
+            reasonPhrase: 'Bad Request'));
+
+      await expectLater(
+        () => service.calculateRoute(start: start, end: end),
+        throwsA(isA<RoutingException>().having(
+          (e) => e.statusCode, 'statusCode', 400)),
+      );
+
+      // Only one call — no retry, no fallback (abort disposition)
+      verify(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).called(1);
+    });
+
+    test('does NOT fallback on 403 (all 4xx except 429 abort)', () async {
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((_) async => http.Response(
+            'Forbidden', 403,
+            reasonPhrase: 'Forbidden'));
+
+      await expectLater(
+        () => service.calculateRoute(start: start, end: end),
+        throwsA(isA<RoutingException>().having(
+          (e) => e.statusCode, 'statusCode', 403)),
+      );
+
+      // Only one call — no retry, no fallback (abort disposition)
+      verify(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).called(1);
+    });
+
+    test('does NOT fallback on API-level business logic errors', () async {
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((_) async => http.Response(
+            json.encode({
+              'ok': false,
+              'error': 'No route found',
+            }),
+            200,
+          ));
+
+      await expectLater(
+        () => service.calculateRoute(start: start, end: end),
+        throwsA(isA<RoutingException>().having(
+          (e) => e.isApiError, 'isApiError', true)),
+      );
+
+      verify(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).called(1);
+    });
+
+    test('primary fails then fallback also fails -> error propagated', () async {
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((_) async => http.Response(
+            'Internal Server Error', 500,
+            reasonPhrase: 'Internal Server Error'));
+
+      await expectLater(
+        () => service.calculateRoute(start: start, end: end),
+        throwsA(isA<RoutingException>().having(
+          (e) => e.statusCode, 'statusCode', 500)),
+      );
+
+      // 2 primary attempts + 2 fallback attempts = 4
+      verify(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).called(4);
+    });
+
+    test('does NOT fallback when using custom baseUrl', () async {
+      final customService = RoutingService(
+        client: mockClient,
+        baseUrl: 'https://custom.example.com/route',
+      );
+
+      when(() => mockAppState.enabledProfiles).thenReturn([]);
+
+      when(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).thenAnswer((_) async => http.Response(
+            'Service Unavailable', 503,
+            reasonPhrase: 'Service Unavailable'));
+
+      await expectLater(
+        () => customService.calculateRoute(start: start, end: end),
+        throwsA(isA<RoutingException>()),
+      );
+
+      // 2 attempts (1 + 1 retry), no fallback with custom URL
+      verify(() => mockClient.post(
+            any(),
+            headers: any(named: 'headers'),
+            body: any(named: 'body'),
+          )).called(2);
+    });
+  });
+
+  group('RoutingException', () {
+    test('statusCode is preserved', () {
+      const e = RoutingException('test', statusCode: 502);
+      expect(e.statusCode, 502);
+      expect(e.isApiError, false);
+    });
+
+    test('isApiError flag works', () {
+      const e = RoutingException('test', isApiError: true);
+      expect(e.isApiError, true);
+      expect(e.statusCode, isNull);
+    });
+  });
 }
--- a/test/services/service_policy_test.dart
+++ b/test/services/service_policy_test.dart
@@ -5,10 +5,6 @@ import 'package:deflockapp/services/service_policy.dart';

 void main() {
  group('ServicePolicyResolver', () {
-    setUp(() {
-      ServicePolicyResolver.clearCustomPolicies();
-    });
-
    group('resolveType', () {
      test('resolves OSM editing API from production URL', () {
        expect(
@@ -200,63 +196,6 @@ void main() {
      });
    });

-    group('custom policy overrides', () {
-      test('custom override takes precedence over built-in', () {
-        ServicePolicyResolver.registerCustomPolicy(
-          'overpass-api.de',
-          const ServicePolicy.custom(maxConcurrent: 20, allowsOffline: true),
-        );
-
-        final policy = ServicePolicyResolver.resolve(
-          'https://overpass-api.de/api/interpreter',
-        );
-        expect(policy.maxConcurrentRequests, 20);
-      });
-
-      test('custom policy for self-hosted tiles allows offline', () {
-        ServicePolicyResolver.registerCustomPolicy(
-          'tiles.myserver.com',
-          const ServicePolicy.custom(allowsOffline: true, maxConcurrent: 16),
-        );
-
-        final policy = ServicePolicyResolver.resolve(
-          'https://tiles.myserver.com/{z}/{x}/{y}.png',
-        );
-        expect(policy.allowsOfflineDownload, true);
-        expect(policy.maxConcurrentRequests, 16);
-      });
-
-      test('removing custom override restores built-in policy', () {
-        ServicePolicyResolver.registerCustomPolicy(
-          'overpass-api.de',
-          const ServicePolicy.custom(maxConcurrent: 20),
-        );
-        expect(
-          ServicePolicyResolver.resolve('https://overpass-api.de/api/interpreter').maxConcurrentRequests,
-          20,
-        );
-
-        ServicePolicyResolver.removeCustomPolicy('overpass-api.de');
-        // Should fall back to built-in Overpass policy (maxConcurrent: 0 = managed elsewhere)
-        expect(
-          ServicePolicyResolver.resolve('https://overpass-api.de/api/interpreter').maxConcurrentRequests,
-          0,
-        );
-      });
-
-      test('clearCustomPolicies removes all overrides', () {
-        ServicePolicyResolver.registerCustomPolicy('a.com', const ServicePolicy.custom(maxConcurrent: 1));
-        ServicePolicyResolver.registerCustomPolicy('b.com', const ServicePolicy.custom(maxConcurrent: 2));
-
-        ServicePolicyResolver.clearCustomPolicies();
-
-        // Both should now return custom (default) policy
-        expect(
-          ServicePolicyResolver.resolve('https://a.com/test').maxConcurrentRequests,
-          8, // default custom maxConcurrent
-        );
-      });
-    });
  });

  group('ServiceRateLimiter', () {
@@ -423,4 +362,197 @@ void main() {
      expect(policy.attributionUrl, 'https://example.com/license');
    });
  });
+
+  group('ResiliencePolicy', () {
+    test('retryDelay uses exponential backoff', () {
+      const policy = ResiliencePolicy(
+        retryBackoffBase: Duration(milliseconds: 100),
+        retryBackoffMaxMs: 2000,
+      );
+      expect(policy.retryDelay(0), const Duration(milliseconds: 100));
+      expect(policy.retryDelay(1), const Duration(milliseconds: 200));
+      expect(policy.retryDelay(2), const Duration(milliseconds: 400));
+    });
+
+    test('retryDelay clamps to max', () {
+      const policy = ResiliencePolicy(
+        retryBackoffBase: Duration(milliseconds: 1000),
+        retryBackoffMaxMs: 3000,
+      );
+      expect(policy.retryDelay(0), const Duration(milliseconds: 1000));
+      expect(policy.retryDelay(1), const Duration(milliseconds: 2000));
+      expect(policy.retryDelay(2), const Duration(milliseconds: 3000)); // clamped
+      expect(policy.retryDelay(10), const Duration(milliseconds: 3000)); // clamped
+    });
+  });
+
+  group('executeWithFallback', () {
+    const policy = ResiliencePolicy(
+      maxRetries: 2,
+      retryBackoffBase: Duration.zero, // no delay in tests
+    );
+
+    test('abort error stops immediately, no fallback', () async {
+      int callCount = 0;
+
+      await expectLater(
+        () => executeWithFallback<String>(
+          primaryUrl: 'https://primary.example.com',
+          fallbackUrl: 'https://fallback.example.com',
+          execute: (url) {
+            callCount++;
+            throw Exception('bad request');
+          },
+          classifyError: (_) => ErrorDisposition.abort,
+          policy: policy,
+        ),
+        throwsA(isA<Exception>()),
+      );
+
+      expect(callCount, 1); // no retries, no fallback
+    });
+
+    test('fallback error skips retries, goes to fallback', () async {
+      final urlsSeen = <String>[];
+
+      final result = await executeWithFallback<String>(
+        primaryUrl: 'https://primary.example.com',
+        fallbackUrl: 'https://fallback.example.com',
+        execute: (url) {
+          urlsSeen.add(url);
+          if (url.contains('primary')) {
+            throw Exception('rate limited');
+          }
+          return Future.value('ok from fallback');
+        },
+        classifyError: (_) => ErrorDisposition.fallback,
+        policy: policy,
+      );
+
+      expect(result, 'ok from fallback');
+      // 1 primary (no retries) + 1 fallback = 2
+      expect(urlsSeen, ['https://primary.example.com', 'https://fallback.example.com']);
+    });
+
+    test('retry error retries N times then falls back', () async {
+      final urlsSeen = <String>[];
+
+      final result = await executeWithFallback<String>(
+        primaryUrl: 'https://primary.example.com',
+        fallbackUrl: 'https://fallback.example.com',
+        execute: (url) {
+          urlsSeen.add(url);
+          if (url.contains('primary')) {
+            throw Exception('server error');
+          }
+          return Future.value('ok from fallback');
+        },
+        classifyError: (_) => ErrorDisposition.retry,
+        policy: policy,
+      );
+
+      expect(result, 'ok from fallback');
+      // 3 primary attempts (1 + 2 retries) + 1 fallback = 4
+      expect(urlsSeen.where((u) => u.contains('primary')).length, 3);
+      expect(urlsSeen.where((u) => u.contains('fallback')).length, 1);
+    });
+
+    test('no fallback URL rethrows after retries', () async {
+      int callCount = 0;
+
+      await expectLater(
+        () => executeWithFallback<String>(
+          primaryUrl: 'https://primary.example.com',
+          fallbackUrl: null,
+          execute: (url) {
+            callCount++;
+            throw Exception('server error');
+          },
+          classifyError: (_) => ErrorDisposition.retry,
+          policy: policy,
+        ),
+        throwsA(isA<Exception>()),
+      );
+
+      // 3 attempts (1 + 2 retries), then rethrow
+      expect(callCount, 3);
+    });
+
+    test('fallback disposition with no fallback URL rethrows immediately', () async {
+      int callCount = 0;
+
+      await expectLater(
+        () => executeWithFallback<String>(
+          primaryUrl: 'https://primary.example.com',
+          fallbackUrl: null,
+          execute: (url) {
+            callCount++;
+            throw Exception('rate limited');
+          },
+          classifyError: (_) => ErrorDisposition.fallback,
+          policy: policy,
+        ),
+        throwsA(isA<Exception>()),
+      );
+
+      // Only 1 attempt — fallback disposition skips retries, and no fallback URL
+      expect(callCount, 1);
+    });
+
+    test('both fail propagates last error', () async {
+      await expectLater(
+        () => executeWithFallback<String>(
+          primaryUrl: 'https://primary.example.com',
+          fallbackUrl: 'https://fallback.example.com',
+          execute: (url) {
+            if (url.contains('fallback')) {
+              throw Exception('fallback also failed');
+            }
+            throw Exception('primary failed');
+          },
+          classifyError: (_) => ErrorDisposition.retry,
+          policy: policy,
+        ),
+        throwsA(isA<Exception>().having(
+          (e) => e.toString(), 'message', contains('fallback also failed'))),
+      );
+    });
+
+    test('success on first try returns immediately', () async {
+      int callCount = 0;
+
+      final result = await executeWithFallback<String>(
+        primaryUrl: 'https://primary.example.com',
+        fallbackUrl: 'https://fallback.example.com',
+        execute: (url) {
+          callCount++;
+          return Future.value('success');
+        },
+        classifyError: (_) => ErrorDisposition.retry,
+        policy: policy,
+      );
+
+      expect(result, 'success');
+      expect(callCount, 1);
+    });
+
+    test('success after retry does not try fallback', () async {
+      int callCount = 0;
+
+      final result = await executeWithFallback<String>(
+        primaryUrl: 'https://primary.example.com',
+        fallbackUrl: 'https://fallback.example.com',
+        execute: (url) {
+          callCount++;
+          if (callCount == 1) throw Exception('transient');
+          return Future.value('recovered');
+        },
+        classifyError: (_) => ErrorDisposition.retry,
+        policy: policy,
+      );
+
+      expect(result, 'recovered');
+      expect(callCount, 2); // 1 fail + 1 success, no fallback
+    });
+  });
 }
--- a/test/widgets/map_data_manager_test.dart
+++ b/test/widgets/map_data_manager_test.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:latlong2/latlong.dart';
+
+import 'package:deflockapp/models/osm_node.dart';
+import 'package:deflockapp/app_state.dart';
+import 'package:deflockapp/widgets/map/map_data_manager.dart';
+
+void main() {
+  OsmNode nodeAt(int id, double lat, double lng) {
+    return OsmNode(id: id, coord: LatLng(lat, lng), tags: {'surveillance': 'outdoor'});
+  }
+
+  group('Node render prioritization', () {
+    late MapDataManager dataManager;
+    late List<OsmNode> testNodes;
+
+    setUp(() {
+      WidgetsFlutterBinding.ensureInitialized();
+      testNodes = [];
+      dataManager = MapDataManager(
+        getNodesForBounds: (_) => testNodes,
+      );
+    });
+
+    test('closest nodes to viewport center are kept', () {
+      final bounds = LatLngBounds(LatLng(38.0, -78.0), LatLng(39.0, -77.0));
+      // Center is (38.5, -77.5)
+      testNodes = [
+        nodeAt(1, 38.9, -77.9),   // far from center
+        nodeAt(2, 38.5, -77.5),   // at center
+        nodeAt(3, 38.1, -77.1),   // far from center
+        nodeAt(4, 38.51, -77.49), // very close to center
+        nodeAt(5, 38.0, -78.0),   // corner — farthest
+      ];
+
+      final result = dataManager.getNodesForRendering(
+        currentZoom: 14,
+        mapBounds: bounds,
+        uploadMode: UploadMode.production,
+        maxNodes: 3,
+      );
+
+      expect(result.isLimitActive, isTrue);
+      expect(result.nodesToRender.length, 3);
+      final ids = result.nodesToRender.map((n) => n.id).toSet();
+      expect(ids.contains(2), isTrue, reason: 'Node at center should be kept');
+      expect(ids.contains(4), isTrue, reason: 'Node near center should be kept');
+      expect(ids.contains(5), isFalse, reason: 'Node at corner should be dropped');
+    });
+
+    test('returns all nodes when under the limit', () {
+      final bounds = LatLngBounds(LatLng(38.0, -78.0), LatLng(39.0, -77.0));
+      testNodes = [
+        nodeAt(1, 38.5, -77.5),
+        nodeAt(2, 38.6, -77.6),
+      ];
+
+      final result = dataManager.getNodesForRendering(
+        currentZoom: 14,
+        mapBounds: bounds,
+        uploadMode: UploadMode.production,
+        maxNodes: 10,
+      );
+
+      expect(result.isLimitActive, isFalse);
+      expect(result.nodesToRender.length, 2);
+    });
+
+    test('returns empty when below minimum zoom', () {
+      final bounds = LatLngBounds(LatLng(38.0, -78.0), LatLng(39.0, -77.0));
+      testNodes = [nodeAt(1, 38.5, -77.5)];
+
+      final result = dataManager.getNodesForRendering(
+        currentZoom: 5,
+        mapBounds: bounds,
+        uploadMode: UploadMode.production,
+        maxNodes: 10,
+      );
+
+      expect(result.nodesToRender, isEmpty);
+    });
+
+    test('panning viewport changes which nodes are prioritized', () {
+      final nodes = [
+        nodeAt(1, 38.0, -78.0), // SW
+        nodeAt(2, 38.5, -77.5), // middle
+        nodeAt(3, 39.0, -77.0), // NE
+      ];
+
+      // Viewport centered near SW
+      testNodes = List.from(nodes);
+      final swBounds = LatLngBounds(LatLng(37.5, -78.5), LatLng(38.5, -77.5));
+      final swResult = dataManager.getNodesForRendering(
+        currentZoom: 14,
+        mapBounds: swBounds,
+        uploadMode: UploadMode.production,
+        maxNodes: 1,
+      );
+      expect(swResult.nodesToRender.first.id, 1,
+          reason: 'SW node closest to SW-centered viewport');
+
+      // Viewport centered near NE
+      testNodes = List.from(nodes);
+      final neBounds = LatLngBounds(LatLng(38.5, -77.5), LatLng(39.5, -76.5));
+      final neResult = dataManager.getNodesForRendering(
+        currentZoom: 14,
+        mapBounds: neBounds,
+        uploadMode: UploadMode.production,
+        maxNodes: 1,
+      );
+      expect(neResult.nodesToRender.first.id, 3,
+          reason: 'NE node closest to NE-centered viewport');
+    });
+
+    test('order is stable for repeated calls with same viewport', () {
+      final bounds = LatLngBounds(LatLng(38.0, -78.0), LatLng(39.0, -77.0));
+      makeNodes() => [
+        nodeAt(1, 38.9, -77.9),
+        nodeAt(2, 38.5, -77.5),
+        nodeAt(3, 38.1, -77.1),
+        nodeAt(4, 38.51, -77.49),
+        nodeAt(5, 38.0, -78.0),
+      ];
+
+      testNodes = makeNodes();
+      final result1 = dataManager.getNodesForRendering(
+        currentZoom: 14, mapBounds: bounds,
+        uploadMode: UploadMode.production, maxNodes: 3,
+      );
+
+      testNodes = makeNodes();
+      final result2 = dataManager.getNodesForRendering(
+        currentZoom: 14, mapBounds: bounds,
+        uploadMode: UploadMode.production, maxNodes: 3,
+      );
+
+      expect(
+        result1.nodesToRender.map((n) => n.id).toList(),
+        result2.nodesToRender.map((n) => n.id).toList(),
+      );
+    });
+
+    test('filters out invalid coordinates before prioritizing', () {
+      final bounds = LatLngBounds(LatLng(38.0, -78.0), LatLng(39.0, -77.0));
+      testNodes = [
+        nodeAt(1, 0, 0),          // invalid (0,0)
+        nodeAt(2, 38.5, -77.5),   // valid, at center
+        nodeAt(3, 200, -77.5),    // invalid lat
+      ];
+
+      final result = dataManager.getNodesForRendering(
+        currentZoom: 14,
+        mapBounds: bounds,
+        uploadMode: UploadMode.production,
+        maxNodes: 10,
+      );
+
+      expect(result.nodesToRender.length, 1);
+      expect(result.nodesToRender.first.id, 2);
+    });
+  });
+}
Author	SHA1	Message	Date
stopflock	157e72011f	devibe changelog	2026-03-23 13:15:26 -05:00
stopflock	bd71f88452	operator profiles - import, reorderable	2026-03-23 12:58:50 -05:00
stopflock	6e2fa3a04c	typo	2026-03-23 11:45:13 -05:00
stopflock	843d377b87	Nuclear reset button now appears when kEnableDevelopmentModes is true as well	2026-03-15 14:31:39 -05:00
stopflock	3857023d43	Fix deprecation warning	2026-03-14 18:11:43 -05:00
stopflock	ddf7f543ff	Button to trigger nuke reset in dev mode	2026-03-14 18:04:57 -05:00
stopflock	9f72ec9a76	Fix lint warnings, clean up debug logging	2026-03-14 17:31:01 -05:00
stopflock	16e34b614f	Rework profile FOVs - 360 checkbox	2026-03-14 17:18:33 -05:00
stopflock	2d00d7a8fb	bump ver	2026-03-12 22:30:16 -05:00
stopflock	f85db3ca11	add "report osm map issue" link to info/about page	2026-03-12 22:19:21 -05:00
stopflock	447f358727	Limit max files open to prevent OS error for too many files open related to tile storage	2026-03-12 19:58:07 -05:00
stopflock	08b395214b	Move "about osm" to about page, add option to clear tile caches, option to add reason when deleting, min zoom 16 for edits/submissions, 300km nav distance warning	2026-03-12 18:59:48 -05:00
stopflock	256dd1a43c	Merge pull request #145 from dougborg/feat/resilience-policy Add endpoint migration with centralized retry/fallback policy	2026-03-12 11:42:28 -05:00
Doug Borg	ca7192d3ec	Add changelog entry for retry/fallback feature Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-11 23:20:08 -06:00
Doug Borg	2833906c68	Add centralized retry/fallback policy with hard-coded endpoints Extract duplicated retry logic from OverpassService and RoutingService into a shared resilience framework in service_policy.dart: - ResiliencePolicy: configurable retries, backoff, and HTTP timeout - executeWithFallback: retry loop with primary→fallback endpoint chain - ErrorDisposition enum: abort / fallback / retry classification - ServicePolicy + ServicePolicyResolver: per-service compliance rules (rate limits, caching, concurrency) for OSMF and third-party services - ServiceRateLimiter: async semaphore-based concurrency and rate control OverpassService now hits overpass.deflock.org first, falls back to overpass-api.de. RoutingService hits api.dontgetflocked.com first, falls back to alprwatch.org. Both use per-service error classifiers to determine retry vs fallback vs abort behavior. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-11 23:13:52 -06:00
stopflock	4d1032e56d	ver, changelog	2026-03-11 23:22:17 -05:00
stopflock	834861bcaf	Merge pull request #148 from dougborg/fix/node-render-prioritization Prioritize closest nodes to viewport center when render limit is active	2026-03-11 23:19:16 -05:00
Doug Borg	ba80b88595	Update lib/widgets/map/map_data_manager.dart Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-03-11 22:06:52 -06:00
Doug Borg	ebb7fd090f	Address review: stable tie-breaker and accurate log message - Add node id tie-breaker to sort comparator so equal-distance nodes have deterministic ordering across renders (prevents flicker) - Log validNodesCount instead of allNodes.length so the message reflects the actual post-filter count Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-10 14:38:58 -06:00
Doug Borg	fe401cc04b	Prioritize closest nodes to viewport center when render limit is active Sort nodes by squared distance from viewport center before applying the render limit, so visible nodes always make the cut instead of arbitrary selection causing gaps that shift as you pan. Also: inject node provider for testability, deduplicate validity filter, and reduce debug log spam to state transitions only. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-09 15:09:37 -06:00