Fix edit submission (addnode version to xml changeset) and improve queue UI upon successful submission. And bump version - patch for 0.9.4.

Edits

README.md

@@ -1,145 +1,139 @@
 # Flock Map App
 
-A Flutter app for mapping and tagging ALPR-style cameras (and other surveillance nodes) for OpenStreetMap, with advanced offline support, robust camera profile management, and a pro-grade UX.
+A comprehensive Flutter app for viewing and mapping surveillance cameras with OpenStreetMap. Includes offline capabilities, editing ability, and an intuitive interface.
+
+**Stop Flock** is a privacy-focused initiative to document the rapid expansion of ALPRs and AI surveillance cameras. This app aims to be the go-to tool for contributors to map cameras in their communities and upload the data to OpenStreetMap, making surveillance infrastructure visible and searchable.
+
+**For complete documentation, tutorials, and community info, visit [stopflock.com/app](https://stopflock.com/app)**
 
 ---
 
-## Code Organization (2025 Refactor)
+## What This App Does
 
-- **Data providers:** All map tile and camera data fetching now routes through `lib/services/map_data_provider.dart`, which supports both OSM/Overpass and fully offline/local sources, with pluggable submodules:
-  - Remote tile fetch: `map_data_submodules/tiles_from_osm.dart`
-  - Remote cameras: `map_data_submodules/cameras_from_overpass.dart`
-  - *Coming soon:* Local tile/camera modules for offline/area-aware access
-- **Settings UI:** Each settings section lives in its own widget under `lib/screens/settings_screen_sections/`, using clean, modular ListTile-based layouts.
-- **Offline areas:** Management, persistence, and download logic remain in `OfflineAreaService`, but all fetch/caching is routed through the new provider.
-- **Legacy OSM/Overpass tile and camera fetch code has been removed from old modules.**
+- **Map surveillance cameras** 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 camera data, plus upload queue
+- **Multiple map types** including satellite imagery from Google, Esri, Mapbox, and OpenStreetMap, plus custom map tile provider support
+- **Editing Ability** to update existing camera locations and properties
+- **Built-in camera profiles** for Flock Safety, Motorola, Genetec, Leonardo, and other major manufacturers, plus custom profiles for more specific tag sets
 
 ---
 
 ## Key Features
 
-### Map Data & Provider Architecture
-- **All map tile and camera fetches** go through MapDataProvider, which selects local or remote sources as needed, automatically obeying the user's offline/online preference and settings.
-- **Offline Mode:** A global toggle in Settings disables all remote network fetches, forcing the app to use only locally downloaded map areas and cached camera data. (Instant feedback; no network calls when enabled.)
-- **MapSource Selection:** MapDataProvider lets calling code specify local-only, remote-only, or auto preference for tiles and camera points.
+### Map & Navigation
+- **Multi-source tiles**: Switch between OpenStreetMap, Google Satellite, Esri imagery, Mapbox, 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
+- **Camera visualization**: Color-coded markers showing real cameras (blue), pending uploads (purple), new cameras (white), edited cameras (grey), and cameras being edited (orange)
 
-### Map View
-- **Seamless offline/online tile loading:** Tiles are fetched (in parallel, with global concurrency/throttle control and exponential backoff) from OSM *only as needed*, with robust error handling and UI updates as tiles arrive.
-- **Camera overlays** are fetched from Overpass or local cache, respecting both offline mode and user preference for which camera types to display.
+### Camera Management
+- **Comprehensive profiles**: Built-in profiles for major manufacturers (Flock, Motorola/Vigilant, Genetec, Leonardo/ELSAG, Neology) plus custom profile creation
+- **Editing capabilities**: Update location, direction, and tags of existing cameras
+- **Direction visualization**: Interactive field-of-view cones showing camera viewing angles
+- **Bulk operations**: Tag multiple cameras efficiently with profile-based workflow
 
-### Camera Profiles & Upload Queue
-- Unchanged: creation/editing/enabling; see prior documentation.
+### Professional Upload & Sync
+- **OpenStreetMap integration**: Direct upload with full OAuth2 authentication
+- **Upload modes**: Production OSM, testing sandbox, or simulate-only mode
+- **Queue management**: Review, edit, retry, or cancel pending uploads
+- **Changeset tracking**: Automatic grouping and commenting for organized contributions
 
-### Offline Map Areas
-- **Download tiles/cameras for any bounding box**; areas cover any region/zoom, and are automatically de-duped and managed.
-- **Robust area downloads** use the same MapDataProvider for source-of-truth logic, so downloads are always consistent with runtime lookup.
-- **Permanent world base map** at low zoom always available for core map functionality, even on first-use/offline.
+### Offline Operations
+- **Smart area downloads**: Automatically calculate tile counts and storage requirements
+- **Camera caching**: Offline areas include camera data for complete functionality without network
+- **Global base map**: Permanent worldwide coverage at low zoom levels
+- **Robust downloads**: Exponential backoff, retry logic, and progress tracking for reliable area downloads
 
-### Modular, Future-friendly Codebase
-- **No network fetch code outside the provider and submodules.**
-- **All legacy/duplicate OSM/Overpass downloaders have been removed or marked for deprecation.**
+---
+
+## Quick Start
+
+1. **Install** the app on iOS or Android
+2. **Enable location** and grant camera permissions  
+3. **Log into OpenStreetMap**: Choose upload mode and get OAuth2 credentials
+4. **Add your first camera**: Tap the "tag camera" button, position the pin, set direction, select a profile, and tap submit
+
+**New to OpenStreetMap?** Visit [stopflock.com/app](https://stopflock.com/app) for complete setup instructions and community guidelines.
 
 ---
 
 ## For Developers
 
-**Highlights:**
-- To add a new data source, just drop in a new submodule and route fetch via MapDataProvider.
-- Any section of the app that needs tiles or camera data calls MapDataProvider with the relevant bounds/zoom/profiles and source preference.
-- Offline Mode and all core settings are strictly respected at a single data/control point.
+### Architecture Highlights
+- **Unified data provider**: All map tiles and camera 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
 
-## Roadmap (2025+)
+```shell
+# Basic setup
+flutter pub get
+cp lib/keys.dart.example lib/keys.dart
+# Add your OAuth2 client IDs to keys.dart
 
-- **COMPLETE:** Core provider logic, settings, robust downloading and modular prefetch/caching.
-- **IN PROGRESS:** Local/offline tile/camera fetch modules for runtime map viewing and offline area management.
-- **NEXT:** More map overlays, offline routing, and data visualization.
-- **SOON:** UX polish for download/error states, multi-layer base maps.
+# iOS additional setup
+cd ios && pod install
 
----
-
-*See prior README version for detailed setup/build/dependency notes—they remain unchanged!*
-
-
-### Map View
-- **Explore the Map:** View OSM raster tiles, live camera overlays, and a visual scale bar and zoom indicator in the lower left.
-- **Tag Cameras:** Add a camera by dropping a pin, setting direction, and choosing a camera profile. Camera tap/double-tap is smart—double-tap always zooms, single-tap opens camera info.
-- **Location:** Blue GPS dot shows your current location, always on top of map icons.
-
-### Camera Profiles
-- **Flexible, Private Profiles:** Enable/disable, create, edit, or delete camera types in Settings. At least one profile must be enabled at all times.
-- If the last enabled profile is disabled, the generic profile will be auto-enabled so the app always works.
-
-### Upload Destinations/Queue
-- **Full OSM OAuth2 Integration:** Upload to live OSM, OSM Sandbox for testing, or keep your changes private in simulate mode.
-- **Queue Management:** Settings screen shows a queue of pending uploads—clear or retry them as you wish.
-
-### Offline Map Areas
-- **Download Any Region, Any Zoom:** Save the current map area at any zoom for true offline viewing.
-- **Intelligent Tile Management:** World tiles at zooms 1–4 are permanently available (via a protected offline area). All downloads include accurate tile and storage estimates, and never request duplicate or unnecessary tiles.
-- **Robust Downloading:** All tile/download logic uses serial fetching and exponential backoff for network failures, minimizing risk of OSM rate-limits and always respecting API etiquette.
-- **No Duplicates:** Only one world area; can be re-downloaded (refreshed) but never deleted or renamed.
-- **Camera Cache:** Download areas keep camera points in sync for full offline visibility—except the global area, which never attempts to fetch all world cameras.
-- **Settings Management:** Cancel, refresh, or remove downloads as needed. Progress, tile count, storage consumption, and cached camera count always displayed.
-
-### Polished UX & Settings Architecture
-- **Permanent global base map:** Coverage for the entire world at zooms 1–4, always present.
-- **Smooth map gestures:** Double-tap to zoom even on markers; pinch zoom; camera popups distinguished from zoom.
-- **Modular Settings:** All major settings/queue/offline/camera management UI sections are cleanly separated for extensibility and rapid development.
-- **Order-preserving overlays:** Your location is always drawn on top for easy visibility.
-- **No more dead ends:** Disabling all profiles is impossible; canceling downloads is clean and instant.
-
----
-
-## OAuth & Build Setup
-
-**Before uploading to OSM:**
-- Register OAuth2 applications on both [Production OSM](https://www.openstreetmap.org/oauth2/applications) and [Sandbox OSM](https://master.apis.dev.openstreetmap.org/oauth2/applications).
-- Copy generated client IDs to `lib/keys.dart` (see template `.example` file).
-
-### Build Environment Notes
-- Requires Xcode, Android Studio, and standard Flutter dependencies. See notes at the end of this file for CLI setup details.
+# Run
+flutter run
+```
 
 ---
 
 ## Roadmap
 
-- **COMPLETE**:  
-  - Offline map area download/storage/camera overlay; cancel/retry; fast tile/camera/size estimates; exponential backoff and robust retry logic for network outages or rate-limiting.
-  - Pro-grade map UX (zoom bar, marker tap/double-tap, robust FABs).
-  - Modularized, maintainable codebase using small service/helper files and section-separated UI components.
-- **SOON**:  
-  - "Offline mode" setting: map never hits the network and always provides a fallback tile for every view (no blank maps; graceful offline-first UX).
-  - Resumable/robust interrupted downloads.
-  - Further polish for edge cases (queue, error states).
-- **LATER**:
-  - Satellite base layers, north-up/satellite-mode.
-  - Offline wayfinding or routing.
-  - Fancier icons and overlays.
+### Current Todo List
+- **Performance**: 1000+ camera warning threshold for large datasets
+- **UX Polish**: 
+  - Fix "tiles loaded" indicator accuracy across different providers
+  - Generic tile provider error messages (not always "OSM tiles slow")
+  - Optional custom icons for camera profiles
+- **Data Management**: Clean up cache when submitted changesets appear in Overpass results
+- **Visual Improvements**: Upgrade camera marker design (considering nullplate's svg)
+
+### Future Features & Wishlist
+- **Operator Profiles**:
+  - Additional tag sets for different surveillance operators
+- **Announcement Mode**:
+  - Location-based notifications when approaching cameras
+- **Enhanced Visualizations**:
+  - Red/yellow ring for cameras missing specific tag details
+  - iOS/Android native themes and dark mode support
+- **Advanced Offline**:
+  - "Cache accumulating" offline areas with size estimates per area
+  - "Offline areas" as tile provider?
+- **Navigation & Search**:
+  - Jump to location by coordinates, address, or POI name
+  - Route planning that avoids surveillance cameras
+- **Data Sources**:
+  - Custom camera providers and OSM/Overpass alternatives
 
 ---
 
-## Build Environment Quick Setup
+## Contributing & Community
 
-# Install from GUI:
-Xcode, Android Studio.
-Xcode cmdline tools
-Android cmdline tools + NDK
+This app is part of the larger **Stop Flock** initiative. Join the community:
 
-# Terminal
-brew install openjdk@17
-sudo ln -sfn /usr/local/opt/openjdk@17/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk
+- **Documentation & Guides**: [stopflock.com/app](https://stopflock.com/app)
+- **Community Discussion**: [stopflock.com](https://stopflock.com)
+- **Issues & Feature Requests**: GitHub Issues
+- **Development**: See developer setup above
 
-brew install ruby
+---
 
-gem install cocoapods
+## Privacy & Ethics
 
-sdkmanager --install "ndk;27.0.12077973"
+This project helps make existing public surveillance infrastructure transparent and searchable. We only document cameras that are already installed and visible in public spaces.
 
-export PATH="/Users/bob/.gem/ruby/3.4.0/bin:$PATH"
-export PATH=$HOME/development/flutter/bin:$PATH
+No user information is ever collected, and no data leaves your device except submissions to OSM and whatever data your tile provider can glean from your requests.
 
-flutter clean
-flutter pub get
-flutter run
+---
+
+## License
+
+This project is open source. See [LICENSE](LICENSE) for details.

lib/app_state.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:latlong2/latlong.dart';
 
 import 'models/camera_profile.dart';
+import 'models/osm_camera_node.dart';
 import 'models/pending_upload.dart';
 import 'models/tile_provider.dart';
 import 'services/offline_area_service.dart';
@@ -11,10 +13,9 @@ import 'state/session_state.dart';
 import 'state/settings_state.dart';
 import 'state/upload_queue_state.dart';
 
-// Re-export types for backward compatibility
+// Re-export types
 export 'state/settings_state.dart' show UploadMode;
-export 'state/session_state.dart' show AddCameraSession;
-export 'models/tile_provider.dart' show TileProviderType;
+export 'state/session_state.dart' show AddCameraSession, EditCameraSession;
 
 // ------------------ AppState ------------------
 class AppState extends ChangeNotifier {
@@ -61,12 +62,19 @@ class AppState extends ChangeNotifier {
   
   // Session state
   AddCameraSession? get session => _sessionState.session;
+  EditCameraSession? get editSession => _sessionState.editSession;
   
   // Settings state
   bool get offlineMode => _settingsState.offlineMode;
   int get maxCameras => _settingsState.maxCameras;
   UploadMode get uploadMode => _settingsState.uploadMode;
-  TileProviderType get tileProvider => _settingsState.tileProvider;
+  
+  // Tile provider state
+  List<TileProvider> get tileProviders => _settingsState.tileProviders;
+  TileType? get selectedTileType => _settingsState.selectedTileType;
+  TileProvider? get selectedTileProvider => _settingsState.selectedTileProvider;
+  
+
   
   // Upload queue state
   int get pendingCount => _uploadQueueState.pendingCount;
@@ -133,6 +141,10 @@ class AppState extends ChangeNotifier {
     _sessionState.startAddSession(enabledProfiles);
   }
 
+  void startEditSession(OsmCameraNode node) {
+    _sessionState.startEditSession(node, enabledProfiles);
+  }
+
   void updateSession({
     double? directionDeg,
     CameraProfile? profile,
@@ -145,14 +157,38 @@ class AppState extends ChangeNotifier {
     );
   }
 
+  void updateEditSession({
+    double? directionDeg,
+    CameraProfile? profile,
+    LatLng? target,
+  }) {
+    _sessionState.updateEditSession(
+      directionDeg: directionDeg,
+      profile: profile,
+      target: target,
+    );
+  }
+
   void cancelSession() {
     _sessionState.cancelSession();
   }
 
+  void cancelEditSession() {
+    _sessionState.cancelEditSession();
+  }
+
   void commitSession() {
     final session = _sessionState.commitSession();
     if (session != null) {
-      _uploadQueueState.addFromSession(session);
+      _uploadQueueState.addFromSession(session, uploadMode: uploadMode);
+      _startUploader();
+    }
+  }
+
+  void commitEditSession() {
+    final session = _sessionState.commitEditSession();
+    if (session != null) {
+      _uploadQueueState.addFromEditSession(session, uploadMode: uploadMode);
       _startUploader();
     }
   }
@@ -179,10 +215,23 @@ class AppState extends ChangeNotifier {
     _startUploader(); // Restart uploader with new mode
   }
 
-  Future<void> setTileProvider(TileProviderType provider) async {
-    await _settingsState.setTileProvider(provider);
+  /// Select a tile type by ID
+  Future<void> setSelectedTileType(String tileTypeId) async {
+    await _settingsState.setSelectedTileType(tileTypeId);
   }
 
+  /// Add or update a tile provider
+  Future<void> addOrUpdateTileProvider(TileProvider provider) async {
+    await _settingsState.addOrUpdateTileProvider(provider);
+  }
+
+  /// Delete a tile provider
+  Future<void> deleteTileProvider(String providerId) async {
+    await _settingsState.deleteTileProvider(providerId);
+  }
+
+
+
   // ---------- Queue Methods ----------
   void clearQueue() {
     _uploadQueueState.clearQueue();

lib/dev_config.dart

@@ -1,4 +1,6 @@
 // lib/dev_config.dart
+import 'package:flutter/material.dart';
+
 /// Developer/build-time configuration for global/non-user-tunable constants.
 const int kWorldMinZoom = 1;
 const int kWorldMaxZoom = 5;
@@ -7,8 +9,9 @@ const int kWorldMaxZoom = 5;
 const double kTileEstimateKb = 25.0;
 
 // Direction cone for map view
-const double kDirectionConeHalfAngle = 20.0; // degrees
-const double kDirectionConeBaseLength = 0.0012; // multiplier
+const double kDirectionConeHalfAngle = 30.0; // degrees
+const double kDirectionConeBaseLength = 0.001; // multiplier
+const Color kDirectionConeColor = Color(0xFF111111); // FOV cone color
 
 // Margin (bottom) for positioning the floating bottom button bar
 const double kBottomButtonBarMargin = 4.0;
@@ -18,18 +21,28 @@ const double kAttributionBottomOffset = 110.0;
 const double kZoomIndicatorBottomOffset = 142.0;
 const double kScaleBarBottomOffset = 170.0;
 
-// Add Camera pin vertical offset (for pin tip to match coordinate on map)
-const double kAddPinYOffset = -16.0;
+// Add Camera icon vertical offset (no offset needed since circle is centered)
+const double kAddPinYOffset = 0.0;
 
 // Client name and version for OSM uploads ("created_by" tag)
 const String kClientName = 'FlockMap';
-const String kClientVersion = '0.8.3';
+const String kClientVersion = '0.9.5';
 
 // Marker/camera interaction
 const int kCameraMinZoomLevel = 10; // Minimum zoom to show cameras or warning
 const Duration kMarkerTapTimeout = Duration(milliseconds: 250);
 const Duration kDebounceCameraRefresh = Duration(milliseconds: 500);
 
+// Follow-me mode smooth transitions
+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';
+const String kFollowMeModeKey = 'follow_me_mode';
+
 // Tile/OSM fetch retry parameters (for tunable backoff)
 const int kTileFetchMaxAttempts = 3;
 const int kTileFetchInitialDelayMs = 4000;
@@ -43,5 +56,15 @@ const int kTileFetchJitter3Ms = 5000;
 const int kMaxUserDownloadZoomSpan = 7;
 
 // Download area limits and constants
-const int kMaxReasonableTileCount = 10000;
+const int kMaxReasonableTileCount = 20000;
 const int kAbsoluteMaxZoom = 19;
+
+// 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 cameras from OSM - blue
+const Color kCameraRingColorMock = Color(0xC4FFFFFF); // Add camera mock point - white
+const Color kCameraRingColorPending = Color(0xC49C27B0); // Submitted/pending cameras - purple
+const Color kCameraRingColorEditing = Color(0xC4FF9800); // Camera being edited - orange
+const Color kCameraRingColorPendingEdit = Color(0xC4757575); // Original camera with pending edit - grey

lib/models/camera_profile.dart

@@ -14,19 +14,103 @@ class CameraProfile {
     this.builtin = false,
   });
 
-  /// Built‑in default: Generic Flock ALPR camera
-  factory CameraProfile.alpr() => CameraProfile(
-        id: 'builtin-alpr',
-        name: 'Generic Flock',
+  /// Built‑in default: Generic ALPR camera (view-only)
+  factory CameraProfile.genericAlpr() => CameraProfile(
+        id: 'builtin-generic-alpr',
+        name: 'Generic ALPR',
         tags: const {
           'man_made': 'surveillance',
           'surveillance:type': 'ALPR',
+        },
+        builtin: true,
+      );
+
+  /// Built‑in: Flock Safety ALPR camera
+  factory CameraProfile.flock() => CameraProfile(
+        id: 'builtin-flock',
+        name: 'Flock',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance': 'public',
+          'surveillance:type': 'ALPR',
+          'surveillance:zone': 'traffic',
+          'camera:type': 'fixed',
           'manufacturer': 'Flock Safety',
           'manufacturer:wikidata': 'Q108485435',
         },
         builtin: true,
       );
 
+  /// Built‑in: Motorola Solutions/Vigilant ALPR camera
+  factory CameraProfile.motorola() => CameraProfile(
+        id: 'builtin-motorola',
+        name: 'Motorola/Vigilant',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance': 'public',
+          'surveillance:type': 'ALPR',
+          'surveillance:zone': 'traffic',
+          'camera:type': 'fixed',
+          'manufacturer': 'Motorola Solutions',
+          'manufacturer:wikidata': 'Q634815',
+        },
+        builtin: true,
+      );
+
+  /// Built‑in: Genetec ALPR camera
+  factory CameraProfile.genetec() => CameraProfile(
+        id: 'builtin-genetec',
+        name: 'Genetec',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance': 'public',
+          'surveillance:type': 'ALPR',
+          'surveillance:zone': 'traffic',
+          'camera:type': 'fixed',
+          'manufacturer': 'Genetec',
+          'manufacturer:wikidata': 'Q30295174',
+        },
+        builtin: true,
+      );
+
+  /// Built‑in: Leonardo/ELSAG ALPR camera
+  factory CameraProfile.leonardo() => CameraProfile(
+        id: 'builtin-leonardo',
+        name: 'Leonardo/ELSAG',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance': 'public',
+          'surveillance:type': 'ALPR',
+          'surveillance:zone': 'traffic',
+          'camera:type': 'fixed',
+          'manufacturer': 'Leonardo',
+          'manufacturer:wikidata': 'Q910379',
+        },
+        builtin: true,
+      );
+
+  /// Built‑in: Neology ALPR camera
+  factory CameraProfile.neology() => CameraProfile(
+        id: 'builtin-neology',
+        name: 'Neology',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance': 'public',
+          'surveillance:type': 'ALPR',
+          'surveillance:zone': 'traffic',
+          'camera:type': 'fixed',
+          'manufacturer': 'Neology, Inc.',
+        },
+        builtin: true,
+      );
+
+  /// Returns true if this profile can be used for submissions
+  bool get isSubmittable {
+    if (!builtin) return true; // All custom profiles are submittable
+    // Only the generic ALPR builtin profile is not submittable
+    return id != 'builtin-generic-alpr';
+  }
+
   CameraProfile copyWith({
     String? id,
     String? name,

lib/models/pending_upload.dart

@@ -1,28 +1,53 @@
 import 'package:latlong2/latlong.dart';
 import 'camera_profile.dart';
+import '../state/settings_state.dart';
 
 class PendingUpload {
   final LatLng coord;
   final double direction;
   final CameraProfile profile;
+  final UploadMode uploadMode; // Capture upload destination when queued
+  final int? originalNodeId; // If this is an edit, the ID of the original OSM node
   int attempts;
   bool error;
+  bool completing; // True when upload succeeded but item is showing checkmark briefly
 
   PendingUpload({
     required this.coord,
     required this.direction,
     required this.profile,
+    required this.uploadMode,
+    this.originalNodeId,
     this.attempts = 0,
     this.error = false,
+    this.completing = false,
   });
 
+  // True if this is an edit of an existing camera, false if it's a new camera
+  bool get isEdit => originalNodeId != null;
+
+  // Get display name for the upload destination
+  String get uploadModeDisplayName {
+    switch (uploadMode) {
+      case UploadMode.production:
+        return 'Production';
+      case UploadMode.sandbox:
+        return 'Sandbox';
+      case UploadMode.simulate:
+        return 'Simulate';
+    }
+  }
+
   Map<String, dynamic> toJson() => {
         'lat': coord.latitude,
         'lon': coord.longitude,
         'dir': direction,
         'profile': profile.toJson(),
+        'uploadMode': uploadMode.index,
+        'originalNodeId': originalNodeId,
         'attempts': attempts,
         'error': error,
+        'completing': completing,
       };
 
   factory PendingUpload.fromJson(Map<String, dynamic> j) => PendingUpload(
@@ -30,9 +55,14 @@ class PendingUpload {
         direction: j['dir'],
         profile: j['profile'] is Map<String, dynamic>
             ? CameraProfile.fromJson(j['profile'])
-            : CameraProfile.alpr(),
+            : CameraProfile.genericAlpr(),
+        uploadMode: j['uploadMode'] != null 
+            ? UploadMode.values[j['uploadMode']] 
+            : UploadMode.production, // Default for legacy entries
+        originalNodeId: j['originalNodeId'],
         attempts: j['attempts'] ?? 0,
         error: j['error'] ?? false,
+        completing: j['completing'] ?? false, // Default to false for legacy entries
       );
 }
 

lib/models/tile_provider.dart

@@ -1,100 +1,214 @@
-enum TileProviderType {
-  osmStreet,
-  googleHybrid,
-  arcgisSatellite,
-  mapboxSatellite,
-}
+import 'dart:convert';
+import 'dart:typed_data';
 
-class TileProviderConfig {
-  final TileProviderType type;
+/// A specific tile type within a provider
+class TileType {
+  final String id;
   final String name;
   final String urlTemplate;
   final String attribution;
-  final bool requiresApiKey;
-  final String? description;
-  
-  const TileProviderConfig({
-    required this.type,
-    required this.name, 
+  final Uint8List? previewTile; // Single tile image data for preview
+
+  const TileType({
+    required this.id,
+    required this.name,
     required this.urlTemplate,
     required this.attribution,
-    this.requiresApiKey = false,
-    this.description,
+    this.previewTile,
   });
 
-  /// Returns the URL template with API key inserted if needed
-  String getUrlTemplate({String? apiKey}) {
-    if (requiresApiKey && apiKey != null) {
-      return urlTemplate.replaceAll('{api_key}', apiKey);
+  /// Create URL for a specific tile, replacing template variables
+  String getTileUrl(int z, int x, int y, {String? apiKey}) {
+    String url = urlTemplate
+        .replaceAll('{z}', z.toString())
+        .replaceAll('{x}', x.toString())
+        .replaceAll('{y}', y.toString());
+    
+    if (apiKey != null && apiKey.isNotEmpty) {
+      url = url.replaceAll('{api_key}', apiKey);
     }
-    return urlTemplate;
+    
+    return url;
   }
 
-  /// Check if this provider is available (has required API key if needed)
-  bool isAvailable({String? apiKey}) {
-    if (requiresApiKey) {
-      return apiKey != null && apiKey.isNotEmpty;
-    }
-    return true;
+  /// Check if this tile type needs an API key
+  bool get requiresApiKey => urlTemplate.contains('{api_key}');
+
+  Map<String, dynamic> toJson() => {
+    'id': id,
+    'name': name,
+    'urlTemplate': urlTemplate,
+    'attribution': attribution,
+    'previewTile': previewTile != null ? base64Encode(previewTile!) : null,
+  };
+
+  static TileType fromJson(Map<String, dynamic> json) => TileType(
+    id: json['id'],
+    name: json['name'],
+    urlTemplate: json['urlTemplate'],
+    attribution: json['attribution'],
+    previewTile: json['previewTile'] != null 
+        ? base64Decode(json['previewTile'])
+        : null,
+  );
+
+  TileType copyWith({
+    String? id,
+    String? name,
+    String? urlTemplate,
+    String? attribution,
+    Uint8List? previewTile,
+  }) => TileType(
+    id: id ?? this.id,
+    name: name ?? this.name,
+    urlTemplate: urlTemplate ?? this.urlTemplate,
+    attribution: attribution ?? this.attribution,
+    previewTile: previewTile ?? this.previewTile,
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is TileType && runtimeType == other.runtimeType && id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}
+
+/// A tile provider containing multiple tile types
+class TileProvider {
+  final String id;
+  final String name;
+  final String? apiKey;
+  final List<TileType> tileTypes;
+
+  const TileProvider({
+    required this.id,
+    required this.name,
+    this.apiKey,
+    required this.tileTypes,
+  });
+
+  /// Check if this provider is usable (has API key if any tile types need it)
+  bool get isUsable {
+    final needsKey = tileTypes.any((type) => type.requiresApiKey);
+    return !needsKey || (apiKey != null && apiKey!.isNotEmpty);
+  }
+
+  /// Get available tile types (those that don't need API key or have one)
+  List<TileType> get availableTileTypes {
+    return tileTypes.where((type) => !type.requiresApiKey || isUsable).toList();
+  }
+
+  Map<String, dynamic> toJson() => {
+    'id': id,
+    'name': name,
+    'apiKey': apiKey,
+    'tileTypes': tileTypes.map((type) => type.toJson()).toList(),
+  };
+
+  static TileProvider fromJson(Map<String, dynamic> json) => TileProvider(
+    id: json['id'],
+    name: json['name'],
+    apiKey: json['apiKey'],
+    tileTypes: (json['tileTypes'] as List)
+        .map((typeJson) => TileType.fromJson(typeJson))
+        .toList(),
+  );
+
+  TileProvider copyWith({
+    String? id,
+    String? name,
+    String? apiKey,
+    List<TileType>? tileTypes,
+  }) => TileProvider(
+    id: id ?? this.id,
+    name: name ?? this.name,
+    apiKey: apiKey ?? this.apiKey,
+    tileTypes: tileTypes ?? this.tileTypes,
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is TileProvider && runtimeType == other.runtimeType && id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}
+
+/// Factory for creating default tile providers
+class DefaultTileProviders {
+  /// Create the default set of tile providers
+  static List<TileProvider> createDefaults() {
+    return [
+      TileProvider(
+        id: 'openstreetmap',
+        name: 'OpenStreetMap',
+        tileTypes: [
+          TileType(
+            id: 'osm_street',
+            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',
+          ),
+        ],
+      ),
+      TileProvider(
+        id: 'mapbox',
+        name: 'Mapbox',
+        tileTypes: [
+          TileType(
+            id: 'mapbox_satellite',
+            name: 'Satellite',
+            urlTemplate: 'https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}@2x.jpg90?access_token={api_key}',
+            attribution: '© Mapbox © Maxar',
+          ),
+          TileType(
+            id: 'mapbox_streets',
+            name: 'Streets',
+            urlTemplate: 'https://api.mapbox.com/styles/v1/mapbox/streets-v12/tiles/{z}/{x}/{y}?access_token={api_key}',
+            attribution: '© Mapbox © OpenStreetMap',
+          ),
+        ],
+      ),
+    ];
   }
 }
 
-/// Built-in tile provider configurations
-class TileProviders {
-  static const osmStreet = TileProviderConfig(
-    type: TileProviderType.osmStreet,
-    name: 'Street Map',
-    urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-    attribution: '© OpenStreetMap contributors',
-    description: 'Standard street map with roads, buildings, and labels',
-  );
-
-  static const googleHybrid = TileProviderConfig(
-    type: TileProviderType.googleHybrid,
-    name: 'Satellite + Roads',
-    urlTemplate: 'https://mt1.google.com/vt/lyrs=y&x={x}&y={y}&z={z}',
-    attribution: '© Google',
-    description: 'Satellite imagery with road and label overlays',
-  );
-
-  static const arcgisSatellite = TileProviderConfig(
-    type: TileProviderType.arcgisSatellite,
-    name: 'Pure Satellite',
-    urlTemplate: 'https://services.arcgisonline.com/ArcGis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}.png',
-    attribution: '© Esri © Maxar',
-    description: 'High-resolution satellite imagery without overlays',
-  );
-
-  static const mapboxSatellite = TileProviderConfig(
-    type: TileProviderType.mapboxSatellite,
-    name: 'Pure Satellite (Mapbox)',
-    urlTemplate: 'https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}@2x.jpg90?access_token={api_key}',
-    attribution: '© Mapbox © Maxar',
-    requiresApiKey: true,
-    description: 'High-resolution satellite imagery without overlays',
-  );
-
-  /// Get all available tile providers (those with API keys if required)
-  static List<TileProviderConfig> getAvailable({String? mapboxApiKey}) {
-    return [
-      osmStreet,
-      googleHybrid,
-      arcgisSatellite,
-      if (mapboxSatellite.isAvailable(apiKey: mapboxApiKey)) mapboxSatellite,
-    ];
-  }
-
-  /// Get provider config by type
-  static TileProviderConfig? getByType(TileProviderType type) {
-    switch (type) {
-      case TileProviderType.osmStreet:
-        return osmStreet;
-      case TileProviderType.googleHybrid:
-        return googleHybrid;
-      case TileProviderType.arcgisSatellite:
-        return arcgisSatellite;
-      case TileProviderType.mapboxSatellite:
-        return mapboxSatellite;
-    }
-  }
-}

lib/screens/home_screen.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map_animations/flutter_map_animations.dart';
 import 'package:provider/provider.dart';
 
 import '../app_state.dart';
@@ -7,9 +8,16 @@ import '../dev_config.dart';
 import '../widgets/map_view.dart';
 
 import '../widgets/add_camera_sheet.dart';
+import '../widgets/edit_camera_sheet.dart';
 import '../widgets/camera_provider_with_cache.dart';
 import '../widgets/download_area_dialog.dart';
 
+enum FollowMeMode {
+  off,      // No following
+  northUp,  // Follow position, keep north up
+  rotating, // Follow position and rotation
+}
+
 class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
 
@@ -17,15 +25,73 @@ class HomeScreen extends StatefulWidget {
   State<HomeScreen> createState() => _HomeScreenState();
 }
 
-class _HomeScreenState extends State<HomeScreen> {
+class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
   final GlobalKey<MapViewState> _mapViewKey = GlobalKey<MapViewState>();
-  final MapController _mapController = MapController();
-  bool _followMe = true;
+  late final AnimatedMapController _mapController;
+  FollowMeMode _followMeMode = FollowMeMode.northUp;
+  bool _editSheetShown = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _mapController = AnimatedMapController(vsync: this);
+    // Load saved follow-me mode
+    _loadFollowMeMode();
+  }
+
+  /// Load the saved follow-me mode
+  Future<void> _loadFollowMeMode() async {
+    final savedMode = await MapViewState.loadFollowMeMode();
+    if (mounted) {
+      setState(() {
+        _followMeMode = savedMode;
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _mapController.dispose();
+    super.dispose();
+  }
+
+  String _getFollowMeTooltip() {
+    switch (_followMeMode) {
+      case FollowMeMode.off:
+        return 'Enable follow-me (north up)';
+      case FollowMeMode.northUp:
+        return 'Enable follow-me (rotating)';
+      case FollowMeMode.rotating:
+        return 'Disable follow-me';
+    }
+  }
+
+  IconData _getFollowMeIcon() {
+    switch (_followMeMode) {
+      case FollowMeMode.off:
+        return Icons.gps_off;
+      case FollowMeMode.northUp:
+        return Icons.gps_fixed;
+      case FollowMeMode.rotating:
+        return Icons.navigation;
+    }
+  }
+
+  FollowMeMode _getNextFollowMeMode() {
+    switch (_followMeMode) {
+      case FollowMeMode.off:
+        return FollowMeMode.northUp;
+      case FollowMeMode.northUp:
+        return FollowMeMode.rotating;
+      case FollowMeMode.rotating:
+        return FollowMeMode.off;
+    }
+  }
 
   void _openAddCameraSheet() {
     // Disable follow-me when adding a camera so the map doesn't jump around
-    setState(() => _followMe = false);
+    setState(() => _followMeMode = FollowMeMode.off);
     
     final appState = context.read<AppState>();
     appState.startAddSession();
@@ -36,10 +102,30 @@ class _HomeScreenState extends State<HomeScreen> {
     );
   }
 
+  void _openEditCameraSheet() {
+    // Disable follow-me when editing a camera so the map doesn't jump around
+    setState(() => _followMeMode = FollowMeMode.off);
+    
+    final appState = context.read<AppState>();
+    final session = appState.editSession!;     // should be non-null when this is called
+
+    _scaffoldKey.currentState!.showBottomSheet(
+      (ctx) => EditCameraSheet(session: session),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final appState = context.watch<AppState>();
 
+    // Auto-open edit sheet when edit session starts
+    if (appState.editSession != null && !_editSheetShown) {
+      _editSheetShown = true;
+      WidgetsBinding.instance.addPostFrameCallback((_) => _openEditCameraSheet());
+    } else if (appState.editSession == null) {
+      _editSheetShown = false;
+    }
+
     return MultiProvider(
       providers: [
         ChangeNotifierProvider<CameraProviderWithCache>(create: (_) => CameraProviderWithCache()),
@@ -50,12 +136,18 @@ class _HomeScreenState extends State<HomeScreen> {
           title: const Text('Flock Map'),
           actions: [
             IconButton(
-              tooltip: _followMe ? 'Disable follow‑me' : 'Enable follow‑me',
-              icon: Icon(_followMe ? Icons.gps_fixed : Icons.gps_off),
+              tooltip: _getFollowMeTooltip(),
+              icon: Icon(_getFollowMeIcon()),
               onPressed: () {
-                setState(() => _followMe = !_followMe);
+                setState(() {
+                  final oldMode = _followMeMode;
+                  _followMeMode = _getNextFollowMeMode();
+                  debugPrint('[HomeScreen] Follow mode changed: $oldMode → $_followMeMode');
+                });
+                // Save the new follow-me mode
+                MapViewState.saveFollowMeMode(_followMeMode);
                 // If enabling follow-me, retry location init in case permission was granted
-                if (_followMe) {
+                if (_followMeMode != FollowMeMode.off) {
                   _mapViewKey.currentState?.retryLocationInit();
                 }
               },
@@ -71,39 +163,13 @@ class _HomeScreenState extends State<HomeScreen> {
             MapView(
               key: _mapViewKey,
               controller: _mapController,
-              followMe: _followMe,
+              followMeMode: _followMeMode,
               onUserGesture: () {
-                if (_followMe) setState(() => _followMe = false);
+                if (_followMeMode != FollowMeMode.off) {
+                  setState(() => _followMeMode = FollowMeMode.off);
+                }
               },
             ),
-            // Zoom buttons
-            Positioned(
-              right: 10,
-              bottom: MediaQuery.of(context).padding.bottom + kBottomButtonBarMargin + 120,
-              child: Column(
-                children: [
-                  FloatingActionButton(
-                    mini: true,
-                    onPressed: () {
-                      final currentZoom = _mapController.camera.zoom;
-                      _mapController.move(_mapController.camera.center, currentZoom + 0.5);
-                    },
-                    child: Icon(Icons.add),
-                    heroTag: 'zoom_in',
-                  ),
-                  SizedBox(height: 8),
-                  FloatingActionButton(
-                    mini: true,
-                    onPressed: () {
-                      final currentZoom = _mapController.camera.zoom;
-                      _mapController.move(_mapController.camera.center, currentZoom - 0.5);
-                    },
-                    child: Icon(Icons.remove),
-                    heroTag: 'zoom_out',
-                  ),
-                ],
-              ),
-            ),
             Align(
               alignment: Alignment.bottomCenter,
               child: Padding(
@@ -140,7 +206,7 @@ class _HomeScreenState extends State<HomeScreen> {
                           label: Text('Download'),
                           onPressed: () => showDialog(
                             context: context,
-                            builder: (ctx) => DownloadAreaDialog(controller: _mapController),
+                            builder: (ctx) => DownloadAreaDialog(controller: _mapController.mapController),
                           ),
                           style: ElevatedButton.styleFrom(
                             minimumSize: Size(0, 48),

lib/screens/profile_editor.dart

@@ -52,14 +52,16 @@ class _ProfileEditorState extends State<ProfileEditor> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title:
-            Text(widget.profile.name.isEmpty ? 'New Profile' : 'Edit Profile'),
+        title: Text(widget.profile.builtin 
+            ? 'View Profile' 
+            : (widget.profile.name.isEmpty ? 'New Profile' : 'Edit Profile')),
       ),
       body: ListView(
         padding: const EdgeInsets.all(16),
         children: [
           TextField(
             controller: _nameCtrl,
+            readOnly: widget.profile.builtin,
             decoration: const InputDecoration(
               labelText: 'Profile name',
               hintText: 'e.g., Custom ALPR Camera',
@@ -71,20 +73,22 @@ class _ProfileEditorState extends State<ProfileEditor> {
             children: [
               const Text('OSM Tags',
                   style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16)),
-              TextButton.icon(
-                onPressed: () => setState(() => _tags.add(const MapEntry('', ''))),
-                icon: const Icon(Icons.add),
-                label: const Text('Add tag'),
-              ),
+              if (!widget.profile.builtin)
+                TextButton.icon(
+                  onPressed: () => setState(() => _tags.add(const MapEntry('', ''))),
+                  icon: const Icon(Icons.add),
+                  label: const Text('Add tag'),
+                ),
             ],
           ),
           const SizedBox(height: 8),
           ..._buildTagRows(),
           const SizedBox(height: 24),
-          ElevatedButton(
-            onPressed: _save,
-            child: const Text('Save Profile'),
-          ),
+          if (!widget.profile.builtin)
+            ElevatedButton(
+              onPressed: _save,
+              child: const Text('Save Profile'),
+            ),
         ],
       ),
     );
@@ -108,7 +112,10 @@ class _ProfileEditorState extends State<ProfileEditor> {
                   isDense: true,
                 ),
                 controller: keyController,
-                onChanged: (v) => _tags[i] = MapEntry(v, _tags[i].value),
+                readOnly: widget.profile.builtin,
+                onChanged: widget.profile.builtin 
+                    ? null 
+                    : (v) => _tags[i] = MapEntry(v, _tags[i].value),
               ),
             ),
             const SizedBox(width: 8),
@@ -121,13 +128,17 @@ class _ProfileEditorState extends State<ProfileEditor> {
                   isDense: true,
                 ),
                 controller: valueController,
-                onChanged: (v) => _tags[i] = MapEntry(_tags[i].key, v),
+                readOnly: widget.profile.builtin,
+                onChanged: widget.profile.builtin 
+                    ? null 
+                    : (v) => _tags[i] = MapEntry(_tags[i].key, v),
               ),
             ),
-            IconButton(
-              icon: const Icon(Icons.delete, color: Colors.red),
-              onPressed: () => setState(() => _tags.removeAt(i)),
-            ),
+            if (!widget.profile.builtin)
+              IconButton(
+                icon: const Icon(Icons.delete, color: Colors.red),
+                onPressed: () => setState(() => _tags.removeAt(i)),
+              ),
           ],
         ),
       );

lib/screens/settings_screen_sections/offline_areas_section.dart

@@ -41,6 +41,7 @@ class _OfflineAreasSectionState extends State<OfflineAreasSection> {
                 : "${(area.sizeBytes / 1024).toStringAsFixed(1)} KB"
             : '--';
         String subtitle =
+            'Provider: ${area.tileProviderDisplay}\n' +
             'Z${area.minZoom}-${area.maxZoom}\n' +
                 'Lat: ${area.bounds.southWest.latitude.toStringAsFixed(3)}, ${area.bounds.southWest.longitude.toStringAsFixed(3)}\n' +
                 'Lat: ${area.bounds.northEast.latitude.toStringAsFixed(3)}, ${area.bounds.northEast.longitude.toStringAsFixed(3)}';
@@ -121,6 +122,10 @@ class _OfflineAreasSectionState extends State<OfflineAreasSection> {
                         name: area.name,
                         onProgress: (progress) {},
                         onComplete: (status) {},
+                        tileProviderId: area.tileProviderId,
+                        tileProviderName: area.tileProviderName,
+                        tileTypeId: area.tileTypeId,
+                        tileTypeName: area.tileTypeName,
                       );
                       setState(() {});
                     },

lib/screens/settings_screen_sections/profile_list_section.dart

@@ -44,42 +44,67 @@ class ProfileListSection extends StatelessWidget {
             ),
             title: Text(p.name),
             subtitle: Text(p.builtin ? 'Built-in' : 'Custom'),
-            trailing: p.builtin ? null : PopupMenuButton(
-              itemBuilder: (context) => [
-                PopupMenuItem(
-                  value: 'edit',
-                  child: const Row(
-                    children: [
-                      Icon(Icons.edit),
-                      SizedBox(width: 8),
-                      Text('Edit'),
-                    ],
-                  ),
-                ),
-                PopupMenuItem(
-                  value: 'delete',
-                  child: const Row(
-                    children: [
-                      Icon(Icons.delete, color: Colors.red),
-                      SizedBox(width: 8),
-                      Text('Delete', style: TextStyle(color: Colors.red)),
-                    ],
-                  ),
-                ),
-              ],
-              onSelected: (value) {
-                if (value == 'edit') {
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (_) => ProfileEditor(profile: p),
+            trailing: p.builtin 
+              ? PopupMenuButton(
+                  itemBuilder: (context) => [
+                    PopupMenuItem(
+                      value: 'view',
+                      child: const Row(
+                        children: [
+                          Icon(Icons.visibility),
+                          SizedBox(width: 8),
+                          Text('View'),
+                        ],
+                      ),
                     ),
-                  );
-                } else if (value == 'delete') {
-                  _showDeleteProfileDialog(context, p);
-                }
-              },
-            ),
+                  ],
+                  onSelected: (value) {
+                    if (value == 'view') {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (_) => ProfileEditor(profile: p),
+                        ),
+                      );
+                    }
+                  },
+                )
+              : PopupMenuButton(
+                  itemBuilder: (context) => [
+                    PopupMenuItem(
+                      value: 'edit',
+                      child: const Row(
+                        children: [
+                          Icon(Icons.edit),
+                          SizedBox(width: 8),
+                          Text('Edit'),
+                        ],
+                      ),
+                    ),
+                    PopupMenuItem(
+                      value: 'delete',
+                      child: const Row(
+                        children: [
+                          Icon(Icons.delete, color: Colors.red),
+                          SizedBox(width: 8),
+                          Text('Delete', style: TextStyle(color: Colors.red)),
+                        ],
+                      ),
+                    ),
+                  ],
+                  onSelected: (value) {
+                    if (value == 'edit') {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (_) => ProfileEditor(profile: p),
+                        ),
+                      );
+                    } else if (value == 'delete') {
+                      _showDeleteProfileDialog(context, p);
+                    }
+                  },
+                ),
           ),
         ),
       ],

lib/screens/settings_screen_sections/queue_section.dart

@@ -1,10 +1,33 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../../app_state.dart';
+import '../../state/settings_state.dart';
 
 class QueueSection extends StatelessWidget {
   const QueueSection({super.key});
 
+  String _getUploadModeDisplayName(UploadMode mode) {
+    switch (mode) {
+      case UploadMode.production:
+        return 'Production';
+      case UploadMode.sandbox:
+        return 'Sandbox';
+      case UploadMode.simulate:
+        return 'Simulate';
+    }
+  }
+
+  Color _getUploadModeColor(UploadMode mode) {
+    switch (mode) {
+      case UploadMode.production:
+        return Colors.green; // Green for production (real)
+      case UploadMode.sandbox:
+        return Colors.orange; // Orange for sandbox (testing)
+      case UploadMode.simulate:
+        return Colors.grey; // Grey for simulate (fake)
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final appState = context.watch<AppState>();
@@ -58,75 +81,86 @@ class QueueSection extends StatelessWidget {
   }
 
   void _showQueueDialog(BuildContext context) {
-    final appState = context.read<AppState>();
     showDialog(
       context: context,
-      builder: (context) => AlertDialog(
-        title: Text('Upload Queue (${appState.pendingCount} items)'),
-        content: SizedBox(
-          width: double.maxFinite,
-          height: 300,
-          child: ListView.builder(
-            itemCount: appState.pendingUploads.length,
-            itemBuilder: (context, index) {
-              final upload = appState.pendingUploads[index];
-              return ListTile(
-                leading: Icon(
-                  upload.error ? Icons.error : Icons.camera_alt,
-                  color: upload.error ? Colors.red : null,
-                ),
-                title: Text('Camera ${index + 1}${upload.error ? " (Error)" : ""}'),
-                subtitle: Text(
-                  'Lat: ${upload.coord.latitude.toStringAsFixed(6)}\n'
-                  'Lon: ${upload.coord.longitude.toStringAsFixed(6)}\n'
-                  'Direction: ${upload.direction.round()}°\n'
-                  'Attempts: ${upload.attempts}' +
-                  (upload.error ? "\nUpload failed. Tap retry to try again." : "")
-                ),
-                trailing: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    if (upload.error)
-                      IconButton(
-                        icon: const Icon(Icons.refresh),
-                        color: Colors.orange,
-                        tooltip: 'Retry upload',
-                        onPressed: () {
-                          appState.retryUpload(upload);
-                        },
-                      ),
-                    IconButton(
-                      icon: const Icon(Icons.delete),
-                      onPressed: () {
-                        appState.removeFromQueue(upload);
-                        if (appState.pendingCount == 0) {
-                          Navigator.pop(context);
-                        }
-                      },
-                    ),
-                  ],
-                ),
-              );
-            },
+      builder: (context) => Consumer<AppState>(
+        builder: (context, appState, child) => AlertDialog(
+          title: Text('Upload Queue (${appState.pendingCount} items)'),
+          content: SizedBox(
+            width: double.maxFinite,
+            height: 300,
+            child: appState.pendingUploads.isEmpty
+                ? const Center(child: Text('Queue is empty'))
+                : ListView.builder(
+                    itemCount: appState.pendingUploads.length,
+                    itemBuilder: (context, index) {
+                      final upload = appState.pendingUploads[index];
+                      return ListTile(
+                        leading: Icon(
+                          upload.error ? Icons.error : Icons.camera_alt,
+                          color: upload.error 
+                              ? Colors.red 
+                              : _getUploadModeColor(upload.uploadMode),
+                        ),
+                        title: Text('Camera ${index + 1}'
+                            '${upload.error ? " (Error)" : ""}'
+                            '${upload.completing ? " (Completing...)" : ""}'),
+                        subtitle: Text(
+                          'Dest: ${_getUploadModeDisplayName(upload.uploadMode)}\n'
+                          'Lat: ${upload.coord.latitude.toStringAsFixed(6)}\n'
+                          'Lon: ${upload.coord.longitude.toStringAsFixed(6)}\n'
+                          'Direction: ${upload.direction.round()}°\n'
+                          'Attempts: ${upload.attempts}' +
+                          (upload.error ? "\nUpload failed. Tap retry to try again." : "")
+                        ),
+                        trailing: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            if (upload.error && !upload.completing)
+                              IconButton(
+                                icon: const Icon(Icons.refresh),
+                                color: Colors.orange,
+                                tooltip: 'Retry upload',
+                                onPressed: () {
+                                  appState.retryUpload(upload);
+                                },
+                              ),
+                            if (upload.completing)
+                              const Icon(Icons.check_circle, color: Colors.green)
+                            else
+                              IconButton(
+                                icon: const Icon(Icons.delete),
+                                onPressed: () {
+                                  appState.removeFromQueue(upload);
+                                  if (appState.pendingCount == 0) {
+                                    Navigator.pop(context);
+                                  }
+                                },
+                              ),
+                          ],
+                        ),
+                      );
+                    },
+                  ),
           ),
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context),
-            child: const Text('Close'),
-          ),
-          if (appState.pendingCount > 1)
+          actions: [
             TextButton(
-              onPressed: () {
-                appState.clearQueue();
-                Navigator.pop(context);
-                ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(content: Text('Queue cleared')),
-                );
-              },
-              child: const Text('Clear All'),
+              onPressed: () => Navigator.pop(context),
+              child: const Text('Close'),
             ),
-        ],
+            if (appState.pendingCount > 1)
+              TextButton(
+                onPressed: () {
+                  appState.clearQueue();
+                  Navigator.pop(context);
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(content: Text('Queue cleared')),
+                  );
+                },
+                child: const Text('Clear All'),
+              ),
+          ],
+        ),
       ),
     );
   }

lib/screens/settings_screen_sections/tile_provider_section.dart

@@ -3,57 +3,35 @@ import 'package:provider/provider.dart';
 
 import '../../app_state.dart';
 import '../../models/tile_provider.dart';
+import '../tile_provider_management_screen.dart';
 
 class TileProviderSection extends StatelessWidget {
   const TileProviderSection({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final appState = context.watch<AppState>();
-    final currentProvider = appState.tileProvider;
-    
-    // Get available providers (for now, all free ones are available)
-    final availableProviders = [
-      TileProviders.osmStreet,
-      TileProviders.googleHybrid,
-      TileProviders.arcgisSatellite,
-      // Don't include Mapbox for now since we don't have API key handling
-    ];
-
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
-          'Map Type',
+          'Map Tiles',
           style: Theme.of(context).textTheme.titleMedium,
         ),
         const SizedBox(height: 8),
-        ...availableProviders.map((config) {
-          final isSelected = config.type == currentProvider;
-          
-          return ListTile(
-            contentPadding: EdgeInsets.zero,
-            leading: Radio<TileProviderType>(
-              value: config.type,
-              groupValue: currentProvider,
-              onChanged: (TileProviderType? value) {
-                if (value != null) {
-                  appState.setTileProvider(value);
-                }
-              },
-            ),
-            title: Text(config.name),
-            subtitle: config.description != null 
-                ? Text(
-                    config.description!,
-                    style: Theme.of(context).textTheme.bodySmall,
-                  )
-                : null,
-            onTap: () {
-              appState.setTileProvider(config.type);
+        SizedBox(
+          width: double.infinity,
+          child: ElevatedButton.icon(
+            onPressed: () {
+              Navigator.of(context).push(
+                MaterialPageRoute(
+                  builder: (context) => const TileProviderManagementScreen(),
+                ),
+              );
             },
-          );
-        }),
+            icon: const Icon(Icons.settings),
+            label: const Text('Manage Providers'),
+          ),
+        ),
       ],
     );
   }

lib/screens/tile_provider_editor_screen.dart

@@ -0,0 +1,415 @@
+import 'dart:typed_data';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:http/http.dart' as http;
+import 'package:collection/collection.dart';
+
+import '../app_state.dart';
+import '../models/tile_provider.dart';
+
+class TileProviderEditorScreen extends StatefulWidget {
+  final TileProvider? provider; // null for adding new provider
+
+  const TileProviderEditorScreen({super.key, this.provider});
+
+  @override
+  State<TileProviderEditorScreen> createState() => _TileProviderEditorScreenState();
+}
+
+class _TileProviderEditorScreenState extends State<TileProviderEditorScreen> {
+  final _formKey = GlobalKey<FormState>();
+  late final TextEditingController _nameController;
+  late final TextEditingController _apiKeyController;
+  late List<TileType> _tileTypes;
+  
+  bool get _isEditing => widget.provider != null;
+
+  @override
+  void initState() {
+    super.initState();
+    final provider = widget.provider;
+    _nameController = TextEditingController(text: provider?.name ?? '');
+    _apiKeyController = TextEditingController(text: provider?.apiKey ?? '');
+    _tileTypes = provider != null 
+        ? List.from(provider.tileTypes)
+        : <TileType>[];
+  }
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    _apiKeyController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(_isEditing ? 'Edit Provider' : 'Add Provider'),
+        actions: [
+          TextButton(
+            onPressed: _saveProvider,
+            child: const Text('Save'),
+          ),
+        ],
+      ),
+      body: Form(
+        key: _formKey,
+        child: ListView(
+          padding: const EdgeInsets.all(16),
+          children: [
+            TextFormField(
+              controller: _nameController,
+              decoration: const InputDecoration(
+                labelText: 'Provider Name',
+                hintText: 'e.g., Custom Maps Inc.',
+              ),
+              validator: (value) {
+                if (value == null || value.trim().isEmpty) {
+                  return 'Provider name is required';
+                }
+                return null;
+              },
+            ),
+            const SizedBox(height: 16),
+            TextFormField(
+              controller: _apiKeyController,
+              decoration: const InputDecoration(
+                labelText: 'API Key (Optional)',
+                hintText: 'Enter API key if required by tile types',
+              ),
+              obscureText: true,
+            ),
+            const SizedBox(height: 32),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  'Tile Types',
+                  style: Theme.of(context).textTheme.headlineSmall,
+                ),
+                TextButton.icon(
+                  onPressed: _addTileType,
+                  icon: const Icon(Icons.add),
+                  label: const Text('Add Type'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
+            if (_tileTypes.isEmpty)
+              const Card(
+                child: Padding(
+                  padding: EdgeInsets.all(16),
+                  child: Text('No tile types configured'),
+                ),
+              )
+            else
+              ..._tileTypes.asMap().entries.map((entry) {
+                final index = entry.key;
+                final tileType = entry.value;
+                
+                return Card(
+                  margin: const EdgeInsets.only(bottom: 8),
+                  child: ListTile(
+                    title: Text(tileType.name),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(tileType.urlTemplate),
+                        Text(
+                          tileType.attribution,
+                          style: Theme.of(context).textTheme.bodySmall,
+                        ),
+                      ],
+                    ),
+                    trailing: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        IconButton(
+                          icon: const Icon(Icons.edit),
+                          onPressed: () => _editTileType(index),
+                        ),
+                        IconButton(
+                          icon: const Icon(Icons.delete),
+                          onPressed: _tileTypes.length > 1 
+                              ? () => _deleteTileType(index)
+                              : null, // Can't delete last tile type
+                        ),
+                      ],
+                    ),
+                    onTap: () => _editTileType(index),
+                  ),
+                );
+              }),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _addTileType() {
+    _showTileTypeDialog();
+  }
+
+  void _editTileType(int index) {
+    _showTileTypeDialog(tileType: _tileTypes[index], index: index);
+  }
+
+  void _deleteTileType(int index) {
+    if (_tileTypes.length <= 1) return;
+    
+    final tileTypeToDelete = _tileTypes[index];
+    final appState = context.read<AppState>();
+    
+    setState(() {
+      _tileTypes.removeAt(index);
+    });
+    
+    // If we're deleting the currently selected tile type, switch to another one
+    if (appState.selectedTileType?.id == tileTypeToDelete.id) {
+      // Find first remaining tile type in this provider or any other provider
+      TileType? replacement;
+      if (_tileTypes.isNotEmpty) {
+        replacement = _tileTypes.first;
+      } else {
+        // Look in other providers
+        for (final provider in appState.tileProviders) {
+          if (provider.availableTileTypes.isNotEmpty) {
+            replacement = provider.availableTileTypes.first;
+            break;
+          }
+        }
+      }
+      
+      if (replacement != null) {
+        appState.setSelectedTileType(replacement.id);
+      }
+    }
+  }
+
+  void _showTileTypeDialog({TileType? tileType, int? index}) {
+    showDialog(
+      context: context,
+      builder: (context) => _TileTypeDialog(
+        tileType: tileType,
+        onSave: (newTileType) {
+          setState(() {
+            if (index != null) {
+              _tileTypes[index] = newTileType;
+            } else {
+              _tileTypes.add(newTileType);
+            }
+          });
+        },
+      ),
+    );
+  }
+
+  void _saveProvider() {
+    if (!_formKey.currentState!.validate()) return;
+    if (_tileTypes.isEmpty) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('At least one tile type is required')),
+      );
+      return;
+    }
+
+    final providerId = widget.provider?.id ?? DateTime.now().millisecondsSinceEpoch.toString();
+    final provider = TileProvider(
+      id: providerId,
+      name: _nameController.text.trim(),
+      apiKey: _apiKeyController.text.trim().isEmpty ? null : _apiKeyController.text.trim(),
+      tileTypes: _tileTypes,
+    );
+
+    context.read<AppState>().addOrUpdateTileProvider(provider);
+    Navigator.of(context).pop();
+  }
+}
+
+class _TileTypeDialog extends StatefulWidget {
+  final TileType? tileType;
+  final Function(TileType) onSave;
+
+  const _TileTypeDialog({
+    required this.onSave,
+    this.tileType,
+  });
+
+  @override
+  State<_TileTypeDialog> createState() => _TileTypeDialogState();
+}
+
+class _TileTypeDialogState extends State<_TileTypeDialog> {
+  final _formKey = GlobalKey<FormState>();
+  late final TextEditingController _nameController;
+  late final TextEditingController _urlController;
+  late final TextEditingController _attributionController;
+  Uint8List? _previewTile;
+  bool _isLoadingPreview = false;
+
+  @override
+  void initState() {
+    super.initState();
+    final tileType = widget.tileType;
+    _nameController = TextEditingController(text: tileType?.name ?? '');
+    _urlController = TextEditingController(text: tileType?.urlTemplate ?? '');
+    _attributionController = TextEditingController(text: tileType?.attribution ?? '');
+    _previewTile = tileType?.previewTile;
+  }
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    _urlController.dispose();
+    _attributionController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(widget.tileType != null ? 'Edit Tile Type' : 'Add Tile Type'),
+      content: SizedBox(
+        width: double.maxFinite,
+        child: Form(
+          key: _formKey,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              TextFormField(
+                controller: _nameController,
+                decoration: const InputDecoration(
+                  labelText: 'Name',
+                  hintText: 'e.g., Satellite',
+                ),
+                validator: (value) => value?.trim().isEmpty == true ? 'Name is required' : null,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _urlController,
+                decoration: const InputDecoration(
+                  labelText: 'URL Template',
+                  hintText: 'https://example.com/{z}/{x}/{y}.png',
+                ),
+                validator: (value) {
+                  if (value?.trim().isEmpty == true) return 'URL template is required';
+                  if (!value!.contains('{z}') || !value.contains('{x}') || !value.contains('{y}')) {
+                    return 'URL must contain {z}, {x}, and {y} placeholders';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _attributionController,
+                decoration: const InputDecoration(
+                  labelText: 'Attribution',
+                  hintText: '© Map Provider',
+                ),
+                validator: (value) => value?.trim().isEmpty == true ? 'Attribution is required' : null,
+              ),
+              const SizedBox(height: 16),
+              Row(
+                children: [
+                  TextButton.icon(
+                    onPressed: _isLoadingPreview ? null : _fetchPreviewTile,
+                    icon: _isLoadingPreview 
+                        ? const SizedBox(
+                            width: 16,
+                            height: 16,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          )
+                        : const Icon(Icons.preview),
+                    label: const Text('Fetch Preview'),
+                  ),
+                  const SizedBox(width: 8),
+                  if (_previewTile != null)
+                    Container(
+                      width: 32,
+                      height: 32,
+                      decoration: BoxDecoration(
+                        border: Border.all(color: Colors.grey),
+                      ),
+                      child: Image.memory(_previewTile!, fit: BoxFit.cover),
+                    ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: const Text('Cancel'),
+        ),
+        TextButton(
+          onPressed: _saveTileType,
+          child: const Text('Save'),
+        ),
+      ],
+    );
+  }
+
+  Future<void> _fetchPreviewTile() async {
+    if (!_formKey.currentState!.validate()) return;
+    
+    setState(() {
+      _isLoadingPreview = true;
+    });
+
+    try {
+      // Use a sample tile (zoom 10, somewhere in the world)
+      final url = _urlController.text
+          .replaceAll('{z}', '10')
+          .replaceAll('{x}', '512')
+          .replaceAll('{y}', '384');
+      
+      final response = await http.get(Uri.parse(url));
+      
+      if (response.statusCode == 200) {
+        setState(() {
+          _previewTile = response.bodyBytes;
+        });
+        
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            const SnackBar(content: Text('Preview tile loaded successfully')),
+          );
+        }
+      } else {
+        throw Exception('HTTP ${response.statusCode}');
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Failed to fetch preview: $e')),
+        );
+      }
+    } finally {
+      setState(() {
+        _isLoadingPreview = false;
+      });
+    }
+  }
+
+  void _saveTileType() {
+    if (!_formKey.currentState!.validate()) return;
+
+    final tileTypeId = widget.tileType?.id ?? 
+        '${_nameController.text.toLowerCase().replaceAll(' ', '_')}_${DateTime.now().millisecondsSinceEpoch}';
+    
+    final tileType = TileType(
+      id: tileTypeId,
+      name: _nameController.text.trim(),
+      urlTemplate: _urlController.text.trim(),
+      attribution: _attributionController.text.trim(),
+      previewTile: _previewTile,
+    );
+
+    widget.onSave(tileType);
+    Navigator.of(context).pop();
+  }
+}

lib/screens/tile_provider_management_screen.dart

@@ -0,0 +1,160 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../app_state.dart';
+import '../models/tile_provider.dart';
+import 'tile_provider_editor_screen.dart';
+
+class TileProviderManagementScreen extends StatelessWidget {
+  const TileProviderManagementScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final appState = context.watch<AppState>();
+    final providers = appState.tileProviders;
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Tile Providers'),
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.add),
+            onPressed: () => _addProvider(context),
+          ),
+        ],
+      ),
+      body: providers.isEmpty
+          ? const Center(
+              child: Text('No tile providers configured'),
+            )
+          : ListView.builder(
+              itemCount: providers.length,
+              itemBuilder: (context, index) {
+                final provider = providers[index];
+                final isSelected = appState.selectedTileProvider?.id == provider.id;
+                
+                return Card(
+                  margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                  child: ListTile(
+                    title: Text(
+                      provider.name,
+                      style: TextStyle(
+                        fontWeight: isSelected ? FontWeight.bold : null,
+                      ),
+                    ),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text('${provider.tileTypes.length} tile types'),
+                        if (provider.apiKey?.isNotEmpty == true)
+                          const Text(
+                            'API Key configured',
+                            style: TextStyle(
+                              fontStyle: FontStyle.italic,
+                              fontSize: 12,
+                            ),
+                          ),
+                        if (!provider.isUsable)
+                          Text(
+                            'Needs API key',
+                            style: TextStyle(
+                              color: Theme.of(context).colorScheme.error,
+                              fontSize: 12,
+                            ),
+                          ),
+                      ],
+                    ),
+                    leading: CircleAvatar(
+                      backgroundColor: isSelected 
+                          ? Theme.of(context).colorScheme.primary
+                          : Theme.of(context).colorScheme.surfaceVariant,
+                      child: Icon(
+                        Icons.map,
+                        color: isSelected 
+                            ? Theme.of(context).colorScheme.onPrimary
+                            : Theme.of(context).colorScheme.onSurfaceVariant,
+                      ),
+                    ),
+                    trailing: providers.length > 1 
+                        ? PopupMenuButton<String>(
+                            onSelected: (action) {
+                              switch (action) {
+                                case 'edit':
+                                  _editProvider(context, provider);
+                                  break;
+                                case 'delete':
+                                  _deleteProvider(context, provider);
+                                  break;
+                              }
+                            },
+                            itemBuilder: (context) => [
+                              const PopupMenuItem(
+                                value: 'edit',
+                                child: Row(
+                                  children: [
+                                    Icon(Icons.edit),
+                                    SizedBox(width: 8),
+                                    Text('Edit'),
+                                  ],
+                                ),
+                              ),
+                              const PopupMenuItem(
+                                value: 'delete',
+                                child: Row(
+                                  children: [
+                                    Icon(Icons.delete),
+                                    SizedBox(width: 8),
+                                    Text('Delete'),
+                                  ],
+                                ),
+                              ),
+                            ],
+                          )
+                        : const Icon(Icons.lock, size: 16), // Can't delete last provider
+                    onTap: () => _editProvider(context, provider),
+                  ),
+                );
+              },
+            ),
+    );
+  }
+
+  void _addProvider(BuildContext context) {
+    Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (context) => const TileProviderEditorScreen(),
+      ),
+    );
+  }
+
+  void _editProvider(BuildContext context, TileProvider provider) {
+    Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (context) => TileProviderEditorScreen(provider: provider),
+      ),
+    );
+  }
+
+  void _deleteProvider(BuildContext context, TileProvider provider) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Delete Provider'),
+        content: Text('Are you sure you want to delete "${provider.name}"?'),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () {
+              context.read<AppState>().deleteTileProvider(provider.id);
+              Navigator.of(context).pop();
+            },
+            child: const Text('Delete'),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/services/camera_cache.dart

@@ -13,7 +13,23 @@ class CameraCache {
   /// Add or update a batch of camera nodes in the cache.
   void addOrUpdate(List<OsmCameraNode> nodes) {
     for (var node in nodes) {
-      _nodes[node.id] = node;
+      final existing = _nodes[node.id];
+      if (existing != null) {
+        // Preserve any tags starting with underscore when updating existing nodes
+        final mergedTags = Map<String, String>.from(node.tags);
+        for (final entry in existing.tags.entries) {
+          if (entry.key.startsWith('_')) {
+            mergedTags[entry.key] = entry.value;
+          }
+        }
+        _nodes[node.id] = OsmCameraNode(
+          id: node.id,
+          coord: node.coord,
+          tags: mergedTags,
+        );
+      } else {
+        _nodes[node.id] = node;
+      }
     }
   }
 

lib/services/map_data_provider.dart

@@ -1,11 +1,12 @@
 import 'package:latlong2/latlong.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter/foundation.dart';
 
 import '../models/camera_profile.dart';
 import '../models/osm_camera_node.dart';
 import '../app_state.dart';
 import 'map_data_submodules/cameras_from_overpass.dart';
-import 'map_data_submodules/tiles_from_osm.dart';
+import 'map_data_submodules/tiles_from_remote.dart';
 import 'map_data_submodules/cameras_from_local.dart';
 import 'map_data_submodules/tiles_from_local.dart';
 
@@ -78,7 +79,7 @@ class MapDataProvider {
           pageSize: AppState.instance.maxCameras,
         );
       } catch (e) {
-        print('[MapDataProvider] Remote camera fetch failed, error: $e. Falling back to local.');
+        debugPrint('[MapDataProvider] Remote camera fetch failed, error: $e. Falling back to local.');
         return fetchLocalCameras(
           bounds: bounds,
           profiles: profiles,
@@ -125,7 +126,7 @@ class MapDataProvider {
       if (offline) {
         throw OfflineModeException("Cannot fetch remote tiles in offline mode.");
       }
-      return fetchOSMTile(z: z, x: x, y: y);
+      return _fetchRemoteTileFromCurrentProvider(z, x, y);
     }
 
     // Explicitly local
@@ -138,15 +139,30 @@ class MapDataProvider {
       return await fetchLocalTile(z: z, x: x, y: y);
     } catch (_) {
       if (!offline) {
-        return fetchOSMTile(z: z, x: x, y: y);
+        return _fetchRemoteTileFromCurrentProvider(z, x, y);
       } else {
         throw OfflineModeException("Tile $z/$x/$y not found in offline areas and offline mode is enabled.");
       }
     }
   }
 
+  /// Fetch remote tile using current provider from AppState
+  Future<List<int>> _fetchRemoteTileFromCurrentProvider(int z, int x, int y) async {
+    final appState = AppState.instance;
+    final selectedTileType = appState.selectedTileType;
+    final selectedProvider = appState.selectedTileProvider;
+    
+    // We guarantee that a provider and tile type are always selected
+    if (selectedTileType == null || selectedProvider == null) {
+      throw Exception('No tile provider selected - this should never happen');
+    }
+    
+    final tileUrl = selectedTileType.getTileUrl(z, x, y, apiKey: selectedProvider.apiKey);
+    return fetchRemoteTile(z: z, x: x, y: y, url: tileUrl);
+  }
+
   /// Clear any queued tile requests (call when map view changes significantly)
   void clearTileQueue() {
-    clearOSMTileQueue();
+    clearRemoteTileQueue();
   }
 }

lib/services/map_data_submodules/cameras_from_overpass.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:http/http.dart' as http;
+import 'package:flutter/foundation.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:flutter_map/flutter_map.dart';
 
@@ -43,15 +44,19 @@ Future<List<OsmCameraNode>> camerasFromOverpass({
       print('[camerasFromOverpass] Querying Overpass...');
       print('[camerasFromOverpass] Query:\n$query');
       final resp = await http.post(Uri.parse(prodEndpoint), body: {'data': query.trim()});
-      print('[camerasFromOverpass] Status: ${resp.statusCode}, Length: ${resp.body.length}');
+      // Only log errors
       if (resp.statusCode != 200) {
-        print('[camerasFromOverpass] Overpass failed: ${resp.body}');
+        debugPrint('[camerasFromOverpass] Overpass failed: ${resp.body}');
         NetworkStatus.instance.reportOverpassIssue();
         return [];
       }
       final data = jsonDecode(resp.body) as Map<String, dynamic>;
       final elements = data['elements'] as List<dynamic>;
-      print('[camerasFromOverpass] Retrieved elements: ${elements.length}');
+      
+      // Only log if many cameras found or if it's a bulk download
+      if (elements.length > 20 || fetchAllPages) {
+        debugPrint('[camerasFromOverpass] Retrieved ${elements.length} cameras');
+      }
       NetworkStatus.instance.reportOverpassSuccess();
       return elements.whereType<Map<String, dynamic>>().map((e) {
         return OsmCameraNode(

lib/services/map_data_submodules/tiles_from_local.dart

@@ -3,9 +3,14 @@ import 'package:latlong2/latlong.dart';
 import '../offline_area_service.dart';
 import '../offline_areas/offline_area_models.dart';
 import '../offline_areas/offline_tile_utils.dart';
+import '../../app_state.dart';
 
-/// Fetch a tile from the newest offline area that plausibly contains it, or throw if not found.
+/// Fetch a tile from the newest offline area that matches the current provider, or throw if not found.
 Future<List<int>> fetchLocalTile({required int z, required int x, required int y}) async {
+  final appState = AppState.instance;
+  final currentProvider = appState.selectedTileProvider;
+  final currentTileType = appState.selectedTileType;
+  
   final offlineService = OfflineAreaService();
   await offlineService.ensureInitialized();
   final areas = offlineService.offlineAreas;
@@ -14,6 +19,9 @@ Future<List<int>> fetchLocalTile({required int z, required int x, required int y
   for (final area in areas) {
     if (area.status != OfflineAreaStatus.complete) continue;
     if (z < area.minZoom || z > area.maxZoom) continue;
+    
+    // Only consider areas that match the current provider/type
+    if (area.tileProviderId != currentProvider?.id || area.tileTypeId != currentTileType?.id) continue;
 
     // Get tile coverage for area at this zoom only
     final coveredTiles = computeTileList(area.bounds, z, z);
@@ -28,7 +36,7 @@ Future<List<int>> fetchLocalTile({required int z, required int x, required int y
     }
   }
   if (candidates.isEmpty) {
-    throw Exception('Tile $z/$x/$y not found in any offline area');
+    throw Exception('Tile $z/$x/$y from current provider ${currentProvider?.id}/${currentTileType?.id} not found in any offline area');
   }
   candidates.sort((a, b) => b.modified.compareTo(a.modified)); // newest first
   return await candidates.first.file.readAsBytes();

lib/services/map_data_submodules/tiles_from_remote.dart

@@ -10,19 +10,24 @@ import '../network_status.dart';
 final _tileFetchSemaphore = _SimpleSemaphore(4); // Max 4 concurrent
 
 /// Clear queued tile requests when map view changes significantly
-void clearOSMTileQueue() {
+void clearRemoteTileQueue() {
   final clearedCount = _tileFetchSemaphore.clearQueue();
-  debugPrint('[OSMTiles] Cleared $clearedCount queued tile requests');
+  // Only log if we actually cleared something significant
+  if (clearedCount > 5) {
+    debugPrint('[RemoteTiles] Cleared $clearedCount queued tile requests');
+  }
 }
 
-/// Fetches a tile from OSM, with in-memory retries/backoff, and global concurrency limit.
+
+
+/// Fetches a tile from any remote provider, with in-memory retries/backoff, and global concurrency limit.
 /// Returns tile image bytes, or throws on persistent failure.
-Future<List<int>> fetchOSMTile({
+Future<List<int>> fetchRemoteTile({
   required int z,
   required int x,
   required int y,
+  required String url,
 }) async {
-  final url = 'https://tile.openstreetmap.org/$z/$x/$y.png';
   const int maxAttempts = kTileFetchMaxAttempts;
   int attempt = 0;
   final random = Random();
@@ -32,40 +37,44 @@ Future<List<int>> fetchOSMTile({
     kTileFetchThirdDelayMs + random.nextInt(kTileFetchJitter3Ms),
   ];
   
+  final hostInfo = Uri.parse(url).host; // For logging
+
   while (true) {
     await _tileFetchSemaphore.acquire();
     try {
-      print('[fetchOSMTile] FETCH $z/$x/$y');
+      // Only log on first attempt or errors
+      if (attempt == 1) {
+        debugPrint('[fetchRemoteTile] Fetching $z/$x/$y from $hostInfo');
+      }
       attempt++;
       final resp = await http.get(Uri.parse(url));
-      print('[fetchOSMTile] HTTP ${resp.statusCode} for $z/$x/$y, length=${resp.bodyBytes.length}');
       
       if (resp.statusCode == 200 && resp.bodyBytes.isNotEmpty) {
-        print('[fetchOSMTile] SUCCESS $z/$x/$y');
-        NetworkStatus.instance.reportOsmTileSuccess();
+        // Success - no logging for normal operation
+        NetworkStatus.instance.reportOsmTileSuccess(); // Generic tile server reporting
         return resp.bodyBytes;
       } else {
-        print('[fetchOSMTile] FAIL $z/$x/$y: code=${resp.statusCode}, bytes=${resp.bodyBytes.length}');
-        NetworkStatus.instance.reportOsmTileIssue();
-        throw HttpException('Failed to fetch tile $z/$x/$y: status ${resp.statusCode}');
+        debugPrint('[fetchRemoteTile] FAIL $z/$x/$y from $hostInfo: code=${resp.statusCode}, bytes=${resp.bodyBytes.length}');
+        NetworkStatus.instance.reportOsmTileIssue(); // Generic tile server reporting
+        throw HttpException('Failed to fetch tile $z/$x/$y from $hostInfo: status ${resp.statusCode}');
       }
     } catch (e) {
-      print('[fetchOSMTile] Exception $z/$x/$y: $e');
-      
       // Report network issues on connection errors
       if (e.toString().contains('Connection refused') || 
           e.toString().contains('Connection timed out') ||
           e.toString().contains('Connection reset')) {
-        NetworkStatus.instance.reportOsmTileIssue();
+        NetworkStatus.instance.reportOsmTileIssue(); // Generic tile server reporting
       }
       
       if (attempt >= maxAttempts) {
-        print("[fetchOSMTile] Failed for $z/$x/$y after $attempt attempts: $e");
+        debugPrint("[fetchRemoteTile] Failed for $z/$x/$y from $hostInfo after $attempt attempts: $e");
         rethrow;
       }
       
       final delay = delays[attempt - 1].clamp(0, 60000);
-      print("[fetchOSMTile] Attempt $attempt for $z/$x/$y failed: $e. Retrying in ${delay}ms.");
+      if (attempt == 1) {
+        debugPrint("[fetchRemoteTile] Attempt $attempt for $z/$x/$y from $hostInfo failed: $e. Retrying in ${delay}ms.");
+      }
       await Future.delayed(Duration(milliseconds: delay));
     } finally {
       _tileFetchSemaphore.release();
@@ -73,6 +82,21 @@ Future<List<int>> fetchOSMTile({
   }
 }
 
+/// Legacy function for backward compatibility
+@Deprecated('Use fetchRemoteTile instead')
+Future<List<int>> fetchOSMTile({
+  required int z,
+  required int x,
+  required int y,
+}) async {
+  return fetchRemoteTile(
+    z: z,
+    x: x,
+    y: y,
+    url: 'https://tile.openstreetmap.org/$z/$x/$y.png',
+  );
+}
+
 /// Simple counting semaphore, suitable for single-thread Flutter concurrency
 class _SimpleSemaphore {
   final int _max;

lib/services/network_status.dart

@@ -4,7 +4,7 @@ import 'dart:async';
 import '../app_state.dart';
 
 enum NetworkIssueType { osmTiles, overpassApi, both }
-enum NetworkStatusType { waiting, issues, timedOut, noData, ready }
+enum NetworkStatusType { waiting, issues, timedOut, noData, ready, success }
 
 class NetworkStatus extends ChangeNotifier {
   static final NetworkStatus instance = NetworkStatus._();
@@ -15,11 +15,13 @@ class NetworkStatus extends ChangeNotifier {
   bool _isWaitingForData = false;
   bool _isTimedOut = false;
   bool _hasNoData = false;
+  bool _hasSuccess = false;
   int _recentOfflineMisses = 0;
   Timer? _osmRecoveryTimer;
   Timer? _overpassRecoveryTimer;
   Timer? _waitingTimer;
   Timer? _noDataResetTimer;
+  Timer? _successResetTimer;
 
   // Getters
   bool get hasAnyIssues => _osmTilesHaveIssues || _overpassHasIssues;
@@ -28,12 +30,14 @@ class NetworkStatus extends ChangeNotifier {
   bool get isWaitingForData => _isWaitingForData;
   bool get isTimedOut => _isTimedOut;
   bool get hasNoData => _hasNoData;
+  bool get hasSuccess => _hasSuccess;
   
   NetworkStatusType get currentStatus {
     if (hasAnyIssues) return NetworkStatusType.issues;
     if (_isWaitingForData) return NetworkStatusType.waiting;
     if (_isTimedOut) return NetworkStatusType.timedOut;
     if (_hasNoData) return NetworkStatusType.noData;
+    if (_hasSuccess) return NetworkStatusType.success;
     return NetworkStatusType.ready;
   }
 
@@ -44,12 +48,12 @@ class NetworkStatus extends ChangeNotifier {
     return null;
   }
 
-  /// Report OSM tile server issues
+  /// Report tile server issues (for any provider)
   void reportOsmTileIssue() {
     if (!_osmTilesHaveIssues) {
       _osmTilesHaveIssues = true;
       notifyListeners();
-      debugPrint('[NetworkStatus] OSM tile server issues detected');
+      debugPrint('[NetworkStatus] Tile server issues detected');
     }
     
     // Reset recovery timer - if we keep getting errors, keep showing indicator
@@ -57,7 +61,7 @@ class NetworkStatus extends ChangeNotifier {
     _osmRecoveryTimer = Timer(const Duration(minutes: 2), () {
       _osmTilesHaveIssues = false;
       notifyListeners();
-      debugPrint('[NetworkStatus] OSM tile server issues cleared');
+      debugPrint('[NetworkStatus] Tile server issues cleared');
     });
   }
 
@@ -82,7 +86,7 @@ class NetworkStatus extends ChangeNotifier {
   void reportOsmTileSuccess() {
     // Clear issues immediately on success (they were likely temporary)
     if (_osmTilesHaveIssues) {
-      debugPrint('[NetworkStatus] OSM tile server issues cleared after success');
+      // Quietly clear - don't log routine success
       _osmTilesHaveIssues = false;
       _osmRecoveryTimer?.cancel();
       notifyListeners();
@@ -91,7 +95,7 @@ class NetworkStatus extends ChangeNotifier {
 
   void reportOverpassSuccess() {
     if (_overpassHasIssues) {
-      debugPrint('[NetworkStatus] Overpass API issues cleared after success');
+      // Quietly clear - don't log routine success
       _overpassHasIssues = false;
       _overpassRecoveryTimer?.cancel();
       notifyListeners();
@@ -109,40 +113,76 @@ class NetworkStatus extends ChangeNotifier {
     if (!_isWaitingForData) {
       _isWaitingForData = true;
       notifyListeners();
-      debugPrint('[NetworkStatus] Waiting for data...');
+      // Don't log routine waiting - only log if we stay waiting too long
     }
     
-    // Set timeout to show appropriate status after reasonable time
+    // Set timeout for genuine network issues (not 404s)
     _waitingTimer?.cancel();
-    _waitingTimer = Timer(const Duration(seconds: 10), () {
+    _waitingTimer = Timer(const Duration(seconds: 8), () {
       _isWaitingForData = false;
-      
-      // If in offline mode, this is "no data" not "timed out"
-      if (AppState.instance.offlineMode) {
-        _hasNoData = true;
-        debugPrint('[NetworkStatus] No offline data available (timeout in offline mode)');
-      } else {
-        _isTimedOut = true;
-        debugPrint('[NetworkStatus] Data request timed out (online mode)');
-      }
-      
+      _isTimedOut = true;
+      debugPrint('[NetworkStatus] Request timed out - likely network issues');
       notifyListeners();
     });
   }
   
-  /// Clear waiting/timeout/no-data status when data arrives
+  /// Show success status briefly when data loads
+  void setSuccess() {
+    _isWaitingForData = false;
+    _isTimedOut = false;
+    _hasNoData = false;
+    _hasSuccess = true;
+    _recentOfflineMisses = 0;
+    _waitingTimer?.cancel();
+    _noDataResetTimer?.cancel();
+    notifyListeners();
+    
+    // Auto-clear success status after 2 seconds
+    _successResetTimer?.cancel();
+    _successResetTimer = Timer(const Duration(seconds: 2), () {
+      if (_hasSuccess) {
+        _hasSuccess = false;
+        notifyListeners();
+      }
+    });
+  }
+
+  /// Show no-data status briefly when tiles aren't available
+  void setNoData() {
+    _isWaitingForData = false;
+    _isTimedOut = false;
+    _hasSuccess = false;
+    _hasNoData = true;
+    _waitingTimer?.cancel();
+    _successResetTimer?.cancel();
+    notifyListeners();
+    
+    // Auto-clear no-data status after 2 seconds
+    _noDataResetTimer?.cancel();
+    _noDataResetTimer = Timer(const Duration(seconds: 2), () {
+      if (_hasNoData) {
+        _hasNoData = false;
+        notifyListeners();
+      }
+    });
+  }
+
+  /// Clear waiting/timeout/no-data status (legacy method for compatibility)
   void clearWaiting() {
-    if (_isWaitingForData || _isTimedOut || _hasNoData) {
+    if (_isWaitingForData || _isTimedOut || _hasNoData || _hasSuccess) {
       _isWaitingForData = false;
       _isTimedOut = false;
       _hasNoData = false;
+      _hasSuccess = false;
       _recentOfflineMisses = 0;
       _waitingTimer?.cancel();
       _noDataResetTimer?.cancel();
+      _successResetTimer?.cancel();
       notifyListeners();
-      debugPrint('[NetworkStatus] Waiting/timeout/no-data status cleared - data arrived');
     }
   }
+
+
   
   /// Report that a tile was not available offline
   void reportOfflineMiss() {

lib/services/offline_area_service.dart

@@ -60,6 +60,7 @@ class OfflineAreaService {
     
     await _loadAreasFromDisk();
     await WorldAreaManager.ensureWorldArea(_areas, getOfflineAreaDir, downloadArea);
+    await saveAreasToDisk(); // Save any world area updates
     _initialized = true;
   }
 
@@ -182,6 +183,10 @@ class OfflineAreaService {
     void Function(double progress)? onProgress,
     void Function(OfflineAreaStatus status)? onComplete,
     String? name,
+    String? tileProviderId,
+    String? tileProviderName,
+    String? tileTypeId,
+    String? tileTypeName,
   }) async {
     OfflineArea? area;
     for (final a in _areas) {
@@ -202,21 +207,25 @@ class OfflineAreaService {
       maxZoom: maxZoom,
       directory: directory,
       isPermanent: area?.isPermanent ?? false,
+      tileProviderId: tileProviderId,
+      tileProviderName: tileProviderName,
+      tileTypeId: tileTypeId,
+      tileTypeName: tileTypeName,
     );
     _areas.add(area);
     await saveAreasToDisk();
 
     try {
-      final success = await OfflineAreaDownloader.downloadArea(
-        area: area,
-        bounds: bounds,
-        minZoom: minZoom,
-        maxZoom: maxZoom,
-        directory: directory,
-        onProgress: onProgress,
-        saveAreasToDisk: saveAreasToDisk,
-        getAreaSizeBytes: getAreaSizeBytes,
-      );
+    final success = await OfflineAreaDownloader.downloadArea(
+      area: area,
+      bounds: bounds,
+      minZoom: minZoom,
+      maxZoom: maxZoom,
+      directory: directory,
+      onProgress: onProgress,
+      saveAreasToDisk: saveAreasToDisk,
+      getAreaSizeBytes: getAreaSizeBytes,
+    );
 
       await getAreaSizeBytes(area);
 

lib/services/offline_areas/offline_area_downloader.dart

@@ -27,7 +27,6 @@ class OfflineAreaDownloader {
     required Future<void> Function() saveAreasToDisk,
     required Future<void> Function(OfflineArea) getAreaSizeBytes,
   }) async {
-    // Calculate tiles to download
     Set<List<int>> allTiles;
     if (area.isPermanent) {
       allTiles = computeTileList(globalWorldBounds(), kWorldMinZoom, kWorldMaxZoom);
@@ -81,7 +80,7 @@ class OfflineAreaDownloader {
       for (final tile in tilesToFetch) {
         if (area.status == OfflineAreaStatus.cancelled) break;
         
-        if (await _downloadSingleTile(tile, directory)) {
+        if (await _downloadSingleTile(tile, directory, area)) {
           totalDone++;
           area.tilesDownloaded = totalDone;
           area.progress = area.tilesTotal == 0 ? 0.0 : (totalDone / area.tilesTotal);
@@ -102,14 +101,20 @@ class OfflineAreaDownloader {
     return false; // Failed after max retries
   }
 
-  /// Download a single tile
-  static Future<bool> _downloadSingleTile(List<int> tile, String directory) async {
+  /// Download a single tile using the unified MapDataProvider path
+  static Future<bool> _downloadSingleTile(
+    List<int> tile, 
+    String directory, 
+    OfflineArea area,
+  ) async {
     try {
+      // Use the same unified path as live tiles: always go through MapDataProvider
+      // MapDataProvider will use current AppState provider for downloads
       final bytes = await MapDataProvider().getTile(
         z: tile[0], 
         x: tile[1], 
         y: tile[2], 
-        source: MapSource.remote,
+        source: MapSource.remote, // Force remote fetch for downloads
       );
       if (bytes.isNotEmpty) {
         await OfflineAreaDownloader.saveTileBytes(tile[0], tile[1], tile[2], directory, bytes);
@@ -144,11 +149,11 @@ class OfflineAreaDownloader {
     final cameraBounds = _calculateCameraBounds(bounds, minZoom);
     final cameras = await MapDataProvider().getAllCamerasForDownload(
       bounds: cameraBounds,
-      profiles: AppState.instance.enabledProfiles,
+      profiles: AppState.instance.profiles, // Use ALL profiles, not just enabled ones
     );
     area.cameras = cameras;
     await OfflineAreaDownloader.saveCameras(cameras, directory);
-    debugPrint('Area ${area.id}: Downloaded ${cameras.length} cameras from expanded bounds');
+    debugPrint('Area ${area.id}: Downloaded ${cameras.length} cameras from expanded bounds (all profiles)');
   }
 
   /// Calculate expanded bounds that cover the entire tile area at minimum zoom

lib/services/offline_areas/offline_area_models.dart

@@ -20,6 +20,12 @@ class OfflineArea {
   List<OsmCameraNode> cameras;
   int sizeBytes; // Disk size in bytes
   final bool isPermanent; // Not user-deletable if true
+  
+  // Tile provider metadata (null for legacy areas)
+  final String? tileProviderId;
+  final String? tileProviderName;
+  final String? tileTypeId;
+  final String? tileTypeName;
 
   OfflineArea({
     required this.id,
@@ -35,6 +41,10 @@ class OfflineArea {
     this.cameras = const [],
     this.sizeBytes = 0,
     this.isPermanent = false,
+    this.tileProviderId,
+    this.tileProviderName,
+    this.tileTypeId,
+    this.tileTypeName,
   });
 
   Map<String, dynamic> toJson() => {
@@ -54,6 +64,10 @@ class OfflineArea {
     'cameras': cameras.map((c) => c.toJson()).toList(),
     'sizeBytes': sizeBytes,
     'isPermanent': isPermanent,
+    'tileProviderId': tileProviderId,
+    'tileProviderName': tileProviderName,
+    'tileTypeId': tileTypeId,
+    'tileTypeName': tileTypeName,
   };
 
   static OfflineArea fromJson(Map<String, dynamic> json) {
@@ -77,6 +91,27 @@ class OfflineArea {
           .map((e) => OsmCameraNode.fromJson(e)).toList(),
       sizeBytes: json['sizeBytes'] ?? 0,
       isPermanent: json['isPermanent'] ?? false,
+      tileProviderId: json['tileProviderId'],
+      tileProviderName: json['tileProviderName'],
+      tileTypeId: json['tileTypeId'],
+      tileTypeName: json['tileTypeName'],
     );
   }
+
+  /// Get display text for the tile provider used in this area
+  String get tileProviderDisplay {
+    if (tileProviderName != null && tileTypeName != null) {
+      return '$tileProviderName - $tileTypeName';
+    } else if (tileTypeName != null) {
+      return tileTypeName!;
+    } else if (tileProviderName != null) {
+      return tileProviderName!;
+    } else {
+      // Legacy area - assume OSM
+      return 'OpenStreetMap (Legacy)';
+    }
+  }
+
+  /// Check if this area has tile provider metadata
+  bool get hasTileProviderInfo => tileProviderId != null && tileTypeId != null;
 }

lib/services/offline_areas/world_area_manager.dart

@@ -23,6 +23,10 @@ class WorldAreaManager {
       required int maxZoom,
       required String directory,
       String? name,
+      String? tileProviderId,
+      String? tileProviderName,
+      String? tileTypeId,
+      String? tileTypeName,
     }) downloadArea,
   ) async {
     // Find existing world area
@@ -34,7 +38,7 @@ class WorldAreaManager {
       }
     }
 
-    // Create world area if it doesn't exist
+    // Create world area if it doesn't exist, or update existing area without provider info
     if (world == null) {
       final appDocDir = await getOfflineAreaDir();
       final dir = "${appDocDir.path}/$_worldAreaId";
@@ -47,8 +51,38 @@ class WorldAreaManager {
         directory: dir,
         status: OfflineAreaStatus.downloading,
         isPermanent: true,
+        // World area always uses OpenStreetMap
+        tileProviderId: 'openstreetmap',
+        tileProviderName: 'OpenStreetMap',
+        tileTypeId: 'osm_street',
+        tileTypeName: 'Street Map',
       );
       areas.insert(0, world);
+    } else if (world.tileProviderId == null || world.tileTypeId == null) {
+      // Update existing world area that lacks provider metadata
+      final updatedWorld = OfflineArea(
+        id: world.id,
+        name: world.name,
+        bounds: world.bounds,
+        minZoom: world.minZoom,
+        maxZoom: world.maxZoom,
+        directory: world.directory,
+        status: world.status,
+        progress: world.progress,
+        tilesDownloaded: world.tilesDownloaded,
+        tilesTotal: world.tilesTotal,
+        cameras: world.cameras,
+        sizeBytes: world.sizeBytes,
+        isPermanent: world.isPermanent,
+        // Add missing provider metadata
+        tileProviderId: 'openstreetmap',
+        tileProviderName: 'OpenStreetMap',
+        tileTypeId: 'osm_street',
+        tileTypeName: 'Street Map',
+      );
+      final index = areas.indexOf(world);
+      areas[index] = updatedWorld;
+      world = updatedWorld;
     }
 
     // Check world area status and start download if needed
@@ -66,6 +100,10 @@ class WorldAreaManager {
       required int maxZoom,
       required String directory,
       String? name,
+      String? tileProviderId,
+      String? tileProviderName,
+      String? tileTypeId,
+      String? tileTypeName,
     }) downloadArea,
   ) async {
     if (world.status == OfflineAreaStatus.complete) return;
@@ -97,7 +135,7 @@ class WorldAreaManager {
       world.status = OfflineAreaStatus.downloading;
       debugPrint('WorldAreaManager: Starting world area download. ${world.tilesDownloaded}/${world.tilesTotal} tiles found.');
       
-      // Start download (fire and forget)
+      // Start download (fire and forget) - use OSM for world areas
       downloadArea(
         id: world.id,
         bounds: world.bounds,
@@ -105,6 +143,10 @@ class WorldAreaManager {
         maxZoom: world.maxZoom,
         directory: world.directory,
         name: world.name,
+        tileProviderId: 'openstreetmap',
+        tileProviderName: 'OpenStreetMap',
+        tileTypeId: 'osm_street',
+        tileTypeName: 'Street Map',
       );
     }
   }

lib/services/simple_tile_service.dart

@@ -13,47 +13,52 @@ class SimpleTileHttpClient extends http.BaseClient {
 
   @override
   Future<http.StreamedResponse> send(http.BaseRequest request) async {
-    // Only intercept tile requests to OSM (for now - other providers pass through)
-    if (request.url.host == 'tile.openstreetmap.org') {
-      return _handleTileRequest(request);
+    // Extract tile coordinates from our custom URL scheme
+    final tileCoords = _extractTileCoords(request.url);
+    if (tileCoords != null) {
+      final z = tileCoords['z']!;
+      final x = tileCoords['x']!;
+      final y = tileCoords['y']!;
+      return _handleTileRequest(z, x, y);
     }
     
-    // Pass through all other requests (Google, Mapbox, etc.)
+    // Pass through non-tile requests
     return _inner.send(request);
   }
 
-  Future<http.StreamedResponse> _handleTileRequest(http.BaseRequest request) async {
-    final pathSegments = request.url.pathSegments;
+  /// Extract z/x/y coordinates from our fake domain: https://tiles.local/provider/type/z/x/y
+  /// We ignore the provider/type in the URL since we use current AppState for actual fetching
+  Map<String, int>? _extractTileCoords(Uri url) {
+    if (url.host != 'tiles.local') return null;
     
-    // Parse z/x/y from URL like: /15/5242/12666.png
-    if (pathSegments.length == 3) {
-      final z = int.tryParse(pathSegments[0]);
-      final x = int.tryParse(pathSegments[1]);
-      final yPng = pathSegments[2];
-      final y = int.tryParse(yPng.replaceAll('.png', ''));
-      
-      if (z != null && x != null && y != null) {
-        return _getTile(z, x, y);
-      }
+    final pathSegments = url.pathSegments;
+    if (pathSegments.length != 5) return null;
+    
+    // pathSegments[0] = providerId (for cache separation only)
+    // pathSegments[1] = tileTypeId (for cache separation only) 
+    final z = int.tryParse(pathSegments[2]);
+    final x = int.tryParse(pathSegments[3]);
+    final y = int.tryParse(pathSegments[4]);
+    
+    if (z != null && x != null && y != null) {
+      return {'z': z, 'x': x, 'y': y};
     }
     
-    // Malformed tile URL - pass through to OSM
-    return _inner.send(request);
+    return null;
   }
 
-  Future<http.StreamedResponse> _getTile(int z, int x, int y) async {
+  Future<http.StreamedResponse> _handleTileRequest(int z, int x, int y) async {
     try {
-      // First try to get tile from offline storage
-      final localTileBytes = await _mapDataProvider.getTile(z: z, x: x, y: y, source: MapSource.local);
+      // Always go through MapDataProvider - it handles offline/online routing
+      // MapDataProvider will get current provider from AppState
+      final tileBytes = await _mapDataProvider.getTile(z: z, x: x, y: y, source: MapSource.auto);
       
-      debugPrint('[SimpleTileService] Serving tile $z/$x/$y from offline storage');
+      // Show success status briefly
+      NetworkStatus.instance.setSuccess();
       
-      // Clear waiting status - we got data
-      NetworkStatus.instance.clearWaiting();
-      
-      // Serve offline tile with proper cache headers
+      // Serve tile with proper cache headers
       return http.StreamedResponse(
-        Stream.value(localTileBytes),
+        Stream.value(tileBytes),
         200,
         headers: {
           'Content-Type': 'image/png',
@@ -64,39 +69,17 @@ class SimpleTileHttpClient extends http.BaseClient {
       );
       
     } catch (e) {
-      // No offline tile available
-      debugPrint('[SimpleTileService] No offline tile for $z/$x/$y');
+      debugPrint('[SimpleTileService] Could not get tile $z/$x/$y: $e');
       
-      // Check if we're in offline mode
-      if (AppState.instance.offlineMode) {
-        debugPrint('[SimpleTileService] Offline mode - not attempting OSM fetch for $z/$x/$y');
-        // Report that we couldn't serve this tile offline
-        NetworkStatus.instance.reportOfflineMiss();
-        return http.StreamedResponse(
-          Stream.value(<int>[]),
-          404,
-          reasonPhrase: 'Tile not available offline',
-        );
-      }
+      // 404 means no tiles available - show "no data" status briefly
+      NetworkStatus.instance.setNoData();
       
-      // We're online - try OSM with proper error handling
-      debugPrint('[SimpleTileService] Online mode - trying OSM for $z/$x/$y');
-      try {
-        final response = await _inner.send(http.Request('GET', Uri.parse('https://tile.openstreetmap.org/$z/$x/$y.png')));
-        // Clear waiting status on successful network tile
-        if (response.statusCode == 200) {
-          NetworkStatus.instance.clearWaiting();
-        }
-        return response;
-      } catch (networkError) {
-        debugPrint('[SimpleTileService] OSM request failed for $z/$x/$y: $networkError');
-        // Return 404 instead of throwing - let flutter_map handle gracefully
-        return http.StreamedResponse(
-          Stream.value(<int>[]),
-          404,
-          reasonPhrase: 'Network tile unavailable: $networkError',
-        );
-      }
+      // Return 404 and let flutter_map handle it gracefully
+      return http.StreamedResponse(
+        Stream.value(<int>[]),
+        404,
+        reasonPhrase: 'Tile unavailable: $e',
+      );
     }
   }
 

lib/services/uploader.dart

@@ -17,11 +17,12 @@ class Uploader {
       print('Uploader: Starting upload for camera at ${p.coord.latitude}, ${p.coord.longitude}');
       
       // 1. open changeset
+      final action = p.isEdit ? 'Update' : 'Add';
       final csXml = '''
         <osm>
           <changeset>
             <tag k="created_by" v="$kClientName $kClientVersion"/>
-            <tag k="comment" v="Add surveillance camera"/>
+            <tag k="comment" v="$action ${p.profile.name} surveillance camera"/>
           </changeset>
         </osm>''';
       print('Uploader: Creating changeset...');
@@ -34,28 +35,64 @@ class Uploader {
       final csId = csResp.body.trim();
       print('Uploader: Created changeset ID: $csId');
 
-      // 2. create node
-      // Merge tags: direction in PendingUpload should always be present,
-      // and override any in the profile for upload purposes
+      // 2. create or update node
       final mergedTags = Map<String, String>.from(p.profile.tags)
         ..['direction'] = p.direction.round().toString();
       final tagsXml = mergedTags.entries.map((e) =>
         '<tag k="${e.key}" v="${e.value}"/>').join('\n            ');
-      final nodeXml = '''
+      
+      final http.Response nodeResp;
+      final String nodeId;
+      
+      if (p.isEdit) {
+        // First, fetch the current node to get its version
+        print('Uploader: Fetching current node ${p.originalNodeId} to get version...');
+        final currentNodeResp = await _get('/api/0.6/node/${p.originalNodeId}');
+        print('Uploader: Current node response: ${currentNodeResp.statusCode}');
+        if (currentNodeResp.statusCode != 200) {
+          print('Uploader: Failed to fetch current node');
+          return false;
+        }
+        
+        // Parse version from the response XML
+        final currentNodeXml = currentNodeResp.body;
+        final versionMatch = RegExp(r'version="(\d+)"').firstMatch(currentNodeXml);
+        if (versionMatch == null) {
+          print('Uploader: Could not parse version from current node XML');
+          return false;
+        }
+        final currentVersion = versionMatch.group(1)!;
+        print('Uploader: Current node version: $currentVersion');
+        
+        // Update existing node with version
+        final nodeXml = '''
+        <osm>
+          <node changeset="$csId" id="${p.originalNodeId}" version="$currentVersion" lat="${p.coord.latitude}" lon="${p.coord.longitude}">
+            $tagsXml
+          </node>
+        </osm>''';
+        print('Uploader: Updating node ${p.originalNodeId}...');
+        nodeResp = await _put('/api/0.6/node/${p.originalNodeId}', nodeXml);
+        nodeId = p.originalNodeId.toString();
+      } else {
+        // Create new node
+        final nodeXml = '''
         <osm>
           <node changeset="$csId" lat="${p.coord.latitude}" lon="${p.coord.longitude}">
             $tagsXml
           </node>
         </osm>''';
-      print('Uploader: Creating node...');
-      final nodeResp = await _put('/api/0.6/node/create', nodeXml);
+        print('Uploader: Creating new node...');
+        nodeResp = await _put('/api/0.6/node/create', nodeXml);
+        nodeId = nodeResp.body.trim();
+      }
+      
       print('Uploader: Node response: ${nodeResp.statusCode} - ${nodeResp.body}');
       if (nodeResp.statusCode != 200) {
-        print('Uploader: Failed to create node');
+        print('Uploader: Failed to ${p.isEdit ? "update" : "create"} node');
         return false;
       }
-      final nodeId = nodeResp.body.trim();
-      print('Uploader: Created node ID: $nodeId');
+      print('Uploader: ${p.isEdit ? "Updated" : "Created"} node ID: $nodeId');
 
       // 3. close changeset
       print('Uploader: Closing changeset...');
@@ -81,6 +118,11 @@ class Uploader {
     }
   }
 
+  Future<http.Response> _get(String path) => http.get(
+        Uri.https(_host, path),
+        headers: _headers,
+      );
+
   Future<http.Response> _post(String path, String body) => http.post(
         Uri.https(_host, path),
         headers: _headers,

lib/state/profile_state.dart

@@ -19,7 +19,12 @@ class ProfileState extends ChangeNotifier {
   // Initialize profiles from built-in and custom sources
   Future<void> init() async {
     // Initialize profiles: built-in + custom
-    _profiles.add(CameraProfile.alpr());
+    _profiles.add(CameraProfile.genericAlpr());
+    _profiles.add(CameraProfile.flock());
+    _profiles.add(CameraProfile.motorola());
+    _profiles.add(CameraProfile.genetec());
+    _profiles.add(CameraProfile.leonardo());
+    _profiles.add(CameraProfile.neology());
     _profiles.addAll(await ProfileService().load());
 
     // Load enabled profile IDs from prefs

lib/state/session_state.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';
 
 import '../models/camera_profile.dart';
+import '../models/osm_camera_node.dart';
 
 // ------------------ AddCameraSession ------------------
 class AddCameraSession {
@@ -11,17 +12,75 @@ class AddCameraSession {
   LatLng? target;
 }
 
+// ------------------ EditCameraSession ------------------
+class EditCameraSession {
+  EditCameraSession({
+    required this.originalNode,
+    required this.profile,
+    required this.directionDegrees,
+    required this.target,
+  });
+  
+  final OsmCameraNode originalNode; // The original camera being edited
+  CameraProfile profile;
+  double directionDegrees;
+  LatLng target; // Current position (can be dragged)
+}
+
 class SessionState extends ChangeNotifier {
   AddCameraSession? _session;
+  EditCameraSession? _editSession;
 
-  // Getter
+  // Getters
   AddCameraSession? get session => _session;
+  EditCameraSession? get editSession => _editSession;
 
   void startAddSession(List<CameraProfile> enabledProfiles) {
-    _session = AddCameraSession(profile: enabledProfiles.first);
+    final submittableProfiles = enabledProfiles.where((p) => p.isSubmittable).toList();
+    final defaultProfile = submittableProfiles.isNotEmpty 
+        ? submittableProfiles.first 
+        : enabledProfiles.first; // Fallback to any enabled profile
+    _session = AddCameraSession(profile: defaultProfile);
+    _editSession = null; // Clear any edit session
     notifyListeners();
   }
 
+  void startEditSession(OsmCameraNode node, List<CameraProfile> enabledProfiles) {
+    final submittableProfiles = enabledProfiles.where((p) => p.isSubmittable).toList();
+    
+    // Try to find a matching profile based on the node's tags
+    CameraProfile matchingProfile = submittableProfiles.isNotEmpty 
+        ? submittableProfiles.first 
+        : enabledProfiles.first;
+    
+    // Attempt to find a better match by comparing tags
+    for (final profile in submittableProfiles) {
+      if (_profileMatchesTags(profile, node.tags)) {
+        matchingProfile = profile;
+        break;
+      }
+    }
+    
+    _editSession = EditCameraSession(
+      originalNode: node,
+      profile: matchingProfile,
+      directionDegrees: node.directionDeg ?? 0,
+      target: node.coord,
+    );
+    _session = null; // Clear any add session
+    notifyListeners();
+  }
+
+  bool _profileMatchesTags(CameraProfile profile, Map<String, String> tags) {
+    // Simple matching: check if all profile tags are present in node tags
+    for (final entry in profile.tags.entries) {
+      if (tags[entry.key] != entry.value) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   void updateSession({
     double? directionDeg,
     CameraProfile? profile,
@@ -45,11 +104,39 @@ class SessionState extends ChangeNotifier {
     if (dirty) notifyListeners();
   }
 
+  void updateEditSession({
+    double? directionDeg,
+    CameraProfile? profile,
+    LatLng? target,
+  }) {
+    if (_editSession == null) return;
+
+    bool dirty = false;
+    if (directionDeg != null && directionDeg != _editSession!.directionDegrees) {
+      _editSession!.directionDegrees = directionDeg;
+      dirty = true;
+    }
+    if (profile != null && profile != _editSession!.profile) {
+      _editSession!.profile = profile;
+      dirty = true;
+    }
+    if (target != null && target != _editSession!.target) {
+      _editSession!.target = target;
+      dirty = true;
+    }
+    if (dirty) notifyListeners();
+  }
+
   void cancelSession() {
     _session = null;
     notifyListeners();
   }
 
+  void cancelEditSession() {
+    _editSession = null;
+    notifyListeners();
+  }
+
   AddCameraSession? commitSession() {
     if (_session?.target == null) return null;
     
@@ -58,4 +145,13 @@ class SessionState extends ChangeNotifier {
     notifyListeners();
     return session;
   }
+
+  EditCameraSession? commitEditSession() {
+    if (_editSession == null) return null;
+    
+    final session = _editSession!;
+    _editSession = null;
+    notifyListeners();
+    return session;
+  }
 }

lib/state/settings_state.dart

@@ -1,5 +1,7 @@
+import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:collection/collection.dart';
 
 import '../models/tile_provider.dart';
 
@@ -10,19 +12,55 @@ class SettingsState extends ChangeNotifier {
   static const String _offlineModePrefsKey = 'offline_mode';
   static const String _maxCamerasPrefsKey = 'max_cameras';
   static const String _uploadModePrefsKey = 'upload_mode';
-  static const String _tileProviderPrefsKey = 'tile_provider';
+  static const String _tileProvidersPrefsKey = 'tile_providers';
+  static const String _selectedTileTypePrefsKey = 'selected_tile_type';
   static const String _legacyTestModePrefsKey = 'test_mode';
 
   bool _offlineMode = false;
   int _maxCameras = 250;
   UploadMode _uploadMode = UploadMode.simulate;
-  TileProviderType _tileProvider = TileProviderType.osmStreet;
+  List<TileProvider> _tileProviders = [];
+  String _selectedTileTypeId = '';
 
   // Getters
   bool get offlineMode => _offlineMode;
   int get maxCameras => _maxCameras;
   UploadMode get uploadMode => _uploadMode;
-  TileProviderType get tileProvider => _tileProvider;
+  List<TileProvider> get tileProviders => List.unmodifiable(_tileProviders);
+  String get selectedTileTypeId => _selectedTileTypeId;
+  
+  /// Get the currently selected tile type
+  TileType? get selectedTileType {
+    for (final provider in _tileProviders) {
+      for (final tileType in provider.tileTypes) {
+        if (tileType.id == _selectedTileTypeId) {
+          return tileType;
+        }
+      }
+    }
+    return null;
+  }
+  
+  /// Get the provider that contains the selected tile type
+  TileProvider? get selectedTileProvider {
+    for (final provider in _tileProviders) {
+      if (provider.tileTypes.any((type) => type.id == _selectedTileTypeId)) {
+        return provider;
+      }
+    }
+    return null;
+  }
+  
+  /// Get all available tile types from all providers
+  List<TileType> get allAvailableTileTypes {
+    final types = <TileType>[];
+    for (final provider in _tileProviders) {
+      types.addAll(provider.availableTileTypes);
+    }
+    return types;
+  }
+
+
 
   // Initialize settings from preferences
   Future<void> init() async {
@@ -50,15 +88,53 @@ class SettingsState extends ChangeNotifier {
       await prefs.setInt(_uploadModePrefsKey, _uploadMode.index);
     }
     
-    // Load tile provider
-    if (prefs.containsKey(_tileProviderPrefsKey)) {
-      final idx = prefs.getInt(_tileProviderPrefsKey) ?? 0;
-      if (idx >= 0 && idx < TileProviderType.values.length) {
-        _tileProvider = TileProviderType.values[idx];
+    // Load tile providers (default to built-in providers if none saved)
+    await _loadTileProviders(prefs);
+    
+    // Load selected tile type (default to first available)
+    _selectedTileTypeId = prefs.getString(_selectedTileTypePrefsKey) ?? '';
+    if (_selectedTileTypeId.isEmpty || selectedTileType == null) {
+      final firstType = allAvailableTileTypes.firstOrNull;
+      if (firstType != null) {
+        _selectedTileTypeId = firstType.id;
+        await prefs.setString(_selectedTileTypePrefsKey, _selectedTileTypeId);
       }
     }
   }
 
+  Future<void> _loadTileProviders(SharedPreferences prefs) async {
+    if (prefs.containsKey(_tileProvidersPrefsKey)) {
+      try {
+        final providersJson = prefs.getString(_tileProvidersPrefsKey);
+        if (providersJson != null) {
+          final providersList = jsonDecode(providersJson) as List;
+          _tileProviders = providersList
+              .map((json) => TileProvider.fromJson(json))
+              .toList();
+        }
+      } catch (e) {
+        debugPrint('Error loading tile providers: $e');
+        // Fall back to defaults on error
+        _tileProviders = DefaultTileProviders.createDefaults();
+      }
+    } else {
+      // First time - use defaults
+      _tileProviders = DefaultTileProviders.createDefaults();
+      await _saveTileProviders(prefs);
+    }
+  }
+
+  Future<void> _saveTileProviders(SharedPreferences prefs) async {
+    try {
+      final providersJson = jsonEncode(
+        _tileProviders.map((provider) => provider.toJson()).toList(),
+      );
+      await prefs.setString(_tileProvidersPrefsKey, providersJson);
+    } catch (e) {
+      debugPrint('Error saving tile providers: $e');
+    }
+  }
+
   Future<void> setOfflineMode(bool enabled) async {
     _offlineMode = enabled;
     final prefs = await SharedPreferences.getInstance();
@@ -82,10 +158,58 @@ class SettingsState extends ChangeNotifier {
     notifyListeners();
   }
 
-  Future<void> setTileProvider(TileProviderType provider) async {
-    _tileProvider = provider;
+  /// Select a tile type by ID
+  Future<void> setSelectedTileType(String tileTypeId) async {
+    if (_selectedTileTypeId != tileTypeId) {
+      _selectedTileTypeId = tileTypeId;
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString(_selectedTileTypePrefsKey, tileTypeId);
+      notifyListeners();
+    }
+  }
+
+  /// Add or update a tile provider
+  Future<void> addOrUpdateTileProvider(TileProvider provider) async {
+    final existingIndex = _tileProviders.indexWhere((p) => p.id == provider.id);
+    if (existingIndex >= 0) {
+      _tileProviders[existingIndex] = provider;
+    } else {
+      _tileProviders.add(provider);
+    }
+    
     final prefs = await SharedPreferences.getInstance();
-    await prefs.setInt(_tileProviderPrefsKey, provider.index);
+    await _saveTileProviders(prefs);
     notifyListeners();
   }
+
+  /// Delete a tile provider
+  Future<void> deleteTileProvider(String providerId) async {
+    // Don't allow deleting all providers
+    if (_tileProviders.length <= 1) return;
+    
+    final providerToDelete = _tileProviders.firstWhereOrNull((p) => p.id == providerId);
+    if (providerToDelete == null) return;
+    
+    // If selected tile type belongs to this provider, switch to another
+    if (providerToDelete.tileTypes.any((type) => type.id == _selectedTileTypeId)) {
+      // Find first available tile type from remaining providers
+      final remainingProviders = _tileProviders.where((p) => p.id != providerId).toList();
+      final firstAvailable = remainingProviders
+          .expand((p) => p.availableTileTypes)
+          .firstOrNull;
+      
+      if (firstAvailable != null) {
+        _selectedTileTypeId = firstAvailable.id;
+        final prefs = await SharedPreferences.getInstance();
+        await prefs.setString(_selectedTileTypePrefsKey, _selectedTileTypeId);
+      }
+    }
+    
+    _tileProviders.removeWhere((p) => p.id == providerId);
+    final prefs = await SharedPreferences.getInstance();
+    await _saveTileProviders(prefs);
+    notifyListeners();
+  }
+
+
 }

lib/state/upload_queue_state.dart

@@ -25,11 +25,12 @@ class UploadQueueState extends ChangeNotifier {
   }
 
   // Add a completed session to the upload queue
-  void addFromSession(AddCameraSession session) {
+  void addFromSession(AddCameraSession session, {required UploadMode uploadMode}) {
     final upload = PendingUpload(
       coord: session.target!,
       direction: session.directionDegrees,
       profile: session.profile,
+      uploadMode: uploadMode,
     );
     
     _queue.add(upload);
@@ -56,6 +57,51 @@ class UploadQueueState extends ChangeNotifier {
     notifyListeners();
   }
 
+  // Add a completed edit session to the upload queue
+  void addFromEditSession(EditCameraSession session, {required UploadMode uploadMode}) {
+    final upload = PendingUpload(
+      coord: session.target,
+      direction: session.directionDegrees,
+      profile: session.profile,
+      uploadMode: uploadMode,
+      originalNodeId: session.originalNode.id, // Track which node we're editing
+    );
+    
+    _queue.add(upload);
+    _saveQueue();
+    
+    // Create two cache entries:
+    
+    // 1. Mark the original camera with _pending_edit (grey ring) at original location
+    final originalTags = Map<String, String>.from(session.originalNode.tags);
+    originalTags['_pending_edit'] = 'true'; // Mark original as having pending edit
+    
+    final originalNode = OsmCameraNode(
+      id: session.originalNode.id,
+      coord: session.originalNode.coord, // Keep at original location
+      tags: originalTags,
+    );
+    
+    // 2. Create new temp node for the edited camera (purple ring) at new location
+    final tempId = -DateTime.now().millisecondsSinceEpoch;
+    final editedTags = Map<String, String>.from(upload.profile.tags);
+    editedTags['direction'] = upload.direction.toStringAsFixed(0);
+    editedTags['_pending_upload'] = 'true'; // Mark as pending upload
+    editedTags['_original_node_id'] = session.originalNode.id.toString(); // Track original for line drawing
+    
+    final editedNode = OsmCameraNode(
+      id: tempId,
+      coord: upload.coord, // At new location
+      tags: editedTags,
+    );
+    
+    CameraCache.instance.addOrUpdate([originalNode, editedNode]);
+    // Notify camera provider to update the map
+    CameraProviderWithCache.instance.notifyListeners();
+    
+    notifyListeners();
+  }
+
   void clearQueue() {
     _queue.clear();
     _saveQueue();
@@ -101,25 +147,24 @@ class UploadQueueState extends ChangeNotifier {
       if (access == null) return; // not logged in
 
       bool ok;
-      if (uploadMode == UploadMode.simulate) {
+      debugPrint('[UploadQueue] Processing item with uploadMode: ${item.uploadMode}');
+      if (item.uploadMode == UploadMode.simulate) {
         // Simulate successful upload without calling real API
+        debugPrint('[UploadQueue] Simulating upload (no real API call)');
         await Future.delayed(const Duration(seconds: 1)); // Simulate network delay
         ok = true;
       } else {
-        // Real upload -- pass uploadMode so uploader can switch between prod and sandbox
+        // Real upload -- use the upload mode that was saved when this item was queued
+        debugPrint('[UploadQueue] Real upload to: ${item.uploadMode}');
         final up = Uploader(access, () {
-          _queue.remove(item);
-          _saveQueue();
-          notifyListeners();
-        }, uploadMode: uploadMode);
+          _markAsCompleting(item);
+        }, uploadMode: item.uploadMode);
         ok = await up.upload(item);
       }
 
-      if (ok && uploadMode == UploadMode.simulate) {
-        // Remove manually for simulate mode
-        _queue.remove(item);
-        _saveQueue();
-        notifyListeners();
+      if (ok && item.uploadMode == UploadMode.simulate) {
+        // Mark as completing for simulate mode too
+        _markAsCompleting(item);
       }
       if (!ok) {
         item.attempts++;
@@ -140,6 +185,20 @@ class UploadQueueState extends ChangeNotifier {
     _uploadTimer?.cancel();
   }
 
+  // Mark an item as completing (shows checkmark) and schedule removal after 1 second
+  void _markAsCompleting(PendingUpload item) {
+    item.completing = true;
+    _saveQueue();
+    notifyListeners();
+    
+    // Remove the item after 1 second
+    Timer(const Duration(seconds: 1), () {
+      _queue.remove(item);
+      _saveQueue();
+      notifyListeners();
+    });
+  }
+
   // ---------- Queue persistence ----------
   Future<void> _saveQueue() async {
     final prefs = await SharedPreferences.getInstance();

lib/widgets/add_camera_sheet.dart

@@ -26,8 +26,8 @@ class AddCameraSheet extends StatelessWidget {
       Navigator.pop(context);
     }
 
-    final customProfiles = appState.enabledProfiles.where((p) => !p.builtin).toList();
-    final allowSubmit = customProfiles.isNotEmpty && !session.profile.builtin;
+    final submittableProfiles = appState.enabledProfiles.where((p) => p.isSubmittable).toList();
+    final allowSubmit = submittableProfiles.isNotEmpty && session.profile.isSubmittable;
 
     return Padding(
       padding:
@@ -49,7 +49,7 @@ class AddCameraSheet extends StatelessWidget {
             title: const Text('Profile'),
             trailing: DropdownButton<CameraProfile>(
               value: session.profile,
-              items: appState.enabledProfiles
+              items: submittableProfiles
                   .map((p) => DropdownMenuItem(value: p, child: Text(p.name)))
                   .toList(),
               onChanged: (p) =>
@@ -67,7 +67,7 @@ class AddCameraSheet extends StatelessWidget {
               onChanged: (v) => appState.updateSession(directionDeg: v),
             ),
           ),
-          if (customProfiles.isEmpty)
+          if (submittableProfiles.isEmpty)
             Padding(
               padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
               child: Row(
@@ -76,14 +76,14 @@ class AddCameraSheet extends StatelessWidget {
                   SizedBox(width: 6),
                   Expanded(
                     child: Text(
-                      'Enable or create a custom profile in Settings to submit new cameras.',
+                      'Enable a submittable profile in Settings to submit new cameras.',
                       style: TextStyle(color: Colors.red, fontSize: 13),
                     ),
                   ),
                 ],
               ),
             )
-          else if (session.profile.builtin)
+          else if (!session.profile.isSubmittable)
             Padding(
               padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
               child: Row(
@@ -92,7 +92,7 @@ class AddCameraSheet extends StatelessWidget {
                   SizedBox(width: 6),
                   Expanded(
                     child: Text(
-                      'The built-in profile is for map viewing only. Please select a custom profile to submit new cameras.',
+                      'This profile is for map viewing only. Please select a submittable profile to submit new cameras.',
                       style: TextStyle(color: Colors.orange, fontSize: 13),
                     ),
                   ),

lib/widgets/camera_icon.dart

@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+import '../dev_config.dart';
+
+enum CameraIconType {
+  real,        // Blue ring - real cameras from OSM
+  mock,        // White ring - add camera mock point
+  pending,     // Purple ring - submitted/pending cameras
+  editing,     // Orange ring - camera being edited
+  pendingEdit, // Grey ring - original camera with pending edit
+}
+
+/// Simple camera icon with grey dot and colored ring
+class CameraIcon extends StatelessWidget {
+  final CameraIconType type;
+  
+  const CameraIcon({super.key, required this.type});
+
+  Color get _ringColor {
+    switch (type) {
+      case CameraIconType.real:
+        return kCameraRingColorReal;
+      case CameraIconType.mock:
+        return kCameraRingColorMock;
+      case CameraIconType.pending:
+        return kCameraRingColorPending;
+      case CameraIconType.editing:
+        return kCameraRingColorEditing;
+      case CameraIconType.pendingEdit:
+        return kCameraRingColorPendingEdit;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: kCameraIconDiameter,
+      height: kCameraIconDiameter,
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        color: Colors.black.withOpacity(kCameraDotOpacity),
+        border: Border.all(
+          color: _ringColor,
+          width: kCameraRingThickness,
+        ),
+      ),
+    );
+  }
+}

lib/widgets/camera_tag_sheet.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import '../models/osm_camera_node.dart';
+import '../app_state.dart';
 
 class CameraTagSheet extends StatelessWidget {
   final OsmCameraNode node;
@@ -8,13 +10,27 @@ class CameraTagSheet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final appState = context.watch<AppState>();
+    
+    // Check if this camera is editable (not a pending upload or pending edit)
+    final isEditable = (!node.tags.containsKey('_pending_upload') || 
+                       node.tags['_pending_upload'] != 'true') &&
+                      (!node.tags.containsKey('_pending_edit') || 
+                       node.tags['_pending_edit'] != 'true');
+    
+    void _openEditSheet() {
+      Navigator.pop(context); // Close this sheet first
+      appState.startEditSession(node); // HomeScreen will auto-show the edit sheet
+    }
+
     return SafeArea(
       child: Padding(
         padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 20),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
+        child: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
             Text('Camera #${node.id}',
                 style: Theme.of(context).textTheme.titleLarge),
             const SizedBox(height: 12),
@@ -45,16 +61,30 @@ class CameraTagSheet extends StatelessWidget {
                 ),
               ),
             ),
-            const SizedBox(height: 8),
-            Align(
-              alignment: Alignment.centerRight,
-              child: TextButton(
-                onPressed: () => Navigator.pop(context),
-                child: const Text('Close'),
-              ),
+            const SizedBox(height: 16),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                if (isEditable) ...[
+                  ElevatedButton.icon(
+                    onPressed: _openEditSheet,
+                    icon: const Icon(Icons.edit, size: 18),
+                    label: const Text('Edit'),
+                    style: ElevatedButton.styleFrom(
+                      minimumSize: const Size(0, 36),
+                    ),
+                  ),
+                  const SizedBox(width: 12),
+                ],
+                TextButton(
+                  onPressed: () => Navigator.pop(context),
+                  child: const Text('Close'),
+                ),
+              ],
             ),
           ],
         ),
+        ),
       ),
     );
   }

lib/widgets/download_area_dialog.dart

@@ -236,6 +236,11 @@ class _DownloadAreaDialogState extends State<DownloadAreaDialog> {
               final appDocDir = await OfflineAreaService().getOfflineAreaDir();
               final dir = "${appDocDir.path}/$id";
               
+              // Get current tile provider info
+              final appState = context.read<AppState>();
+              final selectedProvider = appState.selectedTileProvider;
+              final selectedTileType = appState.selectedTileType;
+              
               // Fire and forget: don't await download, so dialog closes immediately
               // ignore: unawaited_futures
               OfflineAreaService().downloadArea(
@@ -246,6 +251,10 @@ class _DownloadAreaDialogState extends State<DownloadAreaDialog> {
                 directory: dir,
                 onProgress: (progress) {},
                 onComplete: (status) {},
+                tileProviderId: selectedProvider?.id,
+                tileProviderName: selectedProvider?.name,
+                tileTypeId: selectedTileType?.id,
+                tileTypeName: selectedTileType?.name,
               );
               Navigator.pop(context);
               ScaffoldMessenger.of(context).showSnackBar(

lib/widgets/edit_camera_sheet.dart

@@ -0,0 +1,151 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../app_state.dart';
+import '../models/camera_profile.dart';
+import '../state/settings_state.dart';
+
+class EditCameraSheet extends StatelessWidget {
+  const EditCameraSheet({super.key, required this.session});
+
+  final EditCameraSession session;
+
+  @override
+  Widget build(BuildContext context) {
+    final appState = context.watch<AppState>();
+
+    void _commit() {
+      appState.commitEditSession();
+      Navigator.pop(context);
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Camera edit queued for upload')),
+      );
+    }
+
+    void _cancel() {
+      appState.cancelEditSession();
+      Navigator.pop(context);
+    }
+
+    final submittableProfiles = appState.enabledProfiles.where((p) => p.isSubmittable).toList();
+    final isSandboxMode = appState.uploadMode == UploadMode.sandbox;
+    final allowSubmit = submittableProfiles.isNotEmpty && session.profile.isSubmittable && !isSandboxMode;
+
+    return Padding(
+      padding:
+          EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const SizedBox(height: 12),
+          Container(
+            width: 40,
+            height: 4,
+            decoration: BoxDecoration(
+              color: Colors.grey.shade400,
+              borderRadius: BorderRadius.circular(2),
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            'Edit Camera #${session.originalNode.id}',
+            style: Theme.of(context).textTheme.titleMedium,
+          ),
+          const SizedBox(height: 16),
+          ListTile(
+            title: const Text('Profile'),
+            trailing: DropdownButton<CameraProfile>(
+              value: session.profile,
+              items: submittableProfiles
+                  .map((p) => DropdownMenuItem(value: p, child: Text(p.name)))
+                  .toList(),
+              onChanged: (p) =>
+                  appState.updateEditSession(profile: p ?? session.profile),
+            ),
+          ),
+          ListTile(
+            title: Text('Direction  ${session.directionDegrees.round()}°'),
+            subtitle: Slider(
+              min: 0,
+              max: 359,
+              divisions: 359,
+              value: session.directionDegrees,
+              label: session.directionDegrees.round().toString(),
+              onChanged: (v) => appState.updateEditSession(directionDeg: v),
+            ),
+          ),
+          if (isSandboxMode)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: const [
+                  Icon(Icons.info_outline, color: Colors.blue, size: 20),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'Cannot submit edits on production nodes to sandbox. Switch to Production mode in Settings to edit cameras.',
+                      style: TextStyle(color: Colors.blue, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            )
+          else if (submittableProfiles.isEmpty)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: const [
+                  Icon(Icons.info_outline, color: Colors.red, size: 20),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'Enable a submittable profile in Settings to edit cameras.',
+                      style: TextStyle(color: Colors.red, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            )
+          else if (!session.profile.isSubmittable)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: const [
+                  Icon(Icons.info_outline, color: Colors.orange, size: 20),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'This profile is for map viewing only. Please select a submittable profile to edit cameras.',
+                      style: TextStyle(color: Colors.orange, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          const SizedBox(height: 8),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: Row(
+              children: [
+                Expanded(
+                  child: OutlinedButton(
+                    onPressed: _cancel,
+                    child: const Text('Cancel'),
+                  ),
+                ),
+                const SizedBox(width: 12),
+                Expanded(
+                  child: ElevatedButton(
+                    onPressed: allowSubmit ? _commit : null,
+                    child: const Text('Save Edit'),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          const SizedBox(height: 20),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/map/camera_markers.dart

@@ -6,6 +6,7 @@ import 'package:latlong2/latlong.dart';
 import '../../dev_config.dart';
 import '../../models/osm_camera_node.dart';
 import '../camera_tag_sheet.dart';
+import '../camera_icon.dart';
 
 /// Smart marker widget for camera with single/double tap distinction
 class CameraMapMarker extends StatefulWidget {
@@ -45,17 +46,25 @@ class _CameraMapMarkerState extends State<CameraMapMarker> {
 
   @override
   Widget build(BuildContext context) {
-    // Check if this is a pending upload
-    final isPending = widget.node.tags.containsKey('_pending_upload') && 
-                      widget.node.tags['_pending_upload'] == 'true';
+    // Check camera state
+    final isPendingUpload = widget.node.tags.containsKey('_pending_upload') && 
+                           widget.node.tags['_pending_upload'] == 'true';
+    final isPendingEdit = widget.node.tags.containsKey('_pending_edit') && 
+                         widget.node.tags['_pending_edit'] == 'true';
+    
+    CameraIconType iconType;
+    if (isPendingUpload) {
+      iconType = CameraIconType.pending;
+    } else if (isPendingEdit) {
+      iconType = CameraIconType.pendingEdit;
+    } else {
+      iconType = CameraIconType.real;
+    }
     
     return GestureDetector(
       onTap: _onTap,
       onDoubleTap: _onDoubleTap,
-      child: Icon(
-        Icons.videocam, 
-        color: isPending ? Colors.purple : Colors.orange,
-      ),
+      child: CameraIcon(type: iconType),
     );
   }
 }
@@ -73,8 +82,8 @@ class CameraMarkersBuilder {
         .where(_isValidCameraCoordinate)
         .map((n) => Marker(
           point: n.coord,
-          width: 24,
-          height: 24,
+          width: kCameraIconDiameter,
+          height: kCameraIconDiameter,
           child: CameraMapMarker(node: n, mapController: mapController),
         )),
       

lib/widgets/map/direction_cones.dart

@@ -13,6 +13,7 @@ class DirectionConesBuilder {
     required List<OsmCameraNode> cameras,
     required double zoom,
     AddCameraSession? session,
+    EditCameraSession? editSession,
   }) {
     final overlays = <Polygon>[];
     
@@ -22,18 +23,29 @@ class DirectionConesBuilder {
         session.target!, 
         session.directionDegrees, 
         zoom,
+        isSession: true,
       ));
     }
     
-    // Add cones for cameras with direction
+    // Add edit session cone if in edit-camera mode
+    if (editSession != null) {
+      overlays.add(_buildCone(
+        editSession.target, 
+        editSession.directionDegrees, 
+        zoom,
+        isSession: true,
+      ));
+    }
+    
+    // Add cones for cameras with direction (but exclude camera being edited)
     overlays.addAll(
       cameras
-        .where(_isValidCameraWithDirection)
+        .where((n) => _isValidCameraWithDirection(n) && 
+                     (editSession == null || n.id != editSession.originalNode.id))
         .map((n) => _buildCone(
           n.coord, 
           n.directionDeg!, 
           zoom,
-          isPending: _isPendingUpload(n),
         ))
     );
     
@@ -58,9 +70,13 @@ class DirectionConesBuilder {
     double bearingDeg, 
     double zoom, {
     bool isPending = false,
+    bool isSession = false,
   }) {
     final halfAngle = kDirectionConeHalfAngle;
     final length = kDirectionConeBaseLength * math.pow(2, 15 - zoom);
+    
+    // Number of points to create the arc (more = smoother curve)
+    const int arcPoints = 12;
 
     LatLng project(double deg) {
       final rad = deg * math.pi / 180;
@@ -70,16 +86,22 @@ class DirectionConesBuilder {
       return LatLng(origin.latitude + dLat, origin.longitude + dLon);
     }
 
-    final left = project(bearingDeg - halfAngle);
-    final right = project(bearingDeg + halfAngle);
-
-    // Use purple color for pending uploads
-    final color = isPending ? Colors.purple : Colors.redAccent;
+    // Build pizza slice with curved edge
+    final points = <LatLng>[origin];
+    
+    // Add arc points from left to right
+    for (int i = 0; i <= arcPoints; i++) {
+      final angle = bearingDeg - halfAngle + (i * 2 * halfAngle / arcPoints);
+      points.add(project(angle));
+    }
+    
+    // Close the shape back to origin
+    points.add(origin);
 
     return Polygon(
-      points: [origin, left, right, origin],
-      color: color.withOpacity(0.25),
-      borderColor: color,
+      points: points,
+      color: kDirectionConeColor.withOpacity(0.25),
+      borderColor: kDirectionConeColor,
       borderStrokeWidth: 1,
     );
   }

lib/widgets/map/layer_selector_button.dart

@@ -0,0 +1,234 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../app_state.dart';
+import '../../models/tile_provider.dart';
+import '../../services/offline_area_service.dart';
+
+class LayerSelectorButton extends StatelessWidget {
+  const LayerSelectorButton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return FloatingActionButton(
+      mini: true,
+      onPressed: () => _showLayerSelector(context),
+      child: const Icon(Icons.layers),
+    );
+  }
+
+  void _showLayerSelector(BuildContext context) {
+    // Check if any downloads are active
+    final offlineService = OfflineAreaService();
+    if (offlineService.hasActiveDownloads) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Cannot change tile types while downloading offline areas'),
+          duration: Duration(seconds: 3),
+        ),
+      );
+      return;
+    }
+
+    showDialog(
+      context: context,
+      builder: (context) => const _LayerSelectorDialog(),
+    );
+  }
+}
+
+class _LayerSelectorDialog extends StatefulWidget {
+  const _LayerSelectorDialog();
+
+  @override
+  State<_LayerSelectorDialog> createState() => _LayerSelectorDialogState();
+}
+
+class _LayerSelectorDialogState extends State<_LayerSelectorDialog> {
+  String? _selectedTileTypeId;
+
+  @override
+  void initState() {
+    super.initState();
+    final appState = context.read<AppState>();
+    _selectedTileTypeId = appState.selectedTileType?.id;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final appState = context.watch<AppState>();
+    final providers = appState.tileProviders;
+
+    // Group tile types by provider for display
+    final providerGroups = <TileProvider, List<TileType>>{};
+    for (final provider in providers) {
+      final availableTypes = provider.availableTileTypes;
+      if (availableTypes.isNotEmpty) {
+        providerGroups[provider] = availableTypes;
+      }
+    }
+
+    return Dialog(
+      child: Container(
+        width: double.maxFinite,
+        constraints: const BoxConstraints(maxHeight: 500),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            // Header
+            Container(
+              padding: const EdgeInsets.all(16),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surfaceVariant,
+                borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
+              ),
+              child: Row(
+                children: [
+                  const Icon(Icons.layers),
+                  const SizedBox(width: 8),
+                  const Text(
+                    'Select Map Layer',
+                    style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
+                  ),
+                  const Spacer(),
+                  IconButton(
+                    icon: const Icon(Icons.close),
+                    onPressed: () => Navigator.of(context).pop(),
+                  ),
+                ],
+              ),
+            ),
+            // Content
+            Flexible(
+              child: ListView(
+                padding: EdgeInsets.zero,
+                children: [
+                  if (providerGroups.isEmpty)
+                    const Padding(
+                      padding: EdgeInsets.all(24),
+                      child: Center(
+                        child: Text('No tile providers available'),
+                      ),
+                    )
+                  else
+                    ...providerGroups.entries.map((entry) {
+                      final provider = entry.key;
+                      final tileTypes = entry.value;
+                      
+                      return Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          // Provider header
+                          Container(
+                            width: double.infinity,
+                            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                            color: Theme.of(context).colorScheme.surface,
+                            child: Text(
+                              provider.name,
+                              style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                          ),
+                          // Tile types
+                          ...tileTypes.map((tileType) => _TileTypeListItem(
+                            tileType: tileType,
+                            provider: provider,
+                            isSelected: _selectedTileTypeId == tileType.id,
+                            onSelected: () {
+                              setState(() {
+                                _selectedTileTypeId = tileType.id;
+                              });
+                              appState.setSelectedTileType(tileType.id);
+                              Navigator.of(context).pop();
+                            },
+                          )),
+                        ],
+                      );
+                    }),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _TileTypeListItem extends StatelessWidget {
+  final TileType tileType;
+  final TileProvider provider;
+  final bool isSelected;
+  final VoidCallback onSelected;
+
+  const _TileTypeListItem({
+    required this.tileType,
+    required this.provider,
+    required this.isSelected,
+    required this.onSelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: Container(
+        width: 48,
+        height: 48,
+        decoration: BoxDecoration(
+          border: Border.all(
+            color: isSelected 
+                ? Theme.of(context).colorScheme.primary
+                : Colors.grey.shade300,
+            width: isSelected ? 2 : 1,
+          ),
+          borderRadius: BorderRadius.circular(4),
+        ),
+        child: tileType.previewTile != null
+            ? ClipRRect(
+                borderRadius: BorderRadius.circular(3),
+                child: Image.memory(
+                  tileType.previewTile!,
+                  fit: BoxFit.cover,
+                  errorBuilder: (context, error, stackTrace) => _FallbackPreview(),
+                ),
+              )
+            : _FallbackPreview(),
+      ),
+      title: Text(
+        tileType.name,
+        style: TextStyle(
+          fontWeight: isSelected ? FontWeight.bold : null,
+          color: isSelected ? Theme.of(context).colorScheme.primary : null,
+        ),
+      ),
+      subtitle: Text(
+        tileType.attribution,
+        style: Theme.of(context).textTheme.bodySmall,
+      ),
+      trailing: isSelected 
+          ? Icon(
+              Icons.check_circle,
+              color: Theme.of(context).colorScheme.primary,
+            )
+          : null,
+      onTap: onSelected,
+    );
+  }
+}
+
+class _FallbackPreview extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      color: Colors.grey.shade200,
+      child: const Center(
+        child: Icon(
+          Icons.map,
+          size: 24,
+          color: Colors.grey,
+        ),
+      ),
+    );
+  }
+}

lib/widgets/map/map_overlays.dart

@@ -3,18 +3,24 @@ import 'package:flutter_map/flutter_map.dart';
 
 import '../../app_state.dart';
 import '../../dev_config.dart';
+import '../camera_icon.dart';
+import 'layer_selector_button.dart';
 
 /// Widget that renders all map overlay UI elements
 class MapOverlays extends StatelessWidget {
   final MapController mapController;
   final UploadMode uploadMode;
   final AddCameraSession? session;
+  final EditCameraSession? editSession;
+  final String? attribution; // Attribution for current tile provider
 
   const MapOverlays({
     super.key,
     required this.mapController,
     required this.uploadMode,
     this.session,
+    this.editSession,
+    this.attribution,
   });
 
   @override
@@ -78,26 +84,63 @@ class MapOverlays extends StatelessWidget {
         ),
 
         // Attribution overlay
-        Positioned(
-          bottom: kAttributionBottomOffset,
-          left: 10,
-          child: Container(
-            color: Colors.white70,
-            padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
-            child: const Text(
-              '© OpenStreetMap and contributors',
-              style: TextStyle(fontSize: 11),
+        if (attribution != null)
+          Positioned(
+            bottom: kAttributionBottomOffset,
+            left: 10,
+            child: Container(
+              color: Colors.white70,
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
+              child: Text(
+                attribution!,
+                style: const TextStyle(fontSize: 11),
+              ),
             ),
           ),
+
+        // Zoom and layer controls (bottom-right)
+        Positioned(
+          bottom: 80,
+          right: 16,
+          child: Column(
+            children: [
+              // Layer selector button
+              const LayerSelectorButton(),
+              const SizedBox(height: 8),
+              // Zoom in button
+              FloatingActionButton(
+                mini: true,
+                heroTag: "zoom_in",
+                onPressed: () {
+                  final zoom = mapController.camera.zoom;
+                  mapController.move(mapController.camera.center, zoom + 1);
+                },
+                child: const Icon(Icons.add),
+              ),
+              const SizedBox(height: 8),
+              // Zoom out button  
+              FloatingActionButton(
+                mini: true,
+                heroTag: "zoom_out",
+                onPressed: () {
+                  final zoom = mapController.camera.zoom;
+                  mapController.move(mapController.camera.center, zoom - 1);
+                },
+                child: const Icon(Icons.remove),
+              ),
+            ],
+          ),
         ),
 
-        // Fixed pin when adding camera
-        if (session != null)
+        // Fixed pin when adding or editing camera
+        if (session != null || editSession != null)
           IgnorePointer(
             child: Center(
               child: Transform.translate(
                 offset: const Offset(0, kAddPinYOffset),
-                child: const Icon(Icons.place, size: 40, color: Colors.redAccent),
+                child: CameraIcon(
+                  type: editSession != null ? CameraIconType.editing : CameraIconType.mock
+                ),
               ),
             ),
           ),

lib/widgets/map_view.dart

@@ -1,10 +1,13 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map_animations/flutter_map_animations.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:provider/provider.dart';
 import 'package:http/http.dart' as http;
+import 'package:collection/collection.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 import '../app_state.dart';
 import '../services/offline_area_service.dart';
@@ -20,17 +23,18 @@ import 'map/direction_cones.dart';
 import 'map/map_overlays.dart';
 import 'network_status_indicator.dart';
 import '../dev_config.dart';
+import '../screens/home_screen.dart' show FollowMeMode;
 
 class MapView extends StatefulWidget {
-  final MapController controller;
+  final AnimatedMapController controller;
   const MapView({
     super.key,
     required this.controller,
-    required this.followMe,
+    required this.followMeMode,
     required this.onUserGesture,
   });
 
-  final bool followMe;
+  final FollowMeMode followMeMode;
   final VoidCallback onUserGesture;
 
   @override
@@ -38,12 +42,16 @@ class MapView extends StatefulWidget {
 }
 
 class MapViewState extends State<MapView> {
-  late final MapController _controller;
+  late final AnimatedMapController _controller;
   final Debouncer _cameraDebounce = Debouncer(kDebounceCameraRefresh);
   final Debouncer _tileDebounce = Debouncer(const Duration(milliseconds: 150));
+  final Debouncer _mapPositionDebounce = Debouncer(const Duration(milliseconds: 1000));
 
   StreamSubscription<Position>? _positionSub;
   LatLng? _currentLatLng;
+  LatLng? _initialLocation;
+  double? _initialZoom;
+  bool _hasMovedToInitialLocation = false;
 
   late final CameraProviderWithCache _cameraProvider;
   late final SimpleTileHttpClient _tileHttpClient;
@@ -53,6 +61,11 @@ class MapViewState extends State<MapView> {
   
   // Track zoom to clear queue on zoom changes
   double? _lastZoom;
+  
+  // Track changes that require cache clearing
+  String? _lastTileTypeId;
+  bool? _lastOfflineMode;
+  int _mapRebuildKey = 0;
 
   @override
   void initState() {
@@ -60,6 +73,14 @@ class MapViewState extends State<MapView> {
     OfflineAreaService();
     _controller = widget.controller;
     _tileHttpClient = SimpleTileHttpClient();
+    
+    // Load last map position before initializing GPS
+    _loadLastMapPosition().then((_) {
+      // Move to last known position after loading and widget is built
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _moveToInitialLocationIfNeeded();
+      });
+    });
     _initLocation();
 
     // Set up camera overlay caching
@@ -72,11 +93,51 @@ class MapViewState extends State<MapView> {
     });
   }
 
+  /// Move to initial location if we have one and haven't moved yet
+  void _moveToInitialLocationIfNeeded() {
+    if (!_hasMovedToInitialLocation && _initialLocation != null && mounted) {
+      try {
+        final zoom = _initialZoom ?? 15.0;
+        // Double-check coordinates are valid before moving
+        if (_isValidCoordinate(_initialLocation!.latitude) && 
+            _isValidCoordinate(_initialLocation!.longitude) && 
+            _isValidZoom(zoom)) {
+          _controller.mapController.move(_initialLocation!, zoom);
+          _hasMovedToInitialLocation = true;
+          debugPrint('[MapView] Moved to initial location: ${_initialLocation!.latitude}, ${_initialLocation!.longitude}');
+        } else {
+          debugPrint('[MapView] Invalid initial location, not moving: ${_initialLocation!.latitude}, ${_initialLocation!.longitude}, zoom: $zoom');
+        }
+      } catch (e) {
+        debugPrint('[MapView] Failed to move to initial location: $e');
+      }
+    }
+  }
+
+  /// Validate that a coordinate value is valid (not NaN, not infinite, within bounds)
+  bool _isValidCoordinate(double value) {
+    return !value.isNaN && 
+           !value.isInfinite && 
+           value >= -180.0 && 
+           value <= 180.0;
+  }
+
+  /// Validate that a zoom level is valid
+  bool _isValidZoom(double zoom) {
+    return !zoom.isNaN && 
+           !zoom.isInfinite && 
+           zoom >= 1.0 && 
+           zoom <= 25.0;
+  }
+
+
+
   @override
   void dispose() {
     _positionSub?.cancel();
     _cameraDebounce.dispose();
     _tileDebounce.dispose();
+    _mapPositionDebounce.dispose();
     _cameraProvider.removeListener(_onCamerasUpdated);
     _tileHttpClient.close();
     super.dispose();
@@ -92,17 +153,101 @@ class MapViewState extends State<MapView> {
     _initLocation();
   }
 
+  /// Save the last map position to persistent storage
+  Future<void> _saveLastMapPosition(LatLng location, double zoom) async {
+    try {
+      // Validate coordinates and zoom before saving
+      if (!_isValidCoordinate(location.latitude) || 
+          !_isValidCoordinate(location.longitude) || 
+          !_isValidZoom(zoom)) {
+        debugPrint('[MapView] Invalid map position, not saving: lat=${location.latitude}, lng=${location.longitude}, zoom=$zoom');
+        return;
+      }
+      
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setDouble(kLastMapLatKey, location.latitude);
+      await prefs.setDouble(kLastMapLngKey, location.longitude);
+      await prefs.setDouble(kLastMapZoomKey, zoom);
+      debugPrint('[MapView] Saved last map position: ${location.latitude}, ${location.longitude}, zoom: $zoom');
+    } catch (e) {
+      debugPrint('[MapView] Failed to save last map position: $e');
+    }
+  }
+
+  /// Load the last map position from persistent storage
+  Future<void> _loadLastMapPosition() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final lat = prefs.getDouble(kLastMapLatKey);
+      final lng = prefs.getDouble(kLastMapLngKey);
+      final zoom = prefs.getDouble(kLastMapZoomKey);
+      
+      if (lat != null && lng != null && 
+          _isValidCoordinate(lat) && _isValidCoordinate(lng)) {
+        final validZoom = zoom != null && _isValidZoom(zoom) ? zoom : 15.0;
+        _initialLocation = LatLng(lat, lng);
+        _initialZoom = validZoom;
+        debugPrint('[MapView] Loaded last map position: ${_initialLocation!.latitude}, ${_initialLocation!.longitude}, zoom: $_initialZoom');
+      } else {
+        debugPrint('[MapView] Invalid saved coordinates, using defaults');
+      }
+    } catch (e) {
+      debugPrint('[MapView] Failed to load last map position: $e');
+    }
+  }
+
+  /// Save the follow-me mode to persistent storage
+  static Future<void> saveFollowMeMode(FollowMeMode mode) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setInt(kFollowMeModeKey, mode.index);
+      debugPrint('[MapView] Saved follow-me mode: $mode');
+    } catch (e) {
+      debugPrint('[MapView] Failed to save follow-me mode: $e');
+    }
+  }
+
+  /// Load the follow-me mode from persistent storage
+  static Future<FollowMeMode> loadFollowMeMode() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final modeIndex = prefs.getInt(kFollowMeModeKey);
+      if (modeIndex != null && modeIndex < FollowMeMode.values.length) {
+        final mode = FollowMeMode.values[modeIndex];
+        debugPrint('[MapView] Loaded follow-me mode: $mode');
+        return mode;
+      }
+    } catch (e) {
+      debugPrint('[MapView] Failed to load follow-me mode: $e');
+    }
+    // Default to northUp if no saved mode
+    return FollowMeMode.northUp;
+  }
+
+  /// Clear any stored map position (useful for recovery from invalid data)
+  static Future<void> clearStoredMapPosition() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.remove(kLastMapLatKey);
+      await prefs.remove(kLastMapLngKey);
+      await prefs.remove(kLastMapZoomKey);
+      debugPrint('[MapView] Cleared stored map position');
+    } catch (e) {
+      debugPrint('[MapView] Failed to clear stored map position: $e');
+    }
+  }
+
 
 
   void _refreshCamerasFromProvider() {
     final appState = context.read<AppState>();
     LatLngBounds? bounds;
     try {
-      bounds = _controller.camera.visibleBounds;
+      bounds = _controller.mapController.camera.visibleBounds;
     } catch (_) {
       return;
     }
-    final zoom = _controller.camera.zoom;
+    final zoom = _controller.mapController.camera.zoom;
     if (zoom < kCameraMinZoomLevel) {
       // Show a snackbar-style bubble, if desired
       if (mounted) {
@@ -122,11 +267,35 @@ class MapViewState extends State<MapView> {
     );
   }
 
+
+
+
+
   @override
   void didUpdateWidget(covariant MapView oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (widget.followMe && !oldWidget.followMe && _currentLatLng != null) {
-      _controller.move(_currentLatLng!, _controller.camera.zoom);
+    // Back to original pattern - simple check
+    if (widget.followMeMode != FollowMeMode.off && 
+        oldWidget.followMeMode == FollowMeMode.off && 
+        _currentLatLng != null) {
+      // Move to current location when follow me is first enabled - smooth animation
+      if (widget.followMeMode == FollowMeMode.northUp) {
+        _controller.animateTo(
+          dest: _currentLatLng!,
+          zoom: _controller.mapController.camera.zoom,
+          duration: kFollowMeAnimationDuration,
+          curve: Curves.easeOut,
+        );
+      } else if (widget.followMeMode == FollowMeMode.rotating) {
+        // When switching to rotating mode, reset to north-up first - smooth animation
+        _controller.animateTo(
+          dest: _currentLatLng!,
+          zoom: _controller.mapController.camera.zoom,
+          rotation: 0.0,
+          duration: kFollowMeAnimationDuration,
+          curve: Curves.easeOut,
+        );
+      }
     }
   }
 
@@ -139,11 +308,37 @@ class MapViewState extends State<MapView> {
         Geolocator.getPositionStream().listen((Position position) {
       final latLng = LatLng(position.latitude, position.longitude);
       setState(() => _currentLatLng = latLng);
-      if (widget.followMe) {
+      
+      // Back to original pattern - directly check widget parameter
+      if (widget.followMeMode != FollowMeMode.off) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           if (mounted) {
             try {
-              _controller.move(latLng, _controller.camera.zoom);
+              if (widget.followMeMode == FollowMeMode.northUp) {
+                // Follow position only, keep current rotation - smooth animation
+                _controller.animateTo(
+                  dest: latLng,
+                  zoom: _controller.mapController.camera.zoom,
+                  duration: kFollowMeAnimationDuration,
+                  curve: Curves.easeOut,
+                );
+              } else if (widget.followMeMode == FollowMeMode.rotating) {
+                // Follow position and rotation based on heading - smooth animation
+                final heading = position.heading;
+                final speed = position.speed; // Speed in m/s
+                
+                // Only apply rotation if moving fast enough to avoid wild spinning when stationary
+                final shouldRotate = !speed.isNaN && speed >= kMinSpeedForRotationMps && !heading.isNaN;
+                final rotation = shouldRotate ? -heading : _controller.mapController.camera.rotation;
+                
+                _controller.animateTo(
+                  dest: latLng,
+                  zoom: _controller.mapController.camera.zoom,
+                  rotation: rotation,
+                  duration: kFollowMeAnimationDuration,
+                  curve: Curves.easeOut,
+                );
+              }
             } catch (e) {
               debugPrint('MapController not ready yet: $e');
             }
@@ -155,7 +350,7 @@ class MapViewState extends State<MapView> {
 
   double _safeZoom() {
     try {
-      return _controller.camera.zoom;
+      return _controller.mapController.camera.zoom;
     } catch (_) {
       return 15.0;
     }
@@ -170,38 +365,22 @@ class MapViewState extends State<MapView> {
     return ids1.length == ids2.length && ids1.containsAll(ids2);
   }
 
-  /// Build tile layer based on selected tile provider
+  /// Build tile layer - uses fake domain that SimpleTileHttpClient can parse
   Widget _buildTileLayer(AppState appState) {
-    final providerConfig = TileProviders.getByType(appState.tileProvider);
-    if (providerConfig == null) {
-      // Fallback to OSM if somehow we have an invalid provider
-      return TileLayer(
-        urlTemplate: TileProviders.osmStreet.urlTemplate,
-        userAgentPackageName: 'com.stopflock.flock_map_app',
-        tileProvider: NetworkTileProvider(
-          httpClient: _tileHttpClient,
-        ),
-      );
-    }
-
-    // For OSM tiles, use our custom HTTP client for offline/online routing
-    if (providerConfig.type == TileProviderType.osmStreet) {
-      return TileLayer(
-        urlTemplate: providerConfig.urlTemplate,
-        userAgentPackageName: 'com.stopflock.flock_map_app',
-        tileProvider: NetworkTileProvider(
-          httpClient: _tileHttpClient,
-        ),
-      );
-    }
-
-    // For other providers, use standard HTTP client (no offline support yet)
+    final selectedTileType = appState.selectedTileType;
+    final selectedProvider = appState.selectedTileProvider;
+    
+    // Use fake domain with standard HTTPS scheme: https://tiles.local/provider/type/z/x/y
+    // This naturally separates cache entries by provider and type while being HTTP-compatible
+    final urlTemplate = 'https://tiles.local/${selectedProvider?.id ?? 'unknown'}/${selectedTileType?.id ?? 'unknown'}/{z}/{x}/{y}';
+    
     return TileLayer(
-      urlTemplate: providerConfig.urlTemplate,
+      urlTemplate: urlTemplate,
       userAgentPackageName: 'com.stopflock.flock_map_app',
-      additionalOptions: {
-        'attribution': providerConfig.attribution,
-      },
+      tileProvider: NetworkTileProvider(
+        httpClient: _tileHttpClient,
+        // Enable flutter_map caching - cache busting handled by URL changes and FlutterMap key
+      ),
     );
   }
 
@@ -211,6 +390,7 @@ class MapViewState extends State<MapView> {
   Widget build(BuildContext context) {
     final appState = context.watch<AppState>();
     final session = appState.session;
+    final editSession = appState.editSession;
 
     // Check if enabled profiles changed and refresh cameras if needed
     final currentEnabledProfiles = appState.enabledProfiles;
@@ -219,6 +399,8 @@ class MapViewState extends State<MapView> {
       _lastEnabledProfiles = List.from(currentEnabledProfiles);
       // Refresh cameras when profiles change
       WidgetsBinding.instance.addPostFrameCallback((_) {
+        // Clear camera cache to ensure fresh data for new profile combination
+        _cameraProvider.clearCache();
         // Force display refresh first (for immediate UI update)
         _cameraProvider.refreshDisplay();
         // Then fetch new cameras for newly enabled profiles
@@ -226,15 +408,47 @@ class MapViewState extends State<MapView> {
       });
     }
 
+    // Check if tile type OR offline mode changed and clear cache if needed
+    final currentTileTypeId = appState.selectedTileType?.id;
+    final currentOfflineMode = appState.offlineMode;
+    
+    if ((_lastTileTypeId != null && _lastTileTypeId != currentTileTypeId) ||
+        (_lastOfflineMode != null && _lastOfflineMode != currentOfflineMode)) {
+      // Force map rebuild with new key to bust flutter_map cache
+      _mapRebuildKey++;
+      final reason = _lastTileTypeId != currentTileTypeId 
+          ? 'tile type ($currentTileTypeId)' 
+          : 'offline mode ($currentOfflineMode)';
+      debugPrint('[MapView] *** CACHE CLEAR *** $reason changed - rebuilding map $_mapRebuildKey');
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        debugPrint('[MapView] Post-frame: Clearing tile request queue');
+        _tileHttpClient.clearTileQueue();
+      });
+    }
+    
+    _lastTileTypeId = currentTileTypeId;
+    _lastOfflineMode = currentOfflineMode;
+
     // Seed add‑mode target once, after first controller center is available.
     if (session != null && session.target == null) {
       try {
-        final center = _controller.camera.center;
+        final center = _controller.mapController.camera.center;
         WidgetsBinding.instance.addPostFrameCallback(
           (_) => appState.updateSession(target: center),
         );
       } catch (_) {/* controller not ready yet */}
     }
+    
+    // For edit sessions, center the map on the camera being edited initially
+    if (editSession != null && _controller.mapController.camera.center != editSession.target) {
+      WidgetsBinding.instance.addPostFrameCallback(
+        (_) {
+          try {
+            _controller.mapController.move(editSession.target, _controller.mapController.camera.zoom);
+          } catch (_) {/* controller not ready yet */}
+        },
+      );
+    }
 
     final zoom = _safeZoom();
     // Fetch cached cameras for current map bounds (using Consumer so overlays redraw instantly)
@@ -242,7 +456,7 @@ class MapViewState extends State<MapView> {
       builder: (context, cameraProvider, child) {
         LatLngBounds? mapBounds;
         try {
-          mapBounds = _controller.camera.visibleBounds;
+          mapBounds = _controller.mapController.camera.visibleBounds;
         } catch (_) {
           mapBounds = null;
         }
@@ -252,7 +466,7 @@ class MapViewState extends State<MapView> {
         
         final markers = CameraMarkersBuilder.buildCameraMarkers(
           cameras: cameras,
-          mapController: _controller,
+          mapController: _controller.mapController,
           userLocation: _currentLatLng,
         );
 
@@ -260,11 +474,16 @@ class MapViewState extends State<MapView> {
           cameras: cameras,
           zoom: zoom,
           session: session,
+          editSession: editSession,
         );
 
+        // Build edit lines connecting original cameras to their edited positions
+        final editLines = _buildEditLines(cameras);
+
         return Stack(
           children: [
             PolygonLayer(polygons: overlays),
+            if (editLines.isNotEmpty) PolylineLayer(polylines: editLines),
             MarkerLayer(markers: markers),
           ],
         );
@@ -274,11 +493,11 @@ class MapViewState extends State<MapView> {
     return Stack(
       children: [
         FlutterMap(
-          key: ValueKey('map_offline_${appState.offlineMode}_provider_${appState.tileProvider.name}'),
-          mapController: _controller,
+          key: ValueKey('map_${appState.offlineMode}_${appState.selectedTileType?.id ?? 'none'}_$_mapRebuildKey'),
+          mapController: _controller.mapController,
           options: MapOptions(
-            initialCenter: _currentLatLng ?? LatLng(37.7749, -122.4194),
-            initialZoom: 15,
+            initialCenter: _currentLatLng ?? _initialLocation ?? LatLng(37.7749, -122.4194),
+            initialZoom: _initialZoom ?? 15,
             maxZoom: 19,
             onPositionChanged: (pos, gesture) {
               setState(() {}); // Instant UI update for zoom, etc.
@@ -286,6 +505,9 @@ class MapViewState extends State<MapView> {
               if (session != null) {
                 appState.updateSession(target: pos.center);
               }
+              if (editSession != null) {
+                appState.updateEditSession(target: pos.center);
+              }
               
               // Show waiting indicator when map moves (user is expecting new content)
               NetworkStatus.instance.setWaiting();
@@ -296,12 +518,22 @@ class MapViewState extends State<MapView> {
               
               if (zoomChanged) {
                 _tileDebounce(() {
-                  debugPrint('[MapView] Zoom change detected - clearing stale tile requests');
+                  // Clear stale tile requests on zoom change (quietly)
                   _tileHttpClient.clearTileQueue();
                 });
               }
               _lastZoom = currentZoom;
               
+              // Save map position (debounced to avoid excessive writes)
+              _mapPositionDebounce(() {
+                // Only save if position and zoom are valid
+                if (_isValidCoordinate(pos.center.latitude) && 
+                    _isValidCoordinate(pos.center.longitude) && 
+                    _isValidZoom(pos.zoom)) {
+                  _saveLastMapPosition(pos.center, pos.zoom);
+                }
+              });
+              
               // Request more cameras on any map movement/zoom at valid zoom level (slower debounce)
               if (pos.zoom >= 10) {
                 _cameraDebounce(_refreshCamerasFromProvider);
@@ -325,9 +557,11 @@ class MapViewState extends State<MapView> {
 
         // All map overlays (mode indicator, zoom, attribution, add pin)
         MapOverlays(
-          mapController: _controller,
+          mapController: _controller.mapController,
           uploadMode: appState.uploadMode,
           session: session,
+          editSession: editSession,
+          attribution: appState.selectedTileType?.attribution,
         ),
 
         // Network status indicator (top-left)
@@ -335,5 +569,37 @@ class MapViewState extends State<MapView> {
       ],
     );
   }
+
+  /// Build polylines connecting original cameras to their edited positions
+  List<Polyline> _buildEditLines(List<OsmCameraNode> cameras) {
+    final lines = <Polyline>[];
+    
+    // Create a lookup map of original node IDs to their coordinates
+    final originalNodes = <int, LatLng>{};
+    for (final camera in cameras) {
+      if (camera.tags['_pending_edit'] == 'true') {
+        originalNodes[camera.id] = camera.coord;
+      }
+    }
+    
+    // Find edited cameras and draw lines to their originals
+    for (final camera in cameras) {
+      final originalIdStr = camera.tags['_original_node_id'];
+      if (originalIdStr != null && camera.tags['_pending_upload'] == 'true') {
+        final originalId = int.tryParse(originalIdStr);
+        final originalCoord = originalId != null ? originalNodes[originalId] : null;
+        
+        if (originalCoord != null) {
+          lines.add(Polyline(
+            points: [originalCoord, camera.coord],
+            color: kCameraRingColorPending,
+            strokeWidth: 3.0,
+          ));
+        }
+      }
+    }
+    
+    return lines;
+  }
 }
 

lib/widgets/network_status_indicator.dart

@@ -29,10 +29,16 @@ class NetworkStatusIndicator extends StatelessWidget {
               break;
               
             case NetworkStatusType.noData:
-              message = 'No offline data';
+              message = 'No tiles here';
               icon = Icons.cloud_off;
               color = Colors.grey;
               break;
+
+            case NetworkStatusType.success:
+              message = 'Tiles loaded';
+              icon = Icons.check_circle;
+              color = Colors.green;
+              break;
               
             case NetworkStatusType.issues:
               switch (networkStatus.currentIssueType) {

pubspec.lock

@@ -158,6 +158,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.2.1"
+  flutter_map_animations:
+    dependency: "direct main"
+    description:
+      name: flutter_map_animations
+      sha256: bf583863561861aaaf4854ae7ed8940d79bea7d32918bf7a85d309b25235a09e
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.0"
   flutter_native_splash:
     dependency: "direct dev"
     description:

pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   # UI & Map
   provider: ^6.1.2
   flutter_map: ^8.2.1
-  # (removed: using built-in Scalebar from flutter_map >= v6)
+  flutter_map_animations: ^0.9.0
   latlong2: ^0.9.0
   geolocator: ^10.1.0
   http: ^1.2.1
@@ -49,4 +49,4 @@ flutter_icons:
   android: true
   ios: true
   image_path: "assets/app_icon.png"
-  min_sdk_android: 21
+  min_sdk_android: 21

test/models/pending_upload_test.dart

@@ -0,0 +1,83 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:flock_map_app/models/pending_upload.dart';
+import 'package:flock_map_app/models/camera_profile.dart';
+import 'package:flock_map_app/state/settings_state.dart';
+
+void main() {
+  group('PendingUpload', () {
+    test('should serialize and deserialize upload mode correctly', () {
+      // Test each upload mode
+      final testModes = [
+        UploadMode.production,
+        UploadMode.sandbox,
+        UploadMode.simulate,
+      ];
+
+      for (final mode in testModes) {
+        final original = PendingUpload(
+          coord: LatLng(37.7749, -122.4194),
+          direction: 90.0,
+          profile: CameraProfile.flock(),
+          uploadMode: mode,
+        );
+
+        // Serialize to JSON
+        final json = original.toJson();
+        
+        // Deserialize from JSON
+        final restored = PendingUpload.fromJson(json);
+
+        // Verify upload mode is preserved
+        expect(restored.uploadMode, equals(mode));
+        expect(restored.uploadModeDisplayName, equals(original.uploadModeDisplayName));
+        
+        // Verify other fields too
+        expect(restored.coord.latitude, equals(original.coord.latitude));
+        expect(restored.coord.longitude, equals(original.coord.longitude));
+        expect(restored.direction, equals(original.direction));
+        expect(restored.profile.id, equals(original.profile.id));
+      }
+    });
+
+    test('should handle legacy JSON without uploadMode', () {
+      // Simulate old JSON format without uploadMode field
+      final legacyJson = {
+        'lat': 37.7749,
+        'lon': -122.4194,
+        'dir': 90.0,
+        'profile': CameraProfile.flock().toJson(),
+        'originalNodeId': null,
+        'attempts': 0,
+        'error': false,
+        // Note: no 'uploadMode' field
+      };
+
+      final upload = PendingUpload.fromJson(legacyJson);
+      
+      // Should default to production mode for legacy entries
+      expect(upload.uploadMode, equals(UploadMode.production));
+      expect(upload.uploadModeDisplayName, equals('Production'));
+    });
+
+    test('should correctly identify edits vs new cameras', () {
+      final newCamera = PendingUpload(
+        coord: LatLng(37.7749, -122.4194),
+        direction: 90.0,
+        profile: CameraProfile.flock(),
+        uploadMode: UploadMode.production,
+      );
+
+      final editCamera = PendingUpload(
+        coord: LatLng(37.7749, -122.4194),
+        direction: 90.0,
+        profile: CameraProfile.flock(),
+        uploadMode: UploadMode.production,
+        originalNodeId: 12345,
+      );
+
+      expect(newCamera.isEdit, isFalse);
+      expect(editCamera.isEdit, isTrue);
+    });
+  });
+}