UX tweaks to attribution, download button, allow search in release builds

Localize about screen

.github/workflows/workflow.yml

@@ -0,0 +1,156 @@
+name: Build Release
+on: workflow_dispatch
+
+jobs:
+  get-version:
+    name: Get Version
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.set-version.outputs.version }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Get version from lib/dev_config.dart
+        id: set-version
+        run: |
+          echo version=$(grep "version:" pubspec.yaml | head -1 | cut -d ':' -f 2 | tr -d ' ') >> $GITHUB_OUTPUT
+
+#      - name: Extract version from pubspec.yaml
+#        id: extract_version
+#        run: |
+#          version=$(grep '^version: ' pubspec.yaml | cut -d ' ' -f 2 | tr -d '\r')
+#          echo "VERSION=$version" >> $GITHUB_ENV
+
+  build-android-apk:
+    name: Build Android APK
+    needs: get-version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Generate icons and splash screens
+        run: |
+          dart run flutter_launcher_icons
+          dart run flutter_native_splash:create
+
+      - name: Decode Keystore
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > android/app/keystore.jks
+
+      - name: Create key.properties
+        run: |
+          echo "storePassword=${{ secrets.KEYSTORE_PASSWORD }}" > android/key.properties
+          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/key.properties
+          echo "keyAlias=${{ vars.KEY_ALIAS }}" >> android/key.properties
+          echo "storeFile=keystore.jks" >> android/key.properties
+
+      - name: Build Android .apk
+        run: flutter build apk --release
+
+      - name: Upload .apk artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: deflock_v${{ needs.get-version.outputs.version }}.apk
+          path: build/app/outputs/flutter-apk/app-release.apk
+          if-no-files-found: 'error'
+
+
+  build-android-aab:
+    name: Build Android AAB
+    needs: get-version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Generate icons and splash screens
+        run: |
+          dart run flutter_launcher_icons
+          dart run flutter_native_splash:create
+
+      - name: Decode Keystore
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > android/app/keystore.jks
+
+      - name: Create key.properties
+        run: |
+          echo "storePassword=${{ secrets.KEYSTORE_PASSWORD }}" > android/key.properties
+          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/key.properties
+          echo "keyAlias=${{ vars.KEY_ALIAS }}" >> android/key.properties
+          echo "storeFile=keystore.jks" >> android/key.properties
+
+      - name: Build Android appBundle
+        run: flutter build appbundle
+
+      - name: Upload .aab artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: deflock_v${{ needs.get-version.outputs.version }}.aab
+          path: build/app/outputs/bundle/release/app-release.aab
+          if-no-files-found: 'error'
+
+  build-ios:
+    name: Build iOS
+    needs: get-version
+    runs-on: macos-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Generate icons and splash screens
+        run: |
+          dart run flutter_launcher_icons
+          dart run flutter_native_splash:create
+
+#      - name: Build iOS .ipa
+#        run: flutter build ipa --release
+
+      - name: Build iOS .app
+        run: |
+          flutter build ios --release --no-codesign
+          ./app2ipa.sh build/ios/iphoneos/Runner.app
+
+      - name: Upload IPA artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: deflock_v${{ needs.get-version.outputs.version }}.ipa
+          path: Runner.ipa
+          if-no-files-found: 'error'

.gitignore

@@ -25,6 +25,11 @@ android/app/profile/
 android/app/release/
 *.iml
 
+# Generated icons and splash screens (exclude manually maintained files)
+android/app/src/main/res/drawable*/
+android/app/src/main/res/mipmap*/
+!android/app/src/main/res/values*/
+
 # ───────────────────────────────
 # iOS / macOS
 # ───────────────────────────────
@@ -37,10 +42,18 @@ ios/Runner.xcworkspace/
 macos/Pods/
 macos/.generated/
 macos/Flutter/ephemeral/
-# CocoaPods – commit Podfile.lock if you need reproducible iOS builds
+# CocoaPods – commit Podfile.lock if you need reproducible iOS builds
 Podfile.lock
 Pods/
 
+# Generated icons and splash screens  
+ios/Runner/Assets.xcassets/AppIcon.appiconset/*
+ios/Runner/Assets.xcassets/LaunchImage.imageset/*
+ios/Runner/Assets.xcassets/LaunchBackground.imageset/*
+!ios/Runner/Assets.xcassets/AppIcon.appiconset/.gitkeep
+!ios/Runner/Assets.xcassets/LaunchImage.imageset/.gitkeep
+!ios/Runner/Assets.xcassets/LaunchBackground.imageset/.gitkeep
+
 # Xcode user data & build artifacts
 *.xcworkspace
 *.xcuserstate

README.md

@@ -13,7 +13,7 @@ A comprehensive Flutter app for mapping public surveillance infrastructure with
 - **Map surveillance infrastructure** including cameras, ALPRs, gunshot detectors, and more with precise location, direction, and manufacturer details
 - **Upload to OpenStreetMap** with OAuth2 integration (live or sandbox modes)
 - **Work completely offline** with downloadable map areas and device data, plus upload queue
-- **Multiple map types** including satellite imagery from Google, Esri, Mapbox, and OpenStreetMap, plus custom map tile provider support
+- **Multiple map types** including satellite imagery from USGS, Esri, Mapbox, and topographic maps from OpenTopoMap, plus custom map tile provider support
 - **Editing Ability** to update existing device locations and properties
 - **Built-in device profiles** for Flock Safety, Motorola, Genetec, Leonardo, and other major manufacturers, plus custom profiles for more specific tag sets
 
@@ -22,7 +22,7 @@ A comprehensive Flutter app for mapping public surveillance infrastructure with
 ## Key Features
 
 ### Map & Navigation
-- **Multi-source tiles**: Switch between OpenStreetMap, Google Satellite, Esri imagery, Mapbox, and any custom providers
+- **Multi-source tiles**: Switch between OpenStreetMap, USGS imagery, Esri imagery, Mapbox, OpenTopoMap, and any custom providers
 - **Offline-first design**: Download a region for complete offline operation
 - **Smooth UX**: Intuitive controls, follow-me mode with GPS rotation, and gesture-friendly interactions
 - **Device visualization**: Color-coded markers showing real devices (blue), pending uploads (purple), pending edits (grey), devices being edited (orange), and pending deletions (red)
@@ -78,8 +78,14 @@ cp lib/keys.dart.example lib/keys.dart
 
 ## Roadmap
 
+### Needed Bugfixes
+- Are offline areas really working? Are they preferred for fast loading even when online? Check working.
+
 ### Current Development
-- Clean cache when nodes have disappeared / been deletd by others
+- Swap in alprwatch.org/directions avoidance routing API
+- Help button with links to email, discord, and website
+- Move download button?
+- Clean cache when nodes have disappeared / been deleted by others / queue item was deleted
 - Clean up dev_config
 - Improve offline area node refresh live display
 - Add default operator profiles (Lowe’s etc)
@@ -87,8 +93,7 @@ cp lib/keys.dart.example lib/keys.dart
 ### Future Features & Wishlist
 - Update offline area nodes while browsing?
 - Suspected locations toggle (alprwatch.com/flock/utilities)
-- Jump to location by coordinates, address, or POI name
-- Route planning that avoids surveillance devices (alprwatch.com/directions)
+- Offline navigation 
 
 ### Maybes
 - Yellow ring for devices missing specific tag details?
@@ -97,6 +102,14 @@ cp lib/keys.dart.example lib/keys.dart
 - Optional custom icons for camera profiles?
 - Upgrade device marker design? (considering nullplate's svg)
 - Custom device providers and OSM/Overpass alternatives?
+- More map data providers:
+https://gis.sanramon.ca.gov/arcgis_js_api/sdk/jsapi/esri.basemaps-amd.html#osm
+https://www.icgc.cat/en/Geoinformation-and-Maps/Base-Map-Service
+https://github.com/CartoDB/basemap-styles
+https://forum.inductiveautomation.com/t/perspective-map-theming-internet-tile-server-options/40164
+https://github.com/roblabs/xyz-raster-sources
+https://github.com/geopandas/xyzservices/blob/main/provider_sources/xyzservices-providers.json
+https://medium.com/@go2garret/free-basemap-tiles-for-maplibre-18374fab60cb
 
 ---
 

android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -5,11 +8,17 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "me.deflock.deflockapp"
 
     // Matches current stable Flutter (compileSdk 34 as of July 2025)
-    compileSdk = 35
+    compileSdk = 36
 
     // NDK only needed if you build native plugins; keep your pinned version
     ndkVersion = "27.0.12077973"
@@ -31,17 +40,32 @@ android {
         // oauth2_client 4.x & flutter_web_auth_2 5.x require minSdk 23
         // ────────────────────────────────────────────────────────────
         minSdk = 23
-        targetSdk = 34
+        targetSdk = 36
 
         // Flutter tool injects these during `flutter build`
         versionCode = flutter.versionCode
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        if (keystorePropertiesFile.exists()) {
+            create("release") {
+                keyAlias = keystoreProperties["keyAlias"] as String
+                keyPassword = keystoreProperties["keyPassword"] as String
+                storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+                storePassword = keystoreProperties["storePassword"] as String
+            }
+        }
+    }
+
     buildTypes {
         release {
-            // Using debug signing so `flutter run --release` works out‑of‑box.
-            signingConfig = signingConfigs.getByName("debug")
+            if (keystorePropertiesFile.exists()) {
+                signingConfig = signingConfigs.getByName("release")
+            } else {
+                // Fall back to debug signing for development builds
+                signingConfig = signingConfigs.getByName("debug")
+            }
         }
     }
 }

android/app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
             android:hardwareAccelerated="true"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustNothing">
 
             <!-- The theme behind the splash while Flutter initializes -->
             <meta-data

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:gravity="fill" android:src="@drawable/background"/>
-    </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/splash"/>
-    </item>
-</layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:gravity="fill" android:src="@drawable/background"/>
-    </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/splash"/>
-    </item>
-</layer-list>

android/app/src/main/res/values-night-v31/styles.xml

@@ -2,6 +2,9 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>

android/app/src/main/res/values-v31/styles.xml

@@ -2,6 +2,9 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>

android/app/src/main/res/values/colors.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="launch_background">#202020</color>
+    <color name="launch_background">#152131</color>
 </resources>

assets/info.txt

@@ -1,73 +0,0 @@
-🇺🇸 ENGLISH
-
-DeFlock - Surveillance Transparency
-
-DeFlock is a privacy-focused mobile app for mapping public surveillance infrastructure using OpenStreetMap. Document cameras, ALPRs, gunshot detectors, and other surveillance devices in your community to make this infrastructure visible and searchable.
-
-• Offline-capable mapping with downloadable areas
-• Upload directly to OpenStreetMap with OAuth2
-• Built-in profiles for major manufacturers 
-• Privacy-respecting - no user data collected
-• Multiple map tile providers (OSM, satellite imagery)
-
-Part of the broader DeFlock initiative to promote surveillance transparency.
-
-Visit: deflock.me
-Built with Flutter • Open Source
-
----
-
-🇪🇸 ESPAÑOL
-
-DeFlock - Transparencia en Vigilancia
-
-DeFlock es una aplicación móvil enfocada en la privacidad para mapear infraestructura de vigilancia pública usando OpenStreetMap. Documenta cámaras, ALPRs, detectores de disparos y otros dispositivos de vigilancia en tu comunidad para hacer visible y consultable esta infraestructura.
-
-• Mapeo con capacidad offline con áreas descargables
-• Subida directa a OpenStreetMap con OAuth2
-• Perfiles integrados para fabricantes principales
-• Respeta la privacidad - no se recopilan datos del usuario
-• Múltiples proveedores de mapas (OSM, imágenes satelitales)
-
-Parte de la iniciativa más amplia DeFlock para promover la transparencia en vigilancia.
-
-Visita: deflock.me
-Construido con Flutter • Código Abierto
-
----
-
-🇫🇷 FRANÇAIS
-
-DeFlock - Transparence de la Surveillance
-
-DeFlock est une application mobile axée sur la confidentialité pour cartographier l'infrastructure de surveillance publique en utilisant OpenStreetMap. Documentez les caméras, ALPRs, détecteurs de coups de feu et autres dispositifs de surveillance dans votre communauté pour rendre cette infrastructure visible et consultable.
-
-• Cartographie hors ligne avec zones téléchargeables
-• Upload direct vers OpenStreetMap avec OAuth2
-• Profils intégrés pour les principaux fabricants
-• Respectueux de la confidentialité - aucune donnée utilisateur collectée
-• Multiples fournisseurs de cartes (OSM, imagerie satellite)
-
-Partie de l'initiative plus large DeFlock pour promouvoir la transparence de la surveillance.
-
-Visitez : deflock.me
-Construit avec Flutter • Source Ouverte
-
----
-
-🇩🇪 DEUTSCH
-
-DeFlock - Überwachungs-Transparenz
-
-DeFlock ist eine datenschutzorientierte mobile App zur Kartierung öffentlicher Überwachungsinfrastruktür mit OpenStreetMap. Dokumentieren Sie Kameras, ALPRs, Schussdetektoren und andere Überwachungsgeräte in Ihrer Gemeinde, um diese Infrastruktur sichtbar und durchsuchbar zu machen.
-
-• Offline-fähige Kartierung mit herunterladbaren Bereichen
-• Direkter Upload zu OpenStreetMap mit OAuth2
-• Integrierte Profile für große Hersteller
-• Datenschutzfreundlich - keine Nutzerdaten gesammelt
-• Multiple Kartenanbieter (OSM, Satellitenbilder)
-
-Teil der breiteren DeFlock-Initiative zur Förderung von Überwachungstransparenz.
-
-Besuchen Sie: deflock.me
-Gebaut mit Flutter • Open Source

do_builds.sh

@@ -23,7 +23,7 @@ for arg in "$@"; do
   esac
 done
 
-appver=$(grep "kClientVersion" lib/dev_config.dart | cut -d '=' -f 2 | tr -d ';' | tr -d "\'" | tr -d " ")
+appver=$(grep "version:" pubspec.yaml | head -1 | cut -d ':' -f 2 | tr -d ' ')
 echo
 echo "Building app version ${appver}..."
 echo

gen_icons_splashes.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-echo "Generate splash screens..."
-flutter pub run flutter_native_splash:create
-echo
-echo
 echo "Generate icons..."
-flutter pub run flutter_launcher_icons:main
+dart run flutter_launcher_icons
+echo
+echo
+echo "Generate splash screens..."
+dart run flutter_native_splash:create

ios/Runner.xcodeproj/project.pbxproj

@@ -528,7 +528,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flockMapApp.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = me.deflock.deflockapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -681,7 +681,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flockMapApp;
+				PRODUCT_BUNDLE_IDENTIFIER = me.deflock.deflockapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1 +0,0 @@
-{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "background.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "LaunchImage.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "LaunchImage@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "LaunchImage@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md

@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.

lib/app_state.dart

@@ -7,18 +7,22 @@ import 'models/operator_profile.dart';
 import 'models/osm_node.dart';
 import 'models/pending_upload.dart';
 import 'models/tile_provider.dart';
+import 'models/search_result.dart';
 import 'services/offline_area_service.dart';
 import 'services/node_cache.dart';
 import 'services/tile_preview_service.dart';
 import 'widgets/camera_provider_with_cache.dart';
 import 'state/auth_state.dart';
+import 'state/navigation_state.dart';
 import 'state/operator_profile_state.dart';
 import 'state/profile_state.dart';
+import 'state/search_state.dart';
 import 'state/session_state.dart';
 import 'state/settings_state.dart';
 import 'state/upload_queue_state.dart';
 
 // Re-export types
+export 'state/navigation_state.dart' show AppNavigationMode;
 export 'state/settings_state.dart' show UploadMode, FollowMeMode;
 export 'state/session_state.dart' show AddNodeSession, EditNodeSession;
 
@@ -28,8 +32,10 @@ class AppState extends ChangeNotifier {
   
   // State modules
   late final AuthState _authState;
+  late final NavigationState _navigationState;
   late final OperatorProfileState _operatorProfileState;
   late final ProfileState _profileState;
+  late final SearchState _searchState;
   late final SessionState _sessionState;
   late final SettingsState _settingsState;
   late final UploadQueueState _uploadQueueState;
@@ -39,16 +45,20 @@ class AppState extends ChangeNotifier {
   AppState() {
     instance = this;
     _authState = AuthState();
+    _navigationState = NavigationState();
     _operatorProfileState = OperatorProfileState();
     _profileState = ProfileState();
+    _searchState = SearchState();
     _sessionState = SessionState();
     _settingsState = SettingsState();
     _uploadQueueState = UploadQueueState();
     
     // Set up state change listeners
     _authState.addListener(_onStateChanged);
+    _navigationState.addListener(_onStateChanged);
     _operatorProfileState.addListener(_onStateChanged);
     _profileState.addListener(_onStateChanged);
+    _searchState.addListener(_onStateChanged);
     _sessionState.addListener(_onStateChanged);
     _settingsState.addListener(_onStateChanged);
     _uploadQueueState.addListener(_onStateChanged);
@@ -63,6 +73,35 @@ class AppState extends ChangeNotifier {
   bool get isLoggedIn => _authState.isLoggedIn;
   String get username => _authState.username;
   
+  // Navigation state - simplified
+  AppNavigationMode get navigationMode => _navigationState.mode;
+  LatLng? get provisionalPinLocation => _navigationState.provisionalPinLocation;
+  String? get provisionalPinAddress => _navigationState.provisionalPinAddress;
+  bool get showProvisionalPin => _navigationState.showProvisionalPin;
+  bool get isInSearchMode => _navigationState.isInSearchMode;
+  bool get isInRouteMode => _navigationState.isInRouteMode;
+  bool get hasActiveRoute => _navigationState.hasActiveRoute;
+  bool get showSearchButton => _navigationState.showSearchButton;
+  bool get showRouteButton => _navigationState.showRouteButton;
+  List<LatLng>? get routePath => _navigationState.routePath;
+  
+  // Route state
+  LatLng? get routeStart => _navigationState.routeStart;
+  LatLng? get routeEnd => _navigationState.routeEnd;
+  String? get routeStartAddress => _navigationState.routeStartAddress;
+  String? get routeEndAddress => _navigationState.routeEndAddress;
+  double? get routeDistance => _navigationState.routeDistance;
+  bool get settingRouteStart => _navigationState.settingRouteStart;
+  bool get isSettingSecondPoint => _navigationState.isSettingSecondPoint;
+  bool get isCalculating => _navigationState.isCalculating;
+  bool get showingOverview => _navigationState.showingOverview;
+  String? get routingError => _navigationState.routingError;
+  bool get hasRoutingError => _navigationState.hasRoutingError;
+  
+  // Navigation search state
+  bool get isNavigationSearchLoading => _navigationState.isSearchLoading;
+  List<SearchResult> get navigationSearchResults => _navigationState.searchResults;
+  
   // Profile state
   List<NodeProfile> get profiles => _profileState.profiles;
   List<NodeProfile> get enabledProfiles => _profileState.enabledProfiles;
@@ -71,6 +110,11 @@ class AppState extends ChangeNotifier {
   // Operator profile state
   List<OperatorProfile> get operatorProfiles => _operatorProfileState.profiles;
   
+  // Search state
+  bool get isSearchLoading => _searchState.isLoading;
+  List<SearchResult> get searchResults => _searchState.results;
+  String get lastSearchQuery => _searchState.lastQuery;
+  
   // Session state
   AddNodeSession? get session => _sessionState.session;
   EditNodeSession? get editSession => _sessionState.editSession;
@@ -82,6 +126,7 @@ class AppState extends ChangeNotifier {
   FollowMeMode get followMeMode => _settingsState.followMeMode;
   bool get proximityAlertsEnabled => _settingsState.proximityAlertsEnabled;
   int get proximityAlertDistance => _settingsState.proximityAlertDistance;
+  bool get networkStatusIndicatorEnabled => _settingsState.networkStatusIndicatorEnabled;
   
   // Tile provider state
   List<TileProvider> get tileProviders => _settingsState.tileProviders;
@@ -230,6 +275,77 @@ class AppState extends ChangeNotifier {
     _startUploader();
   }
 
+  // ---------- Search Methods ----------
+  Future<void> search(String query) async {
+    await _searchState.search(query);
+  }
+
+  void clearSearchResults() {
+    _searchState.clearResults();
+  }
+
+  // ---------- Navigation Methods - Simplified ----------
+  void enterSearchMode(LatLng mapCenter) {
+    _navigationState.enterSearchMode(mapCenter);
+  }
+
+  void cancelNavigation() {
+    _navigationState.cancel();
+  }
+
+  void updateProvisionalPinLocation(LatLng newLocation) {
+    _navigationState.updateProvisionalPinLocation(newLocation);
+  }
+
+  void selectSearchResult(SearchResult result) {
+    _navigationState.selectSearchResult(result);
+  }
+
+  void startRoutePlanning({required bool thisLocationIsStart}) {
+    _navigationState.startRoutePlanning(thisLocationIsStart: thisLocationIsStart);
+  }
+
+  void selectSecondRoutePoint() {
+    _navigationState.selectSecondRoutePoint();
+  }
+
+  void startRoute() {
+    _navigationState.startRoute();
+    
+    // Auto-enable follow-me if user is near the start point
+    // We need to get user location from the GPS controller
+    // This will be handled in HomeScreen where we have access to MapView
+  }
+  
+  bool shouldAutoEnableFollowMe(LatLng? userLocation) {
+    return _navigationState.shouldAutoEnableFollowMe(userLocation);
+  }
+
+  void showRouteOverview() {
+    _navigationState.showRouteOverview();
+  }
+
+  void hideRouteOverview() {
+    _navigationState.hideRouteOverview();
+  }
+
+  void cancelRoute() {
+    _navigationState.cancelRoute();
+  }
+
+  // Navigation search methods
+  Future<void> searchNavigation(String query) async {
+    await _navigationState.search(query);
+  }
+
+  void clearNavigationSearchResults() {
+    _navigationState.clearSearchResults();
+  }
+
+  void retryRouteCalculation() {
+    _navigationState.retryRouteCalculation();
+  }
+
   // ---------- Settings Methods ----------
   Future<void> setOfflineMode(bool enabled) async {
     await _settingsState.setOfflineMode(enabled);
@@ -287,6 +403,11 @@ class AppState extends ChangeNotifier {
     await _settingsState.setProximityAlertDistance(distance);
   }
 
+  /// Set network status indicator enabled/disabled
+  Future<void> setNetworkStatusIndicatorEnabled(bool enabled) async {
+    await _settingsState.setNetworkStatusIndicatorEnabled(enabled);
+  }
+
   // ---------- Queue Methods ----------
   void clearQueue() {
     _uploadQueueState.clearQueue();
@@ -322,8 +443,10 @@ class AppState extends ChangeNotifier {
   @override
   void dispose() {
     _authState.removeListener(_onStateChanged);
+    _navigationState.removeListener(_onStateChanged);
     _operatorProfileState.removeListener(_onStateChanged);
     _profileState.removeListener(_onStateChanged);
+    _searchState.removeListener(_onStateChanged);
     _sessionState.removeListener(_onStateChanged);
     _settingsState.removeListener(_onStateChanged);
     _uploadQueueState.removeListener(_onStateChanged);

lib/dev_config.dart

@@ -31,18 +31,29 @@ double bottomPositionFromButtonBar(double spacingAboveButtonBar, double safeArea
   return safeAreaBottom + kBottomButtonBarOffset + kButtonBarHeight + spacingAboveButtonBar;
 }
 
-// Add Camera icon vertical offset (no offset needed since circle is centered)
-const double kAddPinYOffset = 0.0;
 
-// Client name and version for OSM uploads ("created_by" tag)
+
+// Client name for OSM uploads ("created_by" tag)
 const String kClientName = 'DeFlock';
-const String kClientVersion = '1.0.0';
+// Note: Version is now dynamically retrieved from VersionService
 
 // Development/testing features - set to false for production builds
 const bool kEnableDevelopmentModes = false; // Set to false to hide sandbox/simulate modes and force production mode
 
+// Navigation features - set to false to hide navigation UI elements while in development
+const bool kEnableNavigationFeatures = kEnableDevelopmentModes; // Hide navigation until fully implemented
+
+/// Navigation availability: only dev builds, and only when online
+bool enableNavigationFeatures({required bool offlineMode}) {
+  if (!kEnableDevelopmentModes) {
+    return false; // Release builds: never allow navigation
+  } else {
+    return !offlineMode; // Dev builds: only when online
+  }
+}
+
 // Marker/node interaction
-const int kCameraMinZoomLevel = 10; // Minimum zoom to show nodes (Overpass)
+const int kNodeMinZoomLevel = 10; // Minimum zoom to show nodes (Overpass)
 const int kOsmApiMinZoomLevel = 13; // Minimum zoom for OSM API bbox queries (sandbox mode)
 const Duration kMarkerTapTimeout = Duration(milliseconds: 250);
 const Duration kDebounceCameraRefresh = Duration(milliseconds: 500);
@@ -57,11 +68,6 @@ const int kProximityAlertMinDistance = 50; // meters
 const int kProximityAlertMaxDistance = 1000; // meters
 const Duration kProximityAlertCooldown = Duration(minutes: 10); // Cooldown between alerts for same node
 
-// Last map location and settings storage
-const String kLastMapLatKey = 'last_map_latitude';
-const String kLastMapLngKey = 'last_map_longitude';
-const String kLastMapZoomKey = 'last_map_zoom';
-
 // Tile/OSM fetch retry parameters (for tunable backoff)
 const int kTileFetchMaxAttempts = 3;
 const int kTileFetchInitialDelayMs = 4000;
@@ -77,15 +83,15 @@ const int kMaxUserDownloadZoomSpan = 7;
 // Download area limits and constants
 const int kMaxReasonableTileCount = 20000;
 const int kAbsoluteMaxTileCount = 50000;
-const int kAbsoluteMaxZoom = 19;
+const int kAbsoluteMaxZoom = 23;
 
-// Camera icon configuration
-const double kCameraIconDiameter = 20.0;
-const double kCameraRingThickness = 4.0;
-const double kCameraDotOpacity = 0.4; // Opacity for the grey dot interior
-const Color kCameraRingColorReal = Color(0xC43F55F3); // Real nodes from OSM - blue
-const Color kCameraRingColorMock = Color(0xC4FFFFFF); // Add node mock point - white
-const Color kCameraRingColorPending = Color(0xC49C27B0); // Submitted/pending nodes - purple
-const Color kCameraRingColorEditing = Color(0xC4FF9800); // Node being edited - orange
-const Color kCameraRingColorPendingEdit = Color(0xC4757575); // Original node with pending edit - grey
-const Color kCameraRingColorPendingDeletion = Color(0xA4F44336); // Node pending deletion - red, slightly transparent
+// Node icon configuration
+const double kNodeIconDiameter = 20.0;
+const double kNodeRingThickness = 4.0;
+const double kNodeDotOpacity = 0.4; // Opacity for the grey dot interior
+const Color kNodeRingColorReal = Color(0xC43F55F3); // Real nodes from OSM - blue
+const Color kNodeRingColorMock = Color(0xC4FFFFFF); // Add node mock point - white
+const Color kNodeRingColorPending = Color(0xC49C27B0); // Submitted/pending nodes - purple
+const Color kNodeRingColorEditing = Color(0xC4FF9800); // Node being edited - orange
+const Color kNodeRingColorPendingEdit = Color(0xC4757575); // Original node with pending edit - grey
+const Color kNodeRingColorPendingDeletion = Color(0xA4F44336); // Node pending deletion - red, slightly transparent

lib/localizations/README.md

@@ -18,6 +18,11 @@ Want to add support for your language? It's simple:
      "app": {
        "title": "DeFlock"  ← Keep this as-is
      },
+     "about": {
+       "title": "Your Translation Here",
+       "description": "Your Translation Here",
+       ...
+     },
      "actions": {
        "tagNode": "Your Translation Here",
        "download": "Your Translation Here",
@@ -26,9 +31,7 @@ Want to add support for your language? It's simple:
    }
    ```
 
-3. **Add your language to the About screen**: Edit `assets/info.txt` and add your language section at the bottom (copy the English section and translate it)
-
-4. **Submit a PR** with your JSON file and the updated about.txt. Done!
+3. **Submit a PR** with your JSON file. Done!
 
 The new language will automatically appear in Settings → Language.
 
@@ -45,12 +48,14 @@ The new language will automatically appear in Settings → Language.
 - `es.json` - Español 
 - `fr.json` - Français
 - `de.json` - Deutsch
+- `it.json` - Italiano
+- `pt.json` - Português
+- `zh.json` - 中文
 
 ## Files to Update
 
-For a complete translation, you'll need to touch:
-1. **`lib/localizations/xx.json`** - Main UI translations (buttons, menus, etc.)
-2. **`assets/info.txt`** - About screen content (add your language section)
+For a complete translation, you only need to update:
+1. **`lib/localizations/xx.json`** - All UI translations including about content
 
 ## That's It!
 

lib/localizations/de.json

@@ -45,7 +45,8 @@
     "offlineSettingsSubtitle": "Offline-Modus und heruntergeladene Bereiche verwalten",
     "advancedSettings": "Erweiterte Einstellungen",
     "advancedSettingsSubtitle": "Leistungs-, Warnungs- und Kachelanbieter-Einstellungen",
-    "proximityAlerts": "Näherungswarnungen"
+    "proximityAlerts": "Näherungswarnungen",
+    "networkStatusIndicator": "Netzwerkstatus-Anzeige"
   },
   "proximityAlerts": {
     "getNotified": "Benachrichtigung erhalten beim Annähern an Überwachungsgeräte",
@@ -183,6 +184,11 @@
     "attribution": "Zuschreibung",
     "attributionHint": "© Karten-Anbieter",
     "attributionRequired": "Zuschreibung ist erforderlich",
+    "maxZoom": "Max Zoom-Stufe",
+    "maxZoomHint": "Maximale Zoom-Stufe (1-23)",
+    "maxZoomRequired": "Max Zoom ist erforderlich",
+    "maxZoomInvalid": "Max Zoom muss eine Zahl sein",
+    "maxZoomRange": "Max Zoom muss zwischen {} und {} liegen",
     "fetchPreview": "Vorschau Laden",
     "previewTileLoaded": "Vorschau-Kachel erfolgreich geladen",
     "previewTileFailed": "Vorschau laden fehlgeschlagen: {}",
@@ -200,7 +206,8 @@
   },
   "mapTiles": {
     "title": "Karten-Kacheln",
-    "manageProviders": "Anbieter Verwalten"
+    "manageProviders": "Anbieter Verwalten",
+    "attribution": "Karten-Zuschreibung"
   },
   "profileEditor": {
     "viewProfile": "Profil Anzeigen",
@@ -287,5 +294,52 @@
     "cannotChangeTileTypes": "Kachel-Typen können während des Herunterladens von Offline-Bereichen nicht geändert werden",
     "selectMapLayer": "Kartenschicht Auswählen",
     "noTileProvidersAvailable": "Keine Kachel-Anbieter verfügbar"
+  },
+  "networkStatus": {
+    "showIndicator": "Netzwerkstatus-Anzeige anzeigen",
+    "showIndicatorSubtitle": "Netzwerk-Ladestatus und Fehlerstatus auf der Karte anzeigen"
+  },
+  "about": {
+    "title": "DeFlock - Überwachungs-Transparenz",
+    "description": "DeFlock ist eine datenschutzorientierte mobile App zur Kartierung öffentlicher Überwachungsinfrastruktür mit OpenStreetMap. Dokumentieren Sie Kameras, ALPRs, Schussdetektoren und andere Überwachungsgeräte in Ihrer Gemeinde, um diese Infrastruktur sichtbar und durchsuchbar zu machen.",
+    "features": "• Offline-fähige Kartierung mit herunterladbaren Bereichen\n• Direkter Upload zu OpenStreetMap mit OAuth2\n• Integrierte Profile für große Hersteller\n• Datenschutzfreundlich - keine Nutzerdaten gesammelt\n• Multiple Kartenanbieter (OSM, Satellitenbilder)",
+    "initiative": "Teil der breiteren DeFlock-Initiative zur Förderung von Überwachungstransparenz.",
+    "footer": "Besuchen Sie: deflock.me\nGebaut mit Flutter • Open Source"
+  },
+  "navigation": {
+    "searchLocation": "Ort suchen",
+    "searchPlaceholder": "Orte oder Koordinaten suchen...",
+    "routeTo": "Route zu",
+    "routeFrom": "Route von",
+    "selectLocation": "Ort auswählen",
+    "calculatingRoute": "Route wird berechnet...",
+    "routeCalculationFailed": "Routenberechnung fehlgeschlagen",
+    "start": "Start",
+    "resume": "Fortsetzen",
+    "endRoute": "Route beenden",
+    "routeOverview": "Routenübersicht",
+    "retry": "Wiederholen",
+    "cancelSearch": "Suche abbrechen",
+    "noResultsFound": "Keine Ergebnisse gefunden",
+    "searching": "Suche...",
+    "location": "Standort",
+    "startPoint": "Start",
+    "endPoint": "Ende",
+    "startSelect": "Start (auswählen)",
+    "endSelect": "Ende (auswählen)",
+    "distance": "Entfernung: {} km",
+    "routeActive": "Route aktiv",
+    "navigationSettings": "Navigation",
+    "navigationSettingsSubtitle": "Routenplanung und Vermeidungseinstellungen",
+    "avoidanceDistance": "Vermeidungsabstand",
+    "avoidanceDistanceSubtitle": "Mindestabstand zu Überwachungsgeräten",
+    "searchHistory": "Max. Suchverlauf",
+    "searchHistorySubtitle": "Maximale Anzahl kürzlicher Suchen zum Merken",
+    "units": "Einheiten",
+    "unitsSubtitle": "Anzeigeeinheiten für Entfernungen und Messungen",
+    "metric": "Metrisch (km, m)",
+    "imperial": "Britisch (mi, ft)",
+    "meters": "Meter",
+    "feet": "Fuß"
   }
 }

lib/localizations/en.json

@@ -5,6 +5,13 @@
   "app": {
     "title": "DeFlock"
   },
+  "about": {
+    "title": "DeFlock - Surveillance Transparency",
+    "description": "DeFlock is a privacy-focused mobile app for mapping public surveillance infrastructure using OpenStreetMap. Document cameras, ALPRs, gunshot detectors, and other surveillance devices in your community to make this infrastructure visible and searchable.",
+    "features": "• Offline-capable mapping with downloadable areas\n• Upload directly to OpenStreetMap with OAuth2\n• Built-in profiles for major manufacturers\n• Privacy-respecting - no user data collected\n• Multiple map tile providers (OSM, satellite imagery)",
+    "initiative": "Part of the broader DeFlock initiative to promote surveillance transparency.",
+    "footer": "Visit: deflock.me\nBuilt with Flutter • Open Source"
+  },
   "actions": {
     "tagNode": "New Node",
     "download": "Download",
@@ -45,7 +52,8 @@
     "offlineSettingsSubtitle": "Manage offline mode and downloaded areas",
     "advancedSettings": "Advanced Settings",
     "advancedSettingsSubtitle": "Performance, alerts, and tile provider settings",
-    "proximityAlerts": "Proximity Alerts"
+    "proximityAlerts": "Proximity Alerts",
+    "networkStatusIndicator": "Network Status Indicator"
   },
   "proximityAlerts": {
     "getNotified": "Get notified when approaching surveillance devices",
@@ -183,6 +191,11 @@
     "attribution": "Attribution",
     "attributionHint": "© Map Provider",
     "attributionRequired": "Attribution is required",
+    "maxZoom": "Max Zoom Level",
+    "maxZoomHint": "Maximum zoom level (1-23)",
+    "maxZoomRequired": "Max zoom is required",
+    "maxZoomInvalid": "Max zoom must be a number",
+    "maxZoomRange": "Max zoom must be between {} and {}",
     "fetchPreview": "Fetch Preview",
     "previewTileLoaded": "Preview tile loaded successfully",
     "previewTileFailed": "Failed to fetch preview: {}",
@@ -200,7 +213,8 @@
   },
   "mapTiles": {
     "title": "Map Tiles",
-    "manageProviders": "Manage Providers"
+    "manageProviders": "Manage Providers",
+    "attribution": "Map Attribution"
   },
   "profileEditor": {
     "viewProfile": "View Profile",
@@ -287,5 +301,45 @@
     "cannotChangeTileTypes": "Cannot change tile types while downloading offline areas",
     "selectMapLayer": "Select Map Layer",
     "noTileProvidersAvailable": "No tile providers available"
+  },
+  "networkStatus": {
+    "showIndicator": "Show network status indicator",
+    "showIndicatorSubtitle": "Display network loading and error status on the map"
+  },
+  "navigation": {
+    "searchLocation": "Search Location",
+    "searchPlaceholder": "Search places or coordinates...",
+    "routeTo": "Route To",
+    "routeFrom": "Route From",
+    "selectLocation": "Select Location",
+    "calculatingRoute": "Calculating route...",
+    "routeCalculationFailed": "Route calculation failed",
+    "start": "Start",
+    "resume": "Resume",
+    "endRoute": "End Route",
+    "routeOverview": "Route Overview",
+    "retry": "Retry",
+    "cancelSearch": "Cancel search",
+    "noResultsFound": "No results found",
+    "searching": "Searching...",
+    "location": "Location",
+    "startPoint": "Start",
+    "endPoint": "End",
+    "startSelect": "Start (select)",
+    "endSelect": "End (select)",
+    "distance": "Distance: {} km",
+    "routeActive": "Route active",
+    "navigationSettings": "Navigation",
+    "navigationSettingsSubtitle": "Route planning and avoidance settings",
+    "avoidanceDistance": "Avoidance Distance",
+    "avoidanceDistanceSubtitle": "Minimum distance to stay away from surveillance devices",
+    "searchHistory": "Max Search History",
+    "searchHistorySubtitle": "Maximum number of recent searches to remember",
+    "units": "Units",
+    "unitsSubtitle": "Display units for distances and measurements",
+    "metric": "Metric (km, m)",
+    "imperial": "Imperial (mi, ft)",
+    "meters": "meters",
+    "feet": "feet"
   }
 }

lib/localizations/es.json

@@ -5,6 +5,13 @@
   "app": {
     "title": "DeFlock"
   },
+  "about": {
+    "title": "DeFlock - Transparencia en Vigilancia",
+    "description": "DeFlock es una aplicación móvil enfocada en la privacidad para mapear infraestructura de vigilancia pública usando OpenStreetMap. Documenta cámaras, ALPRs, detectores de disparos y otros dispositivos de vigilancia en tu comunidad para hacer visible y consultable esta infraestructura.",
+    "features": "• Mapeo con capacidad offline con áreas descargables\n• Subida directa a OpenStreetMap con OAuth2\n• Perfiles integrados para fabricantes principales\n• Respeta la privacidad - no se recopilan datos del usuario\n• Múltiples proveedores de mapas (OSM, imágenes satelitales)",
+    "initiative": "Parte de la iniciativa más amplia DeFlock para promover la transparencia en vigilancia.",
+    "footer": "Visita: deflock.me\nConstruido con Flutter • Código Abierto"
+  },
   "actions": {
     "tagNode": "Nuevo Nodo",
     "download": "Descargar",
@@ -45,7 +52,8 @@
     "offlineSettingsSubtitle": "Gestionar modo sin conexión y áreas descargadas",
     "advancedSettings": "Configuración Avanzada",
     "advancedSettingsSubtitle": "Configuración de rendimiento, alertas y proveedores de teselas",
-    "proximityAlerts": "Alertas de Proximidad"
+    "proximityAlerts": "Alertas de Proximidad",
+    "networkStatusIndicator": "Indicador de Estado de Red"
   },
   "proximityAlerts": {
     "getNotified": "Recibe notificaciones al acercarte a dispositivos de vigilancia",
@@ -183,6 +191,11 @@
     "attribution": "Atribución",
     "attributionHint": "© Proveedor de Mapas",
     "attributionRequired": "La atribución es requerida",
+    "maxZoom": "Nivel de Zoom Máximo",
+    "maxZoomHint": "Nivel de zoom máximo (1-23)",
+    "maxZoomRequired": "El zoom máximo es requerido",
+    "maxZoomInvalid": "El zoom máximo debe ser un número",
+    "maxZoomRange": "El zoom máximo debe estar entre {} y {}",
     "fetchPreview": "Obtener Vista Previa",
     "previewTileLoaded": "Tile de vista previa cargado exitosamente",
     "previewTileFailed": "Falló al obtener vista previa: {}",
@@ -200,7 +213,8 @@
   },
   "mapTiles": {
     "title": "Tiles de Mapa",
-    "manageProviders": "Gestionar Proveedores"
+    "manageProviders": "Gestionar Proveedores",
+    "attribution": "Atribución del Mapa"
   },
   "profileEditor": {
     "viewProfile": "Ver Perfil",
@@ -287,5 +301,45 @@
     "cannotChangeTileTypes": "No se pueden cambiar los tipos de teselas mientras se descargan áreas sin conexión",
     "selectMapLayer": "Seleccionar Capa del Mapa",
     "noTileProvidersAvailable": "No hay proveedores de teselas disponibles"
+  },
+  "networkStatus": {
+    "showIndicator": "Mostrar indicador de estado de red",
+    "showIndicatorSubtitle": "Mostrar estado de carga y errores de red en el mapa"
+  },
+  "navigation": {
+    "searchLocation": "Buscar ubicación",
+    "searchPlaceholder": "Buscar lugares o coordenadas...",
+    "routeTo": "Ruta a",
+    "routeFrom": "Ruta desde",
+    "selectLocation": "Seleccionar ubicación",
+    "calculatingRoute": "Calculando ruta...",
+    "routeCalculationFailed": "Falló el cálculo de ruta",
+    "start": "Iniciar",
+    "resume": "Continuar",
+    "endRoute": "Finalizar ruta",
+    "routeOverview": "Vista de ruta",
+    "retry": "Reintentar",
+    "cancelSearch": "Cancelar búsqueda",
+    "noResultsFound": "No se encontraron resultados",
+    "searching": "Buscando...",
+    "location": "Ubicación",
+    "startPoint": "Inicio",
+    "endPoint": "Fin",
+    "startSelect": "Inicio (seleccionar)",
+    "endSelect": "Fin (seleccionar)",
+    "distance": "Distancia: {} km",
+    "routeActive": "Ruta activa",
+    "navigationSettings": "Navegación",
+    "navigationSettingsSubtitle": "Configuración de planificación de rutas y evitación",
+    "avoidanceDistance": "Distancia de evitación",
+    "avoidanceDistanceSubtitle": "Distancia mínima para mantenerse alejado de dispositivos de vigilancia",
+    "searchHistory": "Historial máximo de búsqueda",
+    "searchHistorySubtitle": "Número máximo de búsquedas recientes para recordar",
+    "units": "Unidades",
+    "unitsSubtitle": "Unidades de visualización para distancias y medidas",
+    "metric": "Métrico (km, m)",
+    "imperial": "Imperial (mi, ft)",
+    "meters": "metros",
+    "feet": "pies"
   }
 }

lib/localizations/fr.json

@@ -5,6 +5,13 @@
   "app": {
     "title": "DeFlock"
   },
+  "about": {
+    "title": "DeFlock - Transparence de la Surveillance",
+    "description": "DeFlock est une application mobile axée sur la confidentialité pour cartographier l'infrastructure de surveillance publique en utilisant OpenStreetMap. Documentez les caméras, ALPRs, détecteurs de coups de feu et autres dispositifs de surveillance dans votre communauté pour rendre cette infrastructure visible et consultable.",
+    "features": "• Cartographie hors ligne avec zones téléchargeables\n• Upload direct vers OpenStreetMap avec OAuth2\n• Profils intégrés pour les principaux fabricants\n• Respectueux de la confidentialité - aucune donnée utilisateur collectée\n• Multiples fournisseurs de cartes (OSM, imagerie satellite)",
+    "initiative": "Partie de l'initiative plus large DeFlock pour promouvoir la transparence de la surveillance.",
+    "footer": "Visitez : deflock.me\nConstruit avec Flutter • Source Ouverte"
+  },
   "actions": {
     "tagNode": "Nouveau Nœud",
     "download": "Télécharger",
@@ -45,7 +52,8 @@
     "offlineSettingsSubtitle": "Gérer le mode hors ligne et les zones téléchargées",
     "advancedSettings": "Paramètres Avancés",
     "advancedSettingsSubtitle": "Paramètres de performance, alertes et fournisseurs de tuiles",
-    "proximityAlerts": "Alertes de Proximité"
+    "proximityAlerts": "Alertes de Proximité",
+    "networkStatusIndicator": "Indicateur de Statut Réseau"
   },
   "proximityAlerts": {
     "getNotified": "Recevoir des notifications en s'approchant de dispositifs de surveillance",
@@ -183,6 +191,11 @@
     "attribution": "Attribution",
     "attributionHint": "© Fournisseur de Cartes",
     "attributionRequired": "L'attribution est requise",
+    "maxZoom": "Niveau de Zoom Maximum",
+    "maxZoomHint": "Niveau de zoom maximum (1-23)",
+    "maxZoomRequired": "Le zoom maximum est requis",
+    "maxZoomInvalid": "Le zoom maximum doit être un nombre",
+    "maxZoomRange": "Le zoom maximum doit être entre {} et {}",
     "fetchPreview": "Récupérer Aperçu",
     "previewTileLoaded": "Tuile d'aperçu chargée avec succès",
     "previewTileFailed": "Échec de récupération de l'aperçu: {}",
@@ -200,7 +213,8 @@
   },
   "mapTiles": {
     "title": "Tuiles de Carte",
-    "manageProviders": "Gérer Fournisseurs"
+    "manageProviders": "Gérer Fournisseurs",
+    "attribution": "Attribution de Carte"
   },
   "profileEditor": {
     "viewProfile": "Voir Profil",
@@ -287,5 +301,45 @@
     "cannotChangeTileTypes": "Impossible de changer les types de tuiles pendant le téléchargement des zones hors ligne",
     "selectMapLayer": "Sélectionner la Couche de Carte",
     "noTileProvidersAvailable": "Aucun fournisseur de tuiles disponible"
+  },
+  "networkStatus": {
+    "showIndicator": "Afficher l'indicateur de statut réseau",
+    "showIndicatorSubtitle": "Afficher l'état de chargement et d'erreur réseau sur la carte"
+  },
+  "navigation": {
+    "searchLocation": "Rechercher lieu",
+    "searchPlaceholder": "Rechercher lieux ou coordonnées...",
+    "routeTo": "Itinéraire vers",
+    "routeFrom": "Itinéraire depuis",
+    "selectLocation": "Sélectionner lieu",
+    "calculatingRoute": "Calcul de l'itinéraire...",
+    "routeCalculationFailed": "Échec du calcul d'itinéraire",
+    "start": "Démarrer",
+    "resume": "Reprendre",
+    "endRoute": "Terminer l'itinéraire",
+    "routeOverview": "Vue d'ensemble",
+    "retry": "Réessayer",
+    "cancelSearch": "Annuler recherche",
+    "noResultsFound": "Aucun résultat trouvé",
+    "searching": "Recherche...",
+    "location": "Lieu",
+    "startPoint": "Début",
+    "endPoint": "Fin",
+    "startSelect": "Début (sélectionner)",
+    "endSelect": "Fin (sélectionner)",
+    "distance": "Distance: {} km",
+    "routeActive": "Itinéraire actif",
+    "navigationSettings": "Navigation",
+    "navigationSettingsSubtitle": "Paramètres de planification d'itinéraire et d'évitement",
+    "avoidanceDistance": "Distance d'évitement",
+    "avoidanceDistanceSubtitle": "Distance minimale pour éviter les dispositifs de surveillance",
+    "searchHistory": "Historique de recherche max",
+    "searchHistorySubtitle": "Nombre maximum de recherches récentes à retenir",
+    "units": "Unités",
+    "unitsSubtitle": "Unités d'affichage pour distances et mesures",
+    "metric": "Métrique (km, m)",
+    "imperial": "Impérial (mi, ft)",
+    "meters": "mètres",
+    "feet": "pieds"
   }
 }

lib/localizations/it.json

@@ -5,6 +5,13 @@
   "app": {
     "title": "DeFlock"
   },
+  "about": {
+    "title": "DeFlock - Trasparenza della Sorveglianza",
+    "description": "DeFlock è un'app mobile orientata alla privacy per mappare l'infrastruttura di sorveglianza pubblica utilizzando OpenStreetMap. Documenta telecamere, ALPR, rilevatori di spari e altri dispositivi di sorveglianza nella tua comunità per rendere questa infrastruttura visibile e ricercabile.",
+    "features": "• Mappatura con capacità offline con aree scaricabili\n• Upload diretto su OpenStreetMap con OAuth2\n• Profili integrati per i principali produttori\n• Rispettoso della privacy - nessun dato utente raccolto\n• Multipli fornitori di mappe (OSM, immagini satellitari)",
+    "initiative": "Parte della più ampia iniziativa DeFlock per promuovere la trasparenza della sorveglianza.",
+    "footer": "Visita: deflock.me\nCostruito con Flutter • Open Source"
+  },
   "actions": {
     "tagNode": "Nuovo Nodo",
     "download": "Scarica",
@@ -45,7 +52,8 @@
     "offlineSettingsSubtitle": "Gestisci modalità offline e aree scaricate",
     "advancedSettings": "Impostazioni Avanzate",
     "advancedSettingsSubtitle": "Impostazioni di prestazioni, avvisi e fornitori di tessere",
-    "proximityAlerts": "Avvisi di Prossimità"
+    "proximityAlerts": "Avvisi di Prossimità",
+    "networkStatusIndicator": "Indicatore di Stato di Rete"
   },
   "proximityAlerts": {
     "getNotified": "Ricevi notifiche quando ti avvicini a dispositivi di sorveglianza",
@@ -183,6 +191,11 @@
     "attribution": "Attribuzione",
     "attributionHint": "© Fornitore Mappe",
     "attributionRequired": "L'attribuzione è obbligatoria",
+    "maxZoom": "Livello Zoom Massimo",
+    "maxZoomHint": "Livello di zoom massimo (1-23)",
+    "maxZoomRequired": "Il zoom massimo è obbligatorio",
+    "maxZoomInvalid": "Il zoom massimo deve essere un numero",
+    "maxZoomRange": "Il zoom massimo deve essere tra {} e {}",
     "fetchPreview": "Ottieni Anteprima",
     "previewTileLoaded": "Tile di anteprima caricato con successo",
     "previewTileFailed": "Impossibile ottenere l'anteprima: {}",
@@ -200,7 +213,8 @@
   },
   "mapTiles": {
     "title": "Tile Mappa",
-    "manageProviders": "Gestisci Fornitori"
+    "manageProviders": "Gestisci Fornitori",
+    "attribution": "Attribuzione Mappa"
   },
   "profileEditor": {
     "viewProfile": "Visualizza Profilo",
@@ -287,5 +301,45 @@
     "cannotChangeTileTypes": "Impossibile cambiare tipi di tile durante il download di aree offline",
     "selectMapLayer": "Seleziona Livello Mappa",
     "noTileProvidersAvailable": "Nessun fornitore di tile disponibile"
+  },
+  "networkStatus": {
+    "showIndicator": "Mostra indicatore di stato di rete",
+    "showIndicatorSubtitle": "Visualizza lo stato di caricamento e errori di rete sulla mappa"
+  },
+  "navigation": {
+    "searchLocation": "Cerca posizione",
+    "searchPlaceholder": "Cerca luoghi o coordinate...",
+    "routeTo": "Percorso verso",
+    "routeFrom": "Percorso da",
+    "selectLocation": "Seleziona posizione",
+    "calculatingRoute": "Calcolo percorso...",
+    "routeCalculationFailed": "Calcolo percorso fallito",
+    "start": "Inizia",
+    "resume": "Riprendi",
+    "endRoute": "Termina percorso",
+    "routeOverview": "Panoramica percorso",
+    "retry": "Riprova",
+    "cancelSearch": "Annulla ricerca",
+    "noResultsFound": "Nessun risultato trovato",
+    "searching": "Ricerca in corso...",
+    "location": "Posizione",
+    "startPoint": "Inizio",
+    "endPoint": "Fine",
+    "startSelect": "Inizio (seleziona)",
+    "endSelect": "Fine (seleziona)",
+    "distance": "Distanza: {} km",
+    "routeActive": "Percorso attivo",
+    "navigationSettings": "Navigazione",
+    "navigationSettingsSubtitle": "Impostazioni pianificazione percorso ed evitamento",
+    "avoidanceDistance": "Distanza di evitamento",
+    "avoidanceDistanceSubtitle": "Distanza minima da mantenere dai dispositivi di sorveglianza",
+    "searchHistory": "Cronologia ricerca max",
+    "searchHistorySubtitle": "Numero massimo di ricerche recenti da ricordare",
+    "units": "Unità",
+    "unitsSubtitle": "Unità di visualizzazione per distanze e misure",
+    "metric": "Metrico (km, m)",
+    "imperial": "Imperiale (mi, ft)",
+    "meters": "metri",
+    "feet": "piedi"
   }
 }

lib/localizations/pt.json

@@ -5,6 +5,13 @@
   "app": {
     "title": "DeFlock"
   },
+  "about": {
+    "title": "DeFlock - Transparência da Vigilância",
+    "description": "DeFlock é um aplicativo móvel focado na privacidade para mapear infraestrutura de vigilância pública usando OpenStreetMap. Documente câmeras, ALPRs, detectores de tiros e outros dispositivos de vigilância em sua comunidade para tornar essa infraestrutura visível e pesquisável.",
+    "features": "• Mapeamento com capacidade offline com áreas para download\n• Upload direto para OpenStreetMap com OAuth2\n• Perfis integrados para principais fabricantes\n• Respeitoso à privacidade - nenhum dado do usuário coletado\n• Múltiplos provedores de mapas (OSM, imagens de satélite)",
+    "initiative": "Parte da iniciativa mais ampla DeFlock para promover transparência na vigilância.",
+    "footer": "Visite: deflock.me\nConstruído com Flutter • Código Aberto"
+  },
   "actions": {
     "tagNode": "Novo Nó",
     "download": "Baixar",
@@ -45,7 +52,8 @@
     "offlineSettingsSubtitle": "Gerenciar modo offline e áreas baixadas",
     "advancedSettings": "Configurações Avançadas",
     "advancedSettingsSubtitle": "Configurações de desempenho, alertas e provedores de mapas",
-    "proximityAlerts": "Alertas de Proximidade"
+    "proximityAlerts": "Alertas de Proximidade",
+    "networkStatusIndicator": "Indicador de Status de Rede"
   },
   "proximityAlerts": {
     "getNotified": "Receba notificações ao se aproximar de dispositivos de vigilância",
@@ -183,6 +191,11 @@
     "attribution": "Atribuição",
     "attributionHint": "© Provedor de Mapas",
     "attributionRequired": "Atribuição é obrigatória",
+    "maxZoom": "Nível de Zoom Máximo",
+    "maxZoomHint": "Nível de zoom máximo (1-23)",
+    "maxZoomRequired": "Zoom máximo é obrigatório",
+    "maxZoomInvalid": "Zoom máximo deve ser um número",
+    "maxZoomRange": "Zoom máximo deve estar entre {} e {}",
     "fetchPreview": "Buscar Preview",
     "previewTileLoaded": "Tile de preview carregado com sucesso",
     "previewTileFailed": "Falha ao buscar preview: {}",
@@ -200,7 +213,8 @@
   },
   "mapTiles": {
     "title": "Tiles do Mapa",
-    "manageProviders": "Gerenciar Provedores"
+    "manageProviders": "Gerenciar Provedores",
+    "attribution": "Atribuição do Mapa"
   },
   "profileEditor": {
     "viewProfile": "Ver Perfil",
@@ -287,5 +301,45 @@
     "cannotChangeTileTypes": "Não é possível alterar tipos de tiles durante o download de áreas offline",
     "selectMapLayer": "Selecionar Camada do Mapa",
     "noTileProvidersAvailable": "Nenhum provedor de tiles disponível"
+  },
+  "networkStatus": {
+    "showIndicator": "Exibir indicador de status de rede",
+    "showIndicatorSubtitle": "Mostrar status de carregamento e erro de rede no mapa"
+  },
+  "navigation": {
+    "searchLocation": "Buscar localização",
+    "searchPlaceholder": "Buscar locais ou coordenadas...",
+    "routeTo": "Rota para",
+    "routeFrom": "Rota de",
+    "selectLocation": "Selecionar localização",
+    "calculatingRoute": "Calculando rota...",
+    "routeCalculationFailed": "Falha no cálculo da rota",
+    "start": "Iniciar",
+    "resume": "Continuar",
+    "endRoute": "Terminar rota",
+    "routeOverview": "Visão geral da rota",
+    "retry": "Tentar novamente",
+    "cancelSearch": "Cancelar busca",
+    "noResultsFound": "Nenhum resultado encontrado",
+    "searching": "Buscando...",
+    "location": "Localização",
+    "startPoint": "Início",
+    "endPoint": "Fim",
+    "startSelect": "Início (selecionar)",
+    "endSelect": "Fim (selecionar)",
+    "distance": "Distância: {} km",
+    "routeActive": "Rota ativa",
+    "navigationSettings": "Navegação",
+    "navigationSettingsSubtitle": "Configurações de planejamento de rota e evasão",
+    "avoidanceDistance": "Distância de evasão",
+    "avoidanceDistanceSubtitle": "Distância mínima para ficar longe de dispositivos de vigilância",
+    "searchHistory": "Histórico máximo de busca",
+    "searchHistorySubtitle": "Número máximo de buscas recentes para lembrar",
+    "units": "Unidades",
+    "unitsSubtitle": "Unidades de exibição para distâncias e medidas",
+    "metric": "Métrico (km, m)",
+    "imperial": "Imperial (mi, ft)",
+    "meters": "metros",
+    "feet": "pés"
   }
 }

lib/localizations/zh.json

@@ -5,6 +5,13 @@
   "app": {
     "title": "DeFlock"
   },
+  "about": {
+    "title": "DeFlock - 监控透明化",
+    "description": "DeFlock 是一款注重隐私的移动应用，使用 OpenStreetMap 绘制公共监控基础设施。记录您社区中的摄像头、车牌识别系统、枪击探测器和其他监控设备，使这些基础设施可见且可搜索。",
+    "features": "• 具有可下载区域的离线映射功能\n• 使用 OAuth2 直接上传到 OpenStreetMap\n• 主要制造商的内置配置文件\n• 尊重隐私 - 不收集用户数据\n• 多个地图提供商（OSM、卫星图像）",
+    "initiative": "DeFlock 更广泛倡议的一部分，旨在促进监控透明化。",
+    "footer": "访问：deflock.me\n使用 Flutter 构建 • 开源"
+  },
   "actions": {
     "tagNode": "新建节点",
     "download": "下载",
@@ -45,7 +52,8 @@
     "offlineSettingsSubtitle": "管理离线模式和已下载区域",
     "advancedSettings": "高级设置",
     "advancedSettingsSubtitle": "性能、警报和地图提供商设置",
-    "proximityAlerts": "邻近警报"
+    "proximityAlerts": "邻近警报",
+    "networkStatusIndicator": "网络状态指示器"
   },
   "proximityAlerts": {
     "getNotified": "接近监控设备时接收通知",
@@ -183,6 +191,11 @@
     "attribution": "归属",
     "attributionHint": "© 地图提供商",
     "attributionRequired": "归属为必填项",
+    "maxZoom": "最大缩放级别",
+    "maxZoomHint": "最大缩放级别 (1-23)",
+    "maxZoomRequired": "最大缩放为必填项",
+    "maxZoomInvalid": "最大缩放必须为数字",
+    "maxZoomRange": "最大缩放必须在 {} 和 {} 之间",
     "fetchPreview": "获取预览",
     "previewTileLoaded": "预览瓦片加载成功",
     "previewTileFailed": "获取预览失败：{}",
@@ -200,7 +213,8 @@
   },
   "mapTiles": {
     "title": "地图瓦片",
-    "manageProviders": "管理提供商"
+    "manageProviders": "管理提供商",
+    "attribution": "地图归属"
   },
   "profileEditor": {
     "viewProfile": "查看配置文件",
@@ -287,5 +301,45 @@
     "cannotChangeTileTypes": "在下载离线区域时无法更改瓦片类型",
     "selectMapLayer": "选择地图图层",
     "noTileProvidersAvailable": "无可用瓦片提供商"
+  },
+  "networkStatus": {
+    "showIndicator": "显示网络状态指示器",
+    "showIndicatorSubtitle": "在地图上显示网络加载和错误状态"
+  },
+  "navigation": {
+    "searchLocation": "搜索位置",
+    "searchPlaceholder": "搜索地点或坐标...",
+    "routeTo": "路线至",
+    "routeFrom": "路线从",
+    "selectLocation": "选择位置",
+    "calculatingRoute": "计算路线中...",
+    "routeCalculationFailed": "路线计算失败",
+    "start": "开始",
+    "resume": "继续",
+    "endRoute": "结束路线",
+    "routeOverview": "路线概览",
+    "retry": "重试",
+    "cancelSearch": "取消搜索",
+    "noResultsFound": "未找到结果",
+    "searching": "搜索中...",
+    "location": "位置",
+    "startPoint": "起点",
+    "endPoint": "终点",
+    "startSelect": "起点（选择）",
+    "endSelect": "终点（选择）",
+    "distance": "距离：{} 公里",
+    "routeActive": "路线活跃",
+    "navigationSettings": "导航",
+    "navigationSettingsSubtitle": "路线规划和回避设置",
+    "avoidanceDistance": "回避距离",
+    "avoidanceDistanceSubtitle": "与监控设备保持的最小距离",
+    "searchHistory": "最大搜索历史",
+    "searchHistorySubtitle": "要记住的最近搜索次数",
+    "units": "单位",
+    "unitsSubtitle": "距离和测量的显示单位",
+    "metric": "公制（公里，米）",
+    "imperial": "英制（英里，英尺）",
+    "meters": "米",
+    "feet": "英尺"
   }
 }

lib/main.dart

@@ -5,17 +5,22 @@ import 'app_state.dart';
 import 'screens/home_screen.dart';
 import 'screens/settings_screen.dart';
 import 'screens/profiles_settings_screen.dart';
+import 'screens/navigation_settings_screen.dart';
 import 'screens/offline_settings_screen.dart';
 import 'screens/advanced_settings_screen.dart';
 import 'screens/language_settings_screen.dart';
 import 'screens/about_screen.dart';
 import 'services/localization_service.dart';
+import 'services/version_service.dart';
 
 
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   
+  // Initialize version service
+  await VersionService().init();
+  
   // Initialize localization service
   await LocalizationService.instance.init();
 
@@ -64,6 +69,7 @@ class DeFlockApp extends StatelessWidget {
         '/': (context) => const HomeScreen(),
         '/settings': (context) => const SettingsScreen(),
         '/settings/profiles': (context) => const ProfilesSettingsScreen(),
+        '/settings/navigation': (context) => const NavigationSettingsScreen(),
         '/settings/offline': (context) => const OfflineSettingsScreen(),
         '/settings/advanced': (context) => const AdvancedSettingsScreen(),
         '/settings/language': (context) => const LanguageSettingsScreen(),

lib/models/search_result.dart

@@ -0,0 +1,47 @@
+import 'package:latlong2/latlong.dart';
+
+/// Represents a search result from a geocoding service
+class SearchResult {
+  final String displayName;
+  final LatLng coordinates;
+  final String? category;
+  final String? type;
+  
+  const SearchResult({
+    required this.displayName,
+    required this.coordinates,
+    this.category,
+    this.type,
+  });
+  
+  /// Create SearchResult from Nominatim JSON response
+  factory SearchResult.fromNominatim(Map<String, dynamic> json) {
+    final lat = double.parse(json['lat'] as String);
+    final lon = double.parse(json['lon'] as String);
+    
+    return SearchResult(
+      displayName: json['display_name'] as String,
+      coordinates: LatLng(lat, lon),
+      category: json['category'] as String?,
+      type: json['type'] as String?,
+    );
+  }
+  
+  @override
+  String toString() {
+    return 'SearchResult(displayName: $displayName, coordinates: $coordinates)';
+  }
+  
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is SearchResult &&
+        other.displayName == displayName &&
+        other.coordinates == coordinates;
+  }
+  
+  @override
+  int get hashCode {
+    return displayName.hashCode ^ coordinates.hashCode;
+  }
+}

lib/models/tile_provider.dart

@@ -8,6 +8,7 @@ class TileType {
   final String urlTemplate;
   final String attribution;
   final Uint8List? previewTile; // Single tile image data for preview
+  final int maxZoom; // Maximum zoom level for this tile type
 
   const TileType({
     required this.id,
@@ -15,6 +16,7 @@ class TileType {
     required this.urlTemplate,
     required this.attribution,
     this.previewTile,
+    this.maxZoom = 18, // Default max zoom level
   });
 
   /// Create URL for a specific tile, replacing template variables
@@ -40,6 +42,7 @@ class TileType {
     'urlTemplate': urlTemplate,
     'attribution': attribution,
     'previewTile': previewTile != null ? base64Encode(previewTile!) : null,
+    'maxZoom': maxZoom,
   };
 
   static TileType fromJson(Map<String, dynamic> json) => TileType(
@@ -50,6 +53,7 @@ class TileType {
     previewTile: json['previewTile'] != null 
         ? base64Decode(json['previewTile'])
         : null,
+    maxZoom: json['maxZoom'] ?? 18, // Default to 18 if not specified
   );
 
   TileType copyWith({
@@ -58,12 +62,14 @@ class TileType {
     String? urlTemplate,
     String? attribution,
     Uint8List? previewTile,
+    int? maxZoom,
   }) => TileType(
     id: id ?? this.id,
     name: name ?? this.name,
     urlTemplate: urlTemplate ?? this.urlTemplate,
     attribution: attribution ?? this.attribution,
     previewTile: previewTile ?? this.previewTile,
+    maxZoom: maxZoom ?? this.maxZoom,
   );
 
   @override
@@ -151,42 +157,7 @@ class DefaultTileProviders {
             name: 'Street Map',
             urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
             attribution: '© OpenStreetMap contributors',
-          ),
-        ],
-      ),
-      TileProvider(
-        id: 'google',
-        name: 'Google',
-        tileTypes: [
-          TileType(
-            id: 'google_hybrid',
-            name: 'Satellite + Roads',
-            urlTemplate: 'https://mt1.google.com/vt/lyrs=y&x={x}&y={y}&z={z}',
-            attribution: '© Google',
-          ),
-          TileType(
-            id: 'google_satellite',
-            name: 'Satellite Only',
-            urlTemplate: 'https://mt1.google.com/vt/lyrs=s&x={x}&y={y}&z={z}',
-            attribution: '© Google',
-          ),
-          TileType(
-            id: 'google_roadmap',
-            name: 'Road Map',
-            urlTemplate: 'https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}',
-            attribution: '© Google',
-          ),
-        ],
-      ),
-      TileProvider(
-        id: 'esri',
-        name: 'Esri',
-        tileTypes: [
-          TileType(
-            id: 'esri_satellite',
-            name: 'Satellite Imagery',
-            urlTemplate: 'https://services.arcgisonline.com/ArcGis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}.png',
-            attribution: '© Esri © Maxar',
+            maxZoom: 19,
           ),
         ],
       ),
@@ -208,6 +179,19 @@ class DefaultTileProviders {
           ),
         ],
       ),
+      TileProvider(
+        id: 'opentopomap_memomaps',
+        name: 'OpenTopoMap/Memomaps',
+        tileTypes: [
+          TileType(
+            id: 'opentopomap_topo',
+            name: 'Topographic',
+            urlTemplate: 'https://tile.memomaps.de/tilegen/{z}/{x}/{y}.png',
+            attribution: 'Kartendaten: © OpenStreetMap-Mitwirkende, SRTM | Kartendarstellung: © OpenTopoMap (CC-BY-SA)',
+            maxZoom: 18,
+          ),
+        ],
+      ),
     ];
   }
 }

lib/screens/about_screen.dart

@@ -14,36 +14,42 @@ class AboutScreen extends StatelessWidget {
         appBar: AppBar(
           title: Text(locService.t('settings.aboutThisApp')),
         ),
-        body: FutureBuilder<String>(
-          future: DefaultAssetBundle.of(context).loadString('assets/info.txt'),
-          builder: (context, snapshot) {
-            if (snapshot.connectionState == ConnectionState.waiting) {
-              return const Center(
-                child: CircularProgressIndicator(),
-              );
-            }
-            
-            if (snapshot.hasError) {
-              return Center(
-                child: Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Text(
-                    'Error loading info: ${snapshot.error}',
-                    style: Theme.of(context).textTheme.bodyLarge,
-                    textAlign: TextAlign.center,
-                  ),
+        body: SingleChildScrollView(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                locService.t('about.title'),
+                style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                  fontWeight: FontWeight.bold,
                 ),
-              );
-            }
-            
-            return SingleChildScrollView(
-              padding: const EdgeInsets.all(16),
-              child: Text(
-                snapshot.data ?? 'No info available.',
+              ),
+              const SizedBox(height: 16),
+              Text(
+                locService.t('about.description'),
                 style: Theme.of(context).textTheme.bodyLarge,
               ),
-            );
-          },
+              const SizedBox(height: 16),
+              Text(
+                locService.t('about.features'),
+                style: Theme.of(context).textTheme.bodyLarge,
+              ),
+              const SizedBox(height: 16),
+              Text(
+                locService.t('about.initiative'),
+                style: Theme.of(context).textTheme.bodyLarge,
+              ),
+              const SizedBox(height: 24),
+              Text(
+                locService.t('about.footer'),
+                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                  color: Theme.of(context).textTheme.bodySmall?.color,
+                ),
+                textAlign: TextAlign.center,
+              ),
+            ],
+          ),
         ),
       ),
     );

lib/screens/advanced_settings_screen.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'settings/sections/max_nodes_section.dart';
 import 'settings/sections/proximity_alerts_section.dart';
 import 'settings/sections/tile_provider_section.dart';
+import 'settings/sections/network_status_section.dart';
 import '../services/localization_service.dart';
 
 class AdvancedSettingsScreen extends StatelessWidget {
@@ -24,6 +25,8 @@ class AdvancedSettingsScreen extends StatelessWidget {
             Divider(),
             ProximityAlertsSection(),
             Divider(),
+            NetworkStatusSection(),
+            Divider(),
             TileProviderSection(),
           ],
         ),

lib/screens/home_screen.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map_animations/flutter_map_animations.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';
 
 import '../app_state.dart';
@@ -15,7 +16,10 @@ import '../widgets/node_tag_sheet.dart';
 import '../widgets/camera_provider_with_cache.dart';
 import '../widgets/download_area_dialog.dart';
 import '../widgets/measured_sheet.dart';
+import '../widgets/navigation_sheet.dart';
+import '../widgets/search_bar.dart';
 import '../models/osm_node.dart';
+import '../models/search_result.dart';
 
 class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
@@ -29,11 +33,13 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
   final GlobalKey<MapViewState> _mapViewKey = GlobalKey<MapViewState>();
   late final AnimatedMapController _mapController;
   bool _editSheetShown = false;
+  bool _navigationSheetShown = false;
   
   // Track sheet heights for map positioning
   double _addSheetHeight = 0.0;
   double _editSheetHeight = 0.0;
   double _tagSheetHeight = 0.0;
+  double _navigationSheetHeight = 0.0;
   
   // Flag to prevent map bounce when transitioning from tag sheet to edit sheet
   bool _transitioningToEdit = false;
@@ -96,13 +102,18 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
     final session = appState.session!;          // guaranteed non‑null now
 
     final controller = _scaffoldKey.currentState!.showBottomSheet(
-      (ctx) => MeasuredSheet(
-        onHeightChanged: (height) {
-          setState(() {
-            _addSheetHeight = height;
-          });
-        },
-        child: AddNodeSheet(session: session),
+      (ctx) => Padding(
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.of(context).padding.bottom, // Only safe area, no keyboard
+        ),
+        child: MeasuredSheet(
+          onHeightChanged: (height) {
+            setState(() {
+              _addSheetHeight = height + MediaQuery.of(context).padding.bottom;
+            });
+          },
+          child: AddNodeSheet(session: session),
+        ),
       ),
     );
     
@@ -134,19 +145,24 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
       if (!mounted) return;
       
       final controller = _scaffoldKey.currentState!.showBottomSheet(
-        (ctx) => MeasuredSheet(
-          onHeightChanged: (height) {
-            setState(() {
-              _editSheetHeight = height;
-              // Clear transition flag and reset tag sheet height once edit sheet starts sizing
-              if (height > 0 && _transitioningToEdit) {
-                _transitioningToEdit = false;
-                _tagSheetHeight = 0.0; // Now safe to reset
-                _selectedNodeId = null; // Clear selection when moving to edit
-              }
-            });
-          },
-          child: EditNodeSheet(session: session),
+        (ctx) => Padding(
+          padding: EdgeInsets.only(
+            bottom: MediaQuery.of(context).padding.bottom, // Only safe area, no keyboard
+          ),
+          child: MeasuredSheet(
+            onHeightChanged: (height) {
+              setState(() {
+                _editSheetHeight = height + MediaQuery.of(context).padding.bottom;
+                // Clear transition flag and reset tag sheet height once edit sheet starts sizing
+                if (height > 0 && _transitioningToEdit) {
+                  _transitioningToEdit = false;
+                  _tagSheetHeight = 0.0; // Now safe to reset
+                  _selectedNodeId = null; // Clear selection when moving to edit
+                }
+              });
+            },
+            child: EditNodeSheet(session: session),
+          ),
         ),
       );
       
@@ -160,6 +176,227 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
     });
   }
 
+  void _openNavigationSheet() {
+    final controller = _scaffoldKey.currentState!.showBottomSheet(
+      (ctx) => Padding(
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.of(context).padding.bottom, // Only safe area, no keyboard
+        ),
+        child: MeasuredSheet(
+          onHeightChanged: (height) {
+            setState(() {
+              _navigationSheetHeight = height + MediaQuery.of(context).padding.bottom;
+            });
+          },
+          child: NavigationSheet(
+            onStartRoute: _onStartRoute,
+            onResumeRoute: _onResumeRoute,
+          ),
+        ),
+      ),
+    );
+    
+    // Reset height when sheet is dismissed
+    controller.closed.then((_) {
+      setState(() {
+        _navigationSheetHeight = 0.0;
+      });
+      
+      // Handle different dismissal scenarios
+      final appState = context.read<AppState>();
+      
+      if (appState.isSettingSecondPoint) {
+        // If user dismisses sheet while setting second point, cancel everything
+        debugPrint('[HomeScreen] Sheet dismissed during second point selection - canceling navigation');
+        appState.cancelNavigation();
+      } else if (appState.isInRouteMode && appState.showingOverview) {
+        // If we're in route active mode and showing overview, just hide the overview
+        debugPrint('[HomeScreen] Sheet dismissed during route overview - hiding overview');
+        appState.hideRouteOverview();
+      }
+    });
+  }
+
+  void _onStartRoute() {
+    final appState = context.read<AppState>();
+    
+    // Get user location and check if we should auto-enable follow-me
+    LatLng? userLocation;
+    bool enableFollowMe = false;
+    
+    try {
+      userLocation = _mapViewKey.currentState?.getUserLocation();
+      if (userLocation != null && appState.shouldAutoEnableFollowMe(userLocation)) {
+        debugPrint('[HomeScreen] Auto-enabling follow-me mode - user within 1km of start');
+        appState.setFollowMeMode(FollowMeMode.northUp);
+        enableFollowMe = true;
+      }
+    } catch (e) {
+      debugPrint('[HomeScreen] Could not get user location for auto follow-me: $e');
+    }
+    
+    // Start the route
+    appState.startRoute();
+    
+    // Zoom to level 14 and center appropriately
+    _zoomAndCenterForRoute(enableFollowMe, userLocation, appState.routeStart);
+  }
+  
+  void _zoomAndCenterForRoute(bool followMeEnabled, LatLng? userLocation, LatLng? routeStart) {
+    try {
+      LatLng centerLocation;
+      
+      if (followMeEnabled && userLocation != null) {
+        // Center on user if follow-me is enabled
+        centerLocation = userLocation;
+        debugPrint('[HomeScreen] Centering on user location for route start');
+      } else if (routeStart != null) {
+        // Center on start pin if user is far away or no GPS
+        centerLocation = routeStart;
+        debugPrint('[HomeScreen] Centering on route start pin');
+      } else {
+        debugPrint('[HomeScreen] No valid location to center on');
+        return;
+      }
+      
+      // Animate to zoom 14 and center location
+      _mapController.animateTo(
+        dest: centerLocation,
+        zoom: 14.0,
+        duration: const Duration(milliseconds: 800),
+        curve: Curves.easeInOut,
+      );
+    } catch (e) {
+      debugPrint('[HomeScreen] Could not zoom/center for route: $e');
+    }
+  }
+  
+  void _onResumeRoute() {
+    final appState = context.read<AppState>();
+    
+    // Hide the overview
+    appState.hideRouteOverview();
+    
+    // Zoom and center for resumed route
+    // For resume, we always center on user if GPS is available, otherwise start pin
+    LatLng? userLocation;
+    try {
+      userLocation = _mapViewKey.currentState?.getUserLocation();
+    } catch (e) {
+      debugPrint('[HomeScreen] Could not get user location for route resume: $e');
+    }
+    
+    _zoomAndCenterForRoute(
+      appState.followMeMode != FollowMeMode.off, // Use current follow-me state
+      userLocation, 
+      appState.routeStart
+    );
+  }
+  
+  void _zoomToShowFullRoute(AppState appState) {
+    if (appState.routeStart == null || appState.routeEnd == null) return;
+    
+    try {
+      // Calculate the bounds of the route
+      final start = appState.routeStart!;
+      final end = appState.routeEnd!;
+      
+      // Find the center point between start and end
+      final centerLat = (start.latitude + end.latitude) / 2;
+      final centerLng = (start.longitude + end.longitude) / 2;
+      final center = LatLng(centerLat, centerLng);
+      
+      // Calculate distance between points to determine appropriate zoom
+      final distance = const Distance().as(LengthUnit.Meter, start, end);
+      double zoom;
+      if (distance < 500) {
+        zoom = 16.0;
+      } else if (distance < 2000) {
+        zoom = 14.0;
+      } else if (distance < 10000) {
+        zoom = 12.0;
+      } else {
+        zoom = 10.0;
+      }
+      
+      debugPrint('[HomeScreen] Zooming to show full route - distance: ${distance.toStringAsFixed(0)}m, zoom: $zoom');
+      
+      _mapController.animateTo(
+        dest: center,
+        zoom: zoom,
+        duration: const Duration(milliseconds: 800),
+        curve: Curves.easeInOut,
+      );
+    } catch (e) {
+      debugPrint('[HomeScreen] Could not zoom to show full route: $e');
+    }
+  }
+
+  void _onNavigationButtonPressed() {
+    final appState = context.read<AppState>();
+    
+    debugPrint('[HomeScreen] Navigation button pressed - showRouteButton: ${appState.showRouteButton}, navigationMode: ${appState.navigationMode}');
+    
+    if (appState.showRouteButton) {
+      // Route button - show route overview and zoom to show route
+      debugPrint('[HomeScreen] Showing route overview');
+      appState.showRouteOverview();
+      
+      // Zoom out a bit to show the full route when viewing overview
+      _zoomToShowFullRoute(appState);
+    } else {
+      // Search button
+      if (appState.offlineMode) {
+        // Show offline snackbar instead of entering search mode
+        debugPrint('[HomeScreen] Search disabled - offline mode');
+        ScaffoldMessenger.of(context).clearSnackBars();
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Search not available while offline'),
+            duration: const Duration(seconds: 3),
+            behavior: SnackBarBehavior.floating,
+          ),
+        );
+      } else {
+        // Enter search mode normally
+        debugPrint('[HomeScreen] Entering search mode');
+        try {
+          final mapCenter = _mapController.mapController.camera.center;
+          debugPrint('[HomeScreen] Map center: $mapCenter');
+          appState.enterSearchMode(mapCenter);
+        } catch (e) {
+          // Controller not ready, use fallback location
+          debugPrint('[HomeScreen] Map controller not ready: $e, using fallback');
+          appState.enterSearchMode(LatLng(37.7749, -122.4194));
+        }
+      }
+    }
+  }
+
+  void _onSearchResultSelected(SearchResult result) {
+    final appState = context.read<AppState>();
+    
+    // Update navigation state with selected result
+    appState.selectSearchResult(result);
+    
+    // Jump to the search result location
+    try {
+      _mapController.animateTo(
+        dest: result.coordinates,
+        zoom: 16.0, // Good zoom level for viewing the area
+        duration: const Duration(milliseconds: 500),
+        curve: Curves.easeOut,
+      );
+    } catch (_) {
+      // Map controller not ready, fallback to immediate move
+      try {
+        _mapController.mapController.move(result.coordinates, 16.0);
+      } catch (_) {
+        debugPrint('[HomeScreen] Could not move to search result: ${result.coordinates}');
+      }
+    }
+  }
+
   void openNodeTagSheet(OsmNode node) {
     setState(() {
       _selectedNodeId = node.id; // Track selected node for highlighting
@@ -184,19 +421,24 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
     }
     
     final controller = _scaffoldKey.currentState!.showBottomSheet(
-      (ctx) => MeasuredSheet(
-        onHeightChanged: (height) {
-          setState(() {
-            _tagSheetHeight = height;
-          });
-        },
-        child: NodeTagSheet(
-          node: node,
-          onEditPressed: () {
-            final appState = context.read<AppState>();
-            appState.startEditSession(node);
-            // This will trigger _openEditNodeSheet via the existing auto-show logic
+      (ctx) => Padding(
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.of(context).padding.bottom, // Only safe area, no keyboard
+        ),
+        child: MeasuredSheet(
+          onHeightChanged: (height) {
+            setState(() {
+              _tagSheetHeight = height + MediaQuery.of(context).padding.bottom;
+            });
           },
+          child: NodeTagSheet(
+            node: node,
+            onEditPressed: () {
+              final appState = context.read<AppState>();
+              appState.startEditSession(node);
+              // This will trigger _openEditNodeSheet via the existing auto-show logic
+            },
+          ),
         ),
       ),
     );
@@ -225,20 +467,36 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
       _editSheetShown = false;
     }
 
+    // Auto-open navigation sheet when needed - simplified logic (only in dev mode)
+    if (kEnableNavigationFeatures) {
+      final shouldShowNavSheet = appState.isInSearchMode || appState.showingOverview;
+      if (shouldShowNavSheet && !_navigationSheetShown) {
+        _navigationSheetShown = true;
+        WidgetsBinding.instance.addPostFrameCallback((_) => _openNavigationSheet());
+      } else if (!shouldShowNavSheet) {
+        _navigationSheetShown = false;
+      }
+    }
+
     // Pass the active sheet height directly to the map
     final activeSheetHeight = _addSheetHeight > 0 
         ? _addSheetHeight 
         : (_editSheetHeight > 0 
             ? _editSheetHeight 
-            : _tagSheetHeight);
+            : (_navigationSheetHeight > 0
+                ? _navigationSheetHeight
+                : _tagSheetHeight));
 
     return MultiProvider(
       providers: [
         ChangeNotifierProvider<CameraProviderWithCache>(create: (_) => CameraProviderWithCache()),
       ],
-      child: Scaffold(
+      child: MediaQuery(
+        data: MediaQuery.of(context).copyWith(viewInsets: EdgeInsets.zero),
+        child: Scaffold(
         key: _scaffoldKey,
         appBar: AppBar(
+          automaticallyImplyLeading: false, // Disable automatic back button
           title: SvgPicture.asset(
             'assets/deflock-logo.svg',
             height: 28,
@@ -278,12 +536,25 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
               sheetHeight: activeSheetHeight,
               selectedNodeId: _selectedNodeId,
               onNodeTap: openNodeTagSheet,
+              onSearchPressed: _onNavigationButtonPressed,
               onUserGesture: () {
                 if (appState.followMeMode != FollowMeMode.off) {
                   appState.setFollowMeMode(FollowMeMode.off);
                 }
               },
             ),
+            // Search bar (slides in when in search mode) - only online since search doesn't work offline
+            if (!appState.offlineMode && appState.isInSearchMode) 
+              Positioned(
+                top: 0,
+                left: 0,
+                right: 0,
+                child: LocationSearchBar(
+                  onResultSelected: _onSearchResultSelected,
+                  onCancel: () => appState.cancelNavigation(),
+                ),
+              ),
+            // Bottom button bar (restored to original)
             Align(
               alignment: Alignment.bottomCenter,
               child: Padding(
@@ -311,6 +582,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
                     child: Row(
                     children: [
                       Expanded(
+                        flex: 7, // 70% for primary action
                         child: AnimatedBuilder(
                           animation: LocalizationService.instance,
                           builder: (context, child) => ElevatedButton.icon(
@@ -326,18 +598,22 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
                       ),
                       SizedBox(width: 12),
                       Expanded(
+                        flex: 3, // 30% for secondary action
                         child: AnimatedBuilder(
                           animation: LocalizationService.instance,
-                          builder: (context, child) => ElevatedButton.icon(
-                            icon: Icon(Icons.download_for_offline),
-                            label: Text(LocalizationService.instance.download),
-                            onPressed: () => showDialog(
-                              context: context,
-                              builder: (ctx) => DownloadAreaDialog(controller: _mapController.mapController),
-                            ),
-                            style: ElevatedButton.styleFrom(
-                              minimumSize: Size(0, 48),
-                              textStyle: TextStyle(fontSize: 16),
+                          builder: (context, child) => FittedBox(
+                            fit: BoxFit.scaleDown,
+                            child: ElevatedButton.icon(
+                              icon: Icon(Icons.download_for_offline),
+                              label: Text(LocalizationService.instance.download),
+                              onPressed: () => showDialog(
+                                context: context,
+                                builder: (ctx) => DownloadAreaDialog(controller: _mapController.mapController),
+                              ),
+                              style: ElevatedButton.styleFrom(
+                                minimumSize: Size(0, 48),
+                                textStyle: TextStyle(fontSize: 16),
+                              ),
                             ),
                           ),
                         ),
@@ -351,6 +627,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
           ],
         ),
       ),
+      ),
     );
   }
 }

lib/screens/navigation_settings_screen.dart

@@ -0,0 +1,124 @@
+import 'package:flutter/material.dart';
+import '../services/localization_service.dart';
+import '../app_state.dart';
+import 'package:provider/provider.dart';
+
+class NavigationSettingsScreen extends StatelessWidget {
+  const NavigationSettingsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final locService = LocalizationService.instance;
+    
+    return AnimatedBuilder(
+      animation: LocalizationService.instance,
+      builder: (context, child) => Scaffold(
+        appBar: AppBar(
+          title: Text(locService.t('navigation.navigationSettings')),
+        ),
+        body: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // Coming soon message
+              Card(
+                child: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Row(
+                        children: [
+                          Icon(Icons.info_outline, color: Colors.blue),
+                          const SizedBox(width: 8),
+                          Text(
+                            'Navigation Features',
+                            style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 8),
+                      Text(
+                        'Navigation and routing settings will be available here. Coming soon:\n\n'
+                        '• Surveillance avoidance distance\n'
+                        '• Route planning preferences\n'
+                        '• Search history management\n'
+                        '• Distance units (metric/imperial)',
+                        style: Theme.of(context).textTheme.bodyMedium,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              
+              const SizedBox(height: 24),
+              
+              // Placeholder settings (disabled for now)
+              _buildDisabledSetting(
+                context,
+                icon: Icons.warning_outlined,
+                title: locService.t('navigation.avoidanceDistance'),
+                subtitle: locService.t('navigation.avoidanceDistanceSubtitle'),
+                value: '100 ${locService.t('navigation.meters')}',
+              ),
+              
+              const Divider(),
+              
+              _buildDisabledSetting(
+                context,
+                icon: Icons.history,
+                title: locService.t('navigation.searchHistory'),
+                subtitle: locService.t('navigation.searchHistorySubtitle'),
+                value: '10 searches',
+              ),
+              
+              const Divider(),
+              
+              _buildDisabledSetting(
+                context,
+                icon: Icons.straighten,
+                title: locService.t('navigation.units'),
+                subtitle: locService.t('navigation.unitsSubtitle'),
+                value: locService.t('navigation.metric'),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildDisabledSetting(
+    BuildContext context, {
+    required IconData icon,
+    required String title,
+    required String subtitle,
+    required String value,
+  }) {
+    return Opacity(
+      opacity: 0.5,
+      child: ListTile(
+        leading: Icon(icon),
+        title: Text(title),
+        subtitle: Text(subtitle),
+        trailing: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(
+              value,
+              style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                color: Theme.of(context).textTheme.bodySmall?.color?.withOpacity(0.6),
+              ),
+            ),
+            const SizedBox(width: 8),
+            const Icon(Icons.chevron_right, size: 16),
+          ],
+        ),
+        enabled: false,
+      ),
+    );
+  }
+}

lib/screens/settings/sections/network_status_section.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../../app_state.dart';
+import '../../../services/localization_service.dart';
+
+/// Settings section for network status indicator configuration
+/// Follows brutalist principles: simple, explicit UI that matches existing patterns
+class NetworkStatusSection extends StatelessWidget {
+  const NetworkStatusSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<AppState>(
+      builder: (context, appState, child) {
+        final locService = LocalizationService.instance;
+        
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              locService.t('settings.networkStatusIndicator'),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            
+            // Enable/disable toggle
+            SwitchListTile(
+              title: Text(locService.t('networkStatus.showIndicator')),
+              subtitle: Text(locService.t('networkStatus.showIndicatorSubtitle')),
+              value: appState.networkStatusIndicatorEnabled,
+              onChanged: (enabled) {
+                appState.setNetworkStatusIndicatorEnabled(enabled);
+              },
+              contentPadding: EdgeInsets.zero,
+            ),
+          ],
+        );
+      },
+    );
+  }
+}

lib/screens/settings_screen.dart

@@ -3,6 +3,7 @@ import 'settings/sections/auth_section.dart';
 import 'settings/sections/upload_mode_section.dart';
 import 'settings/sections/queue_section.dart';
 import '../services/localization_service.dart';
+import '../services/version_service.dart';
 import '../dev_config.dart';
 
 class SettingsScreen extends StatelessWidget {
@@ -39,6 +40,18 @@ class SettingsScreen extends StatelessWidget {
             ),
             const Divider(),
             
+            // Only show navigation settings in development builds
+            if (kEnableNavigationFeatures) ...[
+              _buildNavigationTile(
+                context,
+                icon: Icons.navigation,
+                title: locService.t('navigation.navigationSettings'),
+                subtitle: locService.t('navigation.navigationSettingsSubtitle'),
+                onTap: () => Navigator.pushNamed(context, '/settings/navigation'),
+              ),
+              const Divider(),
+            ],
+            
             _buildNavigationTile(
               context,
               icon: Icons.cloud_off,
@@ -73,6 +86,19 @@ class SettingsScreen extends StatelessWidget {
               subtitle: locService.t('settings.aboutSubtitle'),
               onTap: () => Navigator.pushNamed(context, '/settings/about'),
             ),
+            const Divider(),
+            
+            // Version display
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+              child: Text(
+                'Version: ${VersionService().version}',
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  color: Theme.of(context).textTheme.bodySmall?.color?.withOpacity(0.6),
+                ),
+                textAlign: TextAlign.center,
+              ),
+            ),
           ],
         ),
       ),

lib/screens/tile_provider_editor_screen.dart

@@ -256,6 +256,7 @@ class _TileTypeDialogState extends State<_TileTypeDialog> {
   late final TextEditingController _nameController;
   late final TextEditingController _urlController;
   late final TextEditingController _attributionController;
+  late final TextEditingController _maxZoomController;
   Uint8List? _previewTile;
   bool _isLoadingPreview = false;
 
@@ -266,6 +267,7 @@ class _TileTypeDialogState extends State<_TileTypeDialog> {
     _nameController = TextEditingController(text: tileType?.name ?? '');
     _urlController = TextEditingController(text: tileType?.urlTemplate ?? '');
     _attributionController = TextEditingController(text: tileType?.attribution ?? '');
+    _maxZoomController = TextEditingController(text: (tileType?.maxZoom ?? 18).toString());
     _previewTile = tileType?.previewTile;
   }
 
@@ -274,6 +276,7 @@ class _TileTypeDialogState extends State<_TileTypeDialog> {
     _nameController.dispose();
     _urlController.dispose();
     _attributionController.dispose();
+    _maxZoomController.dispose();
     super.dispose();
   }
 
@@ -326,6 +329,22 @@ class _TileTypeDialogState extends State<_TileTypeDialog> {
                     validator: (value) => value?.trim().isEmpty == true ? locService.t('tileTypeEditor.attributionRequired') : null,
                   ),
                   const SizedBox(height: 16),
+                  TextFormField(
+                    controller: _maxZoomController,
+                    decoration: InputDecoration(
+                      labelText: locService.t('tileTypeEditor.maxZoom'),
+                      hintText: locService.t('tileTypeEditor.maxZoomHint'),
+                    ),
+                    keyboardType: TextInputType.number,
+                    validator: (value) {
+                      if (value?.trim().isEmpty == true) return locService.t('tileTypeEditor.maxZoomRequired');
+                      final zoom = int.tryParse(value!);
+                      if (zoom == null) return locService.t('tileTypeEditor.maxZoomInvalid');
+                      if (zoom < 1 || zoom > kAbsoluteMaxZoom) return locService.t('tileTypeEditor.maxZoomRange', params: ['1', kAbsoluteMaxZoom.toString()]);
+                      return null;
+                    },
+                  ),
+                  const SizedBox(height: 16),
                   Row(
                     children: [
                       TextButton.icon(
@@ -425,6 +444,7 @@ class _TileTypeDialogState extends State<_TileTypeDialog> {
       urlTemplate: _urlController.text.trim(),
       attribution: _attributionController.text.trim(),
       previewTile: _previewTile,
+      maxZoom: int.parse(_maxZoomController.text.trim()),
     );
 
     widget.onSave(tileType);

lib/services/routing_service.dart

@@ -0,0 +1,164 @@
+import 'dart:convert';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart' as http;
+import 'package:latlong2/latlong.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)';
+  }
+}
+
+class RoutingService {
+  static const String _baseUrl = 'https://router.project-osrm.org';
+  static const String _userAgent = 'DeFlock/1.0 (OSM surveillance mapping app)';
+  static const Duration _timeout = Duration(seconds: 15);
+  
+  /// Calculate route between two points using OSRM
+  Future<RouteResult> calculateRoute({
+    required LatLng start,
+    required LatLng end,
+    String profile = 'driving', // driving, walking, cycling
+  }) async {
+    debugPrint('[RoutingService] Calculating route from $start to $end');
+    
+    // OSRM uses lng,lat order (opposite of LatLng)
+    final startCoord = '${start.longitude},${start.latitude}';
+    final endCoord = '${end.longitude},${end.latitude}';
+    
+    final uri = Uri.parse('$_baseUrl/route/v1/$profile/$startCoord;$endCoord')
+        .replace(queryParameters: {
+      'overview': 'full', // Get full geometry
+      'geometries': 'polyline', // Use polyline encoding (more compact)
+      'steps': 'false', // Don't need turn-by-turn for now
+    });
+    
+    debugPrint('[RoutingService] OSRM request: $uri');
+    
+    try {
+      final response = await http.get(
+        uri,
+        headers: {
+          'User-Agent': _userAgent,
+        },
+      ).timeout(_timeout);
+      
+      if (response.statusCode != 200) {
+        throw RoutingException('HTTP ${response.statusCode}: ${response.reasonPhrase}');
+      }
+      
+      final data = json.decode(response.body) as Map<String, dynamic>;
+      
+      // Check OSRM response status
+      final code = data['code'] as String?;
+      if (code != 'Ok') {
+        final message = data['message'] as String? ?? 'Unknown routing error';
+        throw RoutingException('OSRM error ($code): $message');
+      }
+      
+      final routes = data['routes'] as List<dynamic>?;
+      if (routes == null || routes.isEmpty) {
+        throw RoutingException('No route found between these points');
+      }
+      
+      final route = routes[0] as Map<String, dynamic>;
+      final geometry = route['geometry'] as String?;
+      final distance = (route['distance'] as num?)?.toDouble() ?? 0.0;
+      final duration = (route['duration'] as num?)?.toDouble() ?? 0.0;
+      
+      if (geometry == null) {
+        throw RoutingException('Route geometry missing from response');
+      }
+      
+      // Decode polyline geometry to waypoints
+      final waypoints = _decodePolyline(geometry);
+      
+      if (waypoints.isEmpty) {
+        throw RoutingException('Failed to decode route geometry');
+      }
+      
+      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) {
+        rethrow;
+      } else {
+        throw RoutingException('Network error: $e');
+      }
+    }
+  }
+  
+  /// Decode OSRM polyline geometry to LatLng waypoints
+  List<LatLng> _decodePolyline(String encoded) {
+    try {
+      final List<LatLng> points = [];
+      int index = 0;
+      int lat = 0;
+      int lng = 0;
+      
+      while (index < encoded.length) {
+        int b;
+        int shift = 0;
+        int result = 0;
+        
+        // Decode latitude
+        do {
+          b = encoded.codeUnitAt(index++) - 63;
+          result |= (b & 0x1f) << shift;
+          shift += 5;
+        } while (b >= 0x20);
+        
+        final deltaLat = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1));
+        lat += deltaLat;
+        
+        shift = 0;
+        result = 0;
+        
+        // Decode longitude
+        do {
+          b = encoded.codeUnitAt(index++) - 63;
+          result |= (b & 0x1f) << shift;
+          shift += 5;
+        } while (b >= 0x20);
+        
+        final deltaLng = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1));
+        lng += deltaLng;
+        
+        points.add(LatLng(lat / 1E5, lng / 1E5));
+      }
+      
+      return points;
+    } catch (e) {
+      debugPrint('[RoutingService] Manual polyline decoding failed: $e');
+      return [];
+    }
+  }
+}
+
+class RoutingException implements Exception {
+  final String message;
+  
+  const RoutingException(this.message);
+  
+  @override
+  String toString() => 'RoutingException: $message';
+}

lib/services/search_service.dart

@@ -0,0 +1,91 @@
+import 'dart:convert';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart' as http;
+import 'package:latlong2/latlong.dart';
+
+import '../models/search_result.dart';
+
+class SearchService {
+  static const String _baseUrl = 'https://nominatim.openstreetmap.org';
+  static const String _userAgent = 'DeFlock/1.0 (OSM surveillance mapping app)';
+  static const int _maxResults = 5;
+  static const Duration _timeout = Duration(seconds: 10);
+  
+  /// Search for places using Nominatim geocoding service
+  Future<List<SearchResult>> search(String query) async {
+    if (query.trim().isEmpty) {
+      return [];
+    }
+    
+    // Check if query looks like coordinates first
+    final coordResult = _tryParseCoordinates(query.trim());
+    if (coordResult != null) {
+      return [coordResult];
+    }
+    
+    // Otherwise, use Nominatim API
+    return await _searchNominatim(query.trim());
+  }
+  
+  /// Try to parse various coordinate formats
+  SearchResult? _tryParseCoordinates(String query) {
+    // Remove common separators and normalize
+    final normalized = query.replaceAll(RegExp(r'[,;]'), ' ').trim();
+    final parts = normalized.split(RegExp(r'\s+'));
+    
+    if (parts.length != 2) return null;
+    
+    final lat = double.tryParse(parts[0]);
+    final lon = double.tryParse(parts[1]);
+    
+    if (lat == null || lon == null) return null;
+    
+    // Basic validation for Earth coordinates
+    if (lat < -90 || lat > 90 || lon < -180 || lon > 180) return null;
+    
+    return SearchResult(
+      displayName: 'Coordinates: ${lat.toStringAsFixed(6)}, ${lon.toStringAsFixed(6)}',
+      coordinates: LatLng(lat, lon),
+      category: 'coordinates',
+      type: 'point',
+    );
+  }
+  
+  /// Search using Nominatim API
+  Future<List<SearchResult>> _searchNominatim(String query) async {
+    final uri = Uri.parse('$_baseUrl/search').replace(queryParameters: {
+      'q': query,
+      'format': 'json',
+      'limit': _maxResults.toString(),
+      'addressdetails': '1',
+      'extratags': '1',
+    });
+    
+    debugPrint('[SearchService] Searching Nominatim: $uri');
+    
+    try {
+      final response = await http.get(
+        uri,
+        headers: {
+          'User-Agent': _userAgent,
+        },
+      ).timeout(_timeout);
+      
+      if (response.statusCode != 200) {
+        throw Exception('HTTP ${response.statusCode}: ${response.reasonPhrase}');
+      }
+      
+      final List<dynamic> jsonResults = json.decode(response.body);
+      final results = jsonResults
+          .map((json) => SearchResult.fromNominatim(json as Map<String, dynamic>))
+          .toList();
+      
+      debugPrint('[SearchService] Found ${results.length} results');
+      return results;
+      
+    } catch (e) {
+      debugPrint('[SearchService] Search failed: $e');
+      throw Exception('Search failed: $e');
+    }
+  }
+}

lib/services/uploader.dart

@@ -3,6 +3,7 @@ import 'package:http/http.dart' as http;
 
 import '../models/pending_upload.dart';
 import '../dev_config.dart';
+import 'version_service.dart';
 import '../app_state.dart';
 
 class Uploader {
@@ -32,7 +33,7 @@ class Uploader {
       final csXml = '''
         <osm>
           <changeset>
-            <tag k="created_by" v="$kClientName $kClientVersion"/>
+            <tag k="created_by" v="$kClientName ${VersionService().version}"/>
             <tag k="comment" v="$action ${p.profile.name} surveillance node"/>
           </changeset>
         </osm>''';

lib/services/version_service.dart

@@ -0,0 +1,68 @@
+import 'package:flutter/foundation.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+
+/// Service for getting app version information from pubspec.yaml.
+/// This ensures we have a single source of truth for version info.
+class VersionService {
+  static final VersionService _instance = VersionService._internal();
+  factory VersionService() => _instance;
+  VersionService._internal();
+
+  PackageInfo? _packageInfo;
+  bool _initialized = false;
+
+  /// Initialize the service by loading package info
+  Future<void> init() async {
+    if (_initialized) return;
+    
+    try {
+      _packageInfo = await PackageInfo.fromPlatform();
+      _initialized = true;
+      debugPrint('[VersionService] Loaded version: ${_packageInfo!.version}');
+    } catch (e) {
+      debugPrint('[VersionService] Failed to load package info: $e');
+      _initialized = false;
+    }
+  }
+
+  /// Get the app version (e.g., "1.0.2")
+  String get version {
+    if (!_initialized || _packageInfo == null) {
+      debugPrint('[VersionService] Warning: Service not initialized, returning fallback version');
+      return 'unknown'; // Fallback for development/testing
+    }
+    return _packageInfo!.version;
+  }
+
+  /// Get the app name
+  String get appName {
+    if (!_initialized || _packageInfo == null) {
+      return 'DeFlock'; // Fallback
+    }
+    return _packageInfo!.appName;
+  }
+
+  /// Get the package name/bundle ID
+  String get packageName {
+    if (!_initialized || _packageInfo == null) {
+      return 'me.deflock.deflockapp'; // Fallback
+    }
+    return _packageInfo!.packageName;
+  }
+
+  /// Get the build number
+  String get buildNumber {
+    if (!_initialized || _packageInfo == null) {
+      return '1'; // Fallback
+    }
+    return _packageInfo!.buildNumber;
+  }
+
+  /// Get full version string with build number (e.g., "1.0.2+1")
+  String get fullVersion {
+    return '$version+$buildNumber';
+  }
+
+  /// Check if the service is properly initialized
+  bool get isInitialized => _initialized && _packageInfo != null;
+}

lib/state/navigation_state.dart

@@ -0,0 +1,339 @@
+import 'package:flutter/material.dart';
+import 'package:latlong2/latlong.dart';
+
+import '../models/search_result.dart';
+import '../services/search_service.dart';
+import '../services/routing_service.dart';
+
+/// Simplified navigation modes - brutalist approach
+enum AppNavigationMode {
+  normal,      // Regular map view
+  search,      // Search/routing UI active  
+  routeActive, // Following a route
+}
+
+/// Simplified navigation state - fewer modes, clearer logic
+class NavigationState extends ChangeNotifier {
+  final SearchService _searchService = SearchService();
+  final RoutingService _routingService = RoutingService();
+  
+  // Core state - just 3 modes
+  AppNavigationMode _mode = AppNavigationMode.normal;
+  
+  // Simple flags instead of complex sub-states
+  bool _isSettingSecondPoint = false;
+  bool _isCalculating = false;
+  bool _showingOverview = false;
+  String? _routingError;
+  
+  // Search state
+  bool _isSearchLoading = false;
+  List<SearchResult> _searchResults = [];
+  String _lastQuery = '';
+  
+  // Location state
+  LatLng? _provisionalPinLocation;
+  String? _provisionalPinAddress;
+  
+  // Route state
+  LatLng? _routeStart;
+  LatLng? _routeEnd;
+  String? _routeStartAddress;
+  String? _routeEndAddress;
+  List<LatLng>? _routePath;
+  double? _routeDistance;
+  bool _nextPointIsStart = false; // What we're setting next
+  
+  // Getters
+  AppNavigationMode get mode => _mode;
+  bool get isSettingSecondPoint => _isSettingSecondPoint;
+  bool get isCalculating => _isCalculating;
+  bool get showingOverview => _showingOverview;
+  String? get routingError => _routingError;
+  bool get hasRoutingError => _routingError != null;
+  
+  bool get isSearchLoading => _isSearchLoading;
+  List<SearchResult> get searchResults => List.unmodifiable(_searchResults);
+  String get lastQuery => _lastQuery;
+  
+  LatLng? get provisionalPinLocation => _provisionalPinLocation;
+  String? get provisionalPinAddress => _provisionalPinAddress;
+  
+  LatLng? get routeStart => _routeStart;
+  LatLng? get routeEnd => _routeEnd;
+  String? get routeStartAddress => _routeStartAddress;
+  String? get routeEndAddress => _routeEndAddress;
+  List<LatLng>? get routePath => _routePath != null ? List.unmodifiable(_routePath!) : null;
+  double? get routeDistance => _routeDistance;
+  bool get settingRouteStart => _nextPointIsStart; // For sheet display compatibility
+  
+  // Simplified convenience getters
+  bool get isInSearchMode => _mode == AppNavigationMode.search;
+  bool get isInRouteMode => _mode == AppNavigationMode.routeActive;
+  bool get hasActiveRoute => _routePath != null && _mode == AppNavigationMode.routeActive;
+  bool get showProvisionalPin => _provisionalPinLocation != null && (_mode == AppNavigationMode.search);
+  bool get showSearchButton => _mode == AppNavigationMode.normal;
+  bool get showRouteButton => _mode == AppNavigationMode.routeActive;
+  
+  /// BRUTALIST: Single entry point to search mode
+  void enterSearchMode(LatLng mapCenter) {
+    debugPrint('[NavigationState] enterSearchMode - current mode: $_mode');
+    
+    if (_mode != AppNavigationMode.normal) {
+      debugPrint('[NavigationState] Cannot enter search mode - not in normal mode');
+      return;
+    }
+    
+    _mode = AppNavigationMode.search;
+    _provisionalPinLocation = mapCenter;
+    _provisionalPinAddress = null;
+    _clearSearchResults();
+    
+    debugPrint('[NavigationState] Entered search mode');
+    notifyListeners();
+  }
+  
+  /// BRUTALIST: Single cancellation method - cleans up EVERYTHING
+  void cancel() {
+    debugPrint('[NavigationState] cancel() - cleaning up all state');
+    
+    _mode = AppNavigationMode.normal;
+    
+    // Clear ALL provisional data
+    _provisionalPinLocation = null;
+    _provisionalPinAddress = null;
+    
+    // Clear ALL route data (except active route)
+    if (_mode != AppNavigationMode.routeActive) {
+      _routeStart = null;
+      _routeEnd = null;
+      _routeStartAddress = null;
+      _routeEndAddress = null;
+      _routePath = null;
+      _routeDistance = null;
+    }
+    
+    // Reset ALL flags
+    _isSettingSecondPoint = false;
+    _isCalculating = false;
+    _showingOverview = false;
+    _nextPointIsStart = false;
+    _routingError = null;
+    
+    // Clear search
+    _clearSearchResults();
+    
+    debugPrint('[NavigationState] Everything cleaned up');
+    notifyListeners();
+  }
+  
+  /// Update provisional pin when map moves
+  void updateProvisionalPinLocation(LatLng newLocation) {
+    if (!showProvisionalPin) return;
+    
+    _provisionalPinLocation = newLocation;
+    _provisionalPinAddress = null; // Clear address when location changes
+    notifyListeners();
+  }
+  
+  /// Jump to search result
+  void selectSearchResult(SearchResult result) {
+    if (_mode != AppNavigationMode.search) return;
+    
+    _provisionalPinLocation = result.coordinates;
+    _provisionalPinAddress = result.displayName;
+    _clearSearchResults();
+    
+    debugPrint('[NavigationState] Selected search result: ${result.displayName}');
+    notifyListeners();
+  }
+  
+  /// Start route planning - simplified logic
+  void startRoutePlanning({required bool thisLocationIsStart}) {
+    if (_mode != AppNavigationMode.search || _provisionalPinLocation == null) return;
+    
+    debugPrint('[NavigationState] Starting route planning - thisLocationIsStart: $thisLocationIsStart');
+    
+    // Clear any previous route data
+    _routeStart = null;
+    _routeEnd = null;
+    _routeStartAddress = null;
+    _routeEndAddress = null;
+    _routePath = null;
+    _routeDistance = null;
+    
+    // Set the current location as start or end
+    if (thisLocationIsStart) {
+      _routeStart = _provisionalPinLocation;
+      _routeStartAddress = _provisionalPinAddress;
+      _nextPointIsStart = false; // Next we'll set the END
+      debugPrint('[NavigationState] Set route start, next setting END');
+    } else {
+      _routeEnd = _provisionalPinLocation;
+      _routeEndAddress = _provisionalPinAddress;
+      _nextPointIsStart = true; // Next we'll set the START
+      debugPrint('[NavigationState] Set route end, next setting START');
+    }
+    
+    // Enter second point selection mode
+    _isSettingSecondPoint = true;
+    notifyListeners();
+  }
+  
+  /// Select the second route point
+  void selectSecondRoutePoint() {
+    if (!_isSettingSecondPoint || _provisionalPinLocation == null) return;
+    
+    debugPrint('[NavigationState] Selecting second route point - nextPointIsStart: $_nextPointIsStart');
+    
+    // Set the second point
+    if (_nextPointIsStart) {
+      _routeStart = _provisionalPinLocation;
+      _routeStartAddress = _provisionalPinAddress;
+    } else {
+      _routeEnd = _provisionalPinLocation;
+      _routeEndAddress = _provisionalPinAddress;
+    }
+    
+    _isSettingSecondPoint = false;
+    _routingError = null; // Clear any previous errors
+    _calculateRoute();
+  }
+  
+  /// Retry route calculation (for error recovery)
+  void retryRouteCalculation() {
+    if (_routeStart == null || _routeEnd == null) return;
+    
+    debugPrint('[NavigationState] Retrying route calculation');
+    _routingError = null;
+    _calculateRoute();
+  }
+  
+  /// Calculate route using OSRM
+  void _calculateRoute() {
+    if (_routeStart == null || _routeEnd == null) return;
+    
+    debugPrint('[NavigationState] Calculating route with OSRM...');
+    _isCalculating = true;
+    _routingError = null;
+    notifyListeners();
+    
+    _routingService.calculateRoute(
+      start: _routeStart!,
+      end: _routeEnd!,
+      profile: 'driving', // Could make this configurable later
+    ).then((routeResult) {
+      if (!_isCalculating) return; // Canceled while calculating
+      
+      _routePath = routeResult.waypoints;
+      _routeDistance = routeResult.distanceMeters;
+      _isCalculating = false;
+      _showingOverview = true;
+      _provisionalPinLocation = null; // Hide provisional pin
+      
+      debugPrint('[NavigationState] OSRM route calculated: ${routeResult.toString()}');
+      notifyListeners();
+      
+    }).catchError((error) {
+      if (!_isCalculating) return; // Canceled while calculating
+      
+      debugPrint('[NavigationState] Route calculation failed: $error');
+      _isCalculating = false;
+      _routingError = error.toString().replaceAll('RoutingException: ', '');
+      
+      // Don't show overview on error, stay in current state
+      notifyListeners();
+    });
+  }
+  
+  /// Start following the route
+  void startRoute() {
+    if (_routePath == null) return;
+    
+    _mode = AppNavigationMode.routeActive;
+    _showingOverview = false;
+    
+    debugPrint('[NavigationState] Started following route');
+    notifyListeners();
+  }
+  
+  /// Check if user should auto-enable follow-me (called from outside with user location)
+  bool shouldAutoEnableFollowMe(LatLng? userLocation) {
+    if (userLocation == null || _routeStart == null) return false;
+    
+    final distanceToStart = const Distance().as(LengthUnit.Meter, userLocation, _routeStart!);
+    final shouldEnable = distanceToStart <= 1000; // Within 1km
+    
+    debugPrint('[NavigationState] Distance to start: ${distanceToStart.toStringAsFixed(0)}m, auto follow-me: $shouldEnable');
+    return shouldEnable;
+  }
+  
+  /// Show route overview (from route button during active navigation)
+  void showRouteOverview() {
+    if (_mode != AppNavigationMode.routeActive) return;
+    
+    _showingOverview = true;
+    debugPrint('[NavigationState] Showing route overview');
+    notifyListeners();
+  }
+  
+  /// Hide route overview (back to active navigation)
+  void hideRouteOverview() {
+    if (_mode != AppNavigationMode.routeActive) return;
+    
+    _showingOverview = false;
+    debugPrint('[NavigationState] Hiding route overview');
+    notifyListeners();
+  }
+  
+  /// Cancel active route and return to normal
+  void cancelRoute() {
+    if (_mode != AppNavigationMode.routeActive) return;
+    
+    debugPrint('[NavigationState] Canceling active route');
+    cancel(); // Use the brutalist single cleanup method
+  }
+  
+  /// Search functionality
+  Future<void> search(String query) async {
+    if (query.trim().isEmpty) {
+      _clearSearchResults();
+      return;
+    }
+    
+    if (query.trim() == _lastQuery.trim()) return;
+    
+    _setSearchLoading(true);
+    _lastQuery = query.trim();
+    
+    try {
+      final results = await _searchService.search(query.trim());
+      _searchResults = results;
+      debugPrint('[NavigationState] Found ${results.length} results');
+    } catch (e) {
+      debugPrint('[NavigationState] Search failed: $e');
+      _searchResults = [];
+    }
+    
+    _setSearchLoading(false);
+  }
+  
+  void clearSearchResults() {
+    _clearSearchResults();
+  }
+  
+  void _clearSearchResults() {
+    if (_searchResults.isNotEmpty || _lastQuery.isNotEmpty) {
+      _searchResults = [];
+      _lastQuery = '';
+      notifyListeners();
+    }
+  }
+  
+  void _setSearchLoading(bool loading) {
+    if (_isSearchLoading != loading) {
+      _isSearchLoading = loading;
+      notifyListeners();
+    }
+  }
+}

lib/state/search_state.dart

@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+import 'package:latlong2/latlong.dart';
+
+import '../models/search_result.dart';
+import '../services/search_service.dart';
+
+class SearchState extends ChangeNotifier {
+  final SearchService _searchService = SearchService();
+  
+  bool _isLoading = false;
+  List<SearchResult> _results = [];
+  String _lastQuery = '';
+  
+  // Getters
+  bool get isLoading => _isLoading;
+  List<SearchResult> get results => List.unmodifiable(_results);
+  String get lastQuery => _lastQuery;
+  
+  /// Search for places by query string
+  Future<void> search(String query) async {
+    if (query.trim().isEmpty) {
+      _clearResults();
+      return;
+    }
+    
+    // Don't search if query hasn't changed
+    if (query.trim() == _lastQuery.trim()) {
+      return;
+    }
+    
+    _setLoading(true);
+    _lastQuery = query.trim();
+    
+    try {
+      final results = await _searchService.search(query.trim());
+      _results = results;
+      debugPrint('[SearchState] Found ${results.length} results for "$query"');
+    } catch (e) {
+      debugPrint('[SearchState] Search failed: $e');
+      _results = [];
+    }
+    
+    _setLoading(false);
+  }
+  
+  /// Clear search results
+  void clearResults() {
+    _clearResults();
+  }
+  
+  void _clearResults() {
+    if (_results.isNotEmpty || _lastQuery.isNotEmpty) {
+      _results = [];
+      _lastQuery = '';
+      notifyListeners();
+    }
+  }
+  
+  void _setLoading(bool loading) {
+    if (_isLoading != loading) {
+      _isLoading = loading;
+      notifyListeners();
+    }
+  }
+}

lib/state/settings_state.dart

@@ -26,6 +26,7 @@ class SettingsState extends ChangeNotifier {
   static const String _followMeModePrefsKey = 'follow_me_mode';
   static const String _proximityAlertsEnabledPrefsKey = 'proximity_alerts_enabled';
   static const String _proximityAlertDistancePrefsKey = 'proximity_alert_distance';
+  static const String _networkStatusIndicatorEnabledPrefsKey = 'network_status_indicator_enabled';
 
   bool _offlineMode = false;
   int _maxCameras = 250;
@@ -33,6 +34,7 @@ class SettingsState extends ChangeNotifier {
   FollowMeMode _followMeMode = FollowMeMode.northUp;
   bool _proximityAlertsEnabled = false;
   int _proximityAlertDistance = kProximityAlertDefaultDistance;
+  bool _networkStatusIndicatorEnabled = false;
   List<TileProvider> _tileProviders = [];
   String _selectedTileTypeId = '';
 
@@ -43,6 +45,7 @@ class SettingsState extends ChangeNotifier {
   FollowMeMode get followMeMode => _followMeMode;
   bool get proximityAlertsEnabled => _proximityAlertsEnabled;
   int get proximityAlertDistance => _proximityAlertDistance;
+  bool get networkStatusIndicatorEnabled => _networkStatusIndicatorEnabled;
   List<TileProvider> get tileProviders => List.unmodifiable(_tileProviders);
   String get selectedTileTypeId => _selectedTileTypeId;
   
@@ -95,6 +98,9 @@ class SettingsState extends ChangeNotifier {
     _proximityAlertsEnabled = prefs.getBool(_proximityAlertsEnabledPrefsKey) ?? false;
     _proximityAlertDistance = prefs.getInt(_proximityAlertDistancePrefsKey) ?? kProximityAlertDefaultDistance;
     
+    // Load network status indicator setting
+    _networkStatusIndicatorEnabled = prefs.getBool(_networkStatusIndicatorEnabledPrefsKey) ?? false;
+    
     // Load upload mode (including migration from old test_mode bool)
     if (prefs.containsKey(_uploadModePrefsKey)) {
       final idx = prefs.getInt(_uploadModePrefsKey) ?? 0;
@@ -147,6 +153,9 @@ class SettingsState extends ChangeNotifier {
           _tileProviders = providersList
               .map((json) => TileProvider.fromJson(json))
               .toList();
+          
+          // Migration: Add any missing built-in providers
+          await _addMissingBuiltinProviders(prefs);
         }
       } catch (e) {
         debugPrint('Error loading tile providers: $e');
@@ -160,6 +169,25 @@ class SettingsState extends ChangeNotifier {
     }
   }
 
+  /// Add any built-in providers that are missing from user's configuration
+  Future<void> _addMissingBuiltinProviders(SharedPreferences prefs) async {
+    final defaultProviders = DefaultTileProviders.createDefaults();
+    final existingProviderIds = _tileProviders.map((p) => p.id).toSet();
+    bool hasUpdates = false;
+    
+    for (final defaultProvider in defaultProviders) {
+      if (!existingProviderIds.contains(defaultProvider.id)) {
+        _tileProviders.add(defaultProvider);
+        hasUpdates = true;
+        debugPrint('SettingsState: Added missing built-in provider: ${defaultProvider.name}');
+      }
+    }
+    
+    if (hasUpdates) {
+      await _saveTileProviders(prefs);
+    }
+  }
+
   Future<void> _saveTileProviders(SharedPreferences prefs) async {
     try {
       final providersJson = jsonEncode(
@@ -285,4 +313,14 @@ class SettingsState extends ChangeNotifier {
     }
   }
 
+  /// Set network status indicator enabled/disabled
+  Future<void> setNetworkStatusIndicatorEnabled(bool enabled) async {
+    if (_networkStatusIndicatorEnabled != enabled) {
+      _networkStatusIndicatorEnabled = enabled;
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setBool(_networkStatusIndicatorEnabledPrefsKey, enabled);
+      notifyListeners();
+    }
+  }
+
 }

lib/widgets/add_node_sheet.dart

@@ -51,10 +51,7 @@ class AddNodeSheet extends StatelessWidget {
           }
         }
 
-        return Padding(
-          padding:
-              EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
-          child: Column(
+        return Column(
             mainAxisSize: MainAxisSize.min,
             children: [
               const SizedBox(height: 12),
@@ -192,7 +189,6 @@ class AddNodeSheet extends StatelessWidget {
               ),
               const SizedBox(height: 20),
             ],
-          ),
         );
       },
     );

lib/widgets/camera_icon.dart

@@ -19,31 +19,31 @@ class CameraIcon extends StatelessWidget {
   Color get _ringColor {
     switch (type) {
       case CameraIconType.real:
-        return kCameraRingColorReal;
+        return kNodeRingColorReal;
       case CameraIconType.mock:
-        return kCameraRingColorMock;
+        return kNodeRingColorMock;
       case CameraIconType.pending:
-        return kCameraRingColorPending;
+        return kNodeRingColorPending;
       case CameraIconType.editing:
-        return kCameraRingColorEditing;
+        return kNodeRingColorEditing;
       case CameraIconType.pendingEdit:
-        return kCameraRingColorPendingEdit;
+        return kNodeRingColorPendingEdit;
       case CameraIconType.pendingDeletion:
-        return kCameraRingColorPendingDeletion;
+        return kNodeRingColorPendingDeletion;
     }
   }
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: kCameraIconDiameter,
-      height: kCameraIconDiameter,
+      width: kNodeIconDiameter,
+      height: kNodeIconDiameter,
       decoration: BoxDecoration(
         shape: BoxShape.circle,
-        color: Colors.black.withOpacity(kCameraDotOpacity),
+        color: Colors.black.withOpacity(kNodeDotOpacity),
         border: Border.all(
           color: _ringColor,
-          width: kCameraRingThickness,
+          width: kNodeRingThickness,
         ),
       ),
     );

lib/widgets/edit_node_sheet.dart

@@ -53,10 +53,7 @@ class EditNodeSheet extends StatelessWidget {
           }
         }
 
-        return Padding(
-          padding:
-              EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
-          child: Column(
+        return Column(
             mainAxisSize: MainAxisSize.min,
             children: [
               const SizedBox(height: 12),
@@ -199,7 +196,6 @@ class EditNodeSheet extends StatelessWidget {
               ),
               const SizedBox(height: 20),
             ],
-          ),
         );
       },
     );

lib/widgets/map/camera_markers.dart

@@ -107,8 +107,8 @@ class CameraMarkersBuilder {
           
           return Marker(
             point: n.coord,
-            width: kCameraIconDiameter,
-            height: kCameraIconDiameter,
+            width: kNodeIconDiameter,
+            height: kNodeIconDiameter,
             child: Opacity(
               opacity: shouldDim ? 0.5 : 1.0,
               child: CameraMapMarker(

lib/widgets/map/camera_refresh_controller.dart

@@ -69,12 +69,12 @@ class CameraRefreshController {
     }
     
     final zoom = controller.mapController.camera.zoom;
-    if (zoom < kCameraMinZoomLevel) {
+    if (zoom < kNodeMinZoomLevel) {
       // Show a snackbar-style bubble warning
       if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text('Cameras not drawn below zoom level $kCameraMinZoomLevel'),
+            content: Text('Nodes not drawn below zoom level $kNodeMinZoomLevel'),
             duration: const Duration(seconds: 2),
           ),
         );

lib/widgets/map/map_overlays.dart

@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:provider/provider.dart';
 
 import '../../app_state.dart';
 import '../../dev_config.dart';
+import '../../services/localization_service.dart';
 import '../camera_icon.dart';
 import 'layer_selector_button.dart';
 
@@ -13,6 +15,7 @@ class MapOverlays extends StatelessWidget {
   final AddNodeSession? session;
   final EditNodeSession? editSession;
   final String? attribution; // Attribution for current tile provider
+  final VoidCallback? onSearchPressed; // Callback for search button
 
   const MapOverlays({
     super.key,
@@ -21,8 +24,30 @@ class MapOverlays extends StatelessWidget {
     this.session,
     this.editSession,
     this.attribution,
+    this.onSearchPressed,
   });
 
+  /// Show full attribution text in a dialog
+  void _showAttributionDialog(BuildContext context, String attribution) {
+    final locService = LocalizationService.instance;
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(locService.t('mapTiles.attribution')),
+        content: SelectableText(
+          attribution,
+          style: const TextStyle(fontSize: 14),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: Text(locService.t('actions.close')),
+          ),
+        ],
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Stack(
@@ -93,17 +118,23 @@ class MapOverlays extends StatelessWidget {
           Positioned(
             bottom: bottomPositionFromButtonBar(kAttributionSpacingAboveButtonBar, MediaQuery.of(context).padding.bottom),
             left: 10,
-            child: Container(
-              decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.surface.withOpacity(0.9),
-                borderRadius: BorderRadius.circular(4),
-              ),
-              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
-              child: Text(
-                attribution!,
-                style: TextStyle(
-                  fontSize: 11,
-                  color: Theme.of(context).colorScheme.onSurface,
+            child: GestureDetector(
+              onTap: () => _showAttributionDialog(context, attribution!),
+              child: Container(
+                decoration: BoxDecoration(
+                  color: Theme.of(context).colorScheme.surface.withOpacity(0.9),
+                  borderRadius: BorderRadius.circular(4),
+                ),
+                padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
+                constraints: const BoxConstraints(maxWidth: 250),
+                child: Text(
+                  attribution!,
+                  style: TextStyle(
+                    fontSize: 11,
+                    color: Theme.of(context).colorScheme.onSurface,
+                  ),
+                  overflow: TextOverflow.ellipsis,
+                  maxLines: 1,
                 ),
               ),
             ),
@@ -113,45 +144,63 @@ class MapOverlays extends StatelessWidget {
         Positioned(
           bottom: bottomPositionFromButtonBar(kZoomControlsSpacingAboveButtonBar, MediaQuery.of(context).padding.bottom),
           right: 16,
-          child: Column(
-            children: [
-              // Layer selector button
-              const LayerSelectorButton(),
-              const SizedBox(height: 8),
-              // Zoom in button
-              FloatingActionButton(
-                mini: true,
-                heroTag: "zoom_in",
-                onPressed: () {
-                  try {
-                    final zoom = mapController.camera.zoom;
-                    mapController.move(mapController.camera.center, zoom + 1);
-                  } catch (_) {
-                    // Map controller not ready yet
-                  }
-                },
-                child: const Icon(Icons.add),
-              ),
-              const SizedBox(height: 8),
-              // Zoom out button  
-              FloatingActionButton(
-                mini: true,
-                heroTag: "zoom_out",
-                onPressed: () {
-                  try {
-                    final zoom = mapController.camera.zoom;
-                    mapController.move(mapController.camera.center, zoom - 1);
-                  } catch (_) {
-                    // Map controller not ready yet
-                  }
-                },
-                child: const Icon(Icons.remove),
-              ),
-            ],
+          child: Consumer<AppState>(
+            builder: (context, appState, child) {
+              return Column(
+                children: [
+                  // Search/Navigation button - show search button always, show route button only in dev mode when online
+                  if (onSearchPressed != null) ...[
+                    if (appState.showSearchButton || (enableNavigationFeatures(offlineMode: appState.offlineMode) && appState.showRouteButton)) ...[
+                      FloatingActionButton(
+                        mini: true,
+                        heroTag: "search_nav",
+                        onPressed: onSearchPressed,
+                        tooltip: appState.showRouteButton 
+                            ? LocalizationService.instance.t('navigation.routeOverview')
+                            : LocalizationService.instance.t('navigation.searchLocation'),
+                        child: Icon(appState.showRouteButton ? Icons.route : Icons.search),
+                      ),
+                      const SizedBox(height: 8),
+                    ],
+                  ],
+                  
+                  // Layer selector button
+                  const LayerSelectorButton(),
+                  const SizedBox(height: 8),
+                  // Zoom in button
+                  FloatingActionButton(
+                    mini: true,
+                    heroTag: "zoom_in",
+                    onPressed: () {
+                      try {
+                        final zoom = mapController.camera.zoom;
+                        mapController.move(mapController.camera.center, zoom + 1);
+                      } catch (_) {
+                        // Map controller not ready yet
+                      }
+                    },
+                    child: const Icon(Icons.add),
+                  ),
+                  const SizedBox(height: 8),
+                  // Zoom out button  
+                  FloatingActionButton(
+                    mini: true,
+                    heroTag: "zoom_out",
+                    onPressed: () {
+                      try {
+                        final zoom = mapController.camera.zoom;
+                        mapController.move(mapController.camera.center, zoom - 1);
+                      } catch (_) {
+                        // Map controller not ready yet
+                      }
+                    },
+                    child: const Icon(Icons.remove),
+                  ),
+                ],
+              );
+            },
           ),
         ),
-
-
       ],
     );
   }

lib/widgets/map/map_position_manager.dart

@@ -3,8 +3,6 @@ import 'package:flutter_map_animations/flutter_map_animations.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import '../../dev_config.dart';
-
 
 /// Manages map position persistence and initial positioning.
 /// Handles saving/loading last map position and moving to initial locations.
@@ -27,9 +25,9 @@ class MapPositionManager {
   Future<void> loadLastMapPosition() async {
     try {
       final prefs = await SharedPreferences.getInstance();
-      final lat = prefs.getDouble(kLastMapLatKey);
-      final lng = prefs.getDouble(kLastMapLngKey);
-      final zoom = prefs.getDouble(kLastMapZoomKey);
+      final lat = prefs.getDouble('last_map_latitude');
+      final lng = prefs.getDouble('last_map_longitude');
+      final zoom = prefs.getDouble('last_map_zoom');
       
       if (lat != null && lng != null && 
           _isValidCoordinate(lat) && _isValidCoordinate(lng)) {
@@ -80,9 +78,9 @@ class MapPositionManager {
       }
       
       final prefs = await SharedPreferences.getInstance();
-      await prefs.setDouble(kLastMapLatKey, location.latitude);
-      await prefs.setDouble(kLastMapLngKey, location.longitude);
-      await prefs.setDouble(kLastMapZoomKey, zoom);
+      await prefs.setDouble('last_map_latitude', location.latitude);
+      await prefs.setDouble('last_map_longitude', location.longitude);
+      await prefs.setDouble('last_map_zoom', zoom);
       debugPrint('[MapPositionManager] Saved last map position: ${location.latitude}, ${location.longitude}, zoom: $zoom');
     } catch (e) {
       debugPrint('[MapPositionManager] Failed to save last map position: $e');
@@ -95,9 +93,9 @@ class MapPositionManager {
   static Future<void> clearStoredMapPosition() async {
     try {
       final prefs = await SharedPreferences.getInstance();
-      await prefs.remove(kLastMapLatKey);
-      await prefs.remove(kLastMapLngKey);
-      await prefs.remove(kLastMapZoomKey);
+      await prefs.remove('last_map_latitude');
+      await prefs.remove('last_map_longitude');
+      await prefs.remove('last_map_zoom');
       debugPrint('[MapPositionManager] Cleared stored map position');
     } catch (e) {
       debugPrint('[MapPositionManager] Failed to clear stored map position: $e');

lib/widgets/map/tile_layer_manager.dart

@@ -78,6 +78,7 @@ class TileLayerManager {
     return TileLayer(
       urlTemplate: urlTemplate,
       userAgentPackageName: 'me.deflock.deflockapp',
+      maxZoom: selectedTileType?.maxZoom?.toDouble() ?? 18.0,
       tileProvider: NetworkTileProvider(
         httpClient: _tileHttpClient,
         // Enable flutter_map caching - cache busting handled by URL changes and FlutterMap key

lib/widgets/map_view.dart

@@ -21,6 +21,7 @@ import 'map/tile_layer_manager.dart';
 import 'map/camera_refresh_controller.dart';
 import 'map/gps_controller.dart';
 import 'network_status_indicator.dart';
+import 'provisional_pin.dart';
 import 'proximity_alert_banner.dart';
 import '../dev_config.dart';
 import '../app_state.dart' show FollowMeMode;
@@ -37,6 +38,7 @@ class MapView extends StatefulWidget {
     this.sheetHeight = 0.0,
     this.selectedNodeId,
     this.onNodeTap,
+    this.onSearchPressed,
   });
 
   final FollowMeMode followMeMode;
@@ -44,6 +46,7 @@ class MapView extends StatefulWidget {
   final double sheetHeight;
   final int? selectedNodeId;
   final void Function(OsmNode)? onNodeTap;
+  final VoidCallback? onSearchPressed;
 
   @override
   State<MapView> createState() => MapViewState();
@@ -200,6 +203,11 @@ class MapViewState extends State<MapView> {
   void retryLocationInit() {
     _gpsController.retryLocationInit();
   }
+  
+  /// Get current user location
+  LatLng? getUserLocation() {
+    return _gpsController.currentLocation;
+  }
 
   /// Expose static methods from MapPositionManager for external access
   static Future<void> clearStoredMapPosition() => 
@@ -214,7 +222,7 @@ class MapViewState extends State<MapView> {
     if (uploadMode == UploadMode.sandbox) {
       return kOsmApiMinZoomLevel;
     } else {
-      return kCameraMinZoomLevel;
+      return kNodeMinZoomLevel;
     }
   }
 
@@ -362,8 +370,8 @@ class MapViewState extends State<MapView> {
             centerMarkers.add(
               Marker(
                 point: center,
-                width: kCameraIconDiameter,
-                height: kCameraIconDiameter,
+                width: kNodeIconDiameter,
+                height: kNodeIconDiameter,
                 child: CameraIcon(
                   type: editSession != null ? CameraIconType.editing : CameraIconType.mock,
                 ),
@@ -374,10 +382,60 @@ class MapViewState extends State<MapView> {
           }
         }
 
+        // Build provisional pin for navigation/search mode
+        if (appState.showProvisionalPin && appState.provisionalPinLocation != null) {
+          centerMarkers.add(
+            Marker(
+              point: appState.provisionalPinLocation!,
+              width: 32.0,
+              height: 32.0,
+              child: const ProvisionalPin(),
+            ),
+          );
+        }
+
+        // Build start/end pins for route visualization
+        if (appState.showingOverview || appState.isInRouteMode || appState.isSettingSecondPoint) {
+          if (appState.routeStart != null) {
+            centerMarkers.add(
+              Marker(
+                point: appState.routeStart!,
+                width: 32.0,
+                height: 32.0,
+                child: const LocationPin(type: PinType.start),
+              ),
+            );
+          }
+          if (appState.routeEnd != null) {
+            centerMarkers.add(
+              Marker(
+                point: appState.routeEnd!,
+                width: 32.0,
+                height: 32.0,
+                child: const LocationPin(type: PinType.end),
+              ),
+            );
+          }
+        }
+
+        // Build route path visualization
+        final routeLines = <Polyline>[];
+        if (appState.routePath != null && appState.routePath!.length > 1) {
+          // Show route line during overview or active route
+          if (appState.showingOverview || appState.isInRouteMode) {
+            routeLines.add(Polyline(
+              points: appState.routePath!,
+              color: Colors.blue,
+              strokeWidth: 4.0,
+            ));
+          }
+        }
+
         return Stack(
           children: [
             PolygonLayer(polygons: overlays),
             if (editLines.isNotEmpty) PolylineLayer(polylines: editLines),
+            if (routeLines.isNotEmpty) PolylineLayer(polylines: routeLines),
             MarkerLayer(markers: [...markers, ...centerMarkers]),
           ],
         );
@@ -394,7 +452,7 @@ class MapViewState extends State<MapView> {
             options: MapOptions(
               initialCenter: _gpsController.currentLocation ?? _positionManager.initialLocation ?? LatLng(37.7749, -122.4194),
             initialZoom: _positionManager.initialZoom ?? 15,
-            maxZoom: 19,
+            maxZoom: (appState.selectedTileType?.maxZoom ?? 18).toDouble(),
             onPositionChanged: (pos, gesture) {
               setState(() {}); // Instant UI update for zoom, etc.
               if (gesture) widget.onUserGesture();
@@ -406,6 +464,11 @@ class MapViewState extends State<MapView> {
                 appState.updateEditSession(target: pos.center);
               }
               
+              // Update provisional pin location during navigation search/routing
+              if (appState.showProvisionalPin) {
+                appState.updateProvisionalPinLocation(pos.center);
+              }
+              
               // Start dual-source waiting when map moves (user is expecting new tiles AND nodes)
               NetworkStatus.instance.setDualSourceWaiting();
               
@@ -468,10 +531,12 @@ class MapViewState extends State<MapView> {
           session: session,
           editSession: editSession,
           attribution: appState.selectedTileType?.attribution,
+          onSearchPressed: widget.onSearchPressed,
         ),
 
-        // Network status indicator (top-left)
-        const NetworkStatusIndicator(),
+        // Network status indicator (top-left) - conditionally shown
+        if (appState.networkStatusIndicatorEnabled)
+          const NetworkStatusIndicator(),
         
         // Proximity alert banner (top)
         ProximityAlertBanner(
@@ -508,7 +573,7 @@ class MapViewState extends State<MapView> {
         if (originalCoord != null) {
           lines.add(Polyline(
             points: [originalCoord, camera.coord],
-            color: kCameraRingColorPending,
+            color: kNodeRingColorPending,
             strokeWidth: 3.0,
           ));
         }

lib/widgets/navigation_sheet.dart

@@ -0,0 +1,309 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:latlong2/latlong.dart';
+
+import '../app_state.dart';
+import '../dev_config.dart';
+import '../services/localization_service.dart';
+
+class NavigationSheet extends StatelessWidget {
+  final VoidCallback? onStartRoute;
+  final VoidCallback? onResumeRoute;
+  
+  const NavigationSheet({
+    super.key,
+    this.onStartRoute,
+    this.onResumeRoute,
+  });
+
+  String _formatCoordinates(LatLng coordinates) {
+    return '${coordinates.latitude.toStringAsFixed(6)}, ${coordinates.longitude.toStringAsFixed(6)}';
+  }
+
+  Widget _buildLocationInfo({
+    required String label,
+    required LatLng coordinates,
+    String? address,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          label,
+          style: TextStyle(
+            fontWeight: FontWeight.bold,
+            fontSize: 14,
+            color: Colors.grey[600],
+          ),
+        ),
+        const SizedBox(height: 4),
+        if (address != null) ...[
+          Text(
+            address,
+            style: const TextStyle(fontSize: 16),
+            maxLines: 2,
+            overflow: TextOverflow.ellipsis,
+          ),
+          const SizedBox(height: 2),
+        ],
+        Text(
+          _formatCoordinates(coordinates),
+          style: TextStyle(
+            fontSize: 14,
+            color: Colors.grey[600],
+            fontFamily: 'monospace',
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildDragHandle() {
+    return Center(
+      child: Container(
+        width: 40,
+        height: 4,
+        margin: const EdgeInsets.only(bottom: 16),
+        decoration: BoxDecoration(
+          color: Colors.grey[400],
+          borderRadius: BorderRadius.circular(2),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<AppState>(
+      builder: (context, appState, child) {
+        final navigationMode = appState.navigationMode;
+        final provisionalLocation = appState.provisionalPinLocation;
+        final provisionalAddress = appState.provisionalPinAddress;
+
+        if (provisionalLocation == null && !appState.showingOverview) {
+          return const SizedBox.shrink();
+        }
+
+        return Container(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              _buildDragHandle(),
+              
+              // SEARCH MODE: Initial location with route options
+              if (navigationMode == AppNavigationMode.search && !appState.isSettingSecondPoint && !appState.isCalculating && !appState.showingOverview && provisionalLocation != null) ...[
+                _buildLocationInfo(
+                  label: LocalizationService.instance.t('navigation.location'),
+                  coordinates: provisionalLocation,
+                  address: provisionalAddress,
+                ),
+                const SizedBox(height: 16),
+                // Only show routing buttons if navigation features are enabled
+                if (enableNavigationFeatures(offlineMode: appState.offlineMode)) ...[
+                  Row(
+                    children: [
+                        Expanded(
+                          child: ElevatedButton.icon(
+                            icon: const Icon(Icons.directions),
+                            label: Text(LocalizationService.instance.t('navigation.routeTo')),
+                            onPressed: () {
+                              appState.startRoutePlanning(thisLocationIsStart: false);
+                            },
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: ElevatedButton.icon(
+                            icon: const Icon(Icons.my_location),
+                            label: Text(LocalizationService.instance.t('navigation.routeFrom')),
+                            onPressed: () {
+                              appState.startRoutePlanning(thisLocationIsStart: true);
+                            },
+                          ),
+                        ),
+                    ],
+                  ),
+                ],
+              ],
+
+              // SETTING SECOND POINT: Show both points and select button
+              if (appState.isSettingSecondPoint && provisionalLocation != null) ...[
+                // Show existing route points
+                if (appState.routeStart != null) ...[
+                  _buildLocationInfo(
+                    label: LocalizationService.instance.t('navigation.startPoint'),
+                    coordinates: appState.routeStart!,
+                    address: appState.routeStartAddress,
+                  ),
+                  const SizedBox(height: 12),
+                ],
+                if (appState.routeEnd != null) ...[
+                  _buildLocationInfo(
+                    label: LocalizationService.instance.t('navigation.endPoint'),
+                    coordinates: appState.routeEnd!,
+                    address: appState.routeEndAddress,
+                  ),
+                  const SizedBox(height: 12),
+                ],
+                
+                // Show the point we're selecting
+                _buildLocationInfo(
+                  label: appState.settingRouteStart 
+                    ? LocalizationService.instance.t('navigation.startSelect')
+                    : LocalizationService.instance.t('navigation.endSelect'),
+                  coordinates: provisionalLocation,
+                  address: provisionalAddress,
+                ),
+                const SizedBox(height: 16),
+                
+                ElevatedButton.icon(
+                  icon: const Icon(Icons.check),
+                  label: Text(LocalizationService.instance.t('navigation.selectLocation')),
+                  onPressed: () {
+                    debugPrint('[NavigationSheet] Select Location button pressed');
+                    appState.selectSecondRoutePoint();
+                  },
+                ),
+              ],
+
+              // CALCULATING: Show loading
+              if (appState.isCalculating) ...[
+                const Center(
+                  child: SizedBox(
+                    width: 40,
+                    height: 40,
+                    child: CircularProgressIndicator(),
+                  ),
+                ),
+                const SizedBox(height: 16),
+                Text(
+                  LocalizationService.instance.t('navigation.calculatingRoute'),
+                  textAlign: TextAlign.center,
+                ),
+                const SizedBox(height: 16),
+                ElevatedButton(
+                  onPressed: () => appState.cancelNavigation(),
+                  child: Text(LocalizationService.instance.t('actions.cancel')),
+                ),
+              ],
+
+              // ROUTING ERROR: Show error with retry option
+              if (appState.hasRoutingError && !appState.isCalculating) ...[
+                Icon(
+                  Icons.error_outline,
+                  size: 48,
+                  color: Colors.red[400],
+                ),
+                const SizedBox(height: 16),
+                Text(
+                  LocalizationService.instance.t('navigation.routeCalculationFailed'),
+                  style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+                  textAlign: TextAlign.center,
+                ),
+                const SizedBox(height: 8),
+                Text(
+                  appState.routingError ?? 'Unknown error',
+                  style: TextStyle(color: Colors.grey[600]),
+                  textAlign: TextAlign.center,
+                ),
+                const SizedBox(height: 16),
+                Row(
+                  children: [
+                    Expanded(
+                      child: ElevatedButton.icon(
+                        icon: const Icon(Icons.refresh),
+                        label: Text(LocalizationService.instance.t('navigation.retry')),
+                        onPressed: () {
+                          // Retry route calculation
+                          appState.retryRouteCalculation();
+                        },
+                      ),
+                    ),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      child: ElevatedButton.icon(
+                        icon: const Icon(Icons.close),
+                        label: Text(LocalizationService.instance.t('actions.cancel')),
+                        onPressed: () => appState.cancelNavigation(),
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+
+              // ROUTE OVERVIEW: Show route details with start/cancel options
+              if (appState.showingOverview) ...[
+                if (appState.routeStart != null) ...[
+                  _buildLocationInfo(
+                    label: LocalizationService.instance.t('navigation.startPoint'),
+                    coordinates: appState.routeStart!,
+                    address: appState.routeStartAddress,
+                  ),
+                  const SizedBox(height: 12),
+                ],
+                if (appState.routeEnd != null) ...[
+                  _buildLocationInfo(
+                    label: LocalizationService.instance.t('navigation.endPoint'),
+                    coordinates: appState.routeEnd!,
+                    address: appState.routeEndAddress,
+                  ),
+                  const SizedBox(height: 12),
+                ],
+                if (appState.routeDistance != null) ...[
+                  Text(
+                    LocalizationService.instance.t('navigation.distance', params: [(appState.routeDistance! / 1000).toStringAsFixed(1)]),
+                    style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+                  ),
+                  const SizedBox(height: 16),
+                ],
+                
+                Row(
+                  children: [
+                    if (navigationMode == AppNavigationMode.search) ...[
+                      // Route preview mode - start or cancel
+                      Expanded(
+                        child: ElevatedButton.icon(
+                          icon: const Icon(Icons.play_arrow),
+                          label: Text(LocalizationService.instance.t('navigation.start')),
+                          onPressed: onStartRoute ?? () => appState.startRoute(),
+                        ),
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: ElevatedButton.icon(
+                          icon: const Icon(Icons.close),
+                          label: Text(LocalizationService.instance.t('actions.cancel')),
+                          onPressed: () => appState.cancelNavigation(),
+                        ),
+                      ),
+                    ] else if (navigationMode == AppNavigationMode.routeActive) ...[
+                      // Active route overview - resume or cancel
+                      Expanded(
+                        child: ElevatedButton.icon(
+                          icon: const Icon(Icons.play_arrow),
+                          label: Text(LocalizationService.instance.t('navigation.resume')),
+                          onPressed: onResumeRoute ?? () => appState.hideRouteOverview(),
+                        ),
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: ElevatedButton.icon(
+                          icon: const Icon(Icons.close),
+                          label: Text(LocalizationService.instance.t('navigation.endRoute')),
+                          onPressed: () => appState.cancelRoute(),
+                        ),
+                      ),
+                    ],
+                  ],
+                ),
+              ],
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/widgets/network_status_indicator.dart

@@ -67,7 +67,7 @@ class NetworkStatusIndicator extends StatelessWidget {
           }
 
           return Positioned(
-            top: MediaQuery.of(context).padding.top + 8,
+            top: 8, // Position relative to the map area (not the screen)
             left: 8,
             child: Container(
               padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),

lib/widgets/provisional_pin.dart

@@ -0,0 +1,94 @@
+import 'package:flutter/material.dart';
+
+enum PinType {
+  provisional, // Orange - current selection
+  start,       // Green - route start
+  end,         // Red - route end
+}
+
+/// A thumbtack-style pin for marking locations during search/routing
+class LocationPin extends StatelessWidget {
+  final PinType type;
+  final double size;
+  
+  const LocationPin({
+    super.key,
+    required this.type,
+    this.size = 32.0, // Smaller than before
+  });
+
+  Color get _pinColor {
+    switch (type) {
+      case PinType.provisional:
+        return Colors.orange;
+      case PinType.start:
+        return Colors.green;
+      case PinType.end:
+        return Colors.red;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: size,
+      height: size,
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          // Pin shadow
+          Positioned(
+            bottom: 2,
+            child: Container(
+              width: size * 0.4,
+              height: size * 0.2,
+              decoration: BoxDecoration(
+                color: Colors.black.withOpacity(0.3),
+                borderRadius: BorderRadius.circular(size * 0.1),
+              ),
+            ),
+          ),
+          // Main thumbtack pin
+          Icon(
+            Icons.push_pin,
+            size: size,
+            color: _pinColor,
+          ),
+          // Inner dot for better visibility
+          Positioned(
+            top: size * 0.2,
+            child: Container(
+              width: size * 0.3,
+              height: size * 0.3,
+              decoration: BoxDecoration(
+                color: Colors.white,
+                shape: BoxShape.circle,
+                border: Border.all(
+                  color: _pinColor.withOpacity(0.8),
+                  width: 1.5,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+// Legacy widget name for compatibility
+class ProvisionalPin extends StatelessWidget {
+  final double size;
+  final Color color;
+  
+  const ProvisionalPin({
+    super.key,
+    this.size = 32.0,
+    this.color = Colors.orange,
+  });
+  
+  @override
+  Widget build(BuildContext context) {
+    return LocationPin(type: PinType.provisional, size: size);
+  }
+}

lib/widgets/search_bar.dart

@@ -0,0 +1,223 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../app_state.dart';
+import '../models/search_result.dart';
+import '../services/localization_service.dart';
+import '../widgets/debouncer.dart';
+
+class LocationSearchBar extends StatefulWidget {
+  final void Function(SearchResult)? onResultSelected;
+  final VoidCallback? onCancel;
+  
+  const LocationSearchBar({
+    super.key,
+    this.onResultSelected,
+    this.onCancel,
+  });
+
+  @override
+  State<LocationSearchBar> createState() => _LocationSearchBarState();
+}
+
+class _LocationSearchBarState extends State<LocationSearchBar> {
+  final TextEditingController _controller = TextEditingController();
+  final FocusNode _focusNode = FocusNode();
+  final Debouncer _searchDebouncer = Debouncer(const Duration(milliseconds: 500));
+  
+  bool _showResults = false;
+  
+  @override
+  void initState() {
+    super.initState();
+    _focusNode.addListener(_onFocusChanged);
+  }
+  
+  @override
+  void dispose() {
+    _controller.dispose();
+    _focusNode.dispose();
+    _searchDebouncer.dispose();
+    super.dispose();
+  }
+  
+  void _onFocusChanged() {
+    setState(() {
+      _showResults = _focusNode.hasFocus && _controller.text.isNotEmpty;
+    });
+  }
+  
+  void _onSearchChanged(String query) {
+    setState(() {
+      _showResults = query.isNotEmpty && _focusNode.hasFocus;
+    });
+    
+    if (query.isEmpty) {
+      // Clear navigation search results instead of old search state
+      final appState = context.read<AppState>();
+      appState.clearNavigationSearchResults();
+      return;
+    }
+    
+    // Debounce search to avoid too many API calls
+    _searchDebouncer(() {
+      if (mounted) {
+        final appState = context.read<AppState>();
+        appState.searchNavigation(query);
+      }
+    });
+  }
+  
+  void _onResultTap(SearchResult result) {
+    _controller.text = result.displayName;
+    setState(() {
+      _showResults = false;
+    });
+    _focusNode.unfocus();
+    
+    widget.onResultSelected?.call(result);
+  }
+  
+  void _onClear() {
+    _controller.clear();
+    context.read<AppState>().clearNavigationSearchResults();
+    setState(() {
+      _showResults = false;
+    });
+  }
+  
+  void _onCancel() {
+    _controller.clear();
+    context.read<AppState>().clearNavigationSearchResults();
+    setState(() {
+      _showResults = false;
+    });
+    _focusNode.unfocus();
+    widget.onCancel?.call();
+  }
+  
+  Widget _buildResultsList(List<SearchResult> results, bool isLoading) {
+    if (!_showResults) return const SizedBox.shrink();
+    
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 16),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surface,
+        borderRadius: const BorderRadius.vertical(bottom: Radius.circular(12)),
+        boxShadow: [
+          BoxShadow(
+            color: Theme.of(context).shadowColor.withOpacity(0.2),
+            blurRadius: 8,
+            offset: const Offset(0, 2),
+          ),
+        ],
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          if (isLoading)
+            Padding(
+              padding: const EdgeInsets.all(16),
+              child: Row(
+                children: [
+                  const SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+                  const SizedBox(width: 12),
+                  Text(LocalizationService.instance.t('navigation.searching')),
+                ],
+              ),
+            )
+          else if (results.isEmpty && _controller.text.isNotEmpty)
+            Padding(
+              padding: const EdgeInsets.all(16),
+              child: Text(LocalizationService.instance.t('navigation.noResultsFound')),
+            )
+          else
+            ...results.map((result) => ListTile(
+              leading: Icon(
+                result.category == 'coordinates' ? Icons.place : Icons.location_on,
+                size: 20,
+              ),
+              title: Text(
+                result.displayName,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+              subtitle: result.type != null 
+                  ? Text(result.type!, style: Theme.of(context).textTheme.bodySmall)
+                  : null,
+              dense: true,
+              onTap: () => _onResultTap(result),
+            )).toList(),
+        ],
+      ),
+    );
+  }
+  
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<AppState>(
+      builder: (context, appState, child) {
+        return Column(
+          children: [
+            Container(
+              margin: const EdgeInsets.all(16),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surface,
+                borderRadius: BorderRadius.circular(12),
+                boxShadow: [
+                  BoxShadow(
+                    color: Theme.of(context).shadowColor.withOpacity(0.2),
+                    blurRadius: 8,
+                    offset: const Offset(0, 2),
+                  ),
+                ],
+              ),
+              child: TextField(
+                controller: _controller,
+                focusNode: _focusNode,
+                decoration: InputDecoration(
+                  hintText: LocalizationService.instance.t('navigation.searchPlaceholder'),
+                  prefixIcon: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      IconButton(
+                        icon: const Icon(Icons.close),
+                        onPressed: _onCancel,
+                        tooltip: LocalizationService.instance.t('navigation.cancelSearch'),
+                      ),
+                      const Icon(Icons.search),
+                    ],
+                  ),
+                  prefixIconConstraints: const BoxConstraints(minWidth: 80),
+                  suffixIcon: _controller.text.isNotEmpty
+                      ? IconButton(
+                          icon: const Icon(Icons.clear),
+                          onPressed: _onClear,
+                          tooltip: LocalizationService.instance.t('actions.clear'),
+                        )
+                      : null,
+                  border: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(12),
+                    borderSide: BorderSide.none,
+                  ),
+                  filled: true,
+                  fillColor: Theme.of(context).colorScheme.surface,
+                  contentPadding: const EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 12,
+                  ),
+                ),
+                onChanged: _onSearchChanged,
+              ),
+            ),
+            _buildResultsList(appState.navigationSearchResults, appState.isNavigationSearchLoading),
+          ],
+        );
+      },
+    );
+  }
+}

pubspec.lock

@@ -443,6 +443,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.2.0"
+  package_info_plus:
+    dependency: "direct main"
+    description:
+      name: package_info_plus
+      sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.3.1"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
   path:
     dependency: transitive
     description: