debug ASC API key

Everything but Vector tiles:

Splash screens and icons working right on both platforms
Search function available through a button
Stop adjusting UX depending on keyboard
Stop overlapping OS nav controls bar on android
Improve attribution (truncation, tap to view)
Add configurable max zoom to tile types
Remove tile providers whose terms we were possibly breaking
Navigation/routing UX, hidden behind dev mode - not in release yet

.github/workflows/workflow.yml

@@ -0,0 +1,304 @@
+name: Build Release
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+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 ' ' | cut -d '+' -f 1) >> $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 --dart-define=OSM_PROD_CLIENTID='${{ secrets.OSM_PROD_CLIENTID }}' --dart-define=OSM_SANDBOX_CLIENTID='${{ secrets.OSM_SANDBOX_CLIENTID }}'
+
+      - 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 --dart-define=OSM_PROD_CLIENTID='${{ secrets.OSM_PROD_CLIENTID }}' --dart-define=OSM_SANDBOX_CLIENTID='${{ secrets.OSM_SANDBOX_CLIENTID }}'
+
+      - 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: Install Apple certificate and provisioning profile
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.IOS_DISTRIBUTION_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ""
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.IOS_APPSTORE_PROVISIONING_PROFILE_BASE64 }}
+          KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          # import certificate and provisioning profile from secrets
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
+
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          # Set this keychain as the default
+          security list-keychain -d user -s $KEYCHAIN_PATH
+          security default-keychain -s $KEYCHAIN_PATH
+
+          # install provisioning profile
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles/61f9fdb9-bf2d-4d94-b249-63155ee71e74.mobileprovision
+          
+          # Also install using the profile's internal UUID for better compatibility
+          UUID=$(security cms -D -i $PP_PATH | plutil -extract UUID xml1 -o - - | xmllint --xpath "//string/text()" -)
+          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles/$UUID.mobileprovision
+
+          # Debug: Check what we actually have
+          echo "=== Certificates in keychain ==="
+          security find-identity -v -p codesigning $KEYCHAIN_PATH
+          echo "=== Provisioning profiles ==="
+          ls -la ~/Library/MobileDevice/Provisioning\ Profiles/
+          echo "=== Profile UUID extracted: $UUID ==="
+
+      - name: Create export options
+        run: |
+          cat > ios/exportOptions.plist << EOF
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+            <key>destination</key>
+            <string>export</string>
+            <key>method</key>
+            <string>app-store</string>
+            <key>teamID</key>
+            <string>7XG8T28436</string>
+            <key>provisioningProfiles</key>
+            <dict>
+              <key>me.deflock.deflockapp</key>
+              <string>61f9fdb9-bf2d-4d94-b249-63155ee71e74</string>
+            </dict>
+            <key>signingStyle</key>
+            <string>manual</string>
+            <key>stripSwiftSymbols</key>
+            <true/>
+          </dict>
+          </plist>
+          EOF
+
+      - name: Build iOS .ipa
+        run: |
+          flutter build ipa --release \
+            --export-options-plist=ios/exportOptions.plist \
+            --dart-define=OSM_PROD_CLIENTID='${{ secrets.OSM_PROD_CLIENTID }}' \
+            --dart-define=OSM_SANDBOX_CLIENTID='${{ secrets.OSM_SANDBOX_CLIENTID }}'
+          cp build/ios/ipa/*.ipa Runner.ipa
+
+      - name: Clean up keychain and provisioning profile
+        if: always()
+        run: |
+          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+          rm ~/Library/MobileDevice/Provisioning\ Profiles/61f9fdb9-bf2d-4d94-b249-63155ee71e74.mobileprovision
+
+      - 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'
+
+      - name: Upload to App Store Connect
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+        env:
+          APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
+          APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
+          APP_STORE_CONNECT_API_KEY_BASE64: ${{ secrets.APP_STORE_CONNECT_API_KEY_BASE64 }}
+        run: |
+          # Create the private keys directory
+          mkdir -p ~/private_keys
+          
+          # Decode and save the API key
+          echo -n "$APP_STORE_CONNECT_API_KEY_BASE64" | base64 --decode > ~/private_keys/AuthKey_${APP_STORE_CONNECT_API_KEY_ID}.p8
+          
+          # Debug: Check if file was created and has content
+          echo "=== API Key File Debug ==="
+          ls -la ~/private_keys/
+          file ~/private_keys/AuthKey_${APP_STORE_CONNECT_API_KEY_ID}.p8
+          echo "First few lines of key file:"
+          head -3 ~/private_keys/AuthKey_${APP_STORE_CONNECT_API_KEY_ID}.p8
+          echo "=========================="
+          
+          # Upload using xcrun altool
+          xcrun altool --upload-app \
+            --type ios \
+            --file Runner.ipa \
+            --apiKey $APP_STORE_CONNECT_API_KEY_ID \
+            --apiIssuer $APP_STORE_CONNECT_ISSUER_ID
+          
+          # Clean up
+          rm -rf ~/private_keys
+
+  attach-to-release:
+    name: Attach Assets to Release
+    needs: [get-version, build-android-apk, build-android-aab, build-ios]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download APK artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: deflock_v${{ needs.get-version.outputs.version }}.apk
+
+      - name: Download AAB artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: deflock_v${{ needs.get-version.outputs.version }}.aab
+
+      - name: Download IPA artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: deflock_v${{ needs.get-version.outputs.version }}.ipa
+
+      - name: Rename files for release
+        run: |
+          mv app-release.apk deflock_v${{ needs.get-version.outputs.version }}.apk
+          mv app-release.aab deflock_v${{ needs.get-version.outputs.version }}.aab
+          mv Runner.ipa deflock_v${{ needs.get-version.outputs.version }}.ipa
+
+      - name: Attach assets to release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            deflock_v${{ needs.get-version.outputs.version }}.apk
+            deflock_v${{ needs.get-version.outputs.version }}.aab
+            deflock_v${{ needs.get-version.outputs.version }}.ipa

.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
@@ -80,6 +93,9 @@ Thumbs.db
 *.keystore
 .env
 
+# Local OSM client ID configuration (contains secrets)
+build_keys.conf
+
 # ───────────────────────────────
 # For now - not targeting these
 # ───────────────────────────────

DEVELOPER.md

@@ -0,0 +1,425 @@
+# Developer Documentation
+
+This document provides detailed technical information about the DeFlock app architecture, key design decisions, and development guidelines.
+
+---
+
+## Philosophy: Brutalist Code
+
+Our development approach prioritizes **simplicity over cleverness**:
+
+- **Explicit over implicit**: Clear, readable code that states its intent
+- **Few edge cases by design**: Avoid complex branching and special cases
+- **Maintainable over efficient**: Choose the approach that's easier to understand and modify
+- **Delete before adding**: Remove complexity when possible rather than adding features
+
+**Hierarchy of preferred code:**
+1. **Code we don't write** (through thoughtful design and removing edge cases)
+2. **Code we can remove** (by seeing problems from a new angle)
+3. **Code that sadly must exist** (simple, explicit, maintainable)
+
+---
+
+## Architecture Overview
+
+### State Management
+
+The app uses **Provider pattern** with modular state classes:
+
+```
+AppState (main coordinator)
+├── AuthState (OAuth2 login/logout)
+├── OperatorProfileState (operator tag sets)
+├── ProfileState (node profiles & toggles)
+├── SessionState (add/edit sessions)
+├── SettingsState (preferences & tile providers)
+└── UploadQueueState (pending operations)
+```
+
+**Why this approach:**
+- **Separation of concerns**: Each state handles one domain
+- **Testability**: Individual state classes can be unit tested
+- **Brutalist**: No complex state orchestration, just simple delegation
+
+### Data Flow Architecture
+
+```
+UI Layer (Widgets)
+    ↕️
+AppState (Coordinator) 
+    ↕️
+State Modules (AuthState, ProfileState, etc.)
+    ↕️
+Services (MapDataProvider, NodeCache, Uploader)
+    ↕️
+External APIs (OSM, Overpass, Tile providers)
+```
+
+**Key principles:**
+- **Unidirectional data flow**: UI → AppState → Services → APIs
+- **No direct service access from UI**: Everything goes through AppState
+- **Clean boundaries**: Each layer has a clear responsibility
+
+---
+
+## Core Components
+
+### 1. MapDataProvider
+
+**Purpose**: Unified interface for fetching map tiles and surveillance nodes
+
+**Design decisions:**
+- **Pluggable sources**: Local (cached) vs Remote (live API)
+- **Offline-first**: Always try local first, graceful degradation
+- **Mode-aware**: Different behavior for production vs sandbox
+- **Failure handling**: Never crash the UI, always provide fallbacks
+
+**Key methods:**
+- `getNodes()`: Smart fetching with local/remote merging
+- `getTile()`: Tile fetching with caching
+- `_fetchRemoteNodes()`: Handles Overpass → OSM API fallback
+
+**Why unified interface:**
+The app needs to seamlessly switch between multiple data sources (local cache, Overpass API, OSM API, offline areas) based on network status, upload mode, and zoom level. A single interface prevents the UI from needing to know about these complexities.
+
+### 2. Node Operations (Create/Edit/Delete)
+
+**Upload Operations Enum:**
+```dart
+enum UploadOperation { create, modify, delete }
+```
+
+**Why explicit enum vs boolean flags:**
+- **Brutalist**: Three explicit states instead of nullable booleans
+- **Extensible**: Easy to add new operations (like bulk operations)
+- **Clear intent**: `operation == UploadOperation.delete` is unambiguous
+
+**Session Pattern:**
+- `AddNodeSession`: For creating new nodes
+- `EditNodeSession`: For modifying existing nodes
+- No "DeleteSession": Deletions are immediate (simpler)
+
+**Why no delete session:**
+Deletions don't need position dragging or tag editing - they just need confirmation and queuing. A session would add complexity without benefit.
+
+### 3. Upload Queue System
+
+**Design principles:**
+- **Operation-agnostic**: Same queue handles create/modify/delete
+- **Offline-capable**: Queue persists between app sessions
+- **Visual feedback**: Each operation type has distinct UI state
+- **Error recovery**: Retry mechanism with exponential backoff
+
+**Queue workflow:**
+1. User action (add/edit/delete) → `PendingUpload` created
+2. Immediate visual feedback (cache updated with temp markers)
+3. Background uploader processes queue when online
+4. Success → cache updated with real data, temp markers removed
+5. Failure → error state, retry available
+
+**Why immediate visual feedback:**
+Users expect instant response to their actions. By immediately updating the cache with temporary markers (e.g., `_pending_deletion`), the UI stays responsive while the actual API calls happen in background.
+
+### 4. Cache & Visual States
+
+**Node visual states:**
+- **Blue ring**: Real nodes from OSM
+- **Purple ring**: Pending uploads (new nodes)
+- **Grey ring**: Original nodes with pending edits
+- **Orange ring**: Node currently being edited
+- **Red ring**: Nodes pending deletion
+
+**Cache tags for state tracking:**
+```dart
+'_pending_upload'    // New node waiting to upload
+'_pending_edit'      // Original node has pending edits
+'_pending_deletion'  // Node queued for deletion
+'_original_node_id'  // For drawing connection lines
+```
+
+**Why underscore prefix:**
+These are internal app tags, not OSM tags. The underscore prefix makes this explicit and prevents accidental upload to OSM.
+
+### 5. Multi-API Data Sources
+
+**Production mode:** Overpass API → OSM API fallback
+**Sandbox mode:** OSM API only (Overpass doesn't have sandbox data)
+
+**Zoom level restrictions:**
+- **Production (Overpass)**: Zoom ≥ 10 (established limit)
+- **Sandbox (OSM API)**: Zoom ≥ 13 (stricter due to bbox limits)
+
+**Why different zoom limits:**
+The OSM API returns ALL data types (nodes, ways, relations) in a bounding box and has stricter size limits. Overpass is more efficient for large areas. The zoom restrictions prevent API errors and excessive data transfer.
+
+### 6. Offline vs Online Mode Behavior
+
+**Mode combinations:**
+```
+Production + Online  → Local cache + Overpass API
+Production + Offline → Local cache only
+Sandbox + Online     → OSM API only (no cache mixing)
+Sandbox + Offline    → No nodes (cache is production data)
+```
+
+**Why sandbox + offline = no nodes:**
+Local cache contains production data. Showing production nodes in sandbox mode would be confusing and could lead to users trying to edit production nodes with sandbox credentials.
+
+---
+
+## Key Design Decisions & Rationales
+
+### 1. Why Provider Pattern?
+
+**Alternatives considered:**
+- BLoC: Too verbose for our needs
+- Riverpod: Added complexity without clear benefit
+- setState: Doesn't scale beyond single widgets
+
+**Why Provider won:**
+- **Familiar**: Most Flutter developers know Provider
+- **Simple**: Minimal boilerplate
+- **Flexible**: Easy to compose multiple providers
+- **Battle-tested**: Mature, stable library
+
+### 2. Why Separate State Classes?
+
+**Alternative**: Single monolithic AppState
+
+**Why modular state:**
+- **Single responsibility**: Each state class has one concern
+- **Testability**: Easier to unit test individual features
+- **Maintainability**: Changes to auth don't affect profile logic
+- **Team development**: Different developers can work on different states
+
+### 3. Why Upload Queue vs Direct API Calls?
+
+**Alternative**: Direct API calls from UI actions
+
+**Why queue approach:**
+- **Offline capability**: Actions work without internet
+- **User experience**: Instant feedback, no waiting for API calls
+- **Error recovery**: Failed uploads can be retried
+- **Batch processing**: Could optimize multiple operations
+- **Visual feedback**: Users can see pending operations
+
+### 4. Why Overpass + OSM API vs Just One?
+
+**Why not just Overpass:**
+- Overpass doesn't have sandbox data
+- Overpass can be unreliable/slow
+- OSM API is canonical source
+
+**Why not just OSM API:**
+- OSM API has strict bbox size limits
+- OSM API returns all data types (inefficient)
+- Overpass is optimized for surveillance device queries
+
+**Result**: Use the best tool for each situation
+
+### 5. Why Zoom Level Restrictions?
+
+**Alternative**: Always fetch, handle errors gracefully
+
+**Why restrictions:**
+- **Prevents API abuse**: Large bbox queries can overload servers
+- **User experience**: Fetching 10,000 nodes causes UI lag
+- **Battery life**: Excessive network requests drain battery
+- **Clear feedback**: Users understand why nodes aren't showing
+
+---
+
+## Development Guidelines
+
+### 1. Adding New Features
+
+**Before writing code:**
+1. Can we solve this by removing existing code?
+2. Can we simplify the problem to avoid edge cases?
+3. Does this fit the existing patterns?
+
+**When adding new upload operations:**
+1. Add to `UploadOperation` enum
+2. Update `PendingUpload` serialization
+3. Add visual state (color, icon)
+4. Update uploader logic
+5. Add cache cleanup handling
+
+### 2. Testing Philosophy
+
+**Priority order:**
+1. **Integration tests**: Test complete user workflows
+2. **Widget tests**: Test UI components with mock data
+3. **Unit tests**: Test individual state classes
+
+**Why integration tests first:**
+The most important thing is that user workflows work end-to-end. Unit tests can pass while the app is broken from a user perspective.
+
+### 3. Error Handling
+
+**Principles:**
+- **Never crash the UI**: Always provide fallbacks
+- **Fail gracefully**: Empty list is better than exception
+- **User feedback**: Show meaningful error messages
+- **Logging**: Use debugPrint for troubleshooting
+
+**Example pattern:**
+```dart
+try {
+  final result = await riskyOperation();
+  return result;
+} catch (e) {
+  debugPrint('Operation failed: $e');
+  // Show user-friendly message
+  showSnackBar('Unable to load data. Please try again.');
+  return <EmptyResult>[];
+}
+```
+
+### 4. State Updates
+
+**Always notify listeners:**
+```dart
+void updateSomething() {
+  _something = newValue;
+  notifyListeners(); // Don't forget this!
+}
+```
+
+**Batch related updates:**
+```dart
+void updateMultipleThings() {
+  _thing1 = value1;
+  _thing2 = value2;
+  _thing3 = value3;
+  notifyListeners(); // Single notification for all changes
+}
+```
+
+---
+
+## Build & Development Setup
+
+### Prerequisites
+- **Flutter SDK**: Latest stable version
+- **Xcode**: For iOS builds (macOS only)
+- **Android Studio**: For Android builds
+- **Git**: For version control
+
+### OAuth2 Setup
+
+**Required registrations:**
+1. **Production OSM**: https://www.openstreetmap.org/oauth2/applications
+2. **Sandbox OSM**: https://master.apis.dev.openstreetmap.org/oauth2/applications
+
+**Configuration:**
+```bash
+cp lib/keys.dart.example lib/keys.dart
+# Edit keys.dart with your OAuth2 client IDs
+```
+
+### iOS Setup
+```bash
+cd ios && pod install
+```
+
+### Running
+```bash
+flutter pub get
+flutter run
+```
+
+### Testing
+```bash
+# Run all tests
+flutter test
+
+# Run with coverage
+flutter test --coverage
+```
+
+---
+
+## Code Organization
+
+```
+lib/
+├── models/              # Data classes
+│   ├── osm_camera_node.dart
+│   ├── pending_upload.dart
+│   └── node_profile.dart
+├── services/            # Business logic
+│   ├── map_data_provider.dart
+│   ├── uploader.dart
+│   └── node_cache.dart
+├── state/               # State management
+│   ├── app_state.dart
+│   ├── auth_state.dart
+│   └── upload_queue_state.dart
+├── widgets/             # UI components
+│   ├── map_view.dart
+│   ├── edit_node_sheet.dart
+│   └── map/             # Map-specific widgets
+├── screens/             # Full screens
+│   ├── home_screen.dart
+│   └── settings_screen.dart
+└── localizations/       # i18n strings
+    ├── en.json
+    ├── de.json
+    ├── es.json
+    └── fr.json
+```
+
+**Principles:**
+- **Models**: Pure data, no business logic
+- **Services**: Stateless business logic
+- **State**: Stateful coordination
+- **Widgets**: UI only, delegate to AppState
+- **Screens**: Compose widgets, handle navigation
+
+---
+
+## Debugging Tips
+
+### Common Issues
+
+**Nodes not appearing:**
+- Check zoom level (≥10 production, ≥13 sandbox)
+- Check upload mode vs expected data source
+- Check network connectivity
+- Look for console errors
+
+**Upload failures:**
+- Verify OAuth2 credentials
+- Check upload mode matches login (production vs sandbox)
+- Ensure node has required tags
+- Check network connectivity
+
+**Cache issues:**
+- Clear app data to reset cache
+- Check if offline mode is affecting behavior
+- Verify upload mode switches clear cache
+
+### Debug Logging
+
+**Enable verbose logging:**
+```dart
+debugPrint('[ComponentName] Detailed message: $data');
+```
+
+**Key areas to log:**
+- Network requests and responses
+- Cache operations
+- State transitions
+- User actions
+
+### Performance
+
+**Monitor:**
+- Memory usage during large node fetches
+- UI responsiveness during background uploads
+- Battery usage during GPS tracking
+
+---
+
+This documentation should be updated as the architecture evolves. When making significant changes, update both the relevant section here and add a brief note explaining the rationale for the change.

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,14 +22,14 @@ 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), new devices (white), edited devices (grey), and devices being edited (orange)
+- **Device visualization**: Color-coded markers showing real devices (blue), pending uploads (purple), pending edits (grey), devices being edited (orange), and pending deletions (red)
 
 ### Device Management
 - **Comprehensive profiles**: Built-in profiles for major manufacturers (Flock Safety, Motorola/Vigilant, Genetec, Leonardo/ELSAG, Neology) plus custom profile creation
-- **Editing capabilities**: Update location, direction, and tags of existing devices
+- **Full CRUD operations**: Create, edit, and delete surveillance devices
 - **Direction visualization**: Interactive field-of-view cones showing camera viewing angles
 - **Bulk operations**: Tag multiple devices efficiently with profile-based workflow
 
@@ -52,7 +52,8 @@ A comprehensive Flutter app for mapping public surveillance infrastructure with
 1. **Install** the app on iOS or Android
 2. **Enable location** permissions  
 3. **Log into OpenStreetMap**: Choose upload mode and get OAuth2 credentials
-4. **Add your first device**: Tap the "tag node" button, position the pin, set direction, select a profile, and tap submit
+4. **Add your first device**: Tap the "New Node" button, position the pin, set direction, select a profile, and tap submit
+5. **Edit or delete devices**: Tap any device marker to view details, then use Edit or Delete buttons
 
 **New to OpenStreetMap?** Visit [deflock.me](https://deflock.me) for complete setup instructions and community guidelines.
 
@@ -60,50 +61,55 @@ A comprehensive Flutter app for mapping public surveillance infrastructure with
 
 ## For Developers
 
-### Architecture Highlights
-- **Unified data provider**: All map tiles and surveillance device data route through `MapDataProvider` with pluggable remote/local sources
-- **Modular settings**: Each settings section is a separate widget for maintainability
-- **State management**: Provider pattern with clean separation of concerns
-- **Offline-first**: Network calls are optional; app functions fully offline with downloaded data and queues uploads until online
-
-### Build Setup
-**Prerequisites**: Flutter SDK, Xcode (iOS), Android Studio  
-**OAuth Setup**: Register apps at [openstreetmap.org/oauth2](https://www.openstreetmap.org/oauth2/applications) and [OSM Sandbox](https://master.apis.dev.openstreetmap.org/oauth2/applications) to get a client ID
+**See [DEVELOPER.md](DEVELOPER.md)** for comprehensive technical documentation including:
+- Architecture overview and design decisions
+- Development setup and build instructions  
+- Code organization and contribution guidelines
+- Debugging tips and troubleshooting
 
+**Quick setup:**
 ```shell
-# Basic setup
 flutter pub get
 cp lib/keys.dart.example lib/keys.dart
-# Add your OAuth2 client IDs to keys.dart
-
-# iOS additional setup
-cd ios && pod install
-
-# Run
-flutter run
+# Add OAuth2 client IDs, then: flutter run
 ```
 
 ---
 
 ## Roadmap
 
-### v1 todo/bug List
-- Fix "tiles loaded" indicator accuracy across different providers
-- Generic tile provider error messages (not always "OSM tiles slow")
-- Optional custom icons for camera profiles
-- Camera deletions
-- Clean up cache when submitted changesets appear in Overpass results
-- Upgrade device marker design (considering nullplate's svg)
+### Needed Bugfixes
+- Are offline areas preferred for fast loading even when online? Check working.
+- Ease up on overpass by pre-caching a larger area. Maybe we could grab the full latest database just like for suspected locations?
+- Stop failing to fetch tiles; keep retrying after 3. Remove kTileFetchInitialDelayMs, kTileFetchJitter1Ms, etc from dev_config. Fix network indicator - only done when fetch queue is empty!
+
+### Current Development
+- Swap in alprwatch.org/directions avoidance routing API
+- Help button with links to email, discord, and website
+- Clean cache when nodes have disappeared / been deleted by others / queue item was deleted
+- Improve offline area node refresh live display
+- Add default operator profiles (Lowe’s etc)
 
 ### Future Features & Wishlist
-- Location-based notifications when approaching surveillance devices
-- Red/yellow ring for devices missing specific tag details
-- iOS/Android native themes and dark mode support
-- "Cache accumulating" offline areas?
+- Update offline area nodes while browsing?
+- Suspected locations toggle (alprwatch.com/flock/utilities)
+- Offline navigation 
+
+### Maybes
+- Yellow ring for devices missing specific tag details?
+- "Cache accumulating" offline area?
 - "Offline areas" as tile provider?
-- Jump to location by coordinates, address, or POI name
-- Route planning that avoids surveillance devices
-- Custom device providers and OSM/Overpass alternatives
+- 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"
@@ -17,6 +26,7 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
+        isCoreLibraryDesugaringEnabled = true
     }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
@@ -30,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")
+            }
         }
     }
 }
@@ -50,3 +75,7 @@ flutter {
     source = "../.."
 }
 
+dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+}
+

android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,9 @@
     <!-- Location permissions for blue‑dot positioning -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    
+    <!-- Notification permission for proximity alerts -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:name="${applicationName}"
@@ -20,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,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/launch_background" />
-    <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

build_keys.conf.example

@@ -0,0 +1,10 @@
+# Local OSM client ID configuration for builds
+# Copy this file to build_keys.conf and fill in your values
+# This file is gitignored to keep your keys secret
+#
+# Get your client IDs from:
+# Production: https://www.openstreetmap.org/oauth2/applications  
+# Sandbox: https://master.apis.dev.openstreetmap.org/oauth2/applications
+
+OSM_PROD_CLIENTID=your_production_client_id_here
+OSM_SANDBOX_CLIENTID=your_sandbox_client_id_here

do_builds.sh

@@ -1,16 +1,110 @@
 #!/bin/bash
 
-appver=$(cat lib/dev_config.dart | grep "kClientVersion" | cut -d '=' -f 2 | tr -d ';' | tr -d "\'" | tr -d " ")
+# Default options
+BUILD_IOS=true
+BUILD_ANDROID=true
+
+# Function to read key=value from file
+read_from_file() {
+  local key="$1"
+  local file="build_keys.conf"
+  
+  if [ ! -f "$file" ]; then
+    return 1
+  fi
+  
+  # Read key=value pairs, ignoring comments and empty lines
+  while IFS='=' read -r k v; do
+    # Skip comments and empty lines
+    if [[ "$k" =~ ^[[:space:]]*# ]] || [[ -z "$k" ]]; then
+      continue
+    fi
+    
+    # Remove leading/trailing whitespace
+    k=$(echo "$k" | xargs)
+    v=$(echo "$v" | xargs)
+    
+    if [ "$k" = "$key" ]; then
+      echo "$v"
+      return 0
+    fi
+  done < "$file"
+  
+  return 1
+}
+
+# Parse arguments
+for arg in "$@"; do
+  case $arg in
+    --ios)
+      BUILD_ANDROID=false
+      ;;
+    --android)
+      BUILD_IOS=false
+      ;;
+    *)
+      echo "Usage: $0 [--ios | --android]"
+      echo "  --ios       Build only iOS"
+      echo "  --android   Build only Android"
+      echo "  (default builds both)"
+      echo ""
+      echo "OSM client IDs must be configured in build_keys.conf"
+      echo "See build_keys.conf.example for format"
+      exit 1
+      ;;
+  esac
+done
+
+# Load client IDs from build_keys.conf
+if [ ! -f "build_keys.conf" ]; then
+  echo "Error: build_keys.conf not found"
+  echo "Copy build_keys.conf.example to build_keys.conf and fill in your OSM client IDs"
+  exit 1
+fi
+
+echo "Loading OSM client IDs from build_keys.conf..."
+OSM_PROD_CLIENTID=$(read_from_file "OSM_PROD_CLIENTID")
+OSM_SANDBOX_CLIENTID=$(read_from_file "OSM_SANDBOX_CLIENTID")
+
+# Check required keys
+if [ -z "$OSM_PROD_CLIENTID" ]; then
+  echo "Error: OSM_PROD_CLIENTID not found in build_keys.conf"
+  exit 1
+fi
+
+if [ -z "$OSM_SANDBOX_CLIENTID" ]; then
+  echo "Error: OSM_SANDBOX_CLIENTID not found in build_keys.conf"
+  exit 1
+fi
+
+# Build the dart-define arguments
+DART_DEFINE_ARGS="--dart-define=OSM_PROD_CLIENTID=$OSM_PROD_CLIENTID --dart-define=OSM_SANDBOX_CLIENTID=$OSM_SANDBOX_CLIENTID"
+
+appver=$(grep "version:" pubspec.yaml | head -1 | cut -d ':' -f 2 | tr -d ' ' | cut -d '+' -f 1)
 echo
 echo "Building app version ${appver}..."
-flutter build ios --no-codesign
-flutter build apk
-echo
-echo "Converting .app to .ipa..."
-./app2ipa.sh build/ios/iphoneos/Runner.app
-echo
-echo "Moving files..."
-cp build/app/outputs/flutter-apk/app-release.apk ../flockmap_v${appver}.apk
-mv Runner.ipa ../flockmap_v${appver}.ipa
 echo
+
+if [ "$BUILD_IOS" = true ]; then
+  echo "Building iOS..."
+  flutter build ios --no-codesign $DART_DEFINE_ARGS || exit 1
+
+  echo "Converting .app to .ipa..."
+  ./app2ipa.sh build/ios/iphoneos/Runner.app || exit 1
+
+  echo "Moving iOS files..."
+  mv Runner.ipa "../deflock_v${appver}.ipa" || exit 1
+  echo
+fi
+
+if [ "$BUILD_ANDROID" = true ]; then
+  echo "Building Android..."
+  flutter build apk $DART_DEFINE_ARGS || exit 1
+
+  echo "Moving Android files..."
+  cp build/app/outputs/flutter-apk/app-release.apk "../deflock_v${appver}.apk" || exit 1
+  echo
+fi
+
 echo "Done."
+

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

@@ -470,7 +470,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 7XG8T28436;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -479,6 +482,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = me.deflock.deflockapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "61f9fdb9-bf2d-4d94-b249-63155ee71e74";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -512,7 +516,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.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -528,7 +532,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";
@@ -652,15 +656,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 7XG8T28436;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flockMapApp;
+				PRODUCT_BUNDLE_IDENTIFIER = me.deflock.deflockapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "61f9fdb9-bf2d-4d94-b249-63155ee71e74";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -674,15 +682,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 7XG8T28436;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flockMapApp;
+				PRODUCT_BUNDLE_IDENTIFIER = me.deflock.deflockapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "61f9fdb9-bf2d-4d94-b249-63155ee71e74";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

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.

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
-                        <color key="backgroundColor" red="0.125" green="0.125" blue="0.125" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -32,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="512" height="512"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>

lib/app_state.dart

@@ -4,18 +4,27 @@ import 'package:latlong2/latlong.dart';
 
 import 'models/node_profile.dart';
 import 'models/operator_profile.dart';
-import 'models/osm_camera_node.dart';
+import 'models/osm_node.dart';
 import 'models/pending_upload.dart';
+import 'models/suspected_location.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/suspected_location_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;
 
@@ -25,10 +34,13 @@ 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 SuspectedLocationState _suspectedLocationState;
   late final UploadQueueState _uploadQueueState;
 
   bool _isInitialized = false;
@@ -36,18 +48,24 @@ class AppState extends ChangeNotifier {
   AppState() {
     instance = this;
     _authState = AuthState();
+    _navigationState = NavigationState();
     _operatorProfileState = OperatorProfileState();
     _profileState = ProfileState();
+    _searchState = SearchState();
     _sessionState = SessionState();
     _settingsState = SettingsState();
+    _suspectedLocationState = SuspectedLocationState();
     _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);
+    _suspectedLocationState.addListener(_onStateChanged);
     _uploadQueueState.addListener(_onStateChanged);
     
     _init();
@@ -60,6 +78,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;
@@ -68,6 +115,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;
@@ -77,6 +129,10 @@ class AppState extends ChangeNotifier {
   int get maxCameras => _settingsState.maxCameras;
   UploadMode get uploadMode => _settingsState.uploadMode;
   FollowMeMode get followMeMode => _settingsState.followMeMode;
+  bool get proximityAlertsEnabled => _settingsState.proximityAlertsEnabled;
+  int get proximityAlertDistance => _settingsState.proximityAlertDistance;
+  bool get networkStatusIndicatorEnabled => _settingsState.networkStatusIndicatorEnabled;
+  int get suspectedLocationMinDistance => _settingsState.suspectedLocationMinDistance;
   
   // Tile provider state
   List<TileProvider> get tileProviders => _settingsState.tileProviders;
@@ -89,6 +145,12 @@ class AppState extends ChangeNotifier {
   int get pendingCount => _uploadQueueState.pendingCount;
   List<PendingUpload> get pendingUploads => _uploadQueueState.pendingUploads;
 
+  // Suspected location state
+  SuspectedLocation? get selectedSuspectedLocation => _suspectedLocationState.selectedLocation;
+  bool get suspectedLocationsEnabled => _suspectedLocationState.isEnabled;
+  bool get suspectedLocationsLoading => _suspectedLocationState.isLoading;
+  DateTime? get suspectedLocationsLastFetch => _suspectedLocationState.lastFetchTime;
+
   void _onStateChanged() {
     notifyListeners();
   }
@@ -97,8 +159,13 @@ class AppState extends ChangeNotifier {
   Future<void> _init() async {
     // Initialize all state modules
     await _settingsState.init();
+    
+    // Attempt to fetch missing tile type preview tiles (fails silently)
+    _fetchMissingTilePreviews();
+    
     await _operatorProfileState.init();
     await _profileState.init();
+    await _suspectedLocationState.init(offlineMode: _settingsState.offlineMode);
     await _uploadQueueState.init();
     await _authState.init(_settingsState.uploadMode);
     
@@ -160,7 +227,7 @@ class AppState extends ChangeNotifier {
     _sessionState.startAddSession(enabledProfiles);
   }
 
-  void startEditSession(OsmCameraNode node) {
+  void startEditSession(OsmNode node) {
     _sessionState.startEditSession(node, enabledProfiles);
   }
 
@@ -216,6 +283,82 @@ class AppState extends ChangeNotifier {
     }
   }
 
+  void deleteNode(OsmNode node) {
+    _uploadQueueState.addFromNodeDeletion(node, uploadMode: uploadMode);
+    _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);
@@ -233,6 +376,11 @@ class AppState extends ChangeNotifier {
   }
 
   Future<void> setUploadMode(UploadMode mode) async {
+    // Clear node cache when switching upload modes to prevent mixing production/sandbox data
+    NodeCache.instance.clear();
+    CameraProviderWithCache.instance.notifyListeners();
+    debugPrint('[AppState] Cleared node cache due to upload mode change');
+    
     await _settingsState.setUploadMode(mode);
     await _authState.onUploadModeChanged(mode);
     _startUploader(); // Restart uploader with new mode
@@ -258,6 +406,26 @@ class AppState extends ChangeNotifier {
     await _settingsState.setFollowMeMode(mode);
   }
 
+  /// Set proximity alerts enabled/disabled
+  Future<void> setProximityAlertsEnabled(bool enabled) async {
+    await _settingsState.setProximityAlertsEnabled(enabled);
+  }
+
+  /// Set proximity alert distance
+  Future<void> setProximityAlertDistance(int distance) async {
+    await _settingsState.setProximityAlertDistance(distance);
+  }
+
+  /// Set network status indicator enabled/disabled
+  Future<void> setNetworkStatusIndicatorEnabled(bool enabled) async {
+    await _settingsState.setNetworkStatusIndicatorEnabled(enabled);
+  }
+
+  /// Set suspected location minimum distance from real nodes
+  Future<void> setSuspectedLocationMinDistance(int distance) async {
+    await _settingsState.setSuspectedLocationMinDistance(distance);
+  }
+
   // ---------- Queue Methods ----------
   void clearQueue() {
     _uploadQueueState.clearQueue();
@@ -272,7 +440,49 @@ class AppState extends ChangeNotifier {
     _startUploader(); // resume uploader if not busy
   }
 
+  // ---------- Suspected Location Methods ----------
+  Future<void> setSuspectedLocationsEnabled(bool enabled) async {
+    await _suspectedLocationState.setEnabled(enabled);
+  }
+
+  Future<bool> refreshSuspectedLocations({
+    void Function(String message, double? progress)? onProgress,
+  }) async {
+    return await _suspectedLocationState.refreshData(onProgress: onProgress);
+  }
+
+  void selectSuspectedLocation(SuspectedLocation location) {
+    _suspectedLocationState.selectLocation(location);
+  }
+
+  void clearSuspectedLocationSelection() {
+    _suspectedLocationState.clearSelection();
+  }
+
+  List<SuspectedLocation> getSuspectedLocationsInBounds({
+    required double north,
+    required double south,
+    required double east,
+    required double west,
+  }) {
+    return _suspectedLocationState.getLocationsInBounds(
+      north: north,
+      south: south,
+      east: east,
+      west: west,
+    );
+  }
+
   // ---------- Private Methods ----------
+  /// Attempts to fetch missing tile preview images in the background (fire and forget)
+  void _fetchMissingTilePreviews() {
+    // Run asynchronously without awaiting to avoid blocking app startup
+    TilePreviewService.fetchMissingPreviews(_settingsState).catchError((error) {
+      // Silently ignore errors - this is best effort
+      debugPrint('AppState: Tile preview fetching failed silently: $error');
+    });
+  }
+
   void _startUploader() {
     _uploadQueueState.startUploader(
       offlineMode: offlineMode,
@@ -284,10 +494,13 @@ 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);
+    _suspectedLocationState.removeListener(_onStateChanged);
     _uploadQueueState.removeListener(_onStateChanged);
     
     _uploadQueueState.dispose();

lib/dev_config.dart

@@ -2,34 +2,65 @@
 import 'package:flutter/material.dart';
 
 /// Developer/build-time configuration for global/non-user-tunable constants.
-const int kWorldMinZoom = 1;
-const int kWorldMaxZoom = 5;
 
-// Example: Default tile storage estimate (KB per tile), for size estimates
-const double kTileEstimateKb = 25.0;
+// Fallback tile storage estimate (KB per tile), used when no preview tile data is available
+const double kFallbackTileEstimateKb = 25.0;
+
+// Preview tile coordinates for tile provider previews and size estimates
+const int kPreviewTileZoom = 18;
+const int kPreviewTileY = 101300;
+const int kPreviewTileX = 41904;
 
 // Direction cone for map view
-const double kDirectionConeHalfAngle = 30.0; // degrees
-const double kDirectionConeBaseLength = 0.001; // multiplier
-const Color kDirectionConeColor = Color(0xFF000000); // FOV cone color
+const double kDirectionConeHalfAngle = 35.0; // degrees
+const double kDirectionConeBaseLength = 5; // multiplier
+const Color kDirectionConeColor = Color(0xD0767474); // FOV cone color
+const double kDirectionConeOpacity = 0.5; // Fill opacity for FOV cones
+// Base values for thickness - use helper functions below for pixel-ratio scaling
+const double _kDirectionConeBorderWidthBase = 1.6;
 
-// Margin (bottom) for positioning the floating bottom button bar
-const double kBottomButtonBarMargin = 4.0;
+// Bottom button bar positioning
+const double kBottomButtonBarOffset = 4.0; // Distance from screen bottom (above safe area)
+const double kButtonBarHeight = 60.0; // Button height (48) + padding (12)
 
-// Map overlay (attribution, scale bar, zoom) vertical offset from bottom edge
-const double kAttributionBottomOffset = 110.0;
-const double kZoomIndicatorBottomOffset = 142.0;
-const double kScaleBarBottomOffset = 170.0;
+// Map overlay spacing relative to button bar top
+const double kAttributionSpacingAboveButtonBar = 10.0; // Attribution above button bar top
+const double kZoomIndicatorSpacingAboveButtonBar = 40.0; // Zoom indicator above button bar top  
+const double kScaleBarSpacingAboveButtonBar = 70.0; // Scale bar above button bar top
+const double kZoomControlsSpacingAboveButtonBar = 20.0; // Zoom controls above button bar top
 
-// Add Camera icon vertical offset (no offset needed since circle is centered)
-const double kAddPinYOffset = 0.0;
+// Helper to calculate bottom position relative to button bar
+double bottomPositionFromButtonBar(double spacingAboveButtonBar, double safeAreaBottom) {
+  return safeAreaBottom + kBottomButtonBarOffset + kButtonBarHeight + spacingAboveButtonBar;
+}
 
-// 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 = '0.9.8';
+// Note: Version is now dynamically retrieved from VersionService
+
+// Suspected locations CSV URL
+const String kSuspectedLocationsCsvUrl = 'https://alprwatch.org/pub/flock_utilities_mini_latest.csv';
+
+// 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 or warning
+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);
 
@@ -37,10 +68,11 @@ const Duration kDebounceCameraRefresh = Duration(milliseconds: 500);
 const Duration kFollowMeAnimationDuration = Duration(milliseconds: 600);
 const double kMinSpeedForRotationMps = 1.0; // Minimum speed (m/s) to apply rotation
 
-// Last map location and settings storage
-const String kLastMapLatKey = 'last_map_latitude';
-const String kLastMapLngKey = 'last_map_longitude';
-const String kLastMapZoomKey = 'last_map_zoom';
+// Proximity alerts configuration
+const int kProximityAlertDefaultDistance = 200; // meters
+const int kProximityAlertMinDistance = 50; // meters
+const int kProximityAlertMaxDistance = 1000; // meters
+const Duration kProximityAlertCooldown = Duration(minutes: 10); // Cooldown between alerts for same node
 
 // Tile/OSM fetch retry parameters (for tunable backoff)
 const int kTileFetchMaxAttempts = 3;
@@ -56,14 +88,27 @@ const int kMaxUserDownloadZoomSpan = 7;
 
 // Download area limits and constants
 const int kMaxReasonableTileCount = 20000;
-const int kAbsoluteMaxZoom = 19;
+const int kAbsoluteMaxTileCount = 50000;
+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
+// Node icon configuration
+const double kNodeIconDiameter = 18.0;
+const double _kNodeRingThicknessBase = 2.5;
+const double kNodeDotOpacity = 0.3; // Opacity for the grey dot interior
+const Color kNodeRingColorReal = Color(0xFF3036F0); // Real nodes from OSM - blue
+const Color kNodeRingColorMock = Color(0xD0FFFFFF); // Add node mock point - white
+const Color kNodeRingColorPending = Color(0xD09C27B0); // Submitted/pending nodes - purple
+const Color kNodeRingColorEditing = Color(0xD0FF9800); // Node being edited - orange
+const Color kNodeRingColorPendingEdit = Color(0xD0757575); // Original node with pending edit - grey
+const Color kNodeRingColorPendingDeletion = Color(0xC0F44336); // Node pending deletion - red, slightly transparent
+
+// Helper functions for pixel-ratio scaling
+double getDirectionConeBorderWidth(BuildContext context) {
+//  return _kDirectionConeBorderWidthBase * MediaQuery.of(context).devicePixelRatio;
+  return _kDirectionConeBorderWidthBase;
+}
+
+double getNodeRingThickness(BuildContext context) {
+//  return _kNodeRingThicknessBase * MediaQuery.of(context).devicePixelRatio;
+  return _kNodeRingThicknessBase;
+}

lib/keys.dart

@@ -1,7 +1,16 @@
 // OpenStreetMap OAuth client IDs for this app.
-//
-// NEVER commit real secrets to public repos. For open source, use keys.dart.example instead.
+// These must be provided via --dart-define at build time.
 
-const String kOsmProdClientId = 'U8p_n6IjZfQiL1KtdiwbB0-o9nto6CAKz7LC2GifJzk'; // example - replace with real
-const String kOsmSandboxClientId = 'SBHWpWTKf31EdSiTApnah3Fj2rLnk2pEwBORlX0NyZI'; // example - replace with real
+String get kOsmProdClientId {
+  const fromBuild = String.fromEnvironment('OSM_PROD_CLIENTID');
+  if (fromBuild.isNotEmpty) return fromBuild;
+  
+  throw Exception('OSM_PROD_CLIENTID not configured. Use --dart-define=OSM_PROD_CLIENTID=your_id');
+}
 
+String get kOsmSandboxClientId {
+  const fromBuild = String.fromEnvironment('OSM_SANDBOX_CLIENTID');
+  if (fromBuild.isNotEmpty) return fromBuild;
+  
+  throw Exception('OSM_SANDBOX_CLIENTID not configured. Use --dart-define=OSM_SANDBOX_CLIENTID=your_id');
+}

lib/keys.dart.example

@@ -1,3 +0,0 @@
-// Example OSM OAuth key config
-const String kOsmProdClientId = 'YOUR_PROD_CLIENT_ID_HERE';
-const String kOsmSandboxClientId = 'YOUR_SANDBOX_CLIENT_ID_HERE';

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

@@ -6,10 +6,11 @@
     "title": "DeFlock"
   },
   "actions": {
-    "tagNode": "Knoten Markieren",
+    "tagNode": "Neuer Knoten",
     "download": "Herunterladen",
     "settings": "Einstellungen",
     "edit": "Bearbeiten",
+    "delete": "Löschen",
     "cancel": "Abbrechen",
     "ok": "OK",
     "close": "Schließen",
@@ -28,20 +29,46 @@
     "systemDefault": "Systemstandard",
     "aboutInfo": "Über / Informationen",
     "aboutThisApp": "Über Diese App",
-    "maxNodes": "Max. geladene/angezeigte Knoten",
+    "aboutSubtitle": "App-Informationen und Credits",
+    "languageSubtitle": "Wählen Sie Ihre bevorzugte Sprache",
+    "maxNodes": "Max. angezeigte Knoten",
     "maxNodesSubtitle": "Obergrenze für die Anzahl der Knoten auf der Karte festlegen (Standard: 250).",
     "maxNodesWarning": "Sie möchten das wahrscheinlich nicht tun, es sei denn, Sie sind absolut sicher, dass Sie einen guten Grund dafür haben.",
     "offlineMode": "Offline-Modus",
     "offlineModeSubtitle": "Alle Netzwerkanfragen außer für lokale/Offline-Bereiche deaktivieren.",
     "offlineModeWarningTitle": "Aktive Downloads",
     "offlineModeWarningMessage": "Die Aktivierung des Offline-Modus bricht alle aktiven Bereichsdownloads ab. Möchten Sie fortfahren?",
-    "enableOfflineMode": "Offline-Modus Aktivieren"
+    "enableOfflineMode": "Offline-Modus Aktivieren",
+    "profiles": "Profile",
+    "profilesSubtitle": "Knoten- und Betreiberprofile verwalten",
+    "offlineSettings": "Offline-Einstellungen",
+    "offlineSettingsSubtitle": "Offline-Modus und heruntergeladene Bereiche verwalten",
+    "advancedSettings": "Erweiterte Einstellungen",
+    "advancedSettingsSubtitle": "Leistungs-, Warnungs- und Kachelanbieter-Einstellungen",
+    "proximityAlerts": "Näherungswarnungen",
+    "networkStatusIndicator": "Netzwerkstatus-Anzeige"
+  },
+  "proximityAlerts": {
+    "getNotified": "Benachrichtigung erhalten beim Annähern an Überwachungsgeräte",
+    "batteryUsage": "Verbraucht zusätzlich Batterie für kontinuierliche Standortüberwachung",
+    "notificationsEnabled": "✓ Benachrichtigungen aktiviert",
+    "notificationsDisabled": "⚠ Benachrichtigungen deaktiviert",
+    "permissionRequired": "Benachrichtigungsberechtigung erforderlich",
+    "permissionExplanation": "Push-Benachrichtigungen sind deaktiviert. Sie sehen nur In-App-Warnungen und werden nicht benachrichtigt, wenn die App im Hintergrund läuft.",
+    "enableNotifications": "Benachrichtigungen Aktivieren",
+    "checkingPermissions": "Berechtigungen prüfen...",
+    "alertDistance": "Warnentfernung: ",
+    "meters": "Meter",
+    "rangeInfo": "Bereich: {}-{} Meter (Standard: {})"
   },
   "node": {
     "title": "Knoten #{}",
     "tagSheetTitle": "Gerät-Tags",
     "queuedForUpload": "Knoten zum Upload eingereiht",
-    "editQueuedForUpload": "Knotenbearbeitung zum Upload eingereiht"
+    "editQueuedForUpload": "Knotenbearbeitung zum Upload eingereiht",
+    "deleteQueuedForUpload": "Knoten-Löschung zum Upload eingereiht",
+    "confirmDeleteTitle": "Knoten löschen",
+    "confirmDeleteMessage": "Sind Sie sicher, dass Sie Knoten #{} löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden."
   },
   "addNode": {
     "profile": "Profil",
@@ -75,7 +102,7 @@
     "withinTileLimit": "Innerhalb {} Kachel-Limit",
     "exceedsTileLimit": "Aktuelle Auswahl überschreitet {} Kachel-Limit",
     "offlineModeWarning": "Downloads im Offline-Modus deaktiviert. Deaktivieren Sie den Offline-Modus, um neue Bereiche herunterzuladen.",
-    "downloadStarted": "Download gestartet! Lade Kacheln und Kameras...",
+    "downloadStarted": "Download gestartet! Lade Kacheln und Knoten...",
     "downloadFailed": "Download konnte nicht gestartet werden: {}"
   },
   "uploadMode": {
@@ -86,7 +113,6 @@
     "simulate": "Simulieren",
     "productionDescription": "Hochladen in die Live-OSM-Datenbank (für alle Benutzer sichtbar)",
     "sandboxDescription": "Uploads gehen an die OSM Sandbox (sicher zum Testen, wird regelmäßig zurückgesetzt).",
-    "sandboxNote": "HINWEIS: Aufgrund von OpenStreetMap-Limitierungen werden Kameras, die an die Sandbox übermittelt werden, NICHT in der Karte dieser App angezeigt.",
     "simulateDescription": "Uploads simulieren (kontaktiert OSM-Server nicht)"
   },
   "auth": {
@@ -158,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: {}",
@@ -175,7 +206,8 @@
   },
   "mapTiles": {
     "title": "Karten-Kacheln",
-    "manageProviders": "Anbieter Verwalten"
+    "manageProviders": "Anbieter Verwalten",
+    "attribution": "Karten-Zuschreibung"
   },
   "profileEditor": {
     "viewProfile": "Profil Anzeigen",
@@ -211,5 +243,138 @@
     "deleteOperatorProfile": "Betreiber-Profil Löschen",
     "deleteOperatorProfileConfirm": "Sind Sie sicher, dass Sie \"{}\" löschen möchten?",
     "operatorProfileDeleted": "Betreiber-Profil gelöscht"
+  },
+  "offlineAreas": {
+    "title": "Offline-Bereiche",
+    "noAreasTitle": "Keine Offline-Bereiche",
+    "noAreasSubtitle": "Laden Sie einen Kartenbereich für die Offline-Nutzung herunter.",
+    "provider": "Anbieter",
+    "maxZoom": "Max Zoom",
+    "zoomLevels": "Z{}-{}",
+    "latitude": "Breite",
+    "longitude": "Länge",
+    "tiles": "Kacheln",
+    "size": "Größe",
+    "nodes": "Knoten",
+    "areaIdFallback": "Bereich {}...",
+    "renameArea": "Bereich umbenennen",
+    "refreshWorldTiles": "Welt-Kacheln aktualisieren/neu herunterladen",
+    "deleteOfflineArea": "Offline-Bereich löschen",
+    "cancelDownload": "Download abbrechen",
+    "renameAreaDialogTitle": "Offline-Bereich Umbenennen",
+    "areaNameLabel": "Bereichsname",
+    "renameButton": "Umbenennen",
+    "megabytes": "MB",
+    "kilobytes": "KB",
+    "progress": "{}%",
+    "refreshArea": "Bereich aktualisieren",
+    "refreshAreaDialogTitle": "Offline-Bereich aktualisieren",
+    "refreshAreaDialogSubtitle": "Wählen Sie aus, was für diesen Bereich aktualisiert werden soll:",
+    "refreshTiles": "Karten-Kacheln aktualisieren",
+    "refreshTilesSubtitle": "Alle Kacheln für aktualisierte Bilder erneut herunterladen",
+    "refreshNodes": "Knoten aktualisieren",
+    "refreshNodesSubtitle": "Knotendaten für diesen Bereich erneut abrufen",
+    "startRefresh": "Aktualisierung starten",
+    "refreshStarted": "Aktualisierung gestartet!",
+    "refreshFailed": "Aktualisierung fehlgeschlagen: {}"
+  },
+  "refineTagsSheet": {
+    "title": "Tags Verfeinern",
+    "operatorProfile": "Betreiber-Profil",
+    "done": "Fertig",
+    "none": "Keine",
+    "noAdditionalOperatorTags": "Keine zusätzlichen Betreiber-Tags",
+    "additionalTags": "zusätzliche Tags",
+    "additionalTagsTitle": "Zusätzliche Tags",
+    "noTagsDefinedForProfile": "Keine Tags für dieses Betreiber-Profil definiert.",
+    "noOperatorProfiles": "Keine Betreiber-Profile definiert",
+    "noOperatorProfilesMessage": "Erstellen Sie Betreiber-Profile in den Einstellungen, um zusätzliche Tags auf Ihre Knoten-Übertragungen anzuwenden."
+  },
+  "layerSelector": {
+    "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ß"
+  },
+  "suspectedLocations": {
+    "title": "Verdächtige Standorte",
+    "showSuspectedLocations": "Verdächtige Standorte anzeigen",
+    "showSuspectedLocationsSubtitle": "Fragezeichen-Marker für vermutete Überwachungsstandorte aus Versorgungsgenehmigungsdaten anzeigen",
+    "lastUpdated": "Zuletzt aktualisiert",
+    "refreshNow": "Jetzt aktualisieren",
+    "dataSource": "Datenquelle",
+    "dataSourceDescription": "Versorgungsgenehmigungsdaten, die auf potenzielle Installationsstandorte für Überwachungsinfrastruktur hinweisen",
+    "dataSourceCredit": "Datensammlung und -hosting bereitgestellt von alprwatch.org",
+    "minimumDistance": "Mindestabstand zu echten Geräten",
+    "minimumDistanceSubtitle": "Verdächtige Standorte innerhalb von {}m vorhandener Überwachungsgeräte ausblenden",
+    "updating": "Verdächtige Standorte werden aktualisiert",
+    "downloadingAndProcessing": "Daten werden heruntergeladen und verarbeitet...",
+    "updateSuccess": "Verdächtige Standorte erfolgreich aktualisiert",
+    "updateFailed": "Aktualisierung der verdächtigen Standorte fehlgeschlagen",
+    "neverFetched": "Nie abgerufen",
+    "daysAgo": "vor {} Tagen",
+    "hoursAgo": "vor {} Stunden", 
+    "minutesAgo": "vor {} Minuten",
+    "justNow": "Gerade eben"
+  },
+  "suspectedLocation": {
+    "title": "Verdächtiger Standort #{}",
+    "ticketNo": "Ticket-Nr.",
+    "address": "Adresse",
+    "street": "Straße", 
+    "city": "Stadt",
+    "state": "Bundesland",
+    "intersectingStreet": "Kreuzende Straße",
+    "workDoneFor": "Arbeit ausgeführt für",
+    "remarks": "Bemerkungen",
+    "url": "URL",
+    "coordinates": "Koordinaten",
+    "noAddressAvailable": "Keine Adresse verfügbar"
   }
 }

lib/localizations/en.json

@@ -5,11 +5,19 @@
   "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": "Tag Node",
+    "tagNode": "New Node",
     "download": "Download",
     "settings": "Settings",
     "edit": "Edit",
+    "delete": "Delete",
     "cancel": "Cancel",
     "ok": "OK",
     "close": "Close",
@@ -28,20 +36,46 @@
     "systemDefault": "System Default",
     "aboutInfo": "About / Info",
     "aboutThisApp": "About This App",
-    "maxNodes": "Max nodes fetched/drawn",
+    "aboutSubtitle": "App information and credits",
+    "languageSubtitle": "Choose your preferred language",
+    "maxNodes": "Max nodes drawn",
     "maxNodesSubtitle": "Set an upper limit for the number of nodes on the map (default: 250).",
     "maxNodesWarning": "You probably don't want to do that unless you are absolutely sure you have a good reason for it.",
     "offlineMode": "Offline Mode",
     "offlineModeSubtitle": "Disable all network requests except for local/offline areas.",
     "offlineModeWarningTitle": "Active Downloads",
     "offlineModeWarningMessage": "Enabling offline mode will cancel any active area downloads. Do you want to continue?",
-    "enableOfflineMode": "Enable Offline Mode"
+    "enableOfflineMode": "Enable Offline Mode",
+    "profiles": "Profiles",
+    "profilesSubtitle": "Manage node and operator profiles",
+    "offlineSettings": "Offline Settings",
+    "offlineSettingsSubtitle": "Manage offline mode and downloaded areas",
+    "advancedSettings": "Advanced Settings",
+    "advancedSettingsSubtitle": "Performance, alerts, and tile provider settings",
+    "proximityAlerts": "Proximity Alerts",
+    "networkStatusIndicator": "Network Status Indicator"
+  },
+  "proximityAlerts": {
+    "getNotified": "Get notified when approaching surveillance devices",
+    "batteryUsage": "Uses extra battery for continuous location monitoring",
+    "notificationsEnabled": "✓ Notifications enabled",
+    "notificationsDisabled": "⚠ Notifications disabled",
+    "permissionRequired": "Notification permission required",
+    "permissionExplanation": "Push notifications are disabled. You'll only see in-app alerts and won't be notified when the app is in background.",
+    "enableNotifications": "Enable Notifications",
+    "checkingPermissions": "Checking permissions...",
+    "alertDistance": "Alert distance: ",
+    "meters": "meters",
+    "rangeInfo": "Range: {}-{} meters (default: {})"
   },
   "node": {
     "title": "Node #{}",
     "tagSheetTitle": "Surveillance Device Tags",
     "queuedForUpload": "Node queued for upload",
-    "editQueuedForUpload": "Node edit queued for upload"
+    "editQueuedForUpload": "Node edit queued for upload",
+    "deleteQueuedForUpload": "Node deletion queued for upload",
+    "confirmDeleteTitle": "Delete Node",
+    "confirmDeleteMessage": "Are you sure you want to delete node #{}? This action cannot be undone."
   },
   "addNode": {
     "profile": "Profile",
@@ -75,7 +109,7 @@
     "withinTileLimit": "Within {} tile limit",
     "exceedsTileLimit": "Current selection exceeds {} tile limit",
     "offlineModeWarning": "Downloads disabled while in offline mode. Disable offline mode to download new areas.",
-    "downloadStarted": "Download started! Fetching tiles and cameras...",
+    "downloadStarted": "Download started! Fetching tiles and nodes...",
     "downloadFailed": "Failed to start download: {}"
   },
   "uploadMode": {
@@ -86,7 +120,6 @@
     "simulate": "Simulate",
     "productionDescription": "Upload to the live OSM database (visible to all users)",
     "sandboxDescription": "Uploads go to the OSM Sandbox (safe for testing, resets regularly).",
-    "sandboxNote": "NOTE: Due to OpenStreetMap limitations, cameras submitted to the sandbox will NOT appear on the map in this app.",
     "simulateDescription": "Simulate uploads (does not contact OSM servers)"
   },
   "auth": {
@@ -158,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: {}",
@@ -175,7 +213,8 @@
   },
   "mapTiles": {
     "title": "Map Tiles",
-    "manageProviders": "Manage Providers"
+    "manageProviders": "Manage Providers",
+    "attribution": "Map Attribution"
   },
   "profileEditor": {
     "viewProfile": "View Profile",
@@ -211,5 +250,131 @@
     "deleteOperatorProfile": "Delete Operator Profile",
     "deleteOperatorProfileConfirm": "Are you sure you want to delete \"{}\"?",
     "operatorProfileDeleted": "Operator profile deleted"
+  },
+  "offlineAreas": {
+    "title": "Offline Areas",
+    "noAreasTitle": "No offline areas",
+    "noAreasSubtitle": "Download a map area for offline use.",
+    "provider": "Provider",
+    "maxZoom": "Max zoom",
+    "zoomLevels": "Z{}-{}",
+    "latitude": "Lat",
+    "longitude": "Lon",
+    "tiles": "Tiles",
+    "size": "Size",
+    "nodes": "Nodes",
+    "areaIdFallback": "Area {}...",
+    "renameArea": "Rename area",
+    "refreshWorldTiles": "Refresh/re-download world tiles",
+    "deleteOfflineArea": "Delete offline area",
+    "cancelDownload": "Cancel download",
+    "renameAreaDialogTitle": "Rename Offline Area",
+    "areaNameLabel": "Area Name",
+    "renameButton": "Rename",
+    "megabytes": "MB",
+    "kilobytes": "KB",
+    "progress": "{}%",
+    "refreshArea": "Refresh area",
+    "refreshAreaDialogTitle": "Refresh Offline Area",
+    "refreshAreaDialogSubtitle": "Choose what to refresh for this area:",
+    "refreshTiles": "Refresh Map Tiles",
+    "refreshTilesSubtitle": "Re-download all tiles for updated imagery",
+    "refreshNodes": "Refresh Nodes",
+    "refreshNodesSubtitle": "Re-fetch node data for this area",
+    "startRefresh": "Start Refresh",
+    "refreshStarted": "Refresh started!",
+    "refreshFailed": "Refresh failed: {}"
+  },
+  "refineTagsSheet": {
+    "title": "Refine Tags",
+    "operatorProfile": "Operator Profile",
+    "done": "Done",
+    "none": "None",
+    "noAdditionalOperatorTags": "No additional operator tags",
+    "additionalTags": "additional tags",
+    "additionalTagsTitle": "Additional Tags",
+    "noTagsDefinedForProfile": "No tags defined for this operator profile.",
+    "noOperatorProfiles": "No operator profiles defined",
+    "noOperatorProfilesMessage": "Create operator profiles in Settings to apply additional tags to your node submissions."
+  },
+  "layerSelector": {
+    "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"
+  },
+  "suspectedLocations": {
+    "title": "Suspected Locations",
+    "showSuspectedLocations": "Show Suspected Locations",
+    "showSuspectedLocationsSubtitle": "Show question mark markers for suspected surveillance sites from utility permit data",
+    "lastUpdated": "Last Updated",
+    "refreshNow": "Refresh now",
+    "dataSource": "Data Source",
+    "dataSourceDescription": "Utility permit data indicating potential surveillance infrastructure installation sites",
+    "dataSourceCredit": "Data collection and hosting provided by alprwatch.org",
+    "minimumDistance": "Minimum Distance from Real Nodes",
+    "minimumDistanceSubtitle": "Hide suspected locations within {}m of existing surveillance devices",
+    "updating": "Updating Suspected Locations",
+    "downloadingAndProcessing": "Downloading and processing data...",
+    "updateSuccess": "Suspected locations updated successfully",
+    "updateFailed": "Failed to update suspected locations",
+    "neverFetched": "Never fetched",
+    "daysAgo": "{} days ago",
+    "hoursAgo": "{} hours ago", 
+    "minutesAgo": "{} minutes ago",
+    "justNow": "Just now"
+  },
+  "suspectedLocation": {
+    "title": "Suspected Location #{}",
+    "ticketNo": "Ticket No",
+    "address": "Address",
+    "street": "Street", 
+    "city": "City",
+    "state": "State",
+    "intersectingStreet": "Intersecting Street",
+    "workDoneFor": "Work Done For",
+    "remarks": "Remarks",
+    "url": "URL",
+    "coordinates": "Coordinates",
+    "noAddressAvailable": "No address available"
   }
 }

lib/localizations/es.json

@@ -5,11 +5,19 @@
   "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": "Etiquetar Nodo",
+    "tagNode": "Nuevo Nodo",
     "download": "Descargar",
     "settings": "Configuración",
     "edit": "Editar",
+    "delete": "Eliminar",
     "cancel": "Cancelar",
     "ok": "Aceptar",
     "close": "Cerrar",
@@ -28,20 +36,46 @@
     "systemDefault": "Sistema por Defecto",
     "aboutInfo": "Acerca de / Información",
     "aboutThisApp": "Acerca de Esta App",
-    "maxNodes": "Máx. nodos obtenidos/dibujados",
+    "aboutSubtitle": "Información de la aplicación y créditos",
+    "languageSubtitle": "Elige tu idioma preferido",
+    "maxNodes": "Máx. nodos dibujados",
     "maxNodesSubtitle": "Establecer un límite superior para el número de nodos en el mapa (predeterminado: 250).",
     "maxNodesWarning": "Probablemente no quieras hacer eso a menos que estés absolutamente seguro de que tienes una buena razón para ello.",
     "offlineMode": "Modo Sin Conexión",
     "offlineModeSubtitle": "Deshabilitar todas las solicitudes de red excepto para áreas locales/sin conexión.",
     "offlineModeWarningTitle": "Descargas Activas",
     "offlineModeWarningMessage": "Habilitar el modo sin conexión cancelará cualquier descarga de área activa. ¿Desea continuar?",
-    "enableOfflineMode": "Habilitar Modo Sin Conexión"
+    "enableOfflineMode": "Habilitar Modo Sin Conexión",
+    "profiles": "Perfiles",
+    "profilesSubtitle": "Gestionar perfiles de nodos y operadores",
+    "offlineSettings": "Configuración Sin Conexión",
+    "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",
+    "networkStatusIndicator": "Indicador de Estado de Red"
+  },
+  "proximityAlerts": {
+    "getNotified": "Recibe notificaciones al acercarte a dispositivos de vigilancia",
+    "batteryUsage": "Usa batería extra para monitoreo continuo de ubicación",
+    "notificationsEnabled": "✓ Notificaciones habilitadas",
+    "notificationsDisabled": "⚠ Notificaciones deshabilitadas",
+    "permissionRequired": "Permiso de notificación requerido",
+    "permissionExplanation": "Las notificaciones push están deshabilitadas. Solo verás alertas dentro de la app y no serás notificado cuando la app esté en segundo plano.",
+    "enableNotifications": "Habilitar Notificaciones",
+    "checkingPermissions": "Verificando permisos...",
+    "alertDistance": "Distancia de alerta: ",
+    "meters": "metros",
+    "rangeInfo": "Rango: {}-{} metros (predeterminado: {})"
   },
   "node": {
     "title": "Nodo #{}",
     "tagSheetTitle": "Etiquetas del Dispositivo",
     "queuedForUpload": "Nodo en cola para subir",
-    "editQueuedForUpload": "Edición de nodo en cola para subir"
+    "editQueuedForUpload": "Edición de nodo en cola para subir",
+    "deleteQueuedForUpload": "Eliminación de nodo en cola para subir",
+    "confirmDeleteTitle": "Eliminar Nodo",
+    "confirmDeleteMessage": "¿Estás seguro de que quieres eliminar el nodo #{}? Esta acción no se puede deshacer."
   },
   "addNode": {
     "profile": "Perfil",
@@ -75,7 +109,7 @@
     "withinTileLimit": "Dentro del límite de {} mosaicos",
     "exceedsTileLimit": "La selección actual excede el límite de {} mosaicos",
     "offlineModeWarning": "Descargas deshabilitadas en modo sin conexión. Deshabilite el modo sin conexión para descargar nuevas áreas.",
-    "downloadStarted": "¡Descarga iniciada! Obteniendo mosaicos y cámaras...",
+    "downloadStarted": "¡Descarga iniciada! Obteniendo mosaicos y nodos...",
     "downloadFailed": "Error al iniciar la descarga: {}"
   },
   "uploadMode": {
@@ -86,7 +120,6 @@
     "simulate": "Simular",
     "productionDescription": "Subir a la base de datos OSM en vivo (visible para todos los usuarios)",
     "sandboxDescription": "Las subidas van al Sandbox de OSM (seguro para pruebas, se reinicia regularmente).",
-    "sandboxNote": "NOTA: Debido a las limitaciones de OpenStreetMap, las cámaras enviadas al sandbox NO aparecerán en el mapa de esta aplicación.",
     "simulateDescription": "Simular subidas (no contacta servidores OSM)"
   },
   "auth": {
@@ -158,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: {}",
@@ -175,7 +213,8 @@
   },
   "mapTiles": {
     "title": "Tiles de Mapa",
-    "manageProviders": "Gestionar Proveedores"
+    "manageProviders": "Gestionar Proveedores",
+    "attribution": "Atribución del Mapa"
   },
   "profileEditor": {
     "viewProfile": "Ver Perfil",
@@ -211,5 +250,131 @@
     "deleteOperatorProfile": "Eliminar Perfil de Operador",
     "deleteOperatorProfileConfirm": "¿Está seguro de que desea eliminar \"{}\"?",
     "operatorProfileDeleted": "Perfil de operador eliminado"
+  },
+  "offlineAreas": {
+    "title": "Áreas Sin Conexión",
+    "noAreasTitle": "Sin áreas sin conexión",
+    "noAreasSubtitle": "Descarga un área del mapa para uso sin conexión.",
+    "provider": "Proveedor",
+    "maxZoom": "Zoom máx",
+    "zoomLevels": "Z{}-{}",
+    "latitude": "Lat",
+    "longitude": "Lon",
+    "tiles": "Teselas",
+    "size": "Tamaño",
+    "nodes": "Nodos",
+    "areaIdFallback": "Área {}...",
+    "renameArea": "Renombrar área",
+    "refreshWorldTiles": "Actualizar/re-descargar teselas mundiales",
+    "deleteOfflineArea": "Eliminar área sin conexión",
+    "cancelDownload": "Cancelar descarga",
+    "renameAreaDialogTitle": "Renombrar Área Sin Conexión",
+    "areaNameLabel": "Nombre del Área",
+    "renameButton": "Renombrar",
+    "megabytes": "MB",
+    "kilobytes": "KB",
+    "progress": "{}%",
+    "refreshArea": "Actualizar área",
+    "refreshAreaDialogTitle": "Actualizar Área sin Conexión",
+    "refreshAreaDialogSubtitle": "Elija qué actualizar para esta área:",
+    "refreshTiles": "Actualizar Mosaicos del Mapa",
+    "refreshTilesSubtitle": "Volver a descargar todos los mosaicos para imágenes actualizadas",
+    "refreshNodes": "Actualizar Nodos",
+    "refreshNodesSubtitle": "Volver a obtener datos de nodos para esta área",
+    "startRefresh": "Iniciar Actualización",
+    "refreshStarted": "¡Actualización iniciada!",
+    "refreshFailed": "Actualización falló: {}"
+  },
+  "refineTagsSheet": {
+    "title": "Refinar Etiquetas",
+    "operatorProfile": "Perfil de Operador",
+    "done": "Listo",
+    "none": "Ninguno",
+    "noAdditionalOperatorTags": "Sin etiquetas adicionales de operador",
+    "additionalTags": "etiquetas adicionales",
+    "additionalTagsTitle": "Etiquetas Adicionales",
+    "noTagsDefinedForProfile": "No hay etiquetas definidas para este perfil de operador.",
+    "noOperatorProfiles": "No hay perfiles de operador definidos",
+    "noOperatorProfilesMessage": "Cree perfiles de operador en Configuración para aplicar etiquetas adicionales a sus envíos de nodos."
+  },
+  "layerSelector": {
+    "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"
+  },
+  "suspectedLocations": {
+    "title": "Ubicaciones Sospechosas",
+    "showSuspectedLocations": "Mostrar Ubicaciones Sospechosas",
+    "showSuspectedLocationsSubtitle": "Mostrar marcadores de interrogación para sitios de vigilancia sospechosos de datos de permisos de servicios públicos",
+    "lastUpdated": "Última Actualización",
+    "refreshNow": "Actualizar ahora",
+    "dataSource": "Fuente de Datos",
+    "dataSourceDescription": "Datos de permisos de servicios públicos que indican posibles sitios de instalación de infraestructura de vigilancia",
+    "dataSourceCredit": "Recopilación y alojamiento de datos proporcionado por alprwatch.org",
+    "minimumDistance": "Distancia Mínima de Nodos Reales",
+    "minimumDistanceSubtitle": "Ocultar ubicaciones sospechosas dentro de {}m de dispositivos de vigilancia existentes",
+    "updating": "Actualizando Ubicaciones Sospechosas",
+    "downloadingAndProcessing": "Descargando y procesando datos...",
+    "updateSuccess": "Ubicaciones sospechosas actualizadas exitosamente",
+    "updateFailed": "Error al actualizar ubicaciones sospechosas",
+    "neverFetched": "Nunca obtenido",
+    "daysAgo": "hace {} días",
+    "hoursAgo": "hace {} horas", 
+    "minutesAgo": "hace {} minutos",
+    "justNow": "Ahora mismo"
+  },
+  "suspectedLocation": {
+    "title": "Ubicación Sospechosa #{}",
+    "ticketNo": "No. de Ticket",
+    "address": "Dirección",
+    "street": "Calle", 
+    "city": "Ciudad",
+    "state": "Estado",
+    "intersectingStreet": "Calle que Intersecta",
+    "workDoneFor": "Trabajo Realizado Para",
+    "remarks": "Observaciones",
+    "url": "URL",
+    "coordinates": "Coordenadas",
+    "noAddressAvailable": "No hay dirección disponible"
   }
 }

lib/localizations/fr.json

@@ -5,11 +5,19 @@
   "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": "Marquer Nœud",
+    "tagNode": "Nouveau Nœud",
     "download": "Télécharger",
     "settings": "Paramètres",
     "edit": "Modifier",
+    "delete": "Supprimer",
     "cancel": "Annuler",
     "ok": "OK",
     "close": "Fermer",
@@ -28,20 +36,46 @@
     "systemDefault": "Par Défaut du Système",
     "aboutInfo": "À Propos / Informations",
     "aboutThisApp": "À Propos de Cette App",
-    "maxNodes": "Max. nœuds récupérés/dessinés",
+    "aboutSubtitle": "Informations sur l'application et crédits",
+    "languageSubtitle": "Choisissez votre langue préférée",
+    "maxNodes": "Max. nœuds dessinés",
     "maxNodesSubtitle": "Définir une limite supérieure pour le nombre de nœuds sur la carte (par défaut: 250).",
     "maxNodesWarning": "Vous ne voulez probablement pas faire cela à moins d'être absolument sûr d'avoir une bonne raison de le faire.",
     "offlineMode": "Mode Hors Ligne",
     "offlineModeSubtitle": "Désactiver toutes les requêtes réseau sauf pour les zones locales/hors ligne.",
     "offlineModeWarningTitle": "Téléchargements Actifs",
     "offlineModeWarningMessage": "L'activation du mode hors ligne annulera tous les téléchargements de zone actifs. Voulez-vous continuer?",
-    "enableOfflineMode": "Activer le Mode Hors Ligne"
+    "enableOfflineMode": "Activer le Mode Hors Ligne",
+    "profiles": "Profils",
+    "profilesSubtitle": "Gérer les profils de nœuds et d'opérateurs",
+    "offlineSettings": "Paramètres Hors Ligne",
+    "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é",
+    "networkStatusIndicator": "Indicateur de Statut Réseau"
+  },
+  "proximityAlerts": {
+    "getNotified": "Recevoir des notifications en s'approchant de dispositifs de surveillance",
+    "batteryUsage": "Utilise de la batterie supplémentaire pour la surveillance continue de la localisation",
+    "notificationsEnabled": "✓ Notifications activées",
+    "notificationsDisabled": "⚠ Notifications désactivées",
+    "permissionRequired": "Autorisation de notification requise",
+    "permissionExplanation": "Les notifications push sont désactivées. Vous ne verrez que des alertes dans l'application et ne serez pas notifié lorsque l'application est en arrière-plan.",
+    "enableNotifications": "Activer les Notifications",
+    "checkingPermissions": "Vérification des autorisations...",
+    "alertDistance": "Distance d'alerte : ",
+    "meters": "mètres",
+    "rangeInfo": "Plage : {}-{} mètres (par défaut : {})"
   },
   "node": {
     "title": "Nœud #{}",
     "tagSheetTitle": "Balises du Dispositif",
     "queuedForUpload": "Nœud mis en file pour envoi",
-    "editQueuedForUpload": "Modification de nœud mise en file pour envoi"
+    "editQueuedForUpload": "Modification de nœud mise en file pour envoi",
+    "deleteQueuedForUpload": "Suppression de nœud mise en file pour envoi",
+    "confirmDeleteTitle": "Supprimer le Nœud",
+    "confirmDeleteMessage": "Êtes-vous sûr de vouloir supprimer le nœud #{} ? Cette action ne peut pas être annulée."
   },
   "addNode": {
     "profile": "Profil",
@@ -75,7 +109,7 @@
     "withinTileLimit": "Dans la limite de {} tuiles",
     "exceedsTileLimit": "La sélection actuelle dépasse la limite de {} tuiles",
     "offlineModeWarning": "Téléchargements désactivés en mode hors ligne. Désactivez le mode hors ligne pour télécharger de nouvelles zones.",
-    "downloadStarted": "Téléchargement démarré! Récupération des tuiles et caméras...",
+    "downloadStarted": "Téléchargement démarré! Récupération des tuiles et nœuds...",
     "downloadFailed": "Échec du démarrage du téléchargement: {}"
   },
   "uploadMode": {
@@ -86,7 +120,6 @@
     "simulate": "Simuler",
     "productionDescription": "Télécharger vers la base de données OSM en direct (visible pour tous les utilisateurs)",
     "sandboxDescription": "Les téléchargements vont vers le Sandbox OSM (sûr pour les tests, réinitialisé régulièrement).",
-    "sandboxNote": "NOTE: En raison des limitations d'OpenStreetMap, les caméras soumises au sandbox n'apparaîtront PAS sur la carte dans cette application.",
     "simulateDescription": "Simuler les téléchargements (ne contacte pas les serveurs OSM)"
   },
   "auth": {
@@ -158,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: {}",
@@ -175,7 +213,8 @@
   },
   "mapTiles": {
     "title": "Tuiles de Carte",
-    "manageProviders": "Gérer Fournisseurs"
+    "manageProviders": "Gérer Fournisseurs",
+    "attribution": "Attribution de Carte"
   },
   "profileEditor": {
     "viewProfile": "Voir Profil",
@@ -211,5 +250,131 @@
     "deleteOperatorProfile": "Supprimer Profil d'Opérateur",
     "deleteOperatorProfileConfirm": "Êtes-vous sûr de vouloir supprimer \"{}\"?",
     "operatorProfileDeleted": "Profil d'opérateur supprimé"
+  },
+  "offlineAreas": {
+    "title": "Zones Hors Ligne",
+    "noAreasTitle": "Aucune zone hors ligne",
+    "noAreasSubtitle": "Téléchargez une zone de carte pour utilisation hors ligne.",
+    "provider": "Fournisseur",
+    "maxZoom": "Zoom max",
+    "zoomLevels": "Z{}-{}",
+    "latitude": "Lat",
+    "longitude": "Lon",
+    "tiles": "Tuiles",
+    "size": "Taille",
+    "nodes": "Nœuds",
+    "areaIdFallback": "Zone {}...",
+    "renameArea": "Renommer la zone",
+    "refreshWorldTiles": "Actualiser/re-télécharger les tuiles mondiales",
+    "deleteOfflineArea": "Supprimer la zone hors ligne",
+    "cancelDownload": "Annuler le téléchargement",
+    "renameAreaDialogTitle": "Renommer la Zone Hors Ligne",
+    "areaNameLabel": "Nom de la Zone",
+    "renameButton": "Renommer",
+    "megabytes": "Mo",
+    "kilobytes": "Ko",
+    "progress": "{}%",
+    "refreshArea": "Actualiser la zone",
+    "refreshAreaDialogTitle": "Actualiser la Zone Hors Ligne",
+    "refreshAreaDialogSubtitle": "Choisissez quoi actualiser pour cette zone :",
+    "refreshTiles": "Actualiser les Tuiles de Carte",
+    "refreshTilesSubtitle": "Télécharger à nouveau toutes les tuiles pour des images mises à jour",
+    "refreshNodes": "Actualiser les Nœuds",
+    "refreshNodesSubtitle": "Récupérer à nouveau les données de nœuds pour cette zone",
+    "startRefresh": "Démarrer l'Actualisation",
+    "refreshStarted": "Actualisation démarrée !",
+    "refreshFailed": "Actualisation échouée : {}"
+  },
+  "refineTagsSheet": {
+    "title": "Affiner les Étiquettes",
+    "operatorProfile": "Profil d'Opérateur",
+    "done": "Terminé",
+    "none": "Aucun",
+    "noAdditionalOperatorTags": "Aucune étiquette d'opérateur supplémentaire",
+    "additionalTags": "étiquettes supplémentaires",
+    "additionalTagsTitle": "Étiquettes Supplémentaires",
+    "noTagsDefinedForProfile": "Aucune étiquette définie pour ce profil d'opérateur.",
+    "noOperatorProfiles": "Aucun profil d'opérateur défini",
+    "noOperatorProfilesMessage": "Créez des profils d'opérateur dans les Paramètres pour appliquer des étiquettes supplémentaires à vos soumissions de nœuds."
+  },
+  "layerSelector": {
+    "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"
+  },
+  "suspectedLocations": {
+    "title": "Emplacements Suspects",
+    "showSuspectedLocations": "Afficher les Emplacements Suspects",
+    "showSuspectedLocationsSubtitle": "Afficher des marqueurs en point d'interrogation pour les sites de surveillance suspectés à partir des données de permis de services publics",
+    "lastUpdated": "Dernière Mise à Jour",
+    "refreshNow": "Actualiser maintenant",
+    "dataSource": "Source de Données",
+    "dataSourceDescription": "Données de permis de services publics indiquant des sites d'installation potentiels d'infrastructure de surveillance",
+    "dataSourceCredit": "Collecte et hébergement des données fournis par alprwatch.org",
+    "minimumDistance": "Distance Minimale des Nœuds Réels",
+    "minimumDistanceSubtitle": "Masquer les emplacements suspects dans un rayon de {}m des dispositifs de surveillance existants",
+    "updating": "Mise à Jour des Emplacements Suspects",
+    "downloadingAndProcessing": "Téléchargement et traitement des données...",
+    "updateSuccess": "Emplacements suspects mis à jour avec succès",
+    "updateFailed": "Échec de la mise à jour des emplacements suspects",
+    "neverFetched": "Jamais récupéré",
+    "daysAgo": "il y a {} jours",
+    "hoursAgo": "il y a {} heures", 
+    "minutesAgo": "il y a {} minutes",
+    "justNow": "À l'instant"
+  },
+  "suspectedLocation": {
+    "title": "Emplacement Suspect #{}",
+    "ticketNo": "N° de Ticket",
+    "address": "Adresse",
+    "street": "Rue", 
+    "city": "Ville",
+    "state": "État",
+    "intersectingStreet": "Rue Transversale",
+    "workDoneFor": "Travail Effectué Pour",
+    "remarks": "Remarques",
+    "url": "URL",
+    "coordinates": "Coordonnées",
+    "noAddressAvailable": "Aucune adresse disponible"
   }
 }

lib/localizations/it.json

@@ -0,0 +1,380 @@
+{
+  "language": {
+    "name": "Italiano"
+  },
+  "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",
+    "settings": "Impostazioni",
+    "edit": "Modifica",
+    "delete": "Elimina",
+    "cancel": "Annulla",
+    "ok": "OK",
+    "close": "Chiudi",
+    "submit": "Invia",
+    "saveEdit": "Salva Modifica",
+    "clear": "Pulisci"
+  },
+  "followMe": {
+    "off": "Attiva seguimi (nord in alto)",
+    "northUp": "Attiva seguimi (rotazione)",
+    "rotating": "Disattiva seguimi"
+  },
+  "settings": {
+    "title": "Impostazioni",
+    "language": "Lingua",
+    "systemDefault": "Predefinito del Sistema",
+    "aboutInfo": "Informazioni",
+    "aboutThisApp": "Informazioni su questa App",
+    "aboutSubtitle": "Informazioni sull'applicazione e crediti",
+    "languageSubtitle": "Scegli la tua lingua preferita",
+    "maxNodes": "Max nodi disegnati",
+    "maxNodesSubtitle": "Imposta un limite superiore per il numero di nodi sulla mappa (predefinito: 250).",
+    "maxNodesWarning": "Probabilmente non vuoi farlo a meno che non sei assolutamente sicuro di avere una buona ragione per farlo.",
+    "offlineMode": "Modalità Offline",
+    "offlineModeSubtitle": "Disabilita tutte le richieste di rete tranne per aree locali/offline.",
+    "offlineModeWarningTitle": "Download Attivi",
+    "offlineModeWarningMessage": "L'attivazione della modalità offline cancellerà qualsiasi download di area attivo. Vuoi continuare?",
+    "enableOfflineMode": "Attiva Modalità Offline",
+    "profiles": "Profili",
+    "profilesSubtitle": "Gestisci profili di nodi e operatori",
+    "offlineSettings": "Impostazioni Offline",
+    "offlineSettingsSubtitle": "Gestisci modalità offline e aree scaricate",
+    "advancedSettings": "Impostazioni Avanzate",
+    "advancedSettingsSubtitle": "Impostazioni di prestazioni, avvisi e fornitori di tessere",
+    "proximityAlerts": "Avvisi di Prossimità",
+    "networkStatusIndicator": "Indicatore di Stato di Rete"
+  },
+  "proximityAlerts": {
+    "getNotified": "Ricevi notifiche quando ti avvicini a dispositivi di sorveglianza",
+    "batteryUsage": "Utilizza batteria extra per il monitoraggio continuo della posizione",
+    "notificationsEnabled": "✓ Notifiche abilitate",
+    "notificationsDisabled": "⚠ Notifiche disabilitate",
+    "permissionRequired": "Autorizzazione notifica richiesta",
+    "permissionExplanation": "Le notifiche push sono disabilitate. Vedrai solo avvisi nell'app e non sarai notificato quando l'app è in background.",
+    "enableNotifications": "Abilita Notifiche",
+    "checkingPermissions": "Controllo autorizzazioni...",
+    "alertDistance": "Distanza di avviso: ",
+    "meters": "metri",
+    "rangeInfo": "Intervallo: {}-{} metri (predefinito: {})"
+  },
+  "node": {
+    "title": "Nodo #{}",
+    "tagSheetTitle": "Tag Dispositivo di Sorveglianza",
+    "queuedForUpload": "Nodo in coda per il caricamento",
+    "editQueuedForUpload": "Modifica nodo in coda per il caricamento",
+    "deleteQueuedForUpload": "Eliminazione nodo in coda per il caricamento",
+    "confirmDeleteTitle": "Elimina Nodo",
+    "confirmDeleteMessage": "Sei sicuro di voler eliminare il nodo #{}? Questa azione non può essere annullata."
+  },
+  "addNode": {
+    "profile": "Profilo",
+    "direction": "Direzione  {}°",
+    "profileNoDirectionInfo": "Questo profilo non richiede una direzione.",
+    "mustBeLoggedIn": "Devi essere loggato per inviare nuovi nodi. Per favore accedi tramite Impostazioni.",
+    "enableSubmittableProfile": "Abilita un profilo inviabile nelle Impostazioni per inviare nuovi nodi.",
+    "profileViewOnlyWarning": "Questo profilo è solo per la visualizzazione della mappa. Per favore seleziona un profilo inviabile per inviare nuovi nodi.",
+    "refineTags": "Affina Tag",
+    "refineTagsWithProfile": "Affina Tag ({})"
+  },
+  "editNode": {
+    "title": "Modifica Nodo #{}",
+    "profile": "Profilo",
+    "direction": "Direzione  {}°",
+    "profileNoDirectionInfo": "Questo profilo non richiede una direzione.",
+    "mustBeLoggedIn": "Devi essere loggato per modificare i nodi. Per favore accedi tramite Impostazioni.",
+    "sandboxModeWarning": "Impossibile inviare modifiche di nodi di produzione alla sandbox. Passa alla modalità Produzione nelle Impostazioni per modificare i nodi.",
+    "enableSubmittableProfile": "Abilita un profilo inviabile nelle Impostazioni per modificare i nodi.",
+    "profileViewOnlyWarning": "Questo profilo è solo per la visualizzazione della mappa. Per favore seleziona un profilo inviabile per modificare i nodi.",
+    "refineTags": "Affina Tag",
+    "refineTagsWithProfile": "Affina Tag ({})"
+  },
+  "download": {
+    "title": "Scarica Area Mappa",
+    "maxZoomLevel": "Livello zoom max",
+    "storageEstimate": "Stima archiviazione:",
+    "tilesAndSize": "{} tile, {} MB",
+    "minZoom": "Zoom min:",
+    "maxRecommendedZoom": "Zoom max raccomandato: Z{}",
+    "withinTileLimit": "Entro il limite di {} tile",
+    "exceedsTileLimit": "La selezione corrente supera il limite di {} tile",
+    "offlineModeWarning": "Download disabilitati in modalità offline. Disabilita la modalità offline per scaricare nuove aree.",
+    "downloadStarted": "Download avviato! Recupero tile e nodi...",
+    "downloadFailed": "Impossibile avviare il download: {}"
+  },
+  "uploadMode": {
+    "title": "Destinazione Upload",
+    "subtitle": "Scegli dove vengono caricate le telecamere",
+    "production": "Produzione",
+    "sandbox": "Sandbox",
+    "simulate": "Simula",
+    "productionDescription": "Carica nel database OSM dal vivo (visibile a tutti gli utenti)",
+    "sandboxDescription": "Gli upload vanno alla Sandbox OSM (sicuro per i test, si resetta regolarmente).",
+    "simulateDescription": "Simula upload (non contatta i server OSM)"
+  },
+  "auth": {
+    "loggedInAs": "Loggato come {}",
+    "loginToOSM": "Accedi a OpenStreetMap",
+    "tapToLogout": "Tocca per disconnetterti",
+    "requiredToSubmit": "Richiesto per inviare dati delle telecamere",
+    "loggedOut": "Disconnesso",
+    "testConnection": "Testa Connessione",
+    "testConnectionSubtitle": "Verifica che le credenziali OSM funzionino",
+    "connectionOK": "Connessione OK - le credenziali sono valide",
+    "connectionFailed": "Connessione fallita - per favore accedi di nuovo"
+  },
+  "queue": {
+    "pendingUploads": "Upload in sospeso: {}",
+    "simulateModeEnabled": "Modalità simulazione abilitata – upload simulati",
+    "sandboxMode": "Modalità sandbox – upload vanno alla Sandbox OSM",
+    "tapToViewQueue": "Tocca per vedere la coda",
+    "clearUploadQueue": "Pulisci Coda Upload",
+    "removeAllPending": "Rimuovi tutti i {} upload in sospeso",
+    "clearQueueTitle": "Pulisci Coda",
+    "clearQueueConfirm": "Rimuovere tutti i {} upload in sospeso?",
+    "queueCleared": "Coda pulita",
+    "uploadQueueTitle": "Coda Upload ({} elementi)",
+    "queueIsEmpty": "La coda è vuota",
+    "cameraWithIndex": "Telecamera {}",
+    "error": " (Errore)",
+    "completing": " (Completamento...)",
+    "destination": "Dest: {}",
+    "latitude": "Lat: {}",
+    "longitude": "Lon: {}",
+    "direction": "Direzione: {}°",
+    "attempts": "Tentativi: {}",
+    "uploadFailedRetry": "Upload fallito. Tocca riprova per tentare di nuovo.",
+    "retryUpload": "Riprova upload",
+    "clearAll": "Pulisci Tutto"
+  },
+  "tileProviders": {
+    "title": "Fornitori di Tile",
+    "noProvidersConfigured": "Nessun fornitore di tile configurato",
+    "tileTypesCount": "{} tipi di tile",
+    "apiKeyConfigured": "Chiave API configurata",
+    "needsApiKey": "Richiede chiave API",
+    "editProvider": "Modifica Fornitore",
+    "addProvider": "Aggiungi Fornitore",
+    "deleteProvider": "Elimina Fornitore",
+    "deleteProviderConfirm": "Sei sicuro di voler eliminare \"{}\"?",
+    "providerName": "Nome Fornitore",
+    "providerNameHint": "es., Mappe Personalizzate Inc.",
+    "providerNameRequired": "Il nome del fornitore è obbligatorio",
+    "apiKey": "Chiave API (Opzionale)",
+    "apiKeyHint": "Inserisci la chiave API se richiesta dai tipi di tile",
+    "tileTypes": "Tipi di Tile",
+    "addType": "Aggiungi Tipo",
+    "noTileTypesConfigured": "Nessun tipo di tile configurato",
+    "atLeastOneTileTypeRequired": "È richiesto almeno un tipo di tile",
+    "manageTileProviders": "Gestisci Fornitori"
+  },
+  "tileTypeEditor": {
+    "editTileType": "Modifica Tipo Tile",
+    "addTileType": "Aggiungi Tipo Tile",
+    "name": "Nome",
+    "nameHint": "es., Satellite",
+    "nameRequired": "Il nome è obbligatorio",
+    "urlTemplate": "Template URL",
+    "urlTemplateHint": "https://esempio.com/{z}/{x}/{y}.png",
+    "urlTemplateRequired": "Il template URL è obbligatorio",
+    "urlTemplatePlaceholders": "L'URL deve contenere i segnaposto {z}, {x} e {y}",
+    "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: {}",
+    "save": "Salva"
+  },
+  "profiles": {
+    "nodeProfiles": "Profili Nodo",
+    "newProfile": "Nuovo Profilo",
+    "builtIn": "Integrato",
+    "custom": "Personalizzato",
+    "view": "Visualizza",
+    "deleteProfile": "Elimina Profilo",
+    "deleteProfileConfirm": "Sei sicuro di voler eliminare \"{}\"?",
+    "profileDeleted": "Profilo eliminato"
+  },
+  "mapTiles": {
+    "title": "Tile Mappa",
+    "manageProviders": "Gestisci Fornitori",
+    "attribution": "Attribuzione Mappa"
+  },
+  "profileEditor": {
+    "viewProfile": "Visualizza Profilo",
+    "newProfile": "Nuovo Profilo",
+    "editProfile": "Modifica Profilo",
+    "profileName": "Nome profilo",
+    "profileNameHint": "es., Telecamera ALPR Personalizzata",
+    "profileNameRequired": "Il nome del profilo è obbligatorio",
+    "requiresDirection": "Richiede Direzione",
+    "requiresDirectionSubtitle": "Se le telecamere di questo tipo necessitano di un tag direzione",
+    "submittable": "Inviabile",
+    "submittableSubtitle": "Se questo profilo può essere usato per invii di telecamere",
+    "osmTags": "Tag OSM",
+    "addTag": "Aggiungi Tag",
+    "saveProfile": "Salva Profilo",
+    "keyHint": "chiave",
+    "valueHint": "valore",
+    "atLeastOneTagRequired": "È richiesto almeno un tag",
+    "profileSaved": "Profilo \"{}\" salvato"
+  },
+  "operatorProfileEditor": {
+    "newOperatorProfile": "Nuovo Profilo Operatore",
+    "editOperatorProfile": "Modifica Profilo Operatore", 
+    "operatorName": "Nome operatore",
+    "operatorNameHint": "es., Dipartimento di Polizia di Austin",
+    "operatorNameRequired": "Il nome dell'operatore è obbligatorio",
+    "operatorProfileSaved": "Profilo operatore \"{}\" salvato"
+  },
+  "operatorProfiles": {
+    "title": "Profili Operatore",
+    "noProfilesMessage": "Nessun profilo operatore definito. Creane uno per applicare tag operatore agli invii di nodi.",
+    "tagsCount": "{} tag",
+    "deleteOperatorProfile": "Elimina Profilo Operatore",
+    "deleteOperatorProfileConfirm": "Sei sicuro di voler eliminare \"{}\"?",
+    "operatorProfileDeleted": "Profilo operatore eliminato"
+  },
+  "offlineAreas": {
+    "title": "Aree Offline",
+    "noAreasTitle": "Nessuna area offline",
+    "noAreasSubtitle": "Scarica un'area mappa per l'uso offline.",
+    "provider": "Fornitore",
+    "maxZoom": "Zoom max",
+    "zoomLevels": "Z{}-{}",
+    "latitude": "Lat",
+    "longitude": "Lon",
+    "tiles": "Tile",
+    "size": "Dimensione",
+    "nodes": "Nodi",
+    "areaIdFallback": "Area {}...",
+    "renameArea": "Rinomina area",
+    "refreshWorldTiles": "Aggiorna/ri-scarica tile mondiali",
+    "deleteOfflineArea": "Elimina area offline",
+    "cancelDownload": "Annulla download",
+    "renameAreaDialogTitle": "Rinomina Area Offline",
+    "areaNameLabel": "Nome Area",
+    "renameButton": "Rinomina",
+    "megabytes": "MB",
+    "kilobytes": "KB",
+    "progress": "{}%",
+    "refreshArea": "Aggiorna area",
+    "refreshAreaDialogTitle": "Aggiorna Area Offline",
+    "refreshAreaDialogSubtitle": "Scegli cosa aggiornare per quest'area:",
+    "refreshTiles": "Aggiorna Tile Mappa",
+    "refreshTilesSubtitle": "Riscarica tutte le tile per immagini aggiornate",
+    "refreshNodes": "Aggiorna Nodi",
+    "refreshNodesSubtitle": "Ricarica i dati dei nodi per quest'area",
+    "startRefresh": "Avvia Aggiornamento",
+    "refreshStarted": "Aggiornamento avviato!",
+    "refreshFailed": "Aggiornamento fallito: {}"
+  },
+  "refineTagsSheet": {
+    "title": "Affina Tag",
+    "operatorProfile": "Profilo Operatore",
+    "done": "Fatto",
+    "none": "Nessuno",
+    "noAdditionalOperatorTags": "Nessun tag operatore aggiuntivo",
+    "additionalTags": "tag aggiuntivi",
+    "additionalTagsTitle": "Tag Aggiuntivi",
+    "noTagsDefinedForProfile": "Nessun tag definito per questo profilo operatore.",
+    "noOperatorProfiles": "Nessun profilo operatore definito",
+    "noOperatorProfilesMessage": "Crea profili operatore nelle Impostazioni per applicare tag aggiuntivi ai tuoi invii di nodi."
+  },
+  "layerSelector": {
+    "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"
+  },
+  "suspectedLocations": {
+    "title": "Posizioni Sospette",
+    "showSuspectedLocations": "Mostra Posizioni Sospette",
+    "showSuspectedLocationsSubtitle": "Mostra marcatori punto interrogativo per siti di sorveglianza sospetti dai dati dei permessi dei servizi pubblici",
+    "lastUpdated": "Ultimo Aggiornamento",
+    "refreshNow": "Aggiorna ora",
+    "dataSource": "Fonte Dati",
+    "dataSourceDescription": "Dati dei permessi dei servizi pubblici che indicano potenziali siti di installazione di infrastrutture di sorveglianza",
+    "dataSourceCredit": "Raccolta e hosting dei dati forniti da alprwatch.org",
+    "minimumDistance": "Distanza Minima dai Nodi Reali",
+    "minimumDistanceSubtitle": "Nascondi posizioni sospette entro {}m dai dispositivi di sorveglianza esistenti",
+    "updating": "Aggiornamento Posizioni Sospette",
+    "downloadingAndProcessing": "Scaricamento e elaborazione dati...",
+    "updateSuccess": "Posizioni sospette aggiornate con successo",
+    "updateFailed": "Aggiornamento posizioni sospette fallito",
+    "neverFetched": "Mai recuperato",
+    "daysAgo": "{} giorni fa",
+    "hoursAgo": "{} ore fa", 
+    "minutesAgo": "{} minuti fa",
+    "justNow": "Proprio ora"
+  },
+  "suspectedLocation": {
+    "title": "Posizione Sospetta #{}",
+    "ticketNo": "N. Ticket",
+    "address": "Indirizzo",
+    "street": "Via", 
+    "city": "Città",
+    "state": "Stato",
+    "intersectingStreet": "Via che Interseca",
+    "workDoneFor": "Lavoro Svolto Per",
+    "remarks": "Osservazioni",
+    "url": "URL",
+    "coordinates": "Coordinate",
+    "noAddressAvailable": "Nessun indirizzo disponibile"
+  }
+}

lib/localizations/pt.json

@@ -0,0 +1,380 @@
+{
+  "language": {
+    "name": "Português"
+  },
+  "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",
+    "settings": "Configurações",
+    "edit": "Editar",
+    "delete": "Excluir",
+    "cancel": "Cancelar",
+    "ok": "OK",
+    "close": "Fechar",
+    "submit": "Enviar",
+    "saveEdit": "Salvar Edição",
+    "clear": "Limpar"
+  },
+  "followMe": {
+    "off": "Ativar seguir-me (norte para cima)",
+    "northUp": "Ativar seguir-me (rotação)",
+    "rotating": "Desativar seguir-me"
+  },
+  "settings": {
+    "title": "Configurações",
+    "language": "Idioma",
+    "systemDefault": "Padrão do Sistema",
+    "aboutInfo": "Sobre / Informações",
+    "aboutThisApp": "Sobre este App",
+    "aboutSubtitle": "Informações do aplicativo e créditos",
+    "languageSubtitle": "Escolha seu idioma preferido",
+    "maxNodes": "Máx. de nós desenhados",
+    "maxNodesSubtitle": "Definir um limite superior para o número de nós no mapa (padrão: 250).",
+    "maxNodesWarning": "Você provavelmente não quer fazer isso a menos que tenha certeza absoluta de que tem uma boa razão para isso.",
+    "offlineMode": "Modo Offline",
+    "offlineModeSubtitle": "Desabilitar todas as requisições de rede exceto para áreas locais/offline.",
+    "offlineModeWarningTitle": "Downloads Ativos",
+    "offlineModeWarningMessage": "Ativar o modo offline cancelará qualquer download de área ativo. Deseja continuar?",
+    "enableOfflineMode": "Ativar Modo Offline",
+    "profiles": "Perfis",
+    "profilesSubtitle": "Gerenciar perfis de nós e operadores",
+    "offlineSettings": "Configurações Offline",
+    "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",
+    "networkStatusIndicator": "Indicador de Status de Rede"
+  },
+  "proximityAlerts": {
+    "getNotified": "Receba notificações ao se aproximar de dispositivos de vigilância",
+    "batteryUsage": "Usa bateria extra para monitoramento contínuo de localização",
+    "notificationsEnabled": "✓ Notificações habilitadas",
+    "notificationsDisabled": "⚠ Notificações desabilitadas",
+    "permissionRequired": "Permissão de notificação necessária",
+    "permissionExplanation": "Notificações push estão desabilitadas. Você só verá alertas dentro do app e não será notificado quando o app estiver em segundo plano.",
+    "enableNotifications": "Habilitar Notificações",
+    "checkingPermissions": "Verificando permissões...",
+    "alertDistance": "Distância de alerta: ",
+    "meters": "metros",
+    "rangeInfo": "Faixa: {}-{} metros (padrão: {})"
+  },
+  "node": {
+    "title": "Nó #{}",
+    "tagSheetTitle": "Tags do Dispositivo de Vigilância",
+    "queuedForUpload": "Nó na fila para envio",
+    "editQueuedForUpload": "Edição de nó na fila para envio",
+    "deleteQueuedForUpload": "Exclusão de nó na fila para envio",
+    "confirmDeleteTitle": "Excluir Nó",
+    "confirmDeleteMessage": "Tem certeza de que deseja excluir o nó #{}? Esta ação não pode ser desfeita."
+  },
+  "addNode": {
+    "profile": "Perfil",
+    "direction": "Direção  {}°",
+    "profileNoDirectionInfo": "Este perfil não requer uma direção.",
+    "mustBeLoggedIn": "Você deve estar logado para enviar novos nós. Por favor, faça login via Configurações.",
+    "enableSubmittableProfile": "Ative um perfil enviável nas Configurações para enviar novos nós.",
+    "profileViewOnlyWarning": "Este perfil é apenas para visualização do mapa. Por favor, selecione um perfil enviável para enviar novos nós.",
+    "refineTags": "Refinar Tags",
+    "refineTagsWithProfile": "Refinar Tags ({})"
+  },
+  "editNode": {
+    "title": "Editar Nó #{}",
+    "profile": "Perfil",
+    "direction": "Direção  {}°",
+    "profileNoDirectionInfo": "Este perfil não requer uma direção.",
+    "mustBeLoggedIn": "Você deve estar logado para editar nós. Por favor, faça login via Configurações.",
+    "sandboxModeWarning": "Não é possível enviar edições de nós de produção para o sandbox. Mude para o modo Produção nas Configurações para editar nós.",
+    "enableSubmittableProfile": "Ative um perfil enviável nas Configurações para editar nós.",
+    "profileViewOnlyWarning": "Este perfil é apenas para visualização do mapa. Por favor, selecione um perfil enviável para editar nós.",
+    "refineTags": "Refinar Tags",
+    "refineTagsWithProfile": "Refinar Tags ({})"
+  },
+  "download": {
+    "title": "Baixar Área do Mapa",
+    "maxZoomLevel": "Nível máx. de zoom",
+    "storageEstimate": "Estimativa de armazenamento:",
+    "tilesAndSize": "{} tiles, {} MB",
+    "minZoom": "Zoom mín.:",
+    "maxRecommendedZoom": "Zoom máx. recomendado: Z{}",
+    "withinTileLimit": "Dentro do limite de {} tiles",
+    "exceedsTileLimit": "A seleção atual excede o limite de {} tiles",
+    "offlineModeWarning": "Downloads desabilitados no modo offline. Desative o modo offline para baixar novas áreas.",
+    "downloadStarted": "Download iniciado! Buscando tiles e nós...",
+    "downloadFailed": "Falha ao iniciar o download: {}"
+  },
+  "uploadMode": {
+    "title": "Destino do Upload",
+    "subtitle": "Escolha onde as câmeras são enviadas",
+    "production": "Produção",
+    "sandbox": "Sandbox",
+    "simulate": "Simular",
+    "productionDescription": "Enviar para o banco de dados OSM ao vivo (visível para todos os usuários)",
+    "sandboxDescription": "Uploads vão para o Sandbox OSM (seguro para testes, redefine regularmente).",
+    "simulateDescription": "Simular uploads (não contacta servidores OSM)"
+  },
+  "auth": {
+    "loggedInAs": "Logado como {}",
+    "loginToOSM": "Fazer login no OpenStreetMap",
+    "tapToLogout": "Toque para sair",
+    "requiredToSubmit": "Necessário para enviar dados de câmeras",
+    "loggedOut": "Deslogado",
+    "testConnection": "Testar Conexão",
+    "testConnectionSubtitle": "Verificar se as credenciais OSM estão funcionando",
+    "connectionOK": "Conexão OK - credenciais são válidas",
+    "connectionFailed": "Conexão falhou - por favor, faça login novamente"
+  },
+  "queue": {
+    "pendingUploads": "Uploads pendentes: {}",
+    "simulateModeEnabled": "Modo simulação ativado – uploads simulados",
+    "sandboxMode": "Modo sandbox – uploads vão para o Sandbox OSM",
+    "tapToViewQueue": "Toque para ver a fila",
+    "clearUploadQueue": "Limpar Fila de Upload",
+    "removeAllPending": "Remover todos os {} uploads pendentes",
+    "clearQueueTitle": "Limpar Fila",
+    "clearQueueConfirm": "Remover todos os {} uploads pendentes?",
+    "queueCleared": "Fila limpa",
+    "uploadQueueTitle": "Fila de Upload ({} itens)",
+    "queueIsEmpty": "A fila está vazia",
+    "cameraWithIndex": "Câmera {}",
+    "error": " (Erro)",
+    "completing": " (Completando...)",
+    "destination": "Dest: {}",
+    "latitude": "Lat: {}",
+    "longitude": "Lon: {}",
+    "direction": "Direção: {}°",
+    "attempts": "Tentativas: {}",
+    "uploadFailedRetry": "Upload falhou. Toque em tentar novamente para tentar novamente.",
+    "retryUpload": "Tentar upload novamente",
+    "clearAll": "Limpar Tudo"
+  },
+  "tileProviders": {
+    "title": "Provedores de Tiles",
+    "noProvidersConfigured": "Nenhum provedor de tiles configurado",
+    "tileTypesCount": "{} tipos de tiles",
+    "apiKeyConfigured": "Chave API configurada",
+    "needsApiKey": "Precisa de chave API",
+    "editProvider": "Editar Provedor",
+    "addProvider": "Adicionar Provedor",
+    "deleteProvider": "Excluir Provedor",
+    "deleteProviderConfirm": "Tem certeza de que deseja excluir \"{}\"?",
+    "providerName": "Nome do Provedor",
+    "providerNameHint": "ex., Mapas Personalizados Inc.",
+    "providerNameRequired": "Nome do provedor é obrigatório",
+    "apiKey": "Chave API (Opcional)",
+    "apiKeyHint": "Insira a chave API se necessária pelos tipos de tiles",
+    "tileTypes": "Tipos de Tiles",
+    "addType": "Adicionar Tipo",
+    "noTileTypesConfigured": "Nenhum tipo de tile configurado",
+    "atLeastOneTileTypeRequired": "Pelo menos um tipo de tile é obrigatório",
+    "manageTileProviders": "Gerenciar Provedores"
+  },
+  "tileTypeEditor": {
+    "editTileType": "Editar Tipo de Tile",
+    "addTileType": "Adicionar Tipo de Tile",
+    "name": "Nome",
+    "nameHint": "ex., Satélite",
+    "nameRequired": "Nome é obrigatório",
+    "urlTemplate": "Modelo de URL",
+    "urlTemplateHint": "https://exemplo.com/{z}/{x}/{y}.png",
+    "urlTemplateRequired": "Modelo de URL é obrigatório",
+    "urlTemplatePlaceholders": "URL deve conter os marcadores {z}, {x} e {y}",
+    "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: {}",
+    "save": "Salvar"
+  },
+  "profiles": {
+    "nodeProfiles": "Perfis de Nó",
+    "newProfile": "Novo Perfil",
+    "builtIn": "Integrado",
+    "custom": "Personalizado",
+    "view": "Ver",
+    "deleteProfile": "Excluir Perfil",
+    "deleteProfileConfirm": "Tem certeza de que deseja excluir \"{}\"?",
+    "profileDeleted": "Perfil excluído"
+  },
+  "mapTiles": {
+    "title": "Tiles do Mapa",
+    "manageProviders": "Gerenciar Provedores",
+    "attribution": "Atribuição do Mapa"
+  },
+  "profileEditor": {
+    "viewProfile": "Ver Perfil",
+    "newProfile": "Novo Perfil",
+    "editProfile": "Editar Perfil",
+    "profileName": "Nome do perfil",
+    "profileNameHint": "ex., Câmera ALPR Personalizada",
+    "profileNameRequired": "Nome do perfil é obrigatório",
+    "requiresDirection": "Requer Direção",
+    "requiresDirectionSubtitle": "Se câmeras deste tipo precisam de uma tag de direção",
+    "submittable": "Enviável",
+    "submittableSubtitle": "Se este perfil pode ser usado para envios de câmeras",
+    "osmTags": "Tags OSM",
+    "addTag": "Adicionar Tag",
+    "saveProfile": "Salvar Perfil",
+    "keyHint": "chave",
+    "valueHint": "valor",
+    "atLeastOneTagRequired": "Pelo menos uma tag é obrigatória",
+    "profileSaved": "Perfil \"{}\" salvo"
+  },
+  "operatorProfileEditor": {
+    "newOperatorProfile": "Novo Perfil de Operador",
+    "editOperatorProfile": "Editar Perfil de Operador", 
+    "operatorName": "Nome do operador",
+    "operatorNameHint": "ex., Departamento de Polícia de Austin",
+    "operatorNameRequired": "Nome do operador é obrigatório",
+    "operatorProfileSaved": "Perfil de operador \"{}\" salvo"
+  },
+  "operatorProfiles": {
+    "title": "Perfis de Operador",
+    "noProfilesMessage": "Nenhum perfil de operador definido. Crie um para aplicar tags de operador aos envios de nós.",
+    "tagsCount": "{} tags",
+    "deleteOperatorProfile": "Excluir Perfil de Operador",
+    "deleteOperatorProfileConfirm": "Tem certeza de que deseja excluir \"{}\"?",
+    "operatorProfileDeleted": "Perfil de operador excluído"
+  },
+  "offlineAreas": {
+    "title": "Áreas Offline",
+    "noAreasTitle": "Nenhuma área offline",
+    "noAreasSubtitle": "Baixe uma área do mapa para uso offline.",
+    "provider": "Provedor",
+    "maxZoom": "Zoom máx",
+    "zoomLevels": "Z{}-{}",
+    "latitude": "Lat",
+    "longitude": "Lon",
+    "tiles": "Tiles",
+    "size": "Tamanho",
+    "nodes": "Nós",
+    "areaIdFallback": "Área {}...",
+    "renameArea": "Renomear área",
+    "refreshWorldTiles": "Atualizar/rebaixar tiles mundiais",
+    "deleteOfflineArea": "Excluir área offline",
+    "cancelDownload": "Cancelar download",
+    "renameAreaDialogTitle": "Renomear Área Offline",
+    "areaNameLabel": "Nome da Área",
+    "renameButton": "Renomear",
+    "megabytes": "MB",
+    "kilobytes": "KB",
+    "progress": "{}%",
+    "refreshArea": "Atualizar área",
+    "refreshAreaDialogTitle": "Atualizar Área Offline",
+    "refreshAreaDialogSubtitle": "Escolha o que atualizar para esta área:",
+    "refreshTiles": "Atualizar Tiles do Mapa",
+    "refreshTilesSubtitle": "Baixar novamente todos os tiles para imagens atualizadas",
+    "refreshNodes": "Atualizar Nós",
+    "refreshNodesSubtitle": "Buscar novamente os dados dos nós para esta área",
+    "startRefresh": "Iniciar Atualização",
+    "refreshStarted": "Atualização iniciada!",
+    "refreshFailed": "Atualização falhou: {}"
+  },
+  "refineTagsSheet": {
+    "title": "Refinar Tags",
+    "operatorProfile": "Perfil de Operador",
+    "done": "Concluído",
+    "none": "Nenhum",
+    "noAdditionalOperatorTags": "Nenhuma tag adicional de operador",
+    "additionalTags": "tags adicionais",
+    "additionalTagsTitle": "Tags Adicionais",
+    "noTagsDefinedForProfile": "Nenhuma tag definida para este perfil de operador.",
+    "noOperatorProfiles": "Nenhum perfil de operador definido",
+    "noOperatorProfilesMessage": "Crie perfis de operador nas Configurações para aplicar tags adicionais aos seus envios de nós."
+  },
+  "layerSelector": {
+    "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"
+  },
+  "suspectedLocations": {
+    "title": "Localizações Suspeitas",
+    "showSuspectedLocations": "Mostrar Localizações Suspeitas",
+    "showSuspectedLocationsSubtitle": "Mostrar marcadores de ponto de interrogação para sites de vigilância suspeitos de dados de licenças de serviços públicos",
+    "lastUpdated": "Última Atualização",
+    "refreshNow": "Atualizar agora",
+    "dataSource": "Fonte de Dados",
+    "dataSourceDescription": "Dados de licenças de serviços públicos indicando possíveis locais de instalação de infraestrutura de vigilância",
+    "dataSourceCredit": "Coleta e hospedagem de dados fornecidas por alprwatch.org",
+    "minimumDistance": "Distância Mínima de Nós Reais",
+    "minimumDistanceSubtitle": "Ocultar localizações suspeitas dentro de {}m de dispositivos de vigilância existentes",
+    "updating": "Atualizando Localizações Suspeitas",
+    "downloadingAndProcessing": "Baixando e processando dados...",
+    "updateSuccess": "Localizações suspeitas atualizadas com sucesso",
+    "updateFailed": "Falha ao atualizar localizações suspeitas",
+    "neverFetched": "Nunca buscado",
+    "daysAgo": "{} dias atrás",
+    "hoursAgo": "{} horas atrás", 
+    "minutesAgo": "{} minutos atrás",
+    "justNow": "Agora mesmo"
+  },
+  "suspectedLocation": {
+    "title": "Localização Suspeita #{}",
+    "ticketNo": "N° do Ticket",
+    "address": "Endereço",
+    "street": "Rua", 
+    "city": "Cidade",
+    "state": "Estado",
+    "intersectingStreet": "Rua que Cruza",
+    "workDoneFor": "Trabalho Feito Para",
+    "remarks": "Observações",
+    "url": "URL",
+    "coordinates": "Coordenadas",
+    "noAddressAvailable": "Nenhum endereço disponível"
+  }
+}

lib/localizations/zh.json

@@ -0,0 +1,380 @@
+{
+  "language": {
+    "name": "中文"
+  },
+  "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": "下载",
+    "settings": "设置",
+    "edit": "编辑",
+    "delete": "删除",
+    "cancel": "取消",
+    "ok": "确定",
+    "close": "关闭",
+    "submit": "提交",
+    "saveEdit": "保存编辑",
+    "clear": "清空"
+  },
+  "followMe": {
+    "off": "启用跟随模式（北向上）",
+    "northUp": "启用跟随模式（旋转）",
+    "rotating": "禁用跟随模式"
+  },
+  "settings": {
+    "title": "设置",
+    "language": "语言",
+    "systemDefault": "系统默认",
+    "aboutInfo": "关于 / 信息",
+    "aboutThisApp": "关于此应用",
+    "aboutSubtitle": "应用程序信息和鸣谢",
+    "languageSubtitle": "选择您的首选语言",
+    "maxNodes": "最大节点绘制数",
+    "maxNodesSubtitle": "设置地图上节点数量的上限（默认：250）。",
+    "maxNodesWarning": "除非您确定有充分的理由，否则您可能不想这样做。",
+    "offlineMode": "离线模式",
+    "offlineModeSubtitle": "禁用除本地/离线区域外的所有网络请求。",
+    "offlineModeWarningTitle": "活动下载",
+    "offlineModeWarningMessage": "启用离线模式将取消任何活动的区域下载。您要继续吗？",
+    "enableOfflineMode": "启用离线模式",
+    "profiles": "配置文件",
+    "profilesSubtitle": "管理节点和操作员配置文件",
+    "offlineSettings": "离线设置",
+    "offlineSettingsSubtitle": "管理离线模式和已下载区域",
+    "advancedSettings": "高级设置",
+    "advancedSettingsSubtitle": "性能、警报和地图提供商设置",
+    "proximityAlerts": "邻近警报",
+    "networkStatusIndicator": "网络状态指示器"
+  },
+  "proximityAlerts": {
+    "getNotified": "接近监控设备时接收通知",
+    "batteryUsage": "使用额外电量进行连续位置监控",
+    "notificationsEnabled": "✓ 通知已启用",
+    "notificationsDisabled": "⚠ 通知已禁用",
+    "permissionRequired": "需要通知权限",
+    "permissionExplanation": "推送通知已禁用。您只会看到应用内警报，当应用在后台时不会收到通知。",
+    "enableNotifications": "启用通知",
+    "checkingPermissions": "检查权限中...",
+    "alertDistance": "警报距离：",
+    "meters": "米",
+    "rangeInfo": "范围：{}-{} 米（默认：{}）"
+  },
+  "node": {
+    "title": "节点 #{}",
+    "tagSheetTitle": "监控设备标签",
+    "queuedForUpload": "节点已排队上传",
+    "editQueuedForUpload": "节点编辑已排队上传",
+    "deleteQueuedForUpload": "节点删除已排队上传",
+    "confirmDeleteTitle": "删除节点",
+    "confirmDeleteMessage": "您确定要删除节点 #{} 吗？此操作无法撤销。"
+  },
+  "addNode": {
+    "profile": "配置文件",
+    "direction": "方向  {}°",
+    "profileNoDirectionInfo": "此配置文件不需要方向。",
+    "mustBeLoggedIn": "您必须登录才能提交新节点。请通过设置登录。",
+    "enableSubmittableProfile": "在设置中启用可提交的配置文件以提交新节点。",
+    "profileViewOnlyWarning": "此配置文件仅用于地图查看。请选择可提交的配置文件来提交新节点。",
+    "refineTags": "细化标签",
+    "refineTagsWithProfile": "细化标签（{}）"
+  },
+  "editNode": {
+    "title": "编辑节点 #{}",
+    "profile": "配置文件",
+    "direction": "方向  {}°",
+    "profileNoDirectionInfo": "此配置文件不需要方向。",
+    "mustBeLoggedIn": "您必须登录才能编辑节点。请通过设置登录。",
+    "sandboxModeWarning": "无法将生产节点的编辑提交到沙盒。在设置中切换到生产模式以编辑节点。",
+    "enableSubmittableProfile": "在设置中启用可提交的配置文件以编辑节点。",
+    "profileViewOnlyWarning": "此配置文件仅用于地图查看。请选择可提交的配置文件来编辑节点。",
+    "refineTags": "细化标签",
+    "refineTagsWithProfile": "细化标签（{}）"
+  },
+  "download": {
+    "title": "下载地图区域",
+    "maxZoomLevel": "最大缩放级别",
+    "storageEstimate": "存储估算：",
+    "tilesAndSize": "{} 瓦片，{} MB",
+    "minZoom": "最小缩放：",
+    "maxRecommendedZoom": "最大推荐缩放：Z{}",
+    "withinTileLimit": "在 {} 瓦片限制内",
+    "exceedsTileLimit": "当前选择超出 {} 瓦片限制",
+    "offlineModeWarning": "离线模式下禁用下载。禁用离线模式以下载新区域。",
+    "downloadStarted": "下载已开始！正在获取瓦片和节点...",
+    "downloadFailed": "启动下载失败：{}"
+  },
+  "uploadMode": {
+    "title": "上传目标",
+    "subtitle": "选择摄像头上传位置",
+    "production": "生产环境",
+    "sandbox": "沙盒",
+    "simulate": "模拟",
+    "productionDescription": "上传到实时 OSM 数据库（对所有用户可见）",
+    "sandboxDescription": "上传到 OSM 沙盒（测试安全，定期重置）。",
+    "simulateDescription": "模拟上传（不联系 OSM 服务器）"
+  },
+  "auth": {
+    "loggedInAs": "已登录为 {}",
+    "loginToOSM": "登录 OpenStreetMap",
+    "tapToLogout": "点击登出",
+    "requiredToSubmit": "提交摄像头数据所需",
+    "loggedOut": "已登出",
+    "testConnection": "测试连接",
+    "testConnectionSubtitle": "验证 OSM 凭据是否有效",
+    "connectionOK": "连接正常 - 凭据有效",
+    "connectionFailed": "连接失败 - 请重新登录"
+  },
+  "queue": {
+    "pendingUploads": "待上传：{}",
+    "simulateModeEnabled": "模拟模式已启用 – 上传已模拟",
+    "sandboxMode": "沙盒模式 – 上传到 OSM 沙盒",
+    "tapToViewQueue": "点击查看队列",
+    "clearUploadQueue": "清空上传队列",
+    "removeAllPending": "移除所有 {} 个待上传项",
+    "clearQueueTitle": "清空队列",
+    "clearQueueConfirm": "移除所有 {} 个待上传项？",
+    "queueCleared": "队列已清空",
+    "uploadQueueTitle": "上传队列（{} 项）",
+    "queueIsEmpty": "队列为空",
+    "cameraWithIndex": "摄像头 {}",
+    "error": "（错误）",
+    "completing": "（完成中...）",
+    "destination": "目标：{}",
+    "latitude": "纬度：{}",
+    "longitude": "经度：{}",
+    "direction": "方向：{}°",
+    "attempts": "尝试次数：{}",
+    "uploadFailedRetry": "上传失败。点击重试再次尝试。",
+    "retryUpload": "重试上传",
+    "clearAll": "全部清空"
+  },
+  "tileProviders": {
+    "title": "瓦片提供商",
+    "noProvidersConfigured": "未配置瓦片提供商",
+    "tileTypesCount": "{} 种瓦片类型",
+    "apiKeyConfigured": "API 密钥已配置",
+    "needsApiKey": "需要 API 密钥",
+    "editProvider": "编辑提供商",
+    "addProvider": "添加提供商",
+    "deleteProvider": "删除提供商",
+    "deleteProviderConfirm": "您确定要删除 \"{}\" 吗？",
+    "providerName": "提供商名称",
+    "providerNameHint": "例如，自定义地图公司",
+    "providerNameRequired": "提供商名称为必填项",
+    "apiKey": "API 密钥（可选）",
+    "apiKeyHint": "如果瓦片类型需要，请输入 API 密钥",
+    "tileTypes": "瓦片类型",
+    "addType": "添加类型",
+    "noTileTypesConfigured": "未配置瓦片类型",
+    "atLeastOneTileTypeRequired": "至少需要一种瓦片类型",
+    "manageTileProviders": "管理提供商"
+  },
+  "tileTypeEditor": {
+    "editTileType": "编辑瓦片类型",
+    "addTileType": "添加瓦片类型",
+    "name": "名称",
+    "nameHint": "例如，卫星",
+    "nameRequired": "名称为必填项",
+    "urlTemplate": "URL 模板",
+    "urlTemplateHint": "https://example.com/{z}/{x}/{y}.png",
+    "urlTemplateRequired": "URL 模板为必填项",
+    "urlTemplatePlaceholders": "URL 必须包含 {z}、{x} 和 {y} 占位符",
+    "attribution": "归属",
+    "attributionHint": "© 地图提供商",
+    "attributionRequired": "归属为必填项",
+    "maxZoom": "最大缩放级别",
+    "maxZoomHint": "最大缩放级别 (1-23)",
+    "maxZoomRequired": "最大缩放为必填项",
+    "maxZoomInvalid": "最大缩放必须为数字",
+    "maxZoomRange": "最大缩放必须在 {} 和 {} 之间",
+    "fetchPreview": "获取预览",
+    "previewTileLoaded": "预览瓦片加载成功",
+    "previewTileFailed": "获取预览失败：{}",
+    "save": "保存"
+  },
+  "profiles": {
+    "nodeProfiles": "节点配置文件",
+    "newProfile": "新建配置文件",
+    "builtIn": "内置",
+    "custom": "自定义",
+    "view": "查看",
+    "deleteProfile": "删除配置文件",
+    "deleteProfileConfirm": "您确定要删除 \"{}\" 吗？",
+    "profileDeleted": "配置文件已删除"
+  },
+  "mapTiles": {
+    "title": "地图瓦片",
+    "manageProviders": "管理提供商",
+    "attribution": "地图归属"
+  },
+  "profileEditor": {
+    "viewProfile": "查看配置文件",
+    "newProfile": "新建配置文件",
+    "editProfile": "编辑配置文件",
+    "profileName": "配置文件名称",
+    "profileNameHint": "例如，自定义 ALPR 摄像头",
+    "profileNameRequired": "配置文件名称为必填项",
+    "requiresDirection": "需要方向",
+    "requiresDirectionSubtitle": "此类型的摄像头是否需要方向标签",
+    "submittable": "可提交",
+    "submittableSubtitle": "此配置文件是否可用于摄像头提交",
+    "osmTags": "OSM 标签",
+    "addTag": "添加标签",
+    "saveProfile": "保存配置文件",
+    "keyHint": "键",
+    "valueHint": "值",
+    "atLeastOneTagRequired": "至少需要一个标签",
+    "profileSaved": "配置文件 \"{}\" 已保存"
+  },
+  "operatorProfileEditor": {
+    "newOperatorProfile": "新建运营商配置文件",
+    "editOperatorProfile": "编辑运营商配置文件", 
+    "operatorName": "运营商名称",
+    "operatorNameHint": "例如，奥斯汀警察局",
+    "operatorNameRequired": "运营商名称为必填项",
+    "operatorProfileSaved": "运营商配置文件 \"{}\" 已保存"
+  },
+  "operatorProfiles": {
+    "title": "运营商配置文件",
+    "noProfilesMessage": "未定义运营商配置文件。创建一个以将运营商标签应用于节点提交。",
+    "tagsCount": "{} 个标签",
+    "deleteOperatorProfile": "删除运营商配置文件",
+    "deleteOperatorProfileConfirm": "您确定要删除 \"{}\" 吗？",
+    "operatorProfileDeleted": "运营商配置文件已删除"
+  },
+  "offlineAreas": {
+    "title": "离线区域",
+    "noAreasTitle": "无离线区域",
+    "noAreasSubtitle": "下载地图区域以供离线使用。",
+    "provider": "提供商",
+    "maxZoom": "最大缩放",
+    "zoomLevels": "Z{}-{}",
+    "latitude": "纬度",
+    "longitude": "经度",
+    "tiles": "瓦片",
+    "size": "大小",
+    "nodes": "节点",
+    "areaIdFallback": "区域 {}...",
+    "renameArea": "重命名区域",
+    "refreshWorldTiles": "刷新/重新下载世界瓦片",
+    "deleteOfflineArea": "删除离线区域",
+    "cancelDownload": "取消下载",
+    "renameAreaDialogTitle": "重命名离线区域",
+    "areaNameLabel": "区域名称",
+    "renameButton": "重命名",
+    "megabytes": "MB",
+    "kilobytes": "KB",
+    "progress": "{}%",
+    "refreshArea": "刷新区域",
+    "refreshAreaDialogTitle": "刷新离线区域",
+    "refreshAreaDialogSubtitle": "选择要为此区域刷新的内容：",
+    "refreshTiles": "刷新地图瓦片",
+    "refreshTilesSubtitle": "重新下载所有瓦片以获取更新的图像",
+    "refreshNodes": "刷新节点",
+    "refreshNodesSubtitle": "重新获取此区域的节点数据",
+    "startRefresh": "开始刷新",
+    "refreshStarted": "刷新已开始！",
+    "refreshFailed": "刷新失败：{}"
+  },
+  "refineTagsSheet": {
+    "title": "细化标签",
+    "operatorProfile": "运营商配置文件",
+    "done": "完成",
+    "none": "无",
+    "noAdditionalOperatorTags": "无额外运营商标签",
+    "additionalTags": "额外标签",
+    "additionalTagsTitle": "额外标签",
+    "noTagsDefinedForProfile": "此运营商配置文件未定义标签。",
+    "noOperatorProfiles": "未定义运营商配置文件",
+    "noOperatorProfilesMessage": "在设置中创建运营商配置文件，以将额外标签应用于您的节点提交。"
+  },
+  "layerSelector": {
+    "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": "英尺"
+  },
+  "suspectedLocations": {
+    "title": "疑似位置",
+    "showSuspectedLocations": "显示疑似位置",
+    "showSuspectedLocationsSubtitle": "根据公用事业许可数据显示疑似监控站点的问号标记",
+    "lastUpdated": "最后更新",
+    "refreshNow": "立即刷新",
+    "dataSource": "数据源",
+    "dataSourceDescription": "公用事业许可数据，表明潜在的监控基础设施安装站点",
+    "dataSourceCredit": "数据收集和托管由 alprwatch.org 提供",
+    "minimumDistance": "与真实节点的最小距离",
+    "minimumDistanceSubtitle": "隐藏现有监控设备{}米范围内的疑似位置",
+    "updating": "正在更新疑似位置",
+    "downloadingAndProcessing": "正在下载和处理数据...",
+    "updateSuccess": "疑似位置更新成功",
+    "updateFailed": "疑似位置更新失败",
+    "neverFetched": "从未获取",
+    "daysAgo": "{}天前",
+    "hoursAgo": "{}小时前", 
+    "minutesAgo": "{}分钟前",
+    "justNow": "刚刚"
+  },
+  "suspectedLocation": {
+    "title": "疑似位置 #{}",
+    "ticketNo": "工单号",
+    "address": "地址",
+    "street": "街道", 
+    "city": "城市",
+    "state": "州/省",
+    "intersectingStreet": "交叉街道",
+    "workDoneFor": "工作完成方",
+    "remarks": "备注",
+    "url": "网址",
+    "coordinates": "坐标",
+    "noAddressAvailable": "无可用地址"
+  }
+}

lib/main.dart

@@ -4,13 +4,23 @@ import 'package:provider/provider.dart';
 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();
 
@@ -23,7 +33,7 @@ Future<void> main() async {
             // You can customize this splash/loading screen as needed
             return MaterialApp(
               home: Scaffold(
-                backgroundColor: Color(0xFF202020),
+                backgroundColor: Color(0xFF152131),
                 body: Center(
                   child: Image.asset(
                     'assets/app_icon.png',
@@ -58,6 +68,12 @@ class DeFlockApp extends StatelessWidget {
       routes: {
         '/': (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(),
+        '/settings/about': (context) => const AboutScreen(),
       },
       initialRoute: '/',
     );

lib/models/osm_node.dart

@@ -1,11 +1,11 @@
 import 'package:latlong2/latlong.dart';
 
-class OsmCameraNode {
+class OsmNode {
   final int id;
   final LatLng coord;
   final Map<String, String> tags;
 
-  OsmCameraNode({
+  OsmNode({
     required this.id,
     required this.coord,
     required this.tags,
@@ -18,14 +18,14 @@ class OsmCameraNode {
     'tags': tags,
   };
 
-  factory OsmCameraNode.fromJson(Map<String, dynamic> json) {
+  factory OsmNode.fromJson(Map<String, dynamic> json) {
     final tags = <String, String>{};
     if (json['tags'] != null) {
       (json['tags'] as Map<String, dynamic>).forEach((k, v) {
         tags[k.toString()] = v.toString();
       });
     }
-    return OsmCameraNode(
+    return OsmNode(
       id: json['id'] is int ? json['id'] as int : int.tryParse(json['id'].toString()) ?? 0,
       coord: LatLng((json['lat'] as num).toDouble(), (json['lon'] as num).toDouble()),
       tags: tags,
@@ -51,5 +51,4 @@ class OsmCameraNode {
     final normalized = ((val % 360) + 360) % 360;
     return normalized;
   }
-}
-
+}

lib/models/pending_upload.dart

@@ -3,13 +3,17 @@ import 'node_profile.dart';
 import 'operator_profile.dart';
 import '../state/settings_state.dart';
 
+enum UploadOperation { create, modify, delete }
+
 class PendingUpload {
   final LatLng coord;
   final double direction;
   final NodeProfile profile;
   final OperatorProfile? operatorProfile;
   final UploadMode uploadMode; // Capture upload destination when queued
-  final int? originalNodeId; // If this is an edit, the ID of the original OSM node
+  final UploadOperation operation; // Type of operation: create, modify, or delete
+  final int? originalNodeId; // If this is modify/delete, the ID of the original OSM node
+  int? submittedNodeId; // The actual node ID returned by OSM after successful submission
   int attempts;
   bool error;
   bool completing; // True when upload succeeded but item is showing checkmark briefly
@@ -20,14 +24,23 @@ class PendingUpload {
     required this.profile,
     this.operatorProfile,
     required this.uploadMode,
+    required this.operation,
     this.originalNodeId,
+    this.submittedNodeId,
     this.attempts = 0,
     this.error = false,
     this.completing = false,
-  });
+  }) : assert(
+         (operation == UploadOperation.create && originalNodeId == null) ||
+         (operation != UploadOperation.create && originalNodeId != null),
+         'originalNodeId must be null for create operations and non-null for modify/delete operations'
+       );
 
-  // True if this is an edit of an existing camera, false if it's a new camera
-  bool get isEdit => originalNodeId != null;
+  // True if this is an edit of an existing node, false if it's a new node
+  bool get isEdit => operation == UploadOperation.modify;
+  
+  // True if this is a deletion of an existing node
+  bool get isDeletion => operation == UploadOperation.delete;
 
   // Get display name for the upload destination
   String get uploadModeDisplayName {
@@ -41,11 +54,11 @@ class PendingUpload {
     }
   }
 
-  // Get combined tags from camera profile and operator profile
+  // Get combined tags from node profile and operator profile
   Map<String, String> getCombinedTags() {
     final tags = Map<String, String>.from(profile.tags);
     
-    // Add operator profile tags (they override camera profile tags if there are conflicts)
+    // Add operator profile tags (they override node profile tags if there are conflicts)
     if (operatorProfile != null) {
       tags.addAll(operatorProfile!.tags);
     }
@@ -65,7 +78,9 @@ class PendingUpload {
         'profile': profile.toJson(),
         'operatorProfile': operatorProfile?.toJson(),
         'uploadMode': uploadMode.index,
+        'operation': operation.index,
         'originalNodeId': originalNodeId,
+        'submittedNodeId': submittedNodeId,
         'attempts': attempts,
         'error': error,
         'completing': completing,
@@ -83,7 +98,11 @@ class PendingUpload {
         uploadMode: j['uploadMode'] != null 
             ? UploadMode.values[j['uploadMode']] 
             : UploadMode.production, // Default for legacy entries
+        operation: j['operation'] != null
+            ? UploadOperation.values[j['operation']]
+            : (j['originalNodeId'] != null ? UploadOperation.modify : UploadOperation.create), // Legacy compatibility
         originalNodeId: j['originalNodeId'],
+        submittedNodeId: j['submittedNodeId'],
         attempts: j['attempts'] ?? 0,
         error: j['error'] ?? false,
         completing: j['completing'] ?? false, // Default to false for legacy entries

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/suspected_location.dart

@@ -0,0 +1,212 @@
+import 'dart:convert';
+import 'package:latlong2/latlong.dart';
+
+/// A suspected surveillance location from the CSV data
+class SuspectedLocation {
+  final String ticketNo;
+  final String? urlFull;
+  final String? addr;
+  final String? street;
+  final String? city;
+  final String? state;
+  final String? digSiteIntersectingStreet;
+  final String? digWorkDoneFor;
+  final String? digSiteRemarks;
+  final Map<String, dynamic>? geoJson;
+  final LatLng centroid;
+  final List<LatLng> bounds;
+
+  SuspectedLocation({
+    required this.ticketNo,
+    this.urlFull,
+    this.addr,
+    this.street,
+    this.city,
+    this.state,
+    this.digSiteIntersectingStreet,
+    this.digWorkDoneFor,
+    this.digSiteRemarks,
+    this.geoJson,
+    required this.centroid,
+    required this.bounds,
+  });
+
+  /// Create from CSV row data
+  factory SuspectedLocation.fromCsvRow(Map<String, dynamic> row) {
+    final locationString = row['location'] as String?;
+    LatLng centroid = const LatLng(0, 0);
+    List<LatLng> bounds = [];
+    Map<String, dynamic>? geoJson;
+
+    // Parse GeoJSON if available
+    if (locationString != null && locationString.isNotEmpty) {
+      try {
+        geoJson = jsonDecode(locationString) as Map<String, dynamic>;
+        final coordinates = _extractCoordinatesFromGeoJson(geoJson);
+        centroid = coordinates.centroid;
+        bounds = coordinates.bounds;
+      } catch (e) {
+        // If GeoJSON parsing fails, use default coordinates
+        print('[SuspectedLocation] Failed to parse GeoJSON for ticket ${row['ticket_no']}: $e');
+        print('[SuspectedLocation] Location string: $locationString');
+      }
+    }
+
+    return SuspectedLocation(
+      ticketNo: row['ticket_no']?.toString() ?? '',
+      urlFull: row['url_full']?.toString(),
+      addr: row['addr']?.toString(),
+      street: row['street']?.toString(),
+      city: row['city']?.toString(),
+      state: row['state']?.toString(),
+      digSiteIntersectingStreet: row['dig_site_intersecting_street']?.toString(),
+      digWorkDoneFor: row['dig_work_done_for']?.toString(),
+      digSiteRemarks: row['dig_site_remarks']?.toString(),
+      geoJson: geoJson,
+      centroid: centroid,
+      bounds: bounds,
+    );
+  }
+
+  /// Extract coordinates from GeoJSON
+  static ({LatLng centroid, List<LatLng> bounds}) _extractCoordinatesFromGeoJson(Map<String, dynamic> geoJson) {
+    try {
+      // The geoJson IS the geometry object (not wrapped in a 'geometry' property)
+      final coordinates = geoJson['coordinates'] as List?;
+      if (coordinates == null || coordinates.isEmpty) {
+        print('[SuspectedLocation] No coordinates found in GeoJSON');
+        return (centroid: const LatLng(0, 0), bounds: <LatLng>[]);
+      }
+
+      final List<LatLng> points = [];
+      
+      // Handle different geometry types
+      final type = geoJson['type'] as String?;
+      switch (type) {
+        case 'Point':
+          if (coordinates.length >= 2) {
+            final point = LatLng(
+              (coordinates[1] as num).toDouble(),
+              (coordinates[0] as num).toDouble(),
+            );
+            points.add(point);
+          }
+          break;
+        case 'Polygon':
+          // Polygon coordinates are [[[lng, lat], ...]]
+          if (coordinates.isNotEmpty) {
+            final ring = coordinates[0] as List;
+            for (final coord in ring) {
+              if (coord is List && coord.length >= 2) {
+                points.add(LatLng(
+                  (coord[1] as num).toDouble(),
+                  (coord[0] as num).toDouble(),
+                ));
+              }
+            }
+          }
+          break;
+        case 'MultiPolygon':
+          // MultiPolygon coordinates are [[[[lng, lat], ...], ...], ...]
+          for (final polygon in coordinates) {
+            if (polygon is List && polygon.isNotEmpty) {
+              final ring = polygon[0] as List;
+              for (final coord in ring) {
+                if (coord is List && coord.length >= 2) {
+                  points.add(LatLng(
+                    (coord[1] as num).toDouble(),
+                    (coord[0] as num).toDouble(),
+                  ));
+                }
+              }
+            }
+          }
+          break;
+        default:
+          print('Unsupported geometry type: $type');
+      }
+
+      if (points.isEmpty) {
+        return (centroid: const LatLng(0, 0), bounds: <LatLng>[]);
+      }
+
+      // Calculate centroid
+      double sumLat = 0;
+      double sumLng = 0;
+      for (final point in points) {
+        sumLat += point.latitude;
+        sumLng += point.longitude;
+      }
+      final centroid = LatLng(sumLat / points.length, sumLng / points.length);
+
+      return (centroid: centroid, bounds: points);
+    } catch (e) {
+      print('Error extracting coordinates from GeoJSON: $e');
+      return (centroid: const LatLng(0, 0), bounds: <LatLng>[]);
+    }
+  }
+
+  /// Convert to JSON for storage
+  Map<String, dynamic> toJson() => {
+    'ticket_no': ticketNo,
+    'url_full': urlFull,
+    'addr': addr,
+    'street': street,
+    'city': city,
+    'state': state,
+    'dig_site_intersecting_street': digSiteIntersectingStreet,
+    'dig_work_done_for': digWorkDoneFor,
+    'dig_site_remarks': digSiteRemarks,
+    'geo_json': geoJson,
+    'centroid_lat': centroid.latitude,
+    'centroid_lng': centroid.longitude,
+    'bounds': bounds.map((p) => [p.latitude, p.longitude]).toList(),
+  };
+
+  /// Create from stored JSON
+  factory SuspectedLocation.fromJson(Map<String, dynamic> json) {
+    final boundsData = json['bounds'] as List?;
+    final bounds = boundsData?.map((b) => LatLng(
+      (b[0] as num).toDouble(),
+      (b[1] as num).toDouble(),
+    )).toList() ?? <LatLng>[];
+
+    return SuspectedLocation(
+      ticketNo: json['ticket_no'] ?? '',
+      urlFull: json['url_full'],
+      addr: json['addr'],
+      street: json['street'],
+      city: json['city'],
+      state: json['state'],
+      digSiteIntersectingStreet: json['dig_site_intersecting_street'],
+      digWorkDoneFor: json['dig_work_done_for'],
+      digSiteRemarks: json['dig_site_remarks'],
+      geoJson: json['geo_json'],
+      centroid: LatLng(
+        (json['centroid_lat'] as num).toDouble(),
+        (json['centroid_lng'] as num).toDouble(),
+      ),
+      bounds: bounds,
+    );
+  }
+
+  /// Get a formatted display address
+  String get displayAddress {
+    final parts = <String>[];
+    if (addr?.isNotEmpty == true) parts.add(addr!);
+    if (street?.isNotEmpty == true) parts.add(street!);
+    if (city?.isNotEmpty == true) parts.add(city!);
+    if (state?.isNotEmpty == true) parts.add(state!);
+    return parts.isNotEmpty ? parts.join(', ') : 'No address available';
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is SuspectedLocation &&
+          runtimeType == other.runtimeType &&
+          ticketNo == other.ticketNo;
+
+  @override
+  int get hashCode => ticketNo.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

@@ -0,0 +1,113 @@
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+import '../services/localization_service.dart';
+
+class AboutScreen extends StatelessWidget {
+  const AboutScreen({super.key});
+
+  Future<void> _launchUrl(String url, BuildContext context) async {
+    final uri = Uri.parse(url);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri, mode: LaunchMode.externalApplication);
+    } else {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Could not open URL: $url'),
+          ),
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final locService = LocalizationService.instance;
+    
+    return AnimatedBuilder(
+      animation: LocalizationService.instance,
+      builder: (context, child) => Scaffold(
+        appBar: AppBar(
+          title: Text(locService.t('settings.aboutThisApp')),
+        ),
+        body: SingleChildScrollView(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Text(
+                locService.t('about.title'),
+                style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+                textAlign: TextAlign.start,
+              ),
+              const SizedBox(height: 16),
+              Text(
+                locService.t('about.description'),
+                style: Theme.of(context).textTheme.bodyLarge,
+                textAlign: TextAlign.start,
+              ),
+              const SizedBox(height: 16),
+              Text(
+                locService.t('about.features'),
+                style: Theme.of(context).textTheme.bodyLarge,
+                textAlign: TextAlign.start,
+              ),
+              const SizedBox(height: 16),
+              Text(
+                locService.t('about.initiative'),
+                style: Theme.of(context).textTheme.bodyLarge,
+                textAlign: TextAlign.start,
+              ),
+              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,
+              ),
+              const SizedBox(height: 32),
+              _buildHelpLinks(context),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildHelpLinks(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        _buildLinkText(context, 'About DeFlock', 'https://deflock.me/about'),
+        const SizedBox(height: 8),
+        _buildLinkText(context, 'Privacy Policy', 'https://deflock.me/privacy'),
+        const SizedBox(height: 8),
+        _buildLinkText(context, 'DeFlock Discord', 'https://discord.gg/aV7v4R3sKT'),
+        const SizedBox(height: 8),
+        _buildLinkText(context, 'Source Code', 'https://github.com/FoggedLens/deflock-app'),
+        const SizedBox(height: 8),
+        _buildLinkText(context, 'Contact', 'https://deflock.me/contact'),
+        const SizedBox(height: 8),
+        _buildLinkText(context, 'Donate', 'https://deflock.me/donate'),
+      ],
+    );
+  }
+
+  Widget _buildLinkText(BuildContext context, String text, String url) {
+    return GestureDetector(
+      onTap: () => _launchUrl(url, context),
+      child: Text(
+        text,
+        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+          color: Theme.of(context).colorScheme.primary,
+          decoration: TextDecoration.underline,
+        ),
+        textAlign: TextAlign.center,
+      ),
+    );
+  }
+}

lib/screens/advanced_settings_screen.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'settings/sections/max_nodes_section.dart';
+import 'settings/sections/proximity_alerts_section.dart';
+import 'settings/sections/suspected_locations_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 {
+  const AdvancedSettingsScreen({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('settings.advancedSettings')),
+        ),
+        body: ListView(
+          padding: const EdgeInsets.all(16),
+          children: const [
+            MaxNodesSection(),
+            Divider(),
+            ProximityAlertsSection(),
+            Divider(),
+            SuspectedLocationsSection(),
+            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';
@@ -11,9 +12,16 @@ import '../services/localization_service.dart';
 
 import '../widgets/add_node_sheet.dart';
 import '../widgets/edit_node_sheet.dart';
+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 '../widgets/suspected_location_sheet.dart';
+import '../models/osm_node.dart';
+import '../models/suspected_location.dart';
+import '../models/search_result.dart';
 
 class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
@@ -27,10 +35,19 @@ 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 padding
+  // 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;
+  
+  // Track selected node for highlighting
+  int? _selectedNodeId;
 
   @override
   void initState() {
@@ -87,13 +104,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),
+        ),
       ),
     );
     
@@ -110,24 +132,374 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
     // Disable follow-me when editing a camera so the map doesn't jump around
     appState.setFollowMeMode(FollowMeMode.off);
     
+    // Set transition flag to prevent map bounce
+    _transitioningToEdit = true;
+    
+    // Close any existing tag sheet first
+    if (_tagSheetHeight > 0) {
+      Navigator.of(context).pop();
+    }
+    
     final session = appState.editSession!;     // should be non-null when this is called
 
+    // Small delay to let tag sheet close smoothly
+    Future.delayed(const Duration(milliseconds: 150), () {
+      if (!mounted) return;
+      
+      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(() {
+                _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),
+          ),
+        ),
+      );
+      
+      // Reset height when sheet is dismissed
+      controller.closed.then((_) {
+        setState(() {
+          _editSheetHeight = 0.0;
+          _transitioningToEdit = false;
+        });
+      });
+    });
+  }
+
+  void _openNavigationSheet() {
     final controller = _scaffoldKey.currentState!.showBottomSheet(
-      (ctx) => MeasuredSheet(
-        onHeightChanged: (height) {
-          setState(() {
-            _editSheetHeight = height;
-          });
-        },
-        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(() {
+              _navigationSheetHeight = height + MediaQuery.of(context).padding.bottom;
+            });
+          },
+          child: NavigationSheet(
+            onStartRoute: _onStartRoute,
+            onResumeRoute: _onResumeRoute,
+          ),
+        ),
       ),
     );
     
     // Reset height when sheet is dismissed
     controller.closed.then((_) {
       setState(() {
-        _editSheetHeight = 0.0;
+        _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
+    });
+    
+    // Start smooth centering animation simultaneously with sheet opening
+    // Use the same duration as SheetAwareMap (300ms) for coordinated animation
+    try {
+      _mapController.animateTo(
+        dest: node.coord,
+        zoom: _mapController.mapController.camera.zoom,
+        duration: const Duration(milliseconds: 300),
+        curve: Curves.easeOut,
+      );
+    } catch (_) {
+      // Map controller not ready, fallback to immediate move
+      try {
+        _mapController.mapController.move(node.coord, _mapController.mapController.camera.zoom);
+      } catch (_) {
+        // Controller really not ready, skip centering
+      }
+    }
+    
+    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(() {
+              _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
+            },
+          ),
+        ),
+      ),
+    );
+    
+    // Reset height and selection when sheet is dismissed (unless transitioning to edit)
+    controller.closed.then((_) {
+      if (!_transitioningToEdit) {
+        setState(() {
+          _tagSheetHeight = 0.0;
+          _selectedNodeId = null; // Clear selection
+        });
+      }
+      // If transitioning to edit, keep the height until edit sheet takes over
+    });
+  }
+
+  void openSuspectedLocationSheet(SuspectedLocation location) {
+    final appState = context.read<AppState>();
+    appState.selectSuspectedLocation(location);
+    
+    // Start smooth centering animation simultaneously with sheet opening
+    try {
+      _mapController.animateTo(
+        dest: location.centroid,
+        zoom: _mapController.mapController.camera.zoom,
+        duration: const Duration(milliseconds: 300),
+        curve: Curves.easeOut,
+      );
+    } catch (_) {
+      // Map controller not ready, fallback to immediate move
+      try {
+        _mapController.mapController.move(location.centroid, _mapController.mapController.camera.zoom);
+      } catch (_) {
+        // Controller really not ready, skip centering
+      }
+    }
+    
+    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(() {
+              _tagSheetHeight = height + MediaQuery.of(context).padding.bottom;
+            });
+          },
+          child: SuspectedLocationSheet(location: location),
+        ),
+      ),
+    );
+    
+    // Reset height and clear selection when sheet is dismissed
+    controller.closed.then((_) {
+      setState(() {
+        _tagSheetHeight = 0.0;
+      });
+      appState.clearSuspectedLocationSelection();
     });
   }
 
@@ -143,17 +515,36 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
       _editSheetShown = false;
     }
 
-    // Calculate bottom padding for map (90% of active sheet height)
-    final activeSheetHeight = _addSheetHeight > 0 ? _addSheetHeight : _editSheetHeight;
-    final mapBottomPadding = activeSheetHeight * 0.9;
+    // 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 
+            : (_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,
@@ -190,38 +581,57 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
               key: _mapViewKey,
               controller: _mapController,
               followMeMode: appState.followMeMode,
-              bottomPadding: mapBottomPadding,
+              sheetHeight: activeSheetHeight,
+              selectedNodeId: _selectedNodeId,
+              onNodeTap: openNodeTagSheet,
+              onSuspectedLocationTap: openSuspectedLocationSheet,
+              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(
                 padding: EdgeInsets.only(
-                  bottom: MediaQuery.of(context).padding.bottom + kBottomButtonBarMargin,
+                  bottom: MediaQuery.of(context).padding.bottom + kBottomButtonBarOffset,
                   left: 8,
                   right: 8,
                 ),
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.surface,
-                    borderRadius: BorderRadius.circular(16),
-                    boxShadow: [
-                      BoxShadow(
-                        color: Theme.of(context).shadowColor.withOpacity(0.3),
-                        blurRadius: 10,
-                        offset: Offset(0, -2),
-                      )
-                    ],
-                  ),
-                  margin: EdgeInsets.only(bottom: kBottomButtonBarMargin),
-                  padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
-                  child: Row(
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 600), // Match typical sheet width
+                  child: Container(
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.surface,
+                      borderRadius: BorderRadius.circular(16),
+                      boxShadow: [
+                        BoxShadow(
+                          color: Theme.of(context).shadowColor.withOpacity(0.3),
+                          blurRadius: 10,
+                          offset: Offset(0, -2),
+                        )
+                      ],
+                    ),
+                    margin: EdgeInsets.only(bottom: kBottomButtonBarOffset),
+                    padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+                    child: Row(
                     children: [
                       Expanded(
+                        flex: 7, // 70% for primary action
                         child: AnimatedBuilder(
                           animation: LocalizationService.instance,
                           builder: (context, child) => ElevatedButton.icon(
@@ -237,18 +647,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),
+                              ),
                             ),
                           ),
                         ),
@@ -256,11 +670,13 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
                     ],
                   ),
                 ),
+                ),
               ),
             ),
           ],
         ),
       ),
+      ),
     );
   }
 }

lib/screens/language_settings_screen.dart

@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'settings/sections/language_section.dart';
+import '../services/localization_service.dart';
+
+class LanguageSettingsScreen extends StatelessWidget {
+  const LanguageSettingsScreen({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('settings.language')),
+        ),
+        body: const Padding(
+          padding: EdgeInsets.all(16),
+          child: LanguageSection(),
+        ),
+      ),
+    );
+  }
+}

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/offline_settings_screen.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'settings/sections/offline_mode_section.dart';
+import 'settings/sections/offline_areas_section.dart';
+import '../services/localization_service.dart';
+
+class OfflineSettingsScreen extends StatelessWidget {
+  const OfflineSettingsScreen({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('settings.offlineSettings')),
+        ),
+        body: ListView(
+          padding: const EdgeInsets.all(16),
+          children: const [
+            OfflineModeSection(),
+            Divider(),
+            OfflineAreasSection(),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/profiles_settings_screen.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'settings/sections/node_profiles_section.dart';
+import 'settings/sections/operator_profiles_section.dart';
+import '../services/localization_service.dart';
+
+class ProfilesSettingsScreen extends StatelessWidget {
+  const ProfilesSettingsScreen({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('settings.profiles')),
+        ),
+        body: ListView(
+          padding: const EdgeInsets.all(16),
+          children: const [
+            NodeProfilesSection(),
+            Divider(),
+            OperatorProfilesSection(),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/settings/sections/about_section.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../../services/localization_service.dart';
+import '../../../services/localization_service.dart';
 
 class AboutSection extends StatelessWidget {
   const AboutSection({super.key});

lib/screens/settings/sections/auth_section.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../../app_state.dart';
-import '../../services/localization_service.dart';
+import '../../../app_state.dart';
+import '../../../services/localization_service.dart';
 
 class AuthSection extends StatelessWidget {
   const AuthSection({super.key});

lib/screens/settings/sections/language_section.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import '../../services/localization_service.dart';
+import '../../../services/localization_service.dart';
 
 class LanguageSection extends StatefulWidget {
   const LanguageSection({super.key});
@@ -57,15 +57,6 @@ class _LanguageSectionState extends State<LanguageSection> {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Padding(
-              padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
-              child: Text(
-                locService.t('settings.language'),
-                style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                  color: Theme.of(context).colorScheme.primary,
-                ),
-              ),
-            ),
             // System Default option
             RadioListTile<String?>(
               title: Text(locService.t('settings.systemDefault')),
@@ -73,8 +64,18 @@ class _LanguageSectionState extends State<LanguageSection> {
               groupValue: _selectedLanguage,
               onChanged: _setLanguage,
             ),
-            // Dynamic language options
-            ...locService.availableLanguages.map((langCode) => 
+            // English always appears second (if available)
+            if (locService.availableLanguages.contains('en'))
+              RadioListTile<String>(
+                title: Text(_languageNames['en'] ?? 'English'),
+                value: 'en',
+                groupValue: _selectedLanguage,
+                onChanged: _setLanguage,
+              ),
+            // Other language options (excluding English since it's already shown)
+            ...locService.availableLanguages
+                .where((langCode) => langCode != 'en')
+                .map((langCode) => 
               RadioListTile<String>(
                 title: Text(_languageNames[langCode] ?? langCode.toUpperCase()),
                 value: langCode,

lib/screens/settings/sections/max_nodes_section.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../../app_state.dart';
-import '../../services/localization_service.dart';
+import '../../../app_state.dart';
+import '../../../services/localization_service.dart';
 
 class MaxNodesSection extends StatefulWidget {
   const MaxNodesSection({super.key});
@@ -39,13 +39,17 @@ class _MaxNodesSectionState extends State<MaxNodesSection> {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
+            Text(
+              locService.t('settings.maxNodes'),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
             ListTile(
               leading: const Icon(Icons.filter_alt),
-              title: Text(locService.t('settings.maxNodes')),
+              title: Text(locService.t('settings.maxNodesSubtitle')),
               subtitle: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text(locService.t('settings.maxNodesSubtitle')),
                   if (showWarning)
                     Padding(
                       padding: const EdgeInsets.symmetric(vertical: 4.0),

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/sections/node_profiles_section.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 import 'package:provider/provider.dart';
-import '../../app_state.dart';
-import '../../models/node_profile.dart';
-import '../../services/localization_service.dart';
-import '../profile_editor.dart';
+import '../../../app_state.dart';
+import '../../../models/node_profile.dart';
+import '../../../services/localization_service.dart';
+import '../../profile_editor.dart';
 
-class ProfileListSection extends StatelessWidget {
-  const ProfileListSection({super.key});
+class NodeProfilesSection extends StatelessWidget {
+  const NodeProfilesSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -22,7 +22,10 @@ class ProfileListSection extends StatelessWidget {
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                Text(locService.t('profiles.nodeProfiles'), style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+                Text(
+                  locService.t('profiles.nodeProfiles'),
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
                 TextButton.icon(
                   onPressed: () => Navigator.push(
                     context,

lib/screens/settings/sections/offline_areas_section.dart

@@ -0,0 +1,280 @@
+import 'package:flutter/material.dart';
+import '../../../services/offline_area_service.dart';
+import '../../../services/offline_areas/offline_area_models.dart';
+import '../../../services/localization_service.dart';
+
+class OfflineAreasSection extends StatefulWidget {
+  const OfflineAreasSection({super.key});
+
+  @override
+  State<OfflineAreasSection> createState() => _OfflineAreasSectionState();
+}
+
+class _OfflineAreasSectionState extends State<OfflineAreasSection> {
+  OfflineAreaService get service => OfflineAreaService();
+
+  @override
+  void initState() {
+    super.initState();
+    Future.doWhile(() async {
+      await Future.delayed(const Duration(seconds: 1));
+      if (!mounted) return false;
+      setState(() {});
+      return true;
+    });
+  }
+
+  void _showRefreshDialog(OfflineArea area) {
+    showDialog(
+      context: context,
+      builder: (context) => _RefreshAreaDialog(
+        area: area,
+        onRefresh: (refreshTiles, refreshNodes) {
+          try {
+            // ignore: unawaited_futures
+            service.refreshArea(
+              id: area.id,
+              refreshTiles: refreshTiles,
+              refreshNodes: refreshNodes,
+              onProgress: (progress) => setState(() {}),
+              onComplete: (status) => setState(() {}),
+            );
+            
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(LocalizationService.instance.t('offlineAreas.refreshStarted')),
+              ),
+            );
+          } catch (e) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(LocalizationService.instance.t('offlineAreas.refreshFailed', params: [e.toString()])),
+              ),
+            );
+          }
+        },
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: LocalizationService.instance,
+      builder: (context, child) {
+        final locService = LocalizationService.instance;
+        final areas = service.offlineAreas;
+        
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              locService.t('offlineAreas.title'),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            if (areas.isEmpty)
+              ListTile(
+                leading: const Icon(Icons.download_for_offline),
+                title: Text(locService.t('offlineAreas.noAreasTitle')),
+                subtitle: Text(locService.t('offlineAreas.noAreasSubtitle')),
+              )
+            else
+              ...areas.map((area) {
+            String diskStr = area.sizeBytes > 0
+                ? area.sizeBytes > 1024 * 1024
+                    ? "${(area.sizeBytes / (1024 * 1024)).toStringAsFixed(2)} ${locService.t('offlineAreas.megabytes')}"
+                    : "${(area.sizeBytes / 1024).toStringAsFixed(1)} ${locService.t('offlineAreas.kilobytes')}"
+                : '--';
+                
+            String subtitle = '${locService.t('offlineAreas.provider')}: ${area.tileProviderDisplay}\n' +
+                '${locService.t('offlineAreas.maxZoom')}: Z${area.maxZoom}' + '\n' +
+                '${locService.t('offlineAreas.latitude')}: ${area.bounds.southWest.latitude.toStringAsFixed(3)}, ${area.bounds.southWest.longitude.toStringAsFixed(3)}\n' +
+                '${locService.t('offlineAreas.latitude')}: ${area.bounds.northEast.latitude.toStringAsFixed(3)}, ${area.bounds.northEast.longitude.toStringAsFixed(3)}';
+                
+            if (area.status == OfflineAreaStatus.downloading) {
+              subtitle += '\n${locService.t('offlineAreas.tiles')}: ${area.tilesDownloaded} / ${area.tilesTotal}';
+            } else {
+              subtitle += '\n${locService.t('offlineAreas.tiles')}: ${area.tilesTotal}';
+            }
+            subtitle += '\n${locService.t('offlineAreas.size')}: $diskStr';
+            subtitle += '\n${locService.t('offlineAreas.nodes')}: ${area.nodes.length}';
+        return Card(
+          child: ListTile(
+            leading: Icon(area.status == OfflineAreaStatus.complete
+                ? Icons.cloud_done
+                : area.status == OfflineAreaStatus.error
+                    ? Icons.error
+                    : Icons.download_for_offline),
+            title: Row(
+              children: [
+                Expanded(
+                  child: Text(area.name.isNotEmpty
+                      ? area.name
+                      : locService.t('offlineAreas.areaIdFallback', params: [area.id.substring(0, 6)])),
+                ),
+                IconButton(
+                  icon: const Icon(Icons.edit, size: 20),
+                  tooltip: locService.t('offlineAreas.renameArea'),
+                    onPressed: () async {
+                      String? newName = await showDialog<String>(
+                        context: context,
+                        builder: (ctx) {
+                          final ctrl = TextEditingController(text: area.name);
+                          return AlertDialog(
+                            title: Text(locService.t('offlineAreas.renameAreaDialogTitle')),
+                            content: TextField(
+                              controller: ctrl,
+                              maxLength: 40,
+                              decoration: InputDecoration(labelText: locService.t('offlineAreas.areaNameLabel')),
+                              autofocus: true,
+                            ),
+                            actions: [
+                              TextButton(
+                                onPressed: () => Navigator.pop(ctx),
+                                child: Text(locService.t('actions.cancel')),
+                              ),
+                              ElevatedButton(
+                                onPressed: () {
+                                  Navigator.pop(ctx, ctrl.text.trim());
+                                },
+                                child: Text(locService.t('offlineAreas.renameButton')),
+                              ),
+                            ],
+                          );
+                        },
+                      );
+                      if (newName != null && newName.trim().isNotEmpty) {
+                        setState(() {
+                          area.name = newName.trim();
+                          service.saveAreasToDisk();
+                        });
+                      }
+                    },
+                  ),
+                if (area.status != OfflineAreaStatus.downloading) ...[
+                  IconButton(
+                    icon: const Icon(Icons.refresh, color: Colors.blue),
+                    tooltip: locService.t('offlineAreas.refreshArea'),
+                    onPressed: () => _showRefreshDialog(area),
+                  ),
+                  IconButton(
+                    icon: const Icon(Icons.delete, color: Colors.red),
+                    tooltip: locService.t('offlineAreas.deleteOfflineArea'),
+                    onPressed: () async {
+                      service.deleteArea(area.id);
+                      setState(() {});
+                    },
+                  ),
+                ],
+              ],
+            ),
+            subtitle: Text(subtitle),
+            isThreeLine: true,
+            trailing: area.status == OfflineAreaStatus.downloading
+                ? Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      SizedBox(
+                        width: 64,
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            LinearProgressIndicator(value: area.progress),
+                            Text(
+                              locService.t('offlineAreas.progress', params: [(area.progress * 100).toStringAsFixed(0)]),
+                              style: const TextStyle(fontSize: 12),
+                            )
+                          ],
+                        ),
+                      ),
+                      IconButton(
+                        icon: const Icon(Icons.cancel, color: Colors.orange),
+                        tooltip: locService.t('offlineAreas.cancelDownload'),
+                        onPressed: () {
+                          service.cancelDownload(area.id);
+                          setState(() {});
+                        },
+                      )
+                    ],
+                  )
+                : null,
+            onLongPress: area.status == OfflineAreaStatus.downloading
+                ? () {
+                    service.cancelDownload(area.id);
+                    setState(() {});
+                  }
+                : null,
+          ),
+          );
+        }).toList(),
+          ],
+        );
+      },
+    );
+  }
+}
+
+class _RefreshAreaDialog extends StatefulWidget {
+  final OfflineArea area;
+  final Function(bool refreshTiles, bool refreshNodes) onRefresh;
+
+  const _RefreshAreaDialog({
+    required this.area,
+    required this.onRefresh,
+  });
+
+  @override
+  State<_RefreshAreaDialog> createState() => _RefreshAreaDialogState();
+}
+
+class _RefreshAreaDialogState extends State<_RefreshAreaDialog> {
+  bool _refreshTiles = true;
+  bool _refreshNodes = true;
+
+  @override
+  Widget build(BuildContext context) {
+    final locService = LocalizationService.instance;
+    
+    return AlertDialog(
+      title: Text(locService.t('offlineAreas.refreshAreaDialogTitle')),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(locService.t('offlineAreas.refreshAreaDialogSubtitle')),
+          const SizedBox(height: 16),
+          CheckboxListTile(
+            title: Text(locService.t('offlineAreas.refreshTiles')),
+            subtitle: Text(locService.t('offlineAreas.refreshTilesSubtitle')),
+            value: _refreshTiles,
+            onChanged: (value) => setState(() => _refreshTiles = value ?? true),
+            dense: true,
+          ),
+          CheckboxListTile(
+            title: Text(locService.t('offlineAreas.refreshNodes')),
+            subtitle: Text(locService.t('offlineAreas.refreshNodesSubtitle')),
+            value: _refreshNodes,
+            onChanged: (value) => setState(() => _refreshNodes = value ?? true),
+            dense: true,
+          ),
+        ],
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: Text(locService.t('actions.cancel')),
+        ),
+        ElevatedButton(
+          onPressed: (_refreshTiles || _refreshNodes)
+              ? () {
+                  Navigator.of(context).pop();
+                  widget.onRefresh(_refreshTiles, _refreshNodes);
+                }
+              : null,
+          child: Text(locService.t('offlineAreas.startRefresh')),
+        ),
+      ],
+    );
+  }
+}

lib/screens/settings/sections/offline_mode_section.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../../app_state.dart';
-import '../../services/offline_area_service.dart';
-import '../../services/localization_service.dart';
+import '../../../app_state.dart';
+import '../../../services/offline_area_service.dart';
+import '../../../services/localization_service.dart';
 
 class OfflineModeSection extends StatelessWidget {
   const OfflineModeSection({super.key});
@@ -61,14 +61,23 @@ class OfflineModeSection extends StatelessWidget {
         final locService = LocalizationService.instance;
         final appState = context.watch<AppState>();
         
-        return ListTile(
-          leading: const Icon(Icons.wifi_off),
-          title: Text(locService.t('settings.offlineMode')),
-          subtitle: Text(locService.t('settings.offlineModeSubtitle')),
-          trailing: Switch(
-            value: appState.offlineMode,
-            onChanged: (value) => _handleOfflineModeChange(context, appState, value),
-          ),
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              locService.t('settings.offlineMode'),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            ListTile(
+              leading: const Icon(Icons.wifi_off),
+              title: Text(locService.t('settings.offlineModeSubtitle')),
+              trailing: Switch(
+                value: appState.offlineMode,
+                onChanged: (value) => _handleOfflineModeChange(context, appState, value),
+              ),
+            ),
+          ],
         );
       },
     );

lib/screens/settings/sections/operator_profiles_section.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 import 'package:provider/provider.dart';
-import '../../app_state.dart';
-import '../../models/operator_profile.dart';
-import '../../services/localization_service.dart';
-import '../operator_profile_editor.dart';
+import '../../../app_state.dart';
+import '../../../models/operator_profile.dart';
+import '../../../services/localization_service.dart';
+import '../../operator_profile_editor.dart';
 
-class OperatorProfileListSection extends StatelessWidget {
-  const OperatorProfileListSection({super.key});
+class OperatorProfilesSection extends StatelessWidget {
+  const OperatorProfilesSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -22,7 +22,10 @@ class OperatorProfileListSection extends StatelessWidget {
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                Text(locService.t('operatorProfiles.title'), style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+                Text(
+                  locService.t('operatorProfiles.title'),
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
                 TextButton.icon(
                   onPressed: () => Navigator.push(
                     context,

lib/screens/settings/sections/proximity_alerts_section.dart

@@ -0,0 +1,221 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+import '../../../app_state.dart';
+import '../../../services/localization_service.dart';
+import '../../../services/proximity_alert_service.dart';
+import '../../../dev_config.dart';
+
+/// Settings section for proximity alerts configuration
+/// Follows brutalist principles: simple, explicit UI that matches existing patterns
+class ProximityAlertsSection extends StatefulWidget {
+  const ProximityAlertsSection({super.key});
+
+  @override
+  State<ProximityAlertsSection> createState() => _ProximityAlertsSectionState();
+}
+
+class _ProximityAlertsSectionState extends State<ProximityAlertsSection> {
+  late final TextEditingController _distanceController;
+  bool _notificationsEnabled = false;
+  bool _checkingPermissions = false;
+
+  @override
+  void initState() {
+    super.initState();
+    final appState = context.read<AppState>();
+    _distanceController = TextEditingController(
+      text: appState.proximityAlertDistance.toString(),
+    );
+    _checkNotificationPermissions();
+  }
+  
+  Future<void> _checkNotificationPermissions() async {
+    setState(() {
+      _checkingPermissions = true;
+    });
+    
+    final enabled = await ProximityAlertService().areNotificationsEnabled();
+    
+    if (mounted) {
+      setState(() {
+        _notificationsEnabled = enabled;
+        _checkingPermissions = false;
+      });
+    }
+  }
+  
+  Future<void> _requestNotificationPermissions() async {
+    setState(() {
+      _checkingPermissions = true;
+    });
+    
+    final enabled = await ProximityAlertService().requestNotificationPermissions();
+    
+    if (mounted) {
+      setState(() {
+        _notificationsEnabled = enabled;
+        _checkingPermissions = false;
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _distanceController.dispose();
+    super.dispose();
+  }
+
+  void _updateDistance(AppState appState) {
+    final text = _distanceController.text.trim();
+    final distance = int.tryParse(text);
+    if (distance != null) {
+      appState.setProximityAlertDistance(distance);
+    } else {
+      // Reset to current value if invalid
+      _distanceController.text = appState.proximityAlertDistance.toString();
+    }
+  }
+
+  @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.proximityAlerts'),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            
+            // Enable/disable toggle
+            SwitchListTile(
+              title: Text(locService.t('proximityAlerts.getNotified')),
+              subtitle: Text(
+                '${locService.t('proximityAlerts.batteryUsage')}\n'
+                '${_notificationsEnabled ? locService.t('proximityAlerts.notificationsEnabled') : locService.t('proximityAlerts.notificationsDisabled')}',
+                style: TextStyle(fontSize: 12),
+              ),
+              value: appState.proximityAlertsEnabled,
+              onChanged: (enabled) {
+                appState.setProximityAlertsEnabled(enabled);
+                if (enabled && !_notificationsEnabled) {
+                  // Automatically try to request permissions when enabling
+                  _requestNotificationPermissions();
+                }
+              },
+              contentPadding: EdgeInsets.zero,
+            ),
+            
+            // Notification permissions section (only show when proximity alerts are enabled)
+            if (appState.proximityAlertsEnabled && !_notificationsEnabled && !_checkingPermissions) ...[
+              const SizedBox(height: 8),
+              Container(
+                padding: const EdgeInsets.all(12),
+                decoration: BoxDecoration(
+                  color: Colors.orange.withOpacity(0.1),
+                  borderRadius: BorderRadius.circular(8),
+                  border: Border.all(color: Colors.orange.withOpacity(0.3)),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Icon(Icons.notifications_off, color: Colors.orange, size: 20),
+                        const SizedBox(width: 8),
+                        Text(
+                          locService.t('proximityAlerts.permissionRequired'),
+                          style: TextStyle(fontWeight: FontWeight.w600),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      locService.t('proximityAlerts.permissionExplanation'),
+                      style: TextStyle(fontSize: 12),
+                    ),
+                    const SizedBox(height: 8),
+                    ElevatedButton.icon(
+                      onPressed: _requestNotificationPermissions,
+                      icon: const Icon(Icons.settings, size: 16),
+                      label: Text(locService.t('proximityAlerts.enableNotifications')),
+                      style: ElevatedButton.styleFrom(
+                        minimumSize: const Size(0, 32),
+                        textStyle: const TextStyle(fontSize: 12),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+            
+            // Loading indicator
+            if (_checkingPermissions) ...[
+              const SizedBox(height: 8),
+              Row(
+                children: [
+                  const SizedBox(
+                    width: 16,
+                    height: 16,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+                  const SizedBox(width: 8),
+                  Text(locService.t('proximityAlerts.checkingPermissions'), style: TextStyle(fontSize: 12)),
+                ],
+              ),
+            ],
+            
+            // Distance setting (only show when enabled)
+            if (appState.proximityAlertsEnabled) ...[
+              const SizedBox(height: 12),
+              Row(
+                children: [
+                  Text(locService.t('proximityAlerts.alertDistance')),
+                  SizedBox(
+                    width: 80,
+                    child: TextField(
+                      controller: _distanceController,
+                      keyboardType: TextInputType.number,
+                      inputFormatters: [
+                        FilteringTextInputFormatter.digitsOnly,
+                      ],
+                      decoration: const InputDecoration(
+                        isDense: true,
+                        contentPadding: EdgeInsets.symmetric(
+                          horizontal: 8, 
+                          vertical: 8,
+                        ),
+                        border: OutlineInputBorder(),
+                      ),
+                      onSubmitted: (_) => _updateDistance(appState),
+                      onEditingComplete: () => _updateDistance(appState),
+                    ),
+                  ),
+                  const SizedBox(width: 8),
+                  Text(locService.t('proximityAlerts.meters')),
+                ],
+              ),
+              const SizedBox(height: 8),
+              Text(
+                locService.t('proximityAlerts.rangeInfo', params: [
+                  kProximityAlertMinDistance.toString(),
+                  kProximityAlertMaxDistance.toString(),
+                  kProximityAlertDefaultDistance.toString(),
+                ]),
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  color: Theme.of(context).textTheme.bodySmall?.color?.withOpacity(0.6),
+                ),
+              ),
+            ],
+          ],
+        );
+      },
+    );
+  }
+}

lib/screens/settings/sections/queue_section.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../../app_state.dart';
-import '../../services/localization_service.dart';
-import '../../state/settings_state.dart';
+import '../../../app_state.dart';
+import '../../../services/localization_service.dart';
+import '../../../state/settings_state.dart';
 
 class QueueSection extends StatelessWidget {
   const QueueSection({super.key});

lib/screens/settings/sections/suspected_locations_section.dart

@@ -0,0 +1,162 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../../../app_state.dart';
+import '../../../services/localization_service.dart';
+import '../../../widgets/suspected_location_progress_dialog.dart';
+
+class SuspectedLocationsSection extends StatelessWidget {
+  const SuspectedLocationsSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: LocalizationService.instance,
+      builder: (context, child) {
+        final locService = LocalizationService.instance;
+        final appState = context.watch<AppState>();
+        final isEnabled = appState.suspectedLocationsEnabled;
+        final isLoading = appState.suspectedLocationsLoading;
+        final lastFetch = appState.suspectedLocationsLastFetch;
+        
+        String getLastFetchText() {
+          if (lastFetch == null) {
+            return locService.t('suspectedLocations.neverFetched');
+          } else {
+            final now = DateTime.now();
+            final diff = now.difference(lastFetch);
+            if (diff.inDays > 0) {
+              return locService.t('suspectedLocations.daysAgo', params: [diff.inDays.toString()]);
+            } else if (diff.inHours > 0) {
+              return locService.t('suspectedLocations.hoursAgo', params: [diff.inHours.toString()]);
+            } else if (diff.inMinutes > 0) {
+              return locService.t('suspectedLocations.minutesAgo', params: [diff.inMinutes.toString()]);
+            } else {
+              return locService.t('suspectedLocations.justNow');
+            }
+          }
+        }
+        
+        Future<void> handleRefresh() async {
+          if (!context.mounted) return;
+          
+          // Show simple progress dialog
+          showDialog(
+            context: context,
+            barrierDismissible: false,
+            builder: (progressContext) => SuspectedLocationProgressDialog(
+              title: locService.t('suspectedLocations.updating'),
+              message: locService.t('suspectedLocations.downloadingAndProcessing'),
+            ),
+          );
+          
+          // Start the refresh
+          final success = await appState.refreshSuspectedLocations();
+          
+          // Close progress dialog
+          if (context.mounted) {
+            Navigator.of(context).pop();
+            
+            // Show result snackbar
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text(success 
+                      ? locService.t('suspectedLocations.updateSuccess')
+                      : locService.t('suspectedLocations.updateFailed')),
+                ),
+              );
+          }
+        }
+        
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              locService.t('suspectedLocations.title'),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            
+            // Enable/disable switch
+            ListTile(
+              leading: const Icon(Icons.help_outline),
+              title: Text(locService.t('suspectedLocations.showSuspectedLocations')),
+              subtitle: Text(locService.t('suspectedLocations.showSuspectedLocationsSubtitle')),
+              trailing: Switch(
+                value: isEnabled,
+                onChanged: (enabled) {
+                  appState.setSuspectedLocationsEnabled(enabled);
+                },
+              ),
+            ),
+            
+            if (isEnabled) ...[
+              const SizedBox(height: 8),
+              
+              // Last update time
+              ListTile(
+                leading: const Icon(Icons.schedule),
+                title: Text(locService.t('suspectedLocations.lastUpdated')),
+                subtitle: Text(getLastFetchText()),
+                trailing: isLoading
+                    ? const SizedBox(
+                        width: 24,
+                        height: 24,
+                        child: CircularProgressIndicator(strokeWidth: 2),
+                      )
+                    : IconButton(
+                        icon: const Icon(Icons.refresh),
+                        onPressed: handleRefresh,
+                        tooltip: locService.t('suspectedLocations.refreshNow'),
+                      ),
+              ),
+              
+              // Data info with credit
+              ListTile(
+                leading: const Icon(Icons.info_outline),
+                title: Text(locService.t('suspectedLocations.dataSource')),
+                subtitle: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(locService.t('suspectedLocations.dataSourceDescription')),
+                    const SizedBox(height: 4),
+                    Text(
+                      locService.t('suspectedLocations.dataSourceCredit'),
+                      style: TextStyle(
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).colorScheme.primary,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              
+              // Minimum distance setting
+              ListTile(
+                leading: const Icon(Icons.social_distance),
+                title: Text(locService.t('suspectedLocations.minimumDistance')),
+                subtitle: Text(locService.t('suspectedLocations.minimumDistanceSubtitle', params: [appState.suspectedLocationMinDistance.toString()])),
+                trailing: SizedBox(
+                  width: 80,
+                  child: TextFormField(
+                    initialValue: appState.suspectedLocationMinDistance.toString(),
+                    keyboardType: TextInputType.number,
+                    decoration: const InputDecoration(
+                      isDense: true,
+                      contentPadding: EdgeInsets.symmetric(vertical: 6, horizontal: 8),
+                      border: OutlineInputBorder(),
+                      suffixText: 'm',
+                    ),
+                    onFieldSubmitted: (value) {
+                      final distance = int.tryParse(value) ?? 100;
+                      appState.setSuspectedLocationMinDistance(distance.clamp(0, 1000));
+                    },
+                  ),
+                ),
+              ),
+            ],
+          ],
+        );
+      },
+    );
+  }
+}