direction cones only when directional profile selected

Edits

README.md

@@ -1,145 +1,131 @@
 # 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.
+### v1 todo/bug List
+- Fix "tiles loaded" indicator accuracy across different providers
+- Generic tile provider error messages (not always "OSM tiles slow")
+- Optional custom icons for camera profiles
+- Camera deletions
+- Clean up cache when submitted changesets appear in Overpass results
+- Upgrade camera marker design (considering nullplate's svg)
+
+### Future Features & Wishlist
+- Location-based notifications when approaching cameras
+- Red/yellow ring for cameras missing specific tag details
+- iOS/Android native themes and dark mode support
+- "Cache accumulating" offline areas?
+- "Offline areas" as tile provider?
+- Jump to location by coordinates, address, or POI name
+- Route planning that avoids surveillance cameras
+- 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,20 +1,23 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:latlong2/latlong.dart';
 
-import 'models/camera_profile.dart';
+import 'models/node_profile.dart';
+import 'models/operator_profile.dart';
+import 'models/osm_camera_node.dart';
 import 'models/pending_upload.dart';
 import 'models/tile_provider.dart';
 import 'services/offline_area_service.dart';
 import 'state/auth_state.dart';
+import 'state/operator_profile_state.dart';
 import 'state/profile_state.dart';
 import 'state/session_state.dart';
 import 'state/settings_state.dart';
 import 'state/upload_queue_state.dart';
 
-// Re-export types for backward compatibility
-export 'state/settings_state.dart' show UploadMode;
-export 'state/session_state.dart' show AddCameraSession;
-export 'models/tile_provider.dart' show TileProviderType;
+// Re-export types
+export 'state/settings_state.dart' show UploadMode, FollowMeMode;
+export 'state/session_state.dart' show AddNodeSession, EditNodeSession;
 
 // ------------------ AppState ------------------
 class AppState extends ChangeNotifier {
@@ -22,6 +25,7 @@ class AppState extends ChangeNotifier {
   
   // State modules
   late final AuthState _authState;
+  late final OperatorProfileState _operatorProfileState;
   late final ProfileState _profileState;
   late final SessionState _sessionState;
   late final SettingsState _settingsState;
@@ -32,6 +36,7 @@ class AppState extends ChangeNotifier {
   AppState() {
     instance = this;
     _authState = AuthState();
+    _operatorProfileState = OperatorProfileState();
     _profileState = ProfileState();
     _sessionState = SessionState();
     _settingsState = SettingsState();
@@ -39,6 +44,7 @@ class AppState extends ChangeNotifier {
     
     // Set up state change listeners
     _authState.addListener(_onStateChanged);
+    _operatorProfileState.addListener(_onStateChanged);
     _profileState.addListener(_onStateChanged);
     _sessionState.addListener(_onStateChanged);
     _settingsState.addListener(_onStateChanged);
@@ -55,18 +61,29 @@ class AppState extends ChangeNotifier {
   String get username => _authState.username;
   
   // Profile state
-  List<CameraProfile> get profiles => _profileState.profiles;
-  List<CameraProfile> get enabledProfiles => _profileState.enabledProfiles;
-  bool isEnabled(CameraProfile p) => _profileState.isEnabled(p);
+  List<NodeProfile> get profiles => _profileState.profiles;
+  List<NodeProfile> get enabledProfiles => _profileState.enabledProfiles;
+  bool isEnabled(NodeProfile p) => _profileState.isEnabled(p);
+  
+  // Operator profile state
+  List<OperatorProfile> get operatorProfiles => _operatorProfileState.profiles;
   
   // Session state
-  AddCameraSession? get session => _sessionState.session;
+  AddNodeSession? get session => _sessionState.session;
+  EditNodeSession? 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;
+  FollowMeMode get followMeMode => _settingsState.followMeMode;
+  
+  // 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;
@@ -80,6 +97,7 @@ class AppState extends ChangeNotifier {
   Future<void> _init() async {
     // Initialize all state modules
     await _settingsState.init();
+    await _operatorProfileState.init();
     await _profileState.init();
     await _uploadQueueState.init();
     await _authState.init(_settingsState.uploadMode);
@@ -116,31 +134,60 @@ class AppState extends ChangeNotifier {
   }
 
   // ---------- Profile Methods ----------
-  void toggleProfile(CameraProfile p, bool e) {
+  void toggleProfile(NodeProfile p, bool e) {
     _profileState.toggleProfile(p, e);
   }
 
-  void addOrUpdateProfile(CameraProfile p) {
+  void addOrUpdateProfile(NodeProfile p) {
     _profileState.addOrUpdateProfile(p);
   }
 
-  void deleteProfile(CameraProfile p) {
+  void deleteProfile(NodeProfile p) {
     _profileState.deleteProfile(p);
   }
 
+  // ---------- Operator Profile Methods ----------
+  void addOrUpdateOperatorProfile(OperatorProfile p) {
+    _operatorProfileState.addOrUpdateProfile(p);
+  }
+
+  void deleteOperatorProfile(OperatorProfile p) {
+    _operatorProfileState.deleteProfile(p);
+  }
+
   // ---------- Session Methods ----------
   void startAddSession() {
     _sessionState.startAddSession(enabledProfiles);
   }
 
+  void startEditSession(OsmCameraNode node) {
+    _sessionState.startEditSession(node, enabledProfiles);
+  }
+
   void updateSession({
     double? directionDeg,
-    CameraProfile? profile,
+    NodeProfile? profile,
+    OperatorProfile? operatorProfile,
     LatLng? target,
   }) {
     _sessionState.updateSession(
       directionDeg: directionDeg,
       profile: profile,
+      operatorProfile: operatorProfile,
+      target: target,
+    );
+  }
+
+  void updateEditSession({
+    double? directionDeg,
+    NodeProfile? profile,
+    OperatorProfile? operatorProfile,
+    LatLng? target,
+  }) {
+    _sessionState.updateEditSession(
+      directionDeg: directionDeg,
+      profile: profile,
+      operatorProfile: operatorProfile,
       target: target,
     );
   }
@@ -149,10 +196,22 @@ class AppState extends ChangeNotifier {
     _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,8 +238,24 @@ 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);
+  }
+
+  /// Set follow-me mode
+  Future<void> setFollowMeMode(FollowMeMode mode) async {
+    await _settingsState.setFollowMeMode(mode);
   }
 
   // ---------- Queue Methods ----------
@@ -209,6 +284,7 @@ class AppState extends ChangeNotifier {
   @override
   void dispose() {
     _authState.removeListener(_onStateChanged);
+    _operatorProfileState.removeListener(_onStateChanged);
     _profileState.removeListener(_onStateChanged);
     _sessionState.removeListener(_onStateChanged);
     _settingsState.removeListener(_onStateChanged);

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(0xFF000000); // FOV cone color
 
 // Margin (bottom) for positioning the floating bottom button bar
 const double kBottomButtonBarMargin = 4.0;
@@ -18,18 +21,27 @@ 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.7';
 
-// Marker/camera interaction
-const int kCameraMinZoomLevel = 10; // Minimum zoom to show cameras or warning
+// Marker/node interaction
+const int kCameraMinZoomLevel = 10; // Minimum zoom to show nodes 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';
+
 // Tile/OSM fetch retry parameters (for tunable backoff)
 const int kTileFetchMaxAttempts = 3;
 const int kTileFetchInitialDelayMs = 4000;
@@ -43,5 +55,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 nodes from OSM - blue
+const Color kCameraRingColorMock = Color(0xC4FFFFFF); // Add node mock point - white
+const Color kCameraRingColorPending = Color(0xC49C27B0); // Submitted/pending nodes - purple
+const Color kCameraRingColorEditing = Color(0xC4FF9800); // Node being edited - orange
+const Color kCameraRingColorPendingEdit = Color(0xC4757575); // Original node with pending edit - grey

lib/models/camera_profile.dart

@@ -1,63 +0,0 @@
-import 'package:uuid/uuid.dart';
-
-/// A bundle of preset OSM tags that describe a particular camera model/type.
-class CameraProfile {
-  final String id;
-  final String name;
-  final Map<String, String> tags;
-  final bool builtin;
-
-  CameraProfile({
-    required this.id,
-    required this.name,
-    required this.tags,
-    this.builtin = false,
-  });
-
-  /// Built‑in default: Generic Flock ALPR camera
-  factory CameraProfile.alpr() => CameraProfile(
-        id: 'builtin-alpr',
-        name: 'Generic Flock',
-        tags: const {
-          'man_made': 'surveillance',
-          'surveillance:type': 'ALPR',
-          'manufacturer': 'Flock Safety',
-          'manufacturer:wikidata': 'Q108485435',
-        },
-        builtin: true,
-      );
-
-  CameraProfile copyWith({
-    String? id,
-    String? name,
-    Map<String, String>? tags,
-    bool? builtin,
-  }) =>
-      CameraProfile(
-        id: id ?? this.id,
-        name: name ?? this.name,
-        tags: tags ?? this.tags,
-        builtin: builtin ?? this.builtin,
-      );
-
-  Map<String, dynamic> toJson() =>
-      {'id': id, 'name': name, 'tags': tags, 'builtin': builtin};
-
-  factory CameraProfile.fromJson(Map<String, dynamic> j) => CameraProfile(
-        id: j['id'],
-        name: j['name'],
-        tags: Map<String, String>.from(j['tags']),
-        builtin: j['builtin'] ?? false,
-      );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is CameraProfile &&
-          runtimeType == other.runtimeType &&
-          id == other.id;
-
-  @override
-  int get hashCode => id.hashCode;
-}
-

lib/models/node_profile.dart

@@ -0,0 +1,231 @@
+import 'package:uuid/uuid.dart';
+
+/// A bundle of preset OSM tags that describe a particular surveillance node model/type.
+class NodeProfile {
+  final String id;
+  final String name;
+  final Map<String, String> tags;
+  final bool builtin;
+  final bool requiresDirection;
+  final bool submittable;
+  final bool editable;
+
+  NodeProfile({
+    required this.id,
+    required this.name,
+    required this.tags,
+    this.builtin = false,
+    this.requiresDirection = true,
+    this.submittable = true,
+    this.editable = true,
+  });
+
+  /// Built‑in default: Generic ALPR camera (customizable template, not submittable)
+  factory NodeProfile.genericAlpr() => NodeProfile(
+        id: 'builtin-generic-alpr',
+        name: 'Generic ALPR',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance:type': 'ALPR',
+        },
+        builtin: true,
+        requiresDirection: true,
+        submittable: false,
+        editable: false,
+      );
+
+  /// Built‑in: Flock Safety ALPR camera
+  factory NodeProfile.flock() => NodeProfile(
+        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,
+        requiresDirection: true,
+        submittable: true,
+        editable: true,
+      );
+
+  /// Built‑in: Motorola Solutions/Vigilant ALPR camera
+  factory NodeProfile.motorola() => NodeProfile(
+        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,
+        requiresDirection: true,
+        submittable: true,
+        editable: true,
+      );
+
+  /// Built‑in: Genetec ALPR camera
+  factory NodeProfile.genetec() => NodeProfile(
+        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,
+        requiresDirection: true,
+        submittable: true,
+        editable: true,
+      );
+
+  /// Built‑in: Leonardo/ELSAG ALPR camera
+  factory NodeProfile.leonardo() => NodeProfile(
+        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,
+        requiresDirection: true,
+        submittable: true,
+        editable: true,
+      );
+
+  /// Built‑in: Neology ALPR camera
+  factory NodeProfile.neology() => NodeProfile(
+        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,
+        requiresDirection: true,
+        submittable: true,
+        editable: true,
+      );
+
+  /// Built‑in: Generic gunshot detector (customizable template, not submittable)
+  factory NodeProfile.genericGunshotDetector() => NodeProfile(
+        id: 'builtin-generic-gunshot',
+        name: 'Generic Gunshot Detector',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance:type': 'gunshot_detector',
+        },
+        builtin: true,
+        requiresDirection: false,
+        submittable: false,
+        editable: false,
+      );
+
+  /// Built‑in: ShotSpotter gunshot detector
+  factory NodeProfile.shotspotter() => NodeProfile(
+        id: 'builtin-shotspotter',
+        name: 'ShotSpotter',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance': 'public',
+          'surveillance:type': 'gunshot_detector',
+          'surveillance:brand': 'ShotSpotter',
+          'surveillance:brand:wikidata': 'Q107740188',
+        },
+        builtin: true,
+        requiresDirection: false,
+        submittable: true,
+        editable: true,
+      );
+
+  /// Built‑in: Flock Raven gunshot detector
+  factory NodeProfile.flockRaven() => NodeProfile(
+        id: 'builtin-flock-raven',
+        name: 'Flock Raven',
+        tags: const {
+          'man_made': 'surveillance',
+          'surveillance': 'public',
+          'surveillance:type': 'gunshot_detector',
+          'brand': 'Flock Safety',
+          'brand:wikidata': 'Q108485435',
+        },
+        builtin: true,
+        requiresDirection: false,
+        submittable: true,
+        editable: true,
+      );
+
+  /// Returns true if this profile can be used for submissions
+  bool get isSubmittable => submittable;
+
+  NodeProfile copyWith({
+    String? id,
+    String? name,
+    Map<String, String>? tags,
+    bool? builtin,
+    bool? requiresDirection,
+    bool? submittable,
+    bool? editable,
+  }) =>
+      NodeProfile(
+        id: id ?? this.id,
+        name: name ?? this.name,
+        tags: tags ?? this.tags,
+        builtin: builtin ?? this.builtin,
+        requiresDirection: requiresDirection ?? this.requiresDirection,
+        submittable: submittable ?? this.submittable,
+        editable: editable ?? this.editable,
+      );
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'name': name,
+        'tags': tags,
+        'builtin': builtin,
+        'requiresDirection': requiresDirection,
+        'submittable': submittable,
+        'editable': editable,
+      };
+
+  factory NodeProfile.fromJson(Map<String, dynamic> j) => NodeProfile(
+        id: j['id'],
+        name: j['name'],
+        tags: Map<String, String>.from(j['tags']),
+        builtin: j['builtin'] ?? false,
+        requiresDirection: j['requiresDirection'] ?? true, // Default to true for backward compatibility
+        submittable: j['submittable'] ?? true, // Default to true for backward compatibility
+        editable: j['editable'] ?? true, // Default to true for backward compatibility
+      );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is NodeProfile &&
+          runtimeType == other.runtimeType &&
+          id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}
+

lib/models/operator_profile.dart

@@ -0,0 +1,48 @@
+import 'package:uuid/uuid.dart';
+
+/// A bundle of OSM tags that describe a particular surveillance operator.
+/// These are applied on top of camera profile tags during submissions.
+class OperatorProfile {
+  final String id;
+  final String name;
+  final Map<String, String> tags;
+
+  OperatorProfile({
+    required this.id,
+    required this.name,
+    required this.tags,
+  });
+
+  OperatorProfile copyWith({
+    String? id,
+    String? name,
+    Map<String, String>? tags,
+  }) =>
+      OperatorProfile(
+        id: id ?? this.id,
+        name: name ?? this.name,
+        tags: tags ?? this.tags,
+      );
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'name': name,
+        'tags': tags,
+      };
+
+  factory OperatorProfile.fromJson(Map<String, dynamic> j) => OperatorProfile(
+        id: j['id'],
+        name: j['name'],
+        tags: Map<String, String>.from(j['tags']),
+      );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is OperatorProfile &&
+          runtimeType == other.runtimeType &&
+          id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}

lib/models/pending_upload.dart

@@ -1,38 +1,92 @@
 import 'package:latlong2/latlong.dart';
-import 'camera_profile.dart';
+import 'node_profile.dart';
+import 'operator_profile.dart';
+import '../state/settings_state.dart';
 
 class PendingUpload {
   final LatLng coord;
   final double direction;
-  final CameraProfile profile;
+  final NodeProfile profile;
+  final OperatorProfile? operatorProfile;
+  final UploadMode uploadMode; // Capture upload destination when queued
+  final int? originalNodeId; // If this is an edit, the ID of the original OSM node
   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,
+    this.operatorProfile,
+    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';
+    }
+  }
+
+  // Get combined tags from camera profile and operator profile
+  Map<String, String> getCombinedTags() {
+    final tags = Map<String, String>.from(profile.tags);
+    
+    // Add operator profile tags (they override camera profile tags if there are conflicts)
+    if (operatorProfile != null) {
+      tags.addAll(operatorProfile!.tags);
+    }
+    
+    // Add direction if required
+    if (profile.requiresDirection) {
+      tags['direction'] = direction.toStringAsFixed(0);
+    }
+    
+    return tags;
+  }
+
   Map<String, dynamic> toJson() => {
         'lat': coord.latitude,
         'lon': coord.longitude,
         'dir': direction,
         'profile': profile.toJson(),
+        'operatorProfile': operatorProfile?.toJson(),
+        'uploadMode': uploadMode.index,
+        'originalNodeId': originalNodeId,
         'attempts': attempts,
         'error': error,
+        'completing': completing,
       };
 
   factory PendingUpload.fromJson(Map<String, dynamic> j) => PendingUpload(
         coord: LatLng(j['lat'], j['lon']),
         direction: j['dir'],
         profile: j['profile'] is Map<String, dynamic>
-            ? CameraProfile.fromJson(j['profile'])
-            : CameraProfile.alpr(),
+            ? NodeProfile.fromJson(j['profile'])
+            : NodeProfile.genericAlpr(),
+        operatorProfile: j['operatorProfile'] != null
+            ? OperatorProfile.fromJson(j['operatorProfile'])
+            : null,
+        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,14 +1,17 @@
 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';
 import '../dev_config.dart';
 import '../widgets/map_view.dart';
 
-import '../widgets/add_camera_sheet.dart';
+import '../widgets/add_node_sheet.dart';
+import '../widgets/edit_node_sheet.dart';
 import '../widgets/camera_provider_with_cache.dart';
 import '../widgets/download_area_dialog.dart';
+import '../widgets/measured_sheet.dart';
 
 class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
@@ -17,29 +20,130 @@ 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;
+  bool _editSheetShown = false;
+  
+  // Track sheet heights for map padding
+  double _addSheetHeight = 0.0;
+  double _editSheetHeight = 0.0;
 
-  void _openAddCameraSheet() {
-    // Disable follow-me when adding a camera so the map doesn't jump around
-    setState(() => _followMe = false);
-    
+  @override
+  void initState() {
+    super.initState();
+    _mapController = AnimatedMapController(vsync: this);
+  }
+
+  @override
+  void dispose() {
+    _mapController.dispose();
+    super.dispose();
+  }
+
+  String _getFollowMeTooltip(FollowMeMode mode) {
+    switch (mode) {
+      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(FollowMeMode mode) {
+    switch (mode) {
+      case FollowMeMode.off:
+        return Icons.gps_off;
+      case FollowMeMode.northUp:
+        return Icons.gps_fixed;
+      case FollowMeMode.rotating:
+        return Icons.navigation;
+    }
+  }
+
+  FollowMeMode _getNextFollowMeMode(FollowMeMode mode) {
+    switch (mode) {
+      case FollowMeMode.off:
+        return FollowMeMode.northUp;
+      case FollowMeMode.northUp:
+        return FollowMeMode.rotating;
+      case FollowMeMode.rotating:
+        return FollowMeMode.off;
+    }
+  }
+
+  void _openAddNodeSheet() {
     final appState = context.read<AppState>();
+    // Disable follow-me when adding a camera so the map doesn't jump around
+    appState.setFollowMeMode(FollowMeMode.off);
+    
     appState.startAddSession();
     final session = appState.session!;          // guaranteed non‑null now
 
-    _scaffoldKey.currentState!.showBottomSheet(
-      (ctx) => AddCameraSheet(session: session),
+    final controller = _scaffoldKey.currentState!.showBottomSheet(
+      (ctx) => MeasuredSheet(
+        onHeightChanged: (height) {
+          setState(() {
+            _addSheetHeight = height;
+          });
+        },
+        child: AddNodeSheet(session: session),
+      ),
     );
+    
+    // Reset height when sheet is dismissed
+    controller.closed.then((_) {
+      setState(() {
+        _addSheetHeight = 0.0;
+      });
+    });
+  }
+
+  void _openEditNodeSheet() {
+    final appState = context.read<AppState>();
+    // Disable follow-me when editing a camera so the map doesn't jump around
+    appState.setFollowMeMode(FollowMeMode.off);
+    
+    final session = appState.editSession!;     // should be non-null when this is called
+
+    final controller = _scaffoldKey.currentState!.showBottomSheet(
+      (ctx) => MeasuredSheet(
+        onHeightChanged: (height) {
+          setState(() {
+            _editSheetHeight = height;
+          });
+        },
+        child: EditNodeSheet(session: session),
+      ),
+    );
+    
+    // Reset height when sheet is dismissed
+    controller.closed.then((_) {
+      setState(() {
+        _editSheetHeight = 0.0;
+      });
+    });
   }
 
   @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((_) => _openEditNodeSheet());
+    } else if (appState.editSession == null) {
+      _editSheetShown = false;
+    }
+
+    // Calculate bottom padding for map (90% of active sheet height)
+    final activeSheetHeight = _addSheetHeight > 0 ? _addSheetHeight : _editSheetHeight;
+    final mapBottomPadding = activeSheetHeight * 0.9;
+
     return MultiProvider(
       providers: [
         ChangeNotifierProvider<CameraProviderWithCache>(create: (_) => CameraProviderWithCache()),
@@ -50,12 +154,15 @@ 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(appState.followMeMode),
+              icon: Icon(_getFollowMeIcon(appState.followMeMode)),
               onPressed: () {
-                setState(() => _followMe = !_followMe);
+                final oldMode = appState.followMeMode;
+                final newMode = _getNextFollowMeMode(oldMode);
+                debugPrint('[HomeScreen] Follow mode changed: $oldMode → $newMode');
+                appState.setFollowMeMode(newMode);
                 // If enabling follow-me, retry location init in case permission was granted
-                if (_followMe) {
+                if (newMode != FollowMeMode.off) {
                   _mapViewKey.currentState?.retryLocationInit();
                 }
               },
@@ -71,39 +178,14 @@ class _HomeScreenState extends State<HomeScreen> {
             MapView(
               key: _mapViewKey,
               controller: _mapController,
-              followMe: _followMe,
+              followMeMode: appState.followMeMode,
+              bottomPadding: mapBottomPadding,
               onUserGesture: () {
-                if (_followMe) setState(() => _followMe = false);
+                if (appState.followMeMode != FollowMeMode.off) {
+                  appState.setFollowMeMode(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(
@@ -125,8 +207,8 @@ class _HomeScreenState extends State<HomeScreen> {
                       Expanded(
                         child: ElevatedButton.icon(
                           icon: Icon(Icons.add_location_alt),
-                          label: Text('Tag Camera'),
-                          onPressed: _openAddCameraSheet,
+                          label: Text('Tag Node'),
+                          onPressed: _openAddNodeSheet,
                           style: ElevatedButton.styleFrom(
                             minimumSize: Size(0, 48),
                             textStyle: TextStyle(fontSize: 16),
@@ -140,7 +222,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/operator_profile_editor.dart

@@ -0,0 +1,158 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:uuid/uuid.dart';
+
+import '../models/operator_profile.dart';
+import '../app_state.dart';
+
+class OperatorProfileEditor extends StatefulWidget {
+  const OperatorProfileEditor({super.key, required this.profile});
+
+  final OperatorProfile profile;
+
+  @override
+  State<OperatorProfileEditor> createState() => _OperatorProfileEditorState();
+}
+
+class _OperatorProfileEditorState extends State<OperatorProfileEditor> {
+  late TextEditingController _nameCtrl;
+  late List<MapEntry<String, String>> _tags;
+
+  static const _defaultTags = [
+    MapEntry('operator', ''),
+    MapEntry('operator:type', ''),
+    MapEntry('operator:wikidata', ''),
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    _nameCtrl = TextEditingController(text: widget.profile.name);
+
+    if (widget.profile.tags.isEmpty) {
+      // New profile → start with sensible defaults
+      _tags = [..._defaultTags];
+    } else {
+      _tags = widget.profile.tags.entries.toList();
+    }
+  }
+
+  @override
+  void dispose() {
+    _nameCtrl.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(widget.profile.name.isEmpty ? 'New Operator Profile' : 'Edit Operator Profile'),
+      ),
+      body: ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          TextField(
+            controller: _nameCtrl,
+            decoration: const InputDecoration(
+              labelText: 'Operator name',
+              hintText: 'e.g., Austin Police Department',
+            ),
+          ),
+          const SizedBox(height: 24),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            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'),
+              ),
+            ],
+          ),
+          const SizedBox(height: 8),
+          ..._buildTagRows(),
+          const SizedBox(height: 24),
+          ElevatedButton(
+            onPressed: _save,
+            child: const Text('Save Profile'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  List<Widget> _buildTagRows() {
+    return List.generate(_tags.length, (i) {
+      final keyController = TextEditingController(text: _tags[i].key);
+      final valueController = TextEditingController(text: _tags[i].value);
+      
+      return Padding(
+        padding: const EdgeInsets.only(bottom: 8.0),
+        child: Row(
+          children: [
+            Expanded(
+              flex: 2,
+              child: TextField(
+                decoration: const InputDecoration(
+                  hintText: 'key',
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                ),
+                controller: keyController,
+                onChanged: (v) => _tags[i] = MapEntry(v, _tags[i].value),
+              ),
+            ),
+            const SizedBox(width: 8),
+            Expanded(
+              flex: 3,
+              child: TextField(
+                decoration: const InputDecoration(
+                  hintText: 'value',
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                ),
+                controller: valueController,
+                onChanged: (v) => _tags[i] = MapEntry(_tags[i].key, v),
+              ),
+            ),
+            IconButton(
+              icon: const Icon(Icons.delete, color: Colors.red),
+              onPressed: () => setState(() => _tags.removeAt(i)),
+            ),
+          ],
+        ),
+      );
+    });
+  }
+
+  void _save() {
+    final name = _nameCtrl.text.trim();
+    if (name.isEmpty) {
+      ScaffoldMessenger.of(context)
+          .showSnackBar(const SnackBar(content: Text('Operator name is required')));
+      return;
+    }
+    
+    final tagMap = <String, String>{};
+    for (final e in _tags) {
+      if (e.key.trim().isEmpty || e.value.trim().isEmpty) continue;
+      tagMap[e.key.trim()] = e.value.trim();
+    }
+    
+    final newProfile = widget.profile.copyWith(
+      id: widget.profile.id.isEmpty ? const Uuid().v4() : widget.profile.id,
+      name: name,
+      tags: tagMap,
+    );
+    
+    context.read<AppState>().addOrUpdateOperatorProfile(newProfile);
+    Navigator.pop(context);
+    
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text('Operator profile "${newProfile.name}" saved')),
+    );
+  }
+}

lib/screens/profile_editor.dart

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:uuid/uuid.dart';
 
-import '../models/camera_profile.dart';
+import '../models/node_profile.dart';
 import '../app_state.dart';
 
 class ProfileEditor extends StatefulWidget {
   const ProfileEditor({super.key, required this.profile});
 
-  final CameraProfile profile;
+  final NodeProfile profile;
 
   @override
   State<ProfileEditor> createState() => _ProfileEditorState();
@@ -17,6 +17,8 @@ class ProfileEditor extends StatefulWidget {
 class _ProfileEditorState extends State<ProfileEditor> {
   late TextEditingController _nameCtrl;
   late List<MapEntry<String, String>> _tags;
+  late bool _requiresDirection;
+  late bool _submittable;
 
   static const _defaultTags = [
     MapEntry('man_made', 'surveillance'),
@@ -33,6 +35,8 @@ class _ProfileEditorState extends State<ProfileEditor> {
   void initState() {
     super.initState();
     _nameCtrl = TextEditingController(text: widget.profile.name);
+    _requiresDirection = widget.profile.requiresDirection;
+    _submittable = widget.profile.submittable;
 
     if (widget.profile.tags.isEmpty) {
       // New profile → start with sensible defaults
@@ -52,39 +56,60 @@ 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.editable 
+            ? 'View Profile' 
+            : (widget.profile.name.isEmpty ? 'New Profile' : 'Edit Profile')),
       ),
       body: ListView(
         padding: const EdgeInsets.all(16),
         children: [
           TextField(
             controller: _nameCtrl,
+            readOnly: !widget.profile.editable,
             decoration: const InputDecoration(
               labelText: 'Profile name',
               hintText: 'e.g., Custom ALPR Camera',
             ),
           ),
-          const SizedBox(height: 24),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            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'),
-              ),
-            ],
-          ),
+          const SizedBox(height: 16),
+          if (widget.profile.editable) ...[
+            CheckboxListTile(
+              title: const Text('Requires Direction'),
+              subtitle: const Text('Whether cameras of this type need a direction tag'),
+              value: _requiresDirection,
+              onChanged: (value) => setState(() => _requiresDirection = value ?? true),
+              controlAffinity: ListTileControlAffinity.leading,
+            ),
+            CheckboxListTile(
+              title: const Text('Submittable'),
+              subtitle: const Text('Whether this profile can be used for camera submissions'),
+              value: _submittable,
+              onChanged: (value) => setState(() => _submittable = value ?? true),
+              controlAffinity: ListTileControlAffinity.leading,
+            ),
+          ],
+          const SizedBox(height: 8),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                const Text('OSM Tags',
+                    style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16)),
+                if (widget.profile.editable)
+                  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.editable)
+            ElevatedButton(
+              onPressed: _save,
+              child: const Text('Save Profile'),
+            ),
         ],
       ),
     );
@@ -108,7 +133,10 @@ class _ProfileEditorState extends State<ProfileEditor> {
                   isDense: true,
                 ),
                 controller: keyController,
-                onChanged: (v) => _tags[i] = MapEntry(v, _tags[i].value),
+                readOnly: !widget.profile.editable,
+                onChanged: !widget.profile.editable 
+                    ? null 
+                    : (v) => _tags[i] = MapEntry(v, _tags[i].value),
               ),
             ),
             const SizedBox(width: 8),
@@ -121,13 +149,17 @@ class _ProfileEditorState extends State<ProfileEditor> {
                   isDense: true,
                 ),
                 controller: valueController,
-                onChanged: (v) => _tags[i] = MapEntry(_tags[i].key, v),
+                readOnly: !widget.profile.editable,
+                onChanged: !widget.profile.editable 
+                    ? 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.editable)
+              IconButton(
+                icon: const Icon(Icons.delete, color: Colors.red),
+                onPressed: () => setState(() => _tags.removeAt(i)),
+              ),
           ],
         ),
       );
@@ -159,6 +191,9 @@ class _ProfileEditorState extends State<ProfileEditor> {
       name: name,
       tags: tagMap,
       builtin: false,
+      requiresDirection: _requiresDirection,
+      submittable: _submittable,
+      editable: true, // All custom profiles are editable by definition
     );
     
     context.read<AppState>().addOrUpdateProfile(newProfile);

lib/screens/settings_screen.dart

@@ -2,11 +2,12 @@ import 'package:flutter/material.dart';
 import 'settings_screen_sections/auth_section.dart';
 import 'settings_screen_sections/upload_mode_section.dart';
 import 'settings_screen_sections/profile_list_section.dart';
+import 'settings_screen_sections/operator_profile_list_section.dart';
 import 'settings_screen_sections/queue_section.dart';
 import 'settings_screen_sections/offline_areas_section.dart';
 import 'settings_screen_sections/offline_mode_section.dart';
 import 'settings_screen_sections/about_section.dart';
-import 'settings_screen_sections/max_cameras_section.dart';
+import 'settings_screen_sections/max_nodes_section.dart';
 import 'settings_screen_sections/tile_provider_section.dart';
 
 class SettingsScreen extends StatelessWidget {
@@ -27,7 +28,9 @@ class SettingsScreen extends StatelessWidget {
           Divider(),
           ProfileListSection(),
           Divider(),
-          MaxCamerasSection(),
+          OperatorProfileListSection(),
+          Divider(),
+          MaxNodesSection(),
           Divider(),
           TileProviderSection(),
           Divider(),

lib/screens/settings_screen_sections/max_nodes_section.dart

@@ -2,21 +2,21 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../../app_state.dart';
 
-class MaxCamerasSection extends StatefulWidget {
-  const MaxCamerasSection({super.key});
+class MaxNodesSection extends StatefulWidget {
+  const MaxNodesSection({super.key});
 
   @override
-  State<MaxCamerasSection> createState() => _MaxCamerasSectionState();
+  State<MaxNodesSection> createState() => _MaxNodesSectionState();
 }
 
-class _MaxCamerasSectionState extends State<MaxCamerasSection> {
+class _MaxNodesSectionState extends State<MaxNodesSection> {
   late TextEditingController _controller;
 
   @override
   void initState() {
     super.initState();
-    final maxCameras = context.read<AppState>().maxCameras;
-    _controller = TextEditingController(text: maxCameras.toString());
+    final maxNodes = context.read<AppState>().maxCameras;
+    _controller = TextEditingController(text: maxNodes.toString());
   }
 
   @override
@@ -29,17 +29,17 @@ class _MaxCamerasSectionState extends State<MaxCamerasSection> {
   Widget build(BuildContext context) {
     final appState = context.watch<AppState>();
     final current = appState.maxCameras;
-    final showWarning = current > 250;
+    final showWarning = current > 1000;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         ListTile(
           leading: const Icon(Icons.filter_alt),
-          title: const Text('Max cameras fetched/drawn'),
+          title: const Text('Max nodes fetched/drawn'),
           subtitle: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              const Text('Set an upper limit for the number of cameras on the map (default: 250).'),
+              const Text('Set an upper limit for the number of nodes on the map (default: 250).'),
               if (showWarning)
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 4.0),

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

@@ -0,0 +1,122 @@
+import 'package:flutter/material.dart';
+import 'package:uuid/uuid.dart';
+import 'package:provider/provider.dart';
+import '../../app_state.dart';
+import '../../models/operator_profile.dart';
+import '../operator_profile_editor.dart';
+
+class OperatorProfileListSection extends StatelessWidget {
+  const OperatorProfileListSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final appState = context.watch<AppState>();
+
+    return Column(
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const Text('Operator Profiles', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+            TextButton.icon(
+              onPressed: () => Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (_) => OperatorProfileEditor(
+                    profile: OperatorProfile(
+                      id: const Uuid().v4(),
+                      name: '',
+                      tags: const {},
+                    ),
+                  ),
+                ),
+              ),
+              icon: const Icon(Icons.add),
+              label: const Text('New Profile'),
+            ),
+          ],
+        ),
+        if (appState.operatorProfiles.isEmpty)
+          const Padding(
+            padding: EdgeInsets.all(16.0),
+            child: Text(
+              'No operator profiles defined. Create one to apply operator tags to node submissions.',
+              style: TextStyle(color: Colors.grey),
+              textAlign: TextAlign.center,
+            ),
+          )
+        else
+          ...appState.operatorProfiles.map(
+            (p) => ListTile(
+              title: Text(p.name),
+              subtitle: Text('${p.tags.length} tags'),
+              trailing: 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: (_) => OperatorProfileEditor(profile: p),
+                      ),
+                    );
+                  } else if (value == 'delete') {
+                    _showDeleteProfileDialog(context, p);
+                  }
+                },
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+
+void _showDeleteProfileDialog(BuildContext context, OperatorProfile profile) {
+  final appState = context.read<AppState>();
+  showDialog(
+    context: context,
+    builder: (context) => AlertDialog(
+      title: const Text('Delete Operator Profile'),
+      content: Text('Are you sure you want to delete "${profile.name}"?'),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: const Text('Cancel'),
+        ),
+        TextButton(
+          onPressed: () {
+            appState.deleteOperatorProfile(profile);
+            Navigator.pop(context);
+            ScaffoldMessenger.of(context).showSnackBar(
+              const SnackBar(content: Text('Operator profile deleted')),
+            );
+          },
+          style: TextButton.styleFrom(foregroundColor: Colors.red),
+          child: const Text('Delete'),
+        ),
+      ],
+    ),
+  );
+}
+}

lib/screens/settings_screen_sections/profile_list_section.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 import 'package:provider/provider.dart';
 import '../../app_state.dart';
-import '../../models/camera_profile.dart';
+import '../../models/node_profile.dart';
 import '../profile_editor.dart';
 
 class ProfileListSection extends StatelessWidget {
@@ -17,13 +17,13 @@ class ProfileListSection extends StatelessWidget {
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            const Text('Camera Profiles', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+            const Text('Node Profiles', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
             TextButton.icon(
               onPressed: () => Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (_) => ProfileEditor(
-                    profile: CameraProfile(
+                    profile: NodeProfile(
                       id: const Uuid().v4(),
                       name: '',
                       tags: const {},
@@ -44,49 +44,74 @@ 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.editable 
+              ? 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);
+                    }
+                  },
+                ),
           ),
         ),
       ],
     );
   }
 
-void _showDeleteProfileDialog(BuildContext context, CameraProfile profile) {
+void _showDeleteProfileDialog(BuildContext context, NodeProfile profile) {
   final appState = context.read<AppState>();
   showDialog(
     context: context,

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,12 +1,13 @@
 import 'package:latlong2/latlong.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter/foundation.dart';
 
-import '../models/camera_profile.dart';
+import '../models/node_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/cameras_from_local.dart';
+import 'map_data_submodules/nodes_from_overpass.dart';
+import 'map_data_submodules/tiles_from_remote.dart';
+import 'map_data_submodules/nodes_from_local.dart';
 import 'map_data_submodules/tiles_from_local.dart';
 
 enum MapSource { local, remote, auto } // For future use
@@ -30,11 +31,11 @@ class MapDataProvider {
     AppState.instance.setOfflineMode(enabled);
   }
 
-  /// Fetch cameras from OSM/Overpass or local storage.
+  /// Fetch surveillance nodes from OSM/Overpass or local storage.
   /// Remote is default. If source is MapSource.auto, remote is tried first unless offline.
-  Future<List<OsmCameraNode>> getCameras({
+  Future<List<OsmCameraNode>> getNodes({
     required LatLngBounds bounds,
-    required List<CameraProfile> profiles,
+    required List<NodeProfile> profiles,
     UploadMode uploadMode = UploadMode.production,
     MapSource source = MapSource.auto,
   }) async {
@@ -43,20 +44,19 @@ class MapDataProvider {
     // Explicit remote request: error if offline, else always remote
     if (source == MapSource.remote) {
       if (offline) {
-        throw OfflineModeException("Cannot fetch remote cameras in offline mode.");
+        throw OfflineModeException("Cannot fetch remote nodes in offline mode.");
       }
-      return camerasFromOverpass(
+      return fetchOverpassNodes(
         bounds: bounds,
         profiles: profiles,
         uploadMode: uploadMode,
-        pageSize: AppState.instance.maxCameras,
-        fetchAllPages: false,
+        maxResults: AppState.instance.maxCameras,
       );
     }
 
     // Explicit local request: always use local
     if (source == MapSource.local) {
-      return fetchLocalCameras(
+      return fetchLocalNodes(
         bounds: bounds,
         profiles: profiles,
       );
@@ -64,50 +64,49 @@ class MapDataProvider {
 
     // AUTO: default = remote first, fallback to local only if offline
     if (offline) {
-      return fetchLocalCameras(
+      return fetchLocalNodes(
         bounds: bounds,
         profiles: profiles,
+        maxNodes: AppState.instance.maxCameras,
       );
     } else {
       // Try remote, fallback to local ONLY if remote throws (optional, could be removed for stricter behavior)
       try {
-        return await camerasFromOverpass(
+        return await fetchOverpassNodes(
           bounds: bounds,
           profiles: profiles,
           uploadMode: uploadMode,
-          pageSize: AppState.instance.maxCameras,
+          maxResults: AppState.instance.maxCameras,
         );
       } catch (e) {
-        print('[MapDataProvider] Remote camera fetch failed, error: $e. Falling back to local.');
-        return fetchLocalCameras(
-          bounds: bounds,
-          profiles: profiles,
-          maxCameras: AppState.instance.maxCameras,
-        );
+        debugPrint('[MapDataProvider] Remote node fetch failed, error: $e. Falling back to local.');
+      return fetchLocalNodes(
+        bounds: bounds,
+        profiles: profiles,
+        maxNodes: AppState.instance.maxCameras,
+      );
       }
     }
   }
 
-  /// Bulk/paged camera fetch for offline downloads (handling paging, dedup, and Overpass retries)
+  /// Bulk/paged node fetch for offline downloads (handling paging, dedup, and Overpass retries)
   /// Only use for offline area download, not for map browsing! Ignores maxCameras config.
-  Future<List<OsmCameraNode>> getAllCamerasForDownload({
+  Future<List<OsmCameraNode>> getAllNodesForDownload({
     required LatLngBounds bounds,
-    required List<CameraProfile> profiles,
+    required List<NodeProfile> profiles,
     UploadMode uploadMode = UploadMode.production,
     int pageSize = 500,
     int maxTries = 3,
   }) async {
     final offline = AppState.instance.offlineMode;
     if (offline) {
-      throw OfflineModeException("Cannot fetch remote cameras for offline area download in offline mode.");
+      throw OfflineModeException("Cannot fetch remote nodes for offline area download in offline mode.");
     }
-    return camerasFromOverpass(
+    return fetchOverpassNodes(
       bounds: bounds,
       profiles: profiles,
       uploadMode: uploadMode,
-      fetchAllPages: true,
-      pageSize: pageSize,
-      maxTries: maxTries,
+      maxResults: pageSize,
     );
   }
 
@@ -125,7 +124,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 +137,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,79 +0,0 @@
-import 'dart:convert';
-import 'package:http/http.dart' as http;
-import 'package:latlong2/latlong.dart';
-import 'package:flutter_map/flutter_map.dart';
-
-import '../../models/camera_profile.dart';
-import '../../models/osm_camera_node.dart';
-import '../../app_state.dart';
-import '../network_status.dart';
-
-/// Fetches cameras from the Overpass OSM API for the given bounds and profiles.
-/// If fetchAllPages is true, returns all possible cameras using multiple API calls (paging with pageSize).
-/// If false (the default), returns only the first page of up to pageSize results.
-Future<List<OsmCameraNode>> camerasFromOverpass({
-  required LatLngBounds bounds,
-  required List<CameraProfile> profiles,
-  UploadMode uploadMode = UploadMode.production,
-  int pageSize = 500,           // Used for both default limit and paging chunk
-  bool fetchAllPages = false,   // True for offline area download, else just grabs first chunk
-  int maxTries = 3,
-}) async {
-  if (profiles.isEmpty) return [];
-  const String prodEndpoint = 'https://overpass-api.de/api/interpreter';
-
-  final nodeClauses = profiles.map((profile) {
-    final tagFilters = profile.tags.entries
-        .map((e) => '["${e.key}"="${e.value}"]')
-        .join('\n          ');
-    return '''node\n          $tagFilters\n          (${bounds.southWest.latitude},${bounds.southWest.longitude},\n           ${bounds.northEast.latitude},${bounds.northEast.longitude});''';
-  }).join('\n      ');
-
-  // Helper for one Overpass chunk fetch
-  Future<List<OsmCameraNode>> fetchChunk() async {
-    final outLine = fetchAllPages ? 'out body;' : 'out body $pageSize;';
-    final query = '''
-      [out:json][timeout:25];
-      (
-        $nodeClauses
-      );
-      $outLine
-    ''';
-    try {
-      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}');
-      if (resp.statusCode != 200) {
-        print('[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}');
-      NetworkStatus.instance.reportOverpassSuccess();
-      return elements.whereType<Map<String, dynamic>>().map((e) {
-        return OsmCameraNode(
-          id: e['id'],
-          coord: LatLng(e['lat'], e['lon']),
-          tags: Map<String, String>.from(e['tags'] ?? {}),
-        );
-      }).toList();
-    } catch (e) {
-      print('[camerasFromOverpass] Overpass exception: $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.reportOverpassIssue();
-      }
-      
-      return [];
-    }
-  }
-
-  // All paths just use a single fetch now; paging logic no longer required.
-  return await fetchChunk();
-}

lib/services/map_data_submodules/nodes_from_local.dart

@@ -3,15 +3,15 @@ import 'dart:convert';
 import 'package:latlong2/latlong.dart';
 import 'package:flutter_map/flutter_map.dart' show LatLngBounds;
 import '../../models/osm_camera_node.dart';
-import '../../models/camera_profile.dart';
+import '../../models/node_profile.dart';
 import '../offline_area_service.dart';
 import '../offline_areas/offline_area_models.dart';
 
-/// Fetch camera nodes from all offline areas intersecting the bounds/profile list.
-Future<List<OsmCameraNode>> fetchLocalCameras({
+/// Fetch surveillance nodes from all offline areas intersecting the bounds/profile list.
+Future<List<OsmCameraNode>> fetchLocalNodes({
   required LatLngBounds bounds,
-  required List<CameraProfile> profiles,
-  int? maxCameras,
+  required List<NodeProfile> profiles,
+  int? maxNodes,
 }) async {
   final areas = OfflineAreaService().offlineAreas;
   final Map<int, OsmCameraNode> deduped = {};
@@ -20,24 +20,24 @@ Future<List<OsmCameraNode>> fetchLocalCameras({
     if (area.status != OfflineAreaStatus.complete) continue;
     if (!area.bounds.isOverlapping(bounds)) continue;
 
-    final nodes = await _loadAreaCameras(area);
-    for (final cam in nodes) {
-      // Deduplicate by camera ID, preferring the first occurrence
-      if (deduped.containsKey(cam.id)) continue;
+    final nodes = await _loadAreaNodes(area);
+    for (final node in nodes) {
+      // Deduplicate by node ID, preferring the first occurrence
+      if (deduped.containsKey(node.id)) continue;
       // Within view bounds?
-      if (!_pointInBounds(cam.coord, bounds)) continue;
+      if (!_pointInBounds(node.coord, bounds)) continue;
       // Profile filter if used
-      if (profiles.isNotEmpty && !_matchesAnyProfile(cam, profiles)) continue;
-      deduped[cam.id] = cam;
+      if (profiles.isNotEmpty && !_matchesAnyProfile(node, profiles)) continue;
+      deduped[node.id] = node;
     }
   }
 
-  final out = deduped.values.take(maxCameras ?? deduped.length).toList();
+  final out = deduped.values.take(maxNodes ?? deduped.length).toList();
   return out;
 }
 
 // Try in-memory first, else load from disk
-Future<List<OsmCameraNode>> _loadAreaCameras(OfflineArea area) async {
+Future<List<OsmCameraNode>> _loadAreaNodes(OfflineArea area) async {
   if (area.cameras.isNotEmpty) {
     return area.cameras;
   }
@@ -57,16 +57,16 @@ bool _pointInBounds(LatLng pt, LatLngBounds bounds) {
          pt.longitude <= bounds.northEast.longitude;
 }
 
-bool _matchesAnyProfile(OsmCameraNode cam, List<CameraProfile> profiles) {
+bool _matchesAnyProfile(OsmCameraNode node, List<NodeProfile> profiles) {
   for (final prof in profiles) {
-    if (_cameraMatchesProfile(cam, prof)) return true;
+    if (_nodeMatchesProfile(node, prof)) return true;
   }
   return false;
 }
 
-bool _cameraMatchesProfile(OsmCameraNode cam, CameraProfile profile) {
+bool _nodeMatchesProfile(OsmCameraNode node, NodeProfile profile) {
   for (final e in profile.tags.entries) {
-    if (cam.tags[e.key] != e.value) return false; // All profile tags must match
+    if (node.tags[e.key] != e.value) return false; // All profile tags must match
   }
   return true;
 }

lib/services/map_data_submodules/nodes_from_overpass.dart

@@ -0,0 +1,92 @@
+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';
+
+import '../../models/node_profile.dart';
+import '../../models/osm_camera_node.dart';
+import '../../app_state.dart';
+import '../network_status.dart';
+
+/// Fetches surveillance nodes from the Overpass OSM API for the given bounds and profiles.
+Future<List<OsmCameraNode>> fetchOverpassNodes({
+  required LatLngBounds bounds,
+  required List<NodeProfile> profiles,
+  UploadMode uploadMode = UploadMode.production,
+  required int maxResults,
+}) async {
+  if (profiles.isEmpty) return [];
+  
+  const String overpassEndpoint = 'https://overpass-api.de/api/interpreter';
+  
+  // Build the Overpass query
+  final query = _buildOverpassQuery(bounds, profiles, maxResults);
+  
+  try {
+    debugPrint('[fetchOverpassNodes] Querying Overpass for surveillance nodes...');
+    debugPrint('[fetchOverpassNodes] Query:\n$query');
+    
+    final response = await http.post(
+      Uri.parse(overpassEndpoint), 
+      body: {'data': query.trim()}
+    );
+    
+    if (response.statusCode != 200) {
+      debugPrint('[fetchOverpassNodes] Overpass API error: ${response.body}');
+      NetworkStatus.instance.reportOverpassIssue();
+      return [];
+    }
+    
+    final data = jsonDecode(response.body) as Map<String, dynamic>;
+    final elements = data['elements'] as List<dynamic>;
+    
+    if (elements.length > 20) {
+      debugPrint('[fetchOverpassNodes] Retrieved ${elements.length} surveillance nodes');
+    }
+    
+    NetworkStatus.instance.reportOverpassSuccess();
+    
+    return elements.whereType<Map<String, dynamic>>().map((element) {
+      return OsmCameraNode(
+        id: element['id'],
+        coord: LatLng(element['lat'], element['lon']),
+        tags: Map<String, String>.from(element['tags'] ?? {}),
+      );
+    }).toList();
+    
+  } catch (e) {
+    debugPrint('[fetchOverpassNodes] Exception: $e');
+    
+    // Report network issues for connection errors
+    if (e.toString().contains('Connection refused') || 
+        e.toString().contains('Connection timed out') ||
+        e.toString().contains('Connection reset')) {
+      NetworkStatus.instance.reportOverpassIssue();
+    }
+    
+    return [];
+  }
+}
+
+/// Builds an Overpass API query for surveillance nodes matching the given profiles within bounds.
+String _buildOverpassQuery(LatLngBounds bounds, List<NodeProfile> profiles, int maxResults) {
+  // Build node clauses for each profile
+  final nodeClauses = profiles.map((profile) {
+    // Convert profile tags to Overpass filter format
+    final tagFilters = profile.tags.entries
+        .map((entry) => '["${entry.key}"="${entry.value}"]')
+        .join();
+    
+    // Build the node query with tag filters and bounding box
+    return 'node$tagFilters(${bounds.southWest.latitude},${bounds.southWest.longitude},${bounds.northEast.latitude},${bounds.northEast.longitude});';
+  }).join('\n      ');
+
+  return '''
+[out:json][timeout:25];
+(
+  $nodeClauses
+);
+out body $maxResults;
+''';
+}

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);
@@ -142,13 +147,13 @@ class OfflineAreaDownloader {
   }) async {
     // Calculate expanded camera bounds that cover the entire tile area at minimum zoom
     final cameraBounds = _calculateCameraBounds(bounds, minZoom);
-    final cameras = await MapDataProvider().getAllCamerasForDownload(
+    final cameras = await MapDataProvider().getAllNodesForDownload(
       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/operator_profile_service.dart

@@ -0,0 +1,22 @@
+import 'dart:convert';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../models/operator_profile.dart';
+
+class OperatorProfileService {
+  static const _key = 'operator_profiles';
+
+  Future<List<OperatorProfile>> load() async {
+    final prefs = await SharedPreferences.getInstance();
+    final jsonStr = prefs.getString(_key);
+    if (jsonStr == null) return [];
+    final list = jsonDecode(jsonStr) as List<dynamic>;
+    return list.map((e) => OperatorProfile.fromJson(e)).toList();
+  }
+
+  Future<void> save(List<OperatorProfile> profiles) async {
+    final prefs = await SharedPreferences.getInstance();
+    final encodable = profiles.map((p) => p.toJson()).toList();
+    await prefs.setString(_key, jsonEncode(encodable));
+  }
+}

lib/services/profile_service.dart

@@ -1,20 +1,20 @@
 import 'dart:convert';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import '../models/camera_profile.dart';
+import '../models/node_profile.dart';
 
 class ProfileService {
   static const _key = 'custom_profiles';
 
-  Future<List<CameraProfile>> load() async {
+  Future<List<NodeProfile>> load() async {
     final prefs = await SharedPreferences.getInstance();
     final jsonStr = prefs.getString(_key);
     if (jsonStr == null) return [];
     final list = jsonDecode(jsonStr) as List<dynamic>;
-    return list.map((e) => CameraProfile.fromJson(e)).toList();
+    return list.map((e) => NodeProfile.fromJson(e)).toList();
   }
 
-  Future<void> save(List<CameraProfile> profiles) async {
+  Future<void> save(List<NodeProfile> profiles) async {
     final prefs = await SharedPreferences.getInstance();
 
     // MUST convert to List before jsonEncode; the previous MappedIterable

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

@@ -14,14 +14,15 @@ class Uploader {
 
   Future<bool> upload(PendingUpload p) async {
     try {
-      print('Uploader: Starting upload for camera at ${p.coord.latitude}, ${p.coord.longitude}');
+      print('Uploader: Starting upload for node 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 node"/>
           </changeset>
         </osm>''';
       print('Uploader: Creating changeset...');
@@ -34,28 +35,63 @@ 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
-      final mergedTags = Map<String, String>.from(p.profile.tags)
-        ..['direction'] = p.direction.round().toString();
+      // 2. create or update node
+      final mergedTags = p.getCombinedTags();
       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 +117,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/operator_profile_state.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+
+import '../models/operator_profile.dart';
+import '../services/operator_profile_service.dart';
+
+class OperatorProfileState extends ChangeNotifier {
+  final List<OperatorProfile> _profiles = [];
+
+  List<OperatorProfile> get profiles => List.unmodifiable(_profiles);
+
+  Future<void> init() async {
+    _profiles.addAll(await OperatorProfileService().load());
+  }
+
+  void addOrUpdateProfile(OperatorProfile p) {
+    final idx = _profiles.indexWhere((x) => x.id == p.id);
+    if (idx >= 0) {
+      _profiles[idx] = p;
+    } else {
+      _profiles.add(p);
+    }
+    OperatorProfileService().save(_profiles);
+    notifyListeners();
+  }
+
+  void deleteProfile(OperatorProfile p) {
+    _profiles.removeWhere((x) => x.id == p.id);
+    OperatorProfileService().save(_profiles);
+    notifyListeners();
+  }
+}

lib/state/profile_state.dart

@@ -1,25 +1,33 @@
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import '../models/camera_profile.dart';
+import '../models/node_profile.dart';
 import '../services/profile_service.dart';
 
 class ProfileState extends ChangeNotifier {
   static const String _enabledPrefsKey = 'enabled_profiles';
 
-  final List<CameraProfile> _profiles = [];
-  final Set<CameraProfile> _enabled = {};
+  final List<NodeProfile> _profiles = [];
+  final Set<NodeProfile> _enabled = {};
 
   // Getters
-  List<CameraProfile> get profiles => List.unmodifiable(_profiles);
-  bool isEnabled(CameraProfile p) => _enabled.contains(p);
-  List<CameraProfile> get enabledProfiles =>
+  List<NodeProfile> get profiles => List.unmodifiable(_profiles);
+  bool isEnabled(NodeProfile p) => _enabled.contains(p);
+  List<NodeProfile> get enabledProfiles =>
       _profiles.where(isEnabled).toList(growable: false);
 
   // Initialize profiles from built-in and custom sources
   Future<void> init() async {
     // Initialize profiles: built-in + custom
-    _profiles.add(CameraProfile.alpr());
+    _profiles.add(NodeProfile.genericAlpr());
+    _profiles.add(NodeProfile.flock());
+    _profiles.add(NodeProfile.motorola());
+    _profiles.add(NodeProfile.genetec());
+    _profiles.add(NodeProfile.leonardo());
+    _profiles.add(NodeProfile.neology());
+    _profiles.add(NodeProfile.genericGunshotDetector());
+    _profiles.add(NodeProfile.shotspotter());
+    _profiles.add(NodeProfile.flockRaven());
     _profiles.addAll(await ProfileService().load());
 
     // Load enabled profile IDs from prefs
@@ -34,7 +42,7 @@ class ProfileState extends ChangeNotifier {
     }
   }
 
-  void toggleProfile(CameraProfile p, bool e) {
+  void toggleProfile(NodeProfile p, bool e) {
     if (e) {
       _enabled.add(p);
     } else {
@@ -49,7 +57,7 @@ class ProfileState extends ChangeNotifier {
     notifyListeners();
   }
 
-  void addOrUpdateProfile(CameraProfile p) {
+  void addOrUpdateProfile(NodeProfile p) {
     final idx = _profiles.indexWhere((x) => x.id == p.id);
     if (idx >= 0) {
       _profiles[idx] = p;
@@ -62,8 +70,8 @@ class ProfileState extends ChangeNotifier {
     notifyListeners();
   }
 
-  void deleteProfile(CameraProfile p) {
-    if (p.builtin) return;
+  void deleteProfile(NodeProfile p) {
+    if (!p.editable) return;
     _enabled.remove(p);
     _profiles.removeWhere((x) => x.id == p.id);
     // Safety: Always have at least one enabled profile

lib/state/session_state.dart

@@ -1,30 +1,93 @@
 import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';
 
-import '../models/camera_profile.dart';
+import '../models/node_profile.dart';
+import '../models/operator_profile.dart';
+import '../models/osm_camera_node.dart';
 
-// ------------------ AddCameraSession ------------------
-class AddCameraSession {
-  AddCameraSession({required this.profile, this.directionDegrees = 0});
-  CameraProfile profile;
+// ------------------ AddNodeSession ------------------
+class AddNodeSession {
+  AddNodeSession({required this.profile, this.directionDegrees = 0});
+  NodeProfile profile;
+  OperatorProfile? operatorProfile;
   double directionDegrees;
   LatLng? target;
 }
 
+// ------------------ EditNodeSession ------------------
+class EditNodeSession {
+  EditNodeSession({
+    required this.originalNode,
+    required this.profile,
+    required this.directionDegrees,
+    required this.target,
+  });
+  
+  final OsmCameraNode originalNode; // The original node being edited
+  NodeProfile profile;
+  OperatorProfile? operatorProfile;
+  double directionDegrees;
+  LatLng target; // Current position (can be dragged)
+}
+
 class SessionState extends ChangeNotifier {
-  AddCameraSession? _session;
+  AddNodeSession? _session;
+  EditNodeSession? _editSession;
 
-  // Getter
-  AddCameraSession? get session => _session;
+  // Getters
+  AddNodeSession? get session => _session;
+  EditNodeSession? get editSession => _editSession;
 
-  void startAddSession(List<CameraProfile> enabledProfiles) {
-    _session = AddCameraSession(profile: enabledProfiles.first);
+  void startAddSession(List<NodeProfile> enabledProfiles) {
+    final submittableProfiles = enabledProfiles.where((p) => p.isSubmittable).toList();
+    final defaultProfile = submittableProfiles.isNotEmpty 
+        ? submittableProfiles.first 
+        : enabledProfiles.first; // Fallback to any enabled profile
+    _session = AddNodeSession(profile: defaultProfile);
+    _editSession = null; // Clear any edit session
     notifyListeners();
   }
 
+  void startEditSession(OsmCameraNode node, List<NodeProfile> enabledProfiles) {
+    final submittableProfiles = enabledProfiles.where((p) => p.isSubmittable).toList();
+    
+    // Try to find a matching profile based on the node's tags
+    NodeProfile 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 = EditNodeSession(
+      originalNode: node,
+      profile: matchingProfile,
+      directionDegrees: node.directionDeg ?? 0,
+      target: node.coord,
+    );
+    _session = null; // Clear any add session
+    notifyListeners();
+  }
+
+  bool _profileMatchesTags(NodeProfile 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,
+    NodeProfile? profile,
+    OperatorProfile? operatorProfile,
     LatLng? target,
   }) {
     if (_session == null) return;
@@ -38,6 +101,10 @@ class SessionState extends ChangeNotifier {
       _session!.profile = profile;
       dirty = true;
     }
+    if (operatorProfile != _session!.operatorProfile) {
+      _session!.operatorProfile = operatorProfile;
+      dirty = true;
+    }
     if (target != null) {
       _session!.target = target;
       dirty = true;
@@ -45,12 +112,45 @@ class SessionState extends ChangeNotifier {
     if (dirty) notifyListeners();
   }
 
+  void updateEditSession({
+    double? directionDeg,
+    NodeProfile? profile,
+    OperatorProfile? operatorProfile,
+    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 (operatorProfile != _editSession!.operatorProfile) {
+      _editSession!.operatorProfile = operatorProfile;
+      dirty = true;
+    }
+    if (target != null && target != _editSession!.target) {
+      _editSession!.target = target;
+      dirty = true;
+    }
+    if (dirty) notifyListeners();
+  }
+
   void cancelSession() {
     _session = null;
     notifyListeners();
   }
 
-  AddCameraSession? commitSession() {
+  void cancelEditSession() {
+    _editSession = null;
+    notifyListeners();
+  }
+
+  AddNodeSession? commitSession() {
     if (_session?.target == null) return null;
     
     final session = _session!;
@@ -58,4 +158,13 @@ class SessionState extends ChangeNotifier {
     notifyListeners();
     return session;
   }
+
+  EditNodeSession? commitEditSession() {
+    if (_editSession == null) return null;
+    
+    final session = _editSession!;
+    _editSession = null;
+    notifyListeners();
+    return session;
+  }
 }

lib/state/settings_state.dart

@@ -1,28 +1,76 @@
+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';
 
 // Enum for upload mode (Production, OSM Sandbox, Simulate)
 enum UploadMode { production, sandbox, simulate }
 
+// Enum for follow-me mode (moved from HomeScreen to centralized state)
+enum FollowMeMode {
+  off,      // No following
+  northUp,  // Follow position, keep north up
+  rotating, // Follow position and rotation
+}
+
 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';
+  static const String _followMeModePrefsKey = 'follow_me_mode';
 
   bool _offlineMode = false;
   int _maxCameras = 250;
   UploadMode _uploadMode = UploadMode.simulate;
-  TileProviderType _tileProvider = TileProviderType.osmStreet;
+  FollowMeMode _followMeMode = FollowMeMode.northUp;
+  List<TileProvider> _tileProviders = [];
+  String _selectedTileTypeId = '';
 
   // Getters
   bool get offlineMode => _offlineMode;
   int get maxCameras => _maxCameras;
   UploadMode get uploadMode => _uploadMode;
-  TileProviderType get tileProvider => _tileProvider;
+  FollowMeMode get followMeMode => _followMeMode;
+  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,13 +98,59 @@ 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 follow-me mode
+    if (prefs.containsKey(_followMeModePrefsKey)) {
+      final modeIndex = prefs.getInt(_followMeModePrefsKey) ?? 0;
+      if (modeIndex >= 0 && modeIndex < FollowMeMode.values.length) {
+        _followMeMode = FollowMeMode.values[modeIndex];
       }
     }
+    
+    // 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 {
@@ -82,10 +176,67 @@ 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();
+  }
+
+  /// Set follow-me mode
+  Future<void> setFollowMeMode(FollowMeMode mode) async {
+    if (_followMeMode != mode) {
+      _followMeMode = mode;
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setInt(_followMeModePrefsKey, mode.index);
+      notifyListeners();
+    }
+  }
+
 }

lib/state/upload_queue_state.dart

@@ -25,11 +25,13 @@ class UploadQueueState extends ChangeNotifier {
   }
 
   // Add a completed session to the upload queue
-  void addFromSession(AddCameraSession session) {
+  void addFromSession(AddNodeSession session, {required UploadMode uploadMode}) {
     final upload = PendingUpload(
       coord: session.target!,
       direction: session.directionDegrees,
       profile: session.profile,
+      operatorProfile: session.operatorProfile,
+      uploadMode: uploadMode,
     );
     
     _queue.add(upload);
@@ -39,8 +41,7 @@ class UploadQueueState extends ChangeNotifier {
     // Create a temporary node with a negative ID (to distinguish from real OSM nodes)
     // Using timestamp as negative ID to ensure uniqueness
     final tempId = -DateTime.now().millisecondsSinceEpoch;
-    final tags = Map<String, String>.from(upload.profile.tags);
-    tags['direction'] = upload.direction.toStringAsFixed(0);
+    final tags = upload.getCombinedTags();
     tags['_pending_upload'] = 'true'; // Mark as pending for potential UI distinction
     
     final tempNode = OsmCameraNode(
@@ -56,6 +57,51 @@ class UploadQueueState extends ChangeNotifier {
     notifyListeners();
   }
 
+  // Add a completed edit session to the upload queue
+  void addFromEditSession(EditNodeSession session, {required UploadMode uploadMode}) {
+    final upload = PendingUpload(
+      coord: session.target,
+      direction: session.directionDegrees,
+      profile: session.profile,
+      operatorProfile: session.operatorProfile,
+      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 = upload.getCombinedTags();
+    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

@@ -1,129 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-import '../app_state.dart';
-import '../models/camera_profile.dart';
-
-class AddCameraSheet extends StatelessWidget {
-  const AddCameraSheet({super.key, required this.session});
-
-  final AddCameraSession session;
-
-  @override
-  Widget build(BuildContext context) {
-    final appState = context.watch<AppState>();
-
-    void _commit() {
-      appState.commitSession();
-      Navigator.pop(context);
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('Camera queued for upload')),
-      );
-    }
-
-    void _cancel() {
-      appState.cancelSession();
-      Navigator.pop(context);
-    }
-
-    final customProfiles = appState.enabledProfiles.where((p) => !p.builtin).toList();
-    final allowSubmit = customProfiles.isNotEmpty && !session.profile.builtin;
-
-    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: 16),
-          ListTile(
-            title: const Text('Profile'),
-            trailing: DropdownButton<CameraProfile>(
-              value: session.profile,
-              items: appState.enabledProfiles
-                  .map((p) => DropdownMenuItem(value: p, child: Text(p.name)))
-                  .toList(),
-              onChanged: (p) =>
-                  appState.updateSession(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.updateSession(directionDeg: v),
-            ),
-          ),
-          if (customProfiles.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 or create a custom profile in Settings to submit new cameras.',
-                      style: TextStyle(color: Colors.red, fontSize: 13),
-                    ),
-                  ),
-                ],
-              ),
-            )
-          else if (session.profile.builtin)
-            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(
-                      'The built-in profile is for map viewing only. Please select a custom profile to submit new 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('Submit'),
-                  ),
-                ),
-              ],
-            ),
-          ),
-          const SizedBox(height: 20),
-        ],
-      ),
-    );
-  }
-}
-

lib/widgets/add_node_sheet.dart

@@ -0,0 +1,194 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../app_state.dart';
+import '../models/node_profile.dart';
+import '../models/operator_profile.dart';
+import 'refine_tags_sheet.dart';
+
+class AddNodeSheet extends StatelessWidget {
+  const AddNodeSheet({super.key, required this.session});
+
+  final AddNodeSession session;
+
+  @override
+  Widget build(BuildContext context) {
+    final appState = context.watch<AppState>();
+
+    void _commit() {
+      appState.commitSession();
+      Navigator.pop(context);
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Node queued for upload')),
+      );
+    }
+
+    void _cancel() {
+      appState.cancelSession();
+      Navigator.pop(context);
+    }
+
+    final submittableProfiles = appState.enabledProfiles.where((p) => p.isSubmittable).toList();
+    final allowSubmit = appState.isLoggedIn && submittableProfiles.isNotEmpty && session.profile.isSubmittable;
+    
+    void _openRefineTags() async {
+      final result = await Navigator.push<OperatorProfile?>(
+        context,
+        MaterialPageRoute(
+          builder: (context) => RefineTagsSheet(
+            selectedOperatorProfile: session.operatorProfile,
+          ),
+          fullscreenDialog: true,
+        ),
+      );
+      if (result != session.operatorProfile) {
+        appState.updateSession(operatorProfile: result);
+      }
+    }
+
+    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: 16),
+          ListTile(
+            title: const Text('Profile'),
+            trailing: DropdownButton<NodeProfile>(
+              value: session.profile,
+              items: submittableProfiles
+                  .map((p) => DropdownMenuItem(value: p, child: Text(p.name)))
+                  .toList(),
+              onChanged: (p) =>
+                  appState.updateSession(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: session.profile.requiresDirection 
+                  ? (v) => appState.updateSession(directionDeg: v)
+                  : null, // Disables slider when requiresDirection is false
+            ),
+          ),
+          if (!session.profile.requiresDirection)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  Icon(Icons.info_outline, color: Colors.grey, size: 16),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'This profile does not require a direction.',
+                      style: TextStyle(color: Colors.grey, fontSize: 12),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          if (!appState.isLoggedIn)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  Icon(Icons.info_outline, color: Colors.red, size: 20),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'You must be logged in to submit new nodes. Please log in via Settings.',
+                      style: TextStyle(color: Colors.red, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            )
+          else if (submittableProfiles.isEmpty)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  Icon(Icons.info_outline, color: Colors.red, size: 20),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'Enable a submittable profile in Settings to submit new nodes.',
+                      style: TextStyle(color: Colors.red, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            )
+          else if (!session.profile.isSubmittable)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  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 submit new nodes.',
+                      style: TextStyle(color: Colors.orange, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          const SizedBox(height: 8),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: SizedBox(
+              width: double.infinity,
+              child: OutlinedButton.icon(
+                onPressed: _openRefineTags,
+                icon: const Icon(Icons.tune),
+                label: Text(session.operatorProfile != null
+                    ? 'Refine Tags (${session.operatorProfile!.name})'
+                    : 'Refine Tags'),
+              ),
+            ),
+          ),
+          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('Submit'),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          const SizedBox(height: 20),
+        ],
+      ),
+    );
+  }
+}
+

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_provider_with_cache.dart

@@ -6,7 +6,7 @@ import 'package:flutter_map/flutter_map.dart' show LatLngBounds;
 import '../services/map_data_provider.dart';
 import '../services/camera_cache.dart';
 import '../services/network_status.dart';
-import '../models/camera_profile.dart';
+import '../models/node_profile.dart';
 import '../models/osm_camera_node.dart';
 import '../app_state.dart';
 
@@ -38,7 +38,7 @@ class CameraProviderWithCache extends ChangeNotifier {
   /// and notifies listeners/UI when new data is available.
   void fetchAndUpdate({
     required LatLngBounds bounds,
-    required List<CameraProfile> profiles,
+    required List<NodeProfile> profiles,
     UploadMode uploadMode = UploadMode.production,
   }) {
     // Fast: serve cached immediately
@@ -48,7 +48,7 @@ class CameraProviderWithCache extends ChangeNotifier {
     _debounceTimer = Timer(const Duration(milliseconds: 400), () async {
       try {
         // Use MapSource.auto to handle both offline and online modes appropriately
-        final fresh = await MapDataProvider().getCameras(
+        final fresh = await MapDataProvider().getNodes(
           bounds: bounds,
           profiles: profiles,
           uploadMode: uploadMode,
@@ -79,7 +79,7 @@ class CameraProviderWithCache extends ChangeNotifier {
   }
 
   /// Check if a camera matches any of the provided profiles
-  bool _matchesAnyProfile(OsmCameraNode camera, List<CameraProfile> profiles) {
+  bool _matchesAnyProfile(OsmCameraNode camera, List<NodeProfile> profiles) {
     for (final profile in profiles) {
       if (_cameraMatchesProfile(camera, profile)) return true;
     }
@@ -87,7 +87,7 @@ class CameraProviderWithCache extends ChangeNotifier {
   }
 
   /// Check if a camera matches a specific profile (all profile tags must match)
-  bool _cameraMatchesProfile(OsmCameraNode camera, CameraProfile profile) {
+  bool _cameraMatchesProfile(OsmCameraNode camera, NodeProfile profile) {
     for (final entry in profile.tags.entries) {
       if (camera.tags[entry.key] != entry.value) return false;
     }

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_node_sheet.dart

@@ -0,0 +1,216 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../app_state.dart';
+import '../models/node_profile.dart';
+import '../models/operator_profile.dart';
+import '../state/settings_state.dart';
+import 'refine_tags_sheet.dart';
+
+class EditNodeSheet extends StatelessWidget {
+  const EditNodeSheet({super.key, required this.session});
+
+  final EditNodeSession 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('Node 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 = appState.isLoggedIn && submittableProfiles.isNotEmpty && session.profile.isSubmittable && !isSandboxMode;
+    
+    void _openRefineTags() async {
+      final result = await Navigator.push<OperatorProfile?>(
+        context,
+        MaterialPageRoute(
+          builder: (context) => RefineTagsSheet(
+            selectedOperatorProfile: session.operatorProfile,
+          ),
+          fullscreenDialog: true,
+        ),
+      );
+      if (result != session.operatorProfile) {
+        appState.updateEditSession(operatorProfile: result);
+      }
+    }
+
+    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 Node #${session.originalNode.id}',
+            style: Theme.of(context).textTheme.titleMedium,
+          ),
+          const SizedBox(height: 16),
+          ListTile(
+            title: const Text('Profile'),
+            trailing: DropdownButton<NodeProfile>(
+              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: session.profile.requiresDirection
+                  ? (v) => appState.updateEditSession(directionDeg: v)
+                  : null, // Disables slider when requiresDirection is false
+            ),
+          ),
+          if (!session.profile.requiresDirection)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  Icon(Icons.info_outline, color: Colors.grey, size: 16),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'This profile does not require a direction.',
+                      style: TextStyle(color: Colors.grey, fontSize: 12),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          if (!appState.isLoggedIn)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  Icon(Icons.info_outline, color: Colors.red, size: 20),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'You must be logged in to edit nodes. Please log in via Settings.',
+                      style: TextStyle(color: Colors.red, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            )
+          else if (isSandboxMode)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  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 nodes.',
+                      style: TextStyle(color: Colors.blue, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            )
+          else if (submittableProfiles.isEmpty)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  Icon(Icons.info_outline, color: Colors.red, size: 20),
+                  SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      'Enable a submittable profile in Settings to edit nodes.',
+                      style: TextStyle(color: Colors.red, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            )
+          else if (!session.profile.isSubmittable)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
+                children: [
+                  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 nodes.',
+                      style: TextStyle(color: Colors.orange, fontSize: 13),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          const SizedBox(height: 8),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: SizedBox(
+              width: double.infinity,
+              child: OutlinedButton.icon(
+                onPressed: _openRefineTags,
+                icon: const Icon(Icons.tune),
+                label: Text(session.operatorProfile != null
+                    ? 'Refine Tags (${session.operatorProfile!.name})'
+                    : 'Refine Tags'),
+              ),
+            ),
+          ),
+          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/camera_refresh_controller.dart

@@ -0,0 +1,103 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map_animations/flutter_map_animations.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:latlong2/latlong.dart';
+
+import '../../models/node_profile.dart';
+import '../../app_state.dart' show UploadMode;
+import '../camera_provider_with_cache.dart';
+import '../../dev_config.dart';
+
+/// Manages camera data refreshing, profile change detection, and camera cache operations.
+/// Handles debounced camera fetching and profile-based cache invalidation.
+class CameraRefreshController {
+  late final CameraProviderWithCache _cameraProvider;
+  List<NodeProfile>? _lastEnabledProfiles;
+  VoidCallback? _onCamerasUpdated;
+
+  /// Initialize the camera refresh controller
+  void initialize({required VoidCallback onCamerasUpdated}) {
+    _cameraProvider = CameraProviderWithCache.instance;
+    _onCamerasUpdated = onCamerasUpdated;
+    _cameraProvider.addListener(_onCamerasUpdated!);
+  }
+
+  /// Dispose of resources and listeners
+  void dispose() {
+    if (_onCamerasUpdated != null) {
+      _cameraProvider.removeListener(_onCamerasUpdated!);
+    }
+  }
+
+  /// Check if camera profiles changed and handle cache clearing if needed.
+  /// Returns true if profiles changed (triggering a refresh).
+  bool checkAndHandleProfileChanges({
+    required List<NodeProfile> currentEnabledProfiles,
+    required VoidCallback onProfilesChanged,
+  }) {
+    if (_lastEnabledProfiles == null || 
+        !_profileListsEqual(_lastEnabledProfiles!, currentEnabledProfiles)) {
+      _lastEnabledProfiles = List.from(currentEnabledProfiles);
+      
+      // Handle profile change with cache clearing and refresh
+      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();
+        // Notify that profiles changed (triggers camera refresh)
+        onProfilesChanged();
+      });
+      
+      return true;
+    }
+    return false;
+  }
+
+  /// Refresh cameras from provider for the current map view
+  void refreshCamerasFromProvider({
+    required AnimatedMapController controller,
+    required List<NodeProfile> enabledProfiles,
+    required UploadMode uploadMode,
+    required BuildContext context,
+  }) {
+    LatLngBounds? bounds;
+    try {
+      bounds = controller.mapController.camera.visibleBounds;
+    } catch (_) {
+      return;
+    }
+    
+    final zoom = controller.mapController.camera.zoom;
+    if (zoom < kCameraMinZoomLevel) {
+      // Show a snackbar-style bubble warning
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Cameras not drawn below zoom level $kCameraMinZoomLevel'),
+            duration: const Duration(seconds: 2),
+          ),
+        );
+      }
+      return;
+    }
+    
+    _cameraProvider.fetchAndUpdate(
+      bounds: bounds,
+      profiles: enabledProfiles,
+      uploadMode: uploadMode,
+    );
+  }
+
+  /// Get the camera provider instance for external access
+  CameraProviderWithCache get cameraProvider => _cameraProvider;
+
+  /// Helper to check if two profile lists are equal by comparing IDs
+  bool _profileListsEqual(List<NodeProfile> list1, List<NodeProfile> list2) {
+    if (list1.length != list2.length) return false;
+    // Compare by profile IDs since profiles are value objects
+    final ids1 = list1.map((p) => p.id).toSet();
+    final ids2 = list2.map((p) => p.id).toSet();
+    return ids1.length == ids2.length && ids1.containsAll(ids2);
+  }
+}

lib/widgets/map/direction_cones.dart

@@ -12,28 +12,40 @@ class DirectionConesBuilder {
   static List<Polygon> buildDirectionCones({
     required List<OsmCameraNode> cameras,
     required double zoom,
-    AddCameraSession? session,
+    AddNodeSession? session,
+    EditNodeSession? editSession,
   }) {
     final overlays = <Polygon>[];
     
-    // Add session cone if in add-camera mode
-    if (session != null && session.target != null) {
+    // Add session cone if in add-camera mode and profile requires direction
+    if (session != null && session.target != null && session.profile.requiresDirection) {
       overlays.add(_buildCone(
         session.target!, 
         session.directionDegrees, 
         zoom,
+        isSession: true,
       ));
     }
     
-    // Add cones for cameras with direction
+    // Add edit session cone if in edit-camera mode and profile requires direction
+    if (editSession != null && editSession.profile.requiresDirection) {
+      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/gps_controller.dart

@@ -0,0 +1,160 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter_map_animations/flutter_map_animations.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:latlong2/latlong.dart';
+
+import '../../dev_config.dart';
+import '../../app_state.dart' show FollowMeMode;
+
+/// Manages GPS location tracking, follow-me modes, and location-based map animations.
+/// Handles GPS permissions, position streams, and follow-me behavior.
+class GpsController {
+  StreamSubscription<Position>? _positionSub;
+  LatLng? _currentLatLng;
+
+  /// Get the current GPS location (if available)
+  LatLng? get currentLocation => _currentLatLng;
+
+  /// Initialize GPS location tracking
+  Future<void> initializeLocation() async {
+    final perm = await Geolocator.requestPermission();
+    if (perm == LocationPermission.denied ||
+        perm == LocationPermission.deniedForever) {
+      debugPrint('[GpsController] Location permission denied');
+      return;
+    }
+
+    _positionSub = Geolocator.getPositionStream().listen((Position position) {
+      final latLng = LatLng(position.latitude, position.longitude);
+      _currentLatLng = latLng;
+      debugPrint('[GpsController] GPS position updated: ${latLng.latitude}, ${latLng.longitude}');
+    });
+  }
+
+  /// Retry location initialization (e.g., after permission granted)
+  Future<void> retryLocationInit() async {
+    debugPrint('[GpsController] Retrying location initialization');
+    await initializeLocation();
+  }
+
+  /// Handle follow-me mode changes and animate map accordingly
+  void handleFollowMeModeChange({
+    required FollowMeMode newMode,
+    required FollowMeMode oldMode,
+    required AnimatedMapController controller,
+  }) {
+    debugPrint('[GpsController] Follow-me mode changed: $oldMode → $newMode');
+    
+    // Only act when follow-me is first enabled and we have a current location
+    if (newMode != FollowMeMode.off && 
+        oldMode == FollowMeMode.off && 
+        _currentLatLng != null) {
+      
+      try {
+        if (newMode == FollowMeMode.northUp) {
+          controller.animateTo(
+            dest: _currentLatLng!,
+            zoom: controller.mapController.camera.zoom,
+            duration: kFollowMeAnimationDuration,
+            curve: Curves.easeOut,
+          );
+        } else if (newMode == FollowMeMode.rotating) {
+          // When switching to rotating mode, reset to north-up first
+          controller.animateTo(
+            dest: _currentLatLng!,
+            zoom: controller.mapController.camera.zoom,
+            rotation: 0.0,
+            duration: kFollowMeAnimationDuration,
+            curve: Curves.easeOut,
+          );
+        }
+      } catch (e) {
+        debugPrint('[GpsController] MapController not ready for follow-me change: $e');
+      }
+    }
+  }
+
+  /// Process GPS position updates and handle follow-me animations
+  void processPositionUpdate({
+    required Position position,
+    required FollowMeMode followMeMode,
+    required AnimatedMapController controller,
+    required VoidCallback onLocationUpdated,
+  }) {
+    final latLng = LatLng(position.latitude, position.longitude);
+    _currentLatLng = latLng;
+    
+    // Notify that location was updated (for setState, etc.)
+    onLocationUpdated();
+    
+    // Handle follow-me animations if enabled - use current mode from app state
+    if (followMeMode != FollowMeMode.off) {
+      debugPrint('[GpsController] GPS position update: ${latLng.latitude}, ${latLng.longitude}, follow-me: $followMeMode');
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        try {
+          if (followMeMode == FollowMeMode.northUp) {
+            // Follow position only, keep current rotation
+            controller.animateTo(
+              dest: latLng,
+              zoom: controller.mapController.camera.zoom,
+              duration: kFollowMeAnimationDuration,
+              curve: Curves.easeOut,
+            );
+          } else if (followMeMode == FollowMeMode.rotating) {
+            // Follow position and rotation based on heading
+            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('[GpsController] MapController not ready for position animation: $e');
+        }
+      });
+    }
+  }
+
+  /// Initialize GPS with custom position processing callback
+  Future<void> initializeWithCallback({
+    required FollowMeMode followMeMode,
+    required AnimatedMapController controller,
+    required VoidCallback onLocationUpdated,
+    required FollowMeMode Function() getCurrentFollowMeMode,
+  }) async {
+    final perm = await Geolocator.requestPermission();
+    if (perm == LocationPermission.denied ||
+        perm == LocationPermission.deniedForever) {
+      debugPrint('[GpsController] Location permission denied');
+      return;
+    }
+
+    _positionSub = Geolocator.getPositionStream().listen((Position position) {
+      // Get the current follow-me mode from the app state each time
+      final currentFollowMeMode = getCurrentFollowMeMode();
+      processPositionUpdate(
+        position: position,
+        followMeMode: currentFollowMeMode,
+        controller: controller,
+        onLocationUpdated: onLocationUpdated,
+      );
+    });
+  }
+
+  /// Dispose of GPS resources
+  void dispose() {
+    _positionSub?.cancel();
+    _positionSub = null;
+    debugPrint('[GpsController] GPS controller disposed');
+  }
+}

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 AddNodeSession? session;
+  final EditNodeSession? 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,29 +84,55 @@ 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),
-            ),
-          ),
-        ),
-
-        // Fixed pin when adding camera
-        if (session != null)
-          IgnorePointer(
-            child: Center(
-              child: Transform.translate(
-                offset: const Offset(0, kAddPinYOffset),
-                child: const Icon(Icons.place, size: 40, color: Colors.redAccent),
+        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),
+              ),
+            ],
+          ),
+        ),
+
+
       ],
     );
   }

lib/widgets/map/map_position_manager.dart

@@ -0,0 +1,122 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map_animations/flutter_map_animations.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../../dev_config.dart';
+
+
+/// Manages map position persistence and initial positioning.
+/// Handles saving/loading last map position and moving to initial locations.
+class MapPositionManager {
+  LatLng? _initialLocation;
+  double? _initialZoom;
+  bool _hasMovedToInitialLocation = false;
+
+  /// Get the initial location (if any was loaded)
+  LatLng? get initialLocation => _initialLocation;
+  
+  /// Get the initial zoom (if any was loaded)
+  double? get initialZoom => _initialZoom;
+  
+  /// Whether we've already moved to the initial location
+  bool get hasMovedToInitialLocation => _hasMovedToInitialLocation;
+
+  /// Load the last map position from persistent storage.
+  /// Call this during initialization to set up initial location.
+  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('[MapPositionManager] Loaded last map position: ${_initialLocation!.latitude}, ${_initialLocation!.longitude}, zoom: $_initialZoom');
+      } else {
+        debugPrint('[MapPositionManager] Invalid saved coordinates, using defaults');
+      }
+    } catch (e) {
+      debugPrint('[MapPositionManager] Failed to load last map position: $e');
+    }
+  }
+
+  /// Move to initial location if we have one and haven't moved yet.
+  /// Call this after the map controller is ready.
+  void moveToInitialLocationIfNeeded(AnimatedMapController controller) {
+    if (!_hasMovedToInitialLocation && _initialLocation != null) {
+      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('[MapPositionManager] Moved to initial location: ${_initialLocation!.latitude}, ${_initialLocation!.longitude}');
+        } else {
+          debugPrint('[MapPositionManager] Invalid initial location, not moving: ${_initialLocation!.latitude}, ${_initialLocation!.longitude}, zoom: $zoom');
+        }
+      } catch (e) {
+        debugPrint('[MapPositionManager] Failed to move to initial location: $e');
+      }
+    }
+  }
+
+  /// Save the current map position to persistent storage.
+  /// Call this when the map position changes.
+  Future<void> saveMapPosition(LatLng location, double zoom) async {
+    try {
+      // Validate coordinates and zoom before saving
+      if (!_isValidCoordinate(location.latitude) || 
+          !_isValidCoordinate(location.longitude) || 
+          !_isValidZoom(zoom)) {
+        debugPrint('[MapPositionManager] 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('[MapPositionManager] Saved last map position: ${location.latitude}, ${location.longitude}, zoom: $zoom');
+    } catch (e) {
+      debugPrint('[MapPositionManager] Failed to save last map position: $e');
+    }
+  }
+
+
+
+  /// 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('[MapPositionManager] Cleared stored map position');
+    } catch (e) {
+      debugPrint('[MapPositionManager] Failed to clear stored map position: $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;
+  }
+}

lib/widgets/map/tile_layer_manager.dart

@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+
+import '../../models/tile_provider.dart' as models;
+import '../../services/simple_tile_service.dart';
+
+/// Manages tile layer creation, caching, and provider switching.
+/// Handles tile HTTP client lifecycle and cache invalidation.
+class TileLayerManager {
+  late final SimpleTileHttpClient _tileHttpClient;
+  int _mapRebuildKey = 0;
+  String? _lastTileTypeId;
+  bool? _lastOfflineMode;
+
+  /// Get the current map rebuild key for cache busting
+  int get mapRebuildKey => _mapRebuildKey;
+
+  /// Initialize the tile layer manager
+  void initialize() {
+    _tileHttpClient = SimpleTileHttpClient();
+  }
+
+  /// Dispose of resources
+  void dispose() {
+    _tileHttpClient.close();
+  }
+
+  /// Check if cache should be cleared and increment rebuild key if needed.
+  /// Returns true if cache was cleared (map should be rebuilt).
+  bool checkAndClearCacheIfNeeded({
+    required String? currentTileTypeId,
+    required bool currentOfflineMode,
+  }) {
+    bool shouldClear = false;
+    String? reason;
+
+    if ((_lastTileTypeId != null && _lastTileTypeId != currentTileTypeId)) {
+      reason = 'tile type ($currentTileTypeId)';
+      shouldClear = true;
+    } else if ((_lastOfflineMode != null && _lastOfflineMode != currentOfflineMode)) {
+      reason = 'offline mode ($currentOfflineMode)';
+      shouldClear = true;
+    }
+
+    if (shouldClear) {
+      // Force map rebuild with new key to bust flutter_map cache
+      _mapRebuildKey++;
+      debugPrint('[TileLayerManager] *** CACHE CLEAR *** $reason changed - rebuilding map $_mapRebuildKey');
+    }
+
+    _lastTileTypeId = currentTileTypeId;
+    _lastOfflineMode = currentOfflineMode;
+
+    return shouldClear;
+  }
+
+  /// Clear the tile request queue (call after cache clear)
+  void clearTileQueue() {
+    debugPrint('[TileLayerManager] Post-frame: Clearing tile request queue');
+    _tileHttpClient.clearTileQueue();
+  }
+
+  /// Clear tile queue immediately (for zoom changes, etc.)
+  void clearTileQueueImmediate() {
+    _tileHttpClient.clearTileQueue();
+  }
+
+  /// Build tile layer widget with current provider and type.
+  /// Uses fake domain that SimpleTileHttpClient can parse for cache separation.
+  Widget buildTileLayer({
+    required models.TileProvider? selectedProvider,
+    required models.TileType? selectedTileType,
+  }) {
+    // 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: urlTemplate,
+      userAgentPackageName: 'com.stopflock.flock_map_app',
+      tileProvider: NetworkTileProvider(
+        httpClient: _tileHttpClient,
+        // Enable flutter_map caching - cache busting handled by URL changes and FlutterMap key
+      ),
+    );
+  }
+}

lib/widgets/map_view.dart

@@ -1,55 +1,57 @@
-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 '../app_state.dart';
 import '../services/offline_area_service.dart';
-import '../services/simple_tile_service.dart';
 import '../services/network_status.dart';
 import '../models/osm_camera_node.dart';
-import '../models/camera_profile.dart';
+import '../models/node_profile.dart';
 import '../models/tile_provider.dart';
 import 'debouncer.dart';
 import 'camera_provider_with_cache.dart';
+import 'camera_icon.dart';
 import 'map/camera_markers.dart';
 import 'map/direction_cones.dart';
 import 'map/map_overlays.dart';
+import 'map/map_position_manager.dart';
+import 'map/tile_layer_manager.dart';
+import 'map/camera_refresh_controller.dart';
+import 'map/gps_controller.dart';
 import 'network_status_indicator.dart';
 import '../dev_config.dart';
+import '../app_state.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,
+    this.bottomPadding = 0.0,
   });
 
-  final bool followMe;
+  final FollowMeMode followMeMode;
   final VoidCallback onUserGesture;
+  final double bottomPadding;
 
   @override
   State<MapView> createState() => MapViewState();
 }
 
 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;
-
-  late final CameraProviderWithCache _cameraProvider;
-  late final SimpleTileHttpClient _tileHttpClient;
-  
-  // Track profile changes to trigger camera refresh
-  List<CameraProfile>? _lastEnabledProfiles;
+  late final MapPositionManager _positionManager;
+  late final TileLayerManager _tileManager;
+  late final CameraRefreshController _cameraController;
+  late final GpsController _gpsController;
   
   // Track zoom to clear queue on zoom changes
   double? _lastZoom;
@@ -59,26 +61,58 @@ class MapViewState extends State<MapView> {
     super.initState();
     OfflineAreaService();
     _controller = widget.controller;
-    _tileHttpClient = SimpleTileHttpClient();
-    _initLocation();
-
-    // Set up camera overlay caching
-    _cameraProvider = CameraProviderWithCache.instance;
-    _cameraProvider.addListener(_onCamerasUpdated);
+    _positionManager = MapPositionManager();
+    _tileManager = TileLayerManager();
+    _tileManager.initialize();
+    _cameraController = CameraRefreshController();
+    _cameraController.initialize(onCamerasUpdated: _onCamerasUpdated);
+    _gpsController = GpsController();
     
+    // Load last map position before initializing GPS
+    _positionManager.loadLastMapPosition().then((_) {
+      // Move to last known position after loading and widget is built
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _positionManager.moveToInitialLocationIfNeeded(_controller);
+      });
+    });
+    
+    // Initialize GPS with callback for position updates and follow-me
+    _gpsController.initializeWithCallback(
+      followMeMode: widget.followMeMode,
+      controller: _controller,
+      onLocationUpdated: () => setState(() {}),
+      getCurrentFollowMeMode: () {
+        // Use mounted check to avoid calling context when widget is disposed
+        if (mounted) {
+          try {
+            return context.read<AppState>().followMeMode;
+          } catch (e) {
+            debugPrint('[MapView] Could not read AppState, defaulting to off: $e');
+            return FollowMeMode.off;
+          }
+        }
+        return FollowMeMode.off;
+      },
+    );
+
     // Fetch initial cameras
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _refreshCamerasFromProvider();
     });
   }
 
+
+
+
+
   @override
   void dispose() {
-    _positionSub?.cancel();
     _cameraDebounce.dispose();
     _tileDebounce.dispose();
-    _cameraProvider.removeListener(_onCamerasUpdated);
-    _tileHttpClient.close();
+    _mapPositionDebounce.dispose();
+    _cameraController.dispose();
+    _tileManager.dispose();
+    _gpsController.dispose();
     super.dispose();
   }
 
@@ -88,122 +122,53 @@ class MapViewState extends State<MapView> {
 
   /// Public method to retry location initialization (e.g., after permission granted)
   void retryLocationInit() {
-    debugPrint('[MapView] Retrying location initialization');
-    _initLocation();
+    _gpsController.retryLocationInit();
   }
 
+  /// Expose static methods from MapPositionManager for external access
+  static Future<void> clearStoredMapPosition() => 
+      MapPositionManager.clearStoredMapPosition();
+
 
 
   void _refreshCamerasFromProvider() {
     final appState = context.read<AppState>();
-    LatLngBounds? bounds;
-    try {
-      bounds = _controller.camera.visibleBounds;
-    } catch (_) {
-      return;
-    }
-    final zoom = _controller.camera.zoom;
-    if (zoom < kCameraMinZoomLevel) {
-      // Show a snackbar-style bubble, if desired
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text('Cameras not drawn below zoom level $kCameraMinZoomLevel'),
-            duration: const Duration(seconds: 2),
-          ),
-        );
-      }
-      return;
-    }
-    _cameraProvider.fetchAndUpdate(
-      bounds: bounds,
-      profiles: appState.enabledProfiles,
+    _cameraController.refreshCamerasFromProvider(
+      controller: _controller,
+      enabledProfiles: appState.enabledProfiles,
       uploadMode: appState.uploadMode,
+      context: context,
     );
   }
 
+
+
+
+
   @override
   void didUpdateWidget(covariant MapView oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (widget.followMe && !oldWidget.followMe && _currentLatLng != null) {
-      _controller.move(_currentLatLng!, _controller.camera.zoom);
+    // Handle follow-me mode changes - only if it actually changed
+    if (widget.followMeMode != oldWidget.followMeMode) {
+      _gpsController.handleFollowMeModeChange(
+        newMode: widget.followMeMode,
+        oldMode: oldWidget.followMeMode,
+        controller: _controller,
+      );
     }
   }
 
-  Future<void> _initLocation() async {
-    final perm = await Geolocator.requestPermission();
-    if (perm == LocationPermission.denied ||
-        perm == LocationPermission.deniedForever) return;
-
-    _positionSub =
-        Geolocator.getPositionStream().listen((Position position) {
-      final latLng = LatLng(position.latitude, position.longitude);
-      setState(() => _currentLatLng = latLng);
-      if (widget.followMe) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (mounted) {
-            try {
-              _controller.move(latLng, _controller.camera.zoom);
-            } catch (e) {
-              debugPrint('MapController not ready yet: $e');
-            }
-          }
-        });
-      }
-    });
-  }
-
   double _safeZoom() {
     try {
-      return _controller.camera.zoom;
+      return _controller.mapController.camera.zoom;
     } catch (_) {
       return 15.0;
     }
   }
 
-  /// Helper to check if two profile lists are equal
-  bool _profileListsEqual(List<CameraProfile> list1, List<CameraProfile> list2) {
-    if (list1.length != list2.length) return false;
-    // Compare by profile IDs since profiles are value objects
-    final ids1 = list1.map((p) => p.id).toSet();
-    final ids2 = list2.map((p) => p.id).toSet();
-    return ids1.length == ids2.length && ids1.containsAll(ids2);
-  }
 
-  /// Build tile layer based on selected tile provider
-  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)
-    return TileLayer(
-      urlTemplate: providerConfig.urlTemplate,
-      userAgentPackageName: 'com.stopflock.flock_map_app',
-      additionalOptions: {
-        'attribution': providerConfig.attribution,
-      },
-    );
-  }
 
 
 
@@ -211,30 +176,46 @@ 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;
-    if (_lastEnabledProfiles == null || 
-        !_profileListsEqual(_lastEnabledProfiles!, currentEnabledProfiles)) {
-      _lastEnabledProfiles = List.from(currentEnabledProfiles);
-      // Refresh cameras when profiles change
+    _cameraController.checkAndHandleProfileChanges(
+      currentEnabledProfiles: appState.enabledProfiles,
+      onProfilesChanged: _refreshCamerasFromProvider,
+    );
+
+    // Check if tile type OR offline mode changed and clear cache if needed
+    final cacheCleared = _tileManager.checkAndClearCacheIfNeeded(
+      currentTileTypeId: appState.selectedTileType?.id,
+      currentOfflineMode: appState.offlineMode,
+    );
+    
+    if (cacheCleared) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        // Force display refresh first (for immediate UI update)
-        _cameraProvider.refreshDisplay();
-        // Then fetch new cameras for newly enabled profiles
-        _refreshCamerasFromProvider();
+        _tileManager.clearTileQueue();
       });
     }
 
     // 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 +223,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,20 +233,45 @@ class MapViewState extends State<MapView> {
         
         final markers = CameraMarkersBuilder.buildCameraMarkers(
           cameras: cameras,
-          mapController: _controller,
-          userLocation: _currentLatLng,
+          mapController: _controller.mapController,
+          userLocation: _gpsController.currentLocation,
         );
 
         final overlays = DirectionConesBuilder.buildDirectionCones(
           cameras: cameras,
           zoom: zoom,
           session: session,
+          editSession: editSession,
         );
 
+        // Build edit lines connecting original cameras to their edited positions
+        final editLines = _buildEditLines(cameras);
+
+        // Build center marker for add/edit sessions
+        final centerMarkers = <Marker>[];
+        if (session != null || editSession != null) {
+          try {
+            final center = _controller.mapController.camera.center;
+            centerMarkers.add(
+              Marker(
+                point: center,
+                width: kCameraIconDiameter,
+                height: kCameraIconDiameter,
+                child: CameraIcon(
+                  type: editSession != null ? CameraIconType.editing : CameraIconType.mock,
+                ),
+              ),
+            );
+          } catch (_) {
+            // Controller not ready yet
+          }
+        }
+
         return Stack(
           children: [
             PolygonLayer(polygons: overlays),
-            MarkerLayer(markers: markers),
+            if (editLines.isNotEmpty) PolylineLayer(polylines: editLines),
+            MarkerLayer(markers: [...markers, ...centerMarkers]),
           ],
         );
       }
@@ -273,12 +279,16 @@ class MapViewState extends State<MapView> {
 
     return Stack(
       children: [
-        FlutterMap(
-          key: ValueKey('map_offline_${appState.offlineMode}_provider_${appState.tileProvider.name}'),
-          mapController: _controller,
-          options: MapOptions(
-            initialCenter: _currentLatLng ?? LatLng(37.7749, -122.4194),
-            initialZoom: 15,
+        AnimatedPadding(
+          duration: const Duration(milliseconds: 300),
+          curve: Curves.easeOut,
+          padding: EdgeInsets.only(bottom: widget.bottomPadding),
+          child: FlutterMap(
+            key: ValueKey('map_${appState.offlineMode}_${appState.selectedTileType?.id ?? 'none'}_${_tileManager.mapRebuildKey}'),
+            mapController: _controller.mapController,
+            options: MapOptions(
+              initialCenter: _gpsController.currentLocation ?? _positionManager.initialLocation ?? LatLng(37.7749, -122.4194),
+            initialZoom: _positionManager.initialZoom ?? 15,
             maxZoom: 19,
             onPositionChanged: (pos, gesture) {
               setState(() {}); // Instant UI update for zoom, etc.
@@ -286,6 +296,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 +309,17 @@ class MapViewState extends State<MapView> {
               
               if (zoomChanged) {
                 _tileDebounce(() {
-                  debugPrint('[MapView] Zoom change detected - clearing stale tile requests');
-                  _tileHttpClient.clearTileQueue();
+                  // Clear stale tile requests on zoom change (quietly)
+                  _tileManager.clearTileQueueImmediate();
                 });
               }
               _lastZoom = currentZoom;
               
+              // Save map position (debounced to avoid excessive writes)
+              _mapPositionDebounce(() {
+                _positionManager.saveMapPosition(pos.center, pos.zoom);
+              });
+              
               // Request more cameras on any map movement/zoom at valid zoom level (slower debounce)
               if (pos.zoom >= 10) {
                 _cameraDebounce(_refreshCamerasFromProvider);
@@ -309,7 +327,10 @@ class MapViewState extends State<MapView> {
             },
           ),
           children: [
-            _buildTileLayer(appState),
+            _tileManager.buildTileLayer(
+              selectedProvider: appState.selectedTileProvider,
+              selectedTileType: appState.selectedTileType,
+            ),
             cameraLayers,
             // Built-in scale bar from flutter_map 
             Scalebar(
@@ -321,13 +342,16 @@ class MapViewState extends State<MapView> {
               // backgroundColor removed in flutter_map >=8 (wrap in Container if needed)
             ),
           ],
+          ),
         ),
 
         // 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 +359,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/measured_sheet.dart

@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+
+/// Wrapper widget that measures its child's height and reports changes via callback
+class MeasuredSheet extends StatefulWidget {
+  final Widget child;
+  final ValueChanged<double> onHeightChanged;
+  
+  const MeasuredSheet({
+    super.key,
+    required this.child,
+    required this.onHeightChanged,
+  });
+
+  @override
+  State<MeasuredSheet> createState() => _MeasuredSheetState();
+}
+
+class _MeasuredSheetState extends State<MeasuredSheet> {
+  final GlobalKey _key = GlobalKey();
+  double _lastHeight = 0.0;
+
+  @override
+  void initState() {
+    super.initState();
+    // Schedule height measurement after first frame
+    WidgetsBinding.instance.addPostFrameCallback(_measureHeight);
+  }
+
+  void _measureHeight(Duration _) {
+    final renderBox = _key.currentContext?.findRenderObject() as RenderBox?;
+    if (renderBox != null) {
+      final height = renderBox.size.height;
+      if (height != _lastHeight) {
+        _lastHeight = height;
+        widget.onHeightChanged(height);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return NotificationListener<SizeChangedLayoutNotification>(
+      onNotification: (notification) {
+        WidgetsBinding.instance.addPostFrameCallback(_measureHeight);
+        return true;
+      },
+      child: SizeChangedLayoutNotifier(
+        child: Container(
+          key: _key,
+          child: widget.child,
+        ),
+      ),
+    );
+  }
+}

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) {

lib/widgets/refine_tags_sheet.dart

@@ -0,0 +1,157 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../app_state.dart';
+import '../models/operator_profile.dart';
+
+class RefineTagsSheet extends StatefulWidget {
+  const RefineTagsSheet({
+    super.key,
+    this.selectedOperatorProfile,
+  });
+
+  final OperatorProfile? selectedOperatorProfile;
+
+  @override
+  State<RefineTagsSheet> createState() => _RefineTagsSheetState();
+}
+
+class _RefineTagsSheetState extends State<RefineTagsSheet> {
+  OperatorProfile? _selectedOperatorProfile;
+
+  @override
+  void initState() {
+    super.initState();
+    _selectedOperatorProfile = widget.selectedOperatorProfile;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final appState = context.watch<AppState>();
+    final operatorProfiles = appState.operatorProfiles;
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Refine Tags'),
+        leading: IconButton(
+          icon: const Icon(Icons.close),
+          onPressed: () => Navigator.pop(context, widget.selectedOperatorProfile),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, _selectedOperatorProfile),
+            child: const Text('Done'),
+          ),
+        ],
+      ),
+      body: ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          const Text(
+            'Operator Profile',
+            style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+          ),
+          const SizedBox(height: 8),
+          if (operatorProfiles.isEmpty)
+            const Card(
+              child: Padding(
+                padding: EdgeInsets.all(16.0),
+                child: Column(
+                  children: [
+                    Icon(Icons.info_outline, color: Colors.grey, size: 48),
+                    SizedBox(height: 8),
+                    Text(
+                      'No operator profiles defined',
+                      style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+                    ),
+                    SizedBox(height: 4),
+                    Text(
+                      'Create operator profiles in Settings to apply additional tags to your node submissions.',
+                      style: TextStyle(color: Colors.grey),
+                      textAlign: TextAlign.center,
+                    ),
+                  ],
+                ),
+              ),
+            )
+          else ...[
+            Card(
+              child: Column(
+                children: [
+                  RadioListTile<OperatorProfile?>(
+                    title: const Text('None'),
+                    subtitle: const Text('No additional operator tags'),
+                    value: null,
+                    groupValue: _selectedOperatorProfile,
+                    onChanged: (value) => setState(() => _selectedOperatorProfile = value),
+                  ),
+                  ...operatorProfiles.map((profile) => RadioListTile<OperatorProfile?>(
+                    title: Text(profile.name),
+                    subtitle: Text('${profile.tags.length} additional tags'),
+                    value: profile,
+                    groupValue: _selectedOperatorProfile,
+                    onChanged: (value) => setState(() => _selectedOperatorProfile = value),
+                  )),
+                ],
+              ),
+            ),
+            const SizedBox(height: 16),
+            if (_selectedOperatorProfile != null) ...[
+              const Text(
+                'Additional Tags',
+                style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+              ),
+              const SizedBox(height: 8),
+              Card(
+                child: Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        _selectedOperatorProfile!.name,
+                        style: const TextStyle(fontWeight: FontWeight.bold),
+                      ),
+                      const SizedBox(height: 8),
+                      if (_selectedOperatorProfile!.tags.isEmpty)
+                        const Text(
+                          'No tags defined for this operator profile.',
+                          style: TextStyle(color: Colors.grey),
+                        )
+                      else
+                        ...(_selectedOperatorProfile!.tags.entries.map((entry) => 
+                          Padding(
+                            padding: const EdgeInsets.only(bottom: 4.0),
+                            child: Row(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Expanded(
+                                  flex: 2,
+                                  child: Text(
+                                    entry.key,
+                                    style: const TextStyle(fontFamily: 'monospace', fontSize: 12),
+                                  ),
+                                ),
+                                const SizedBox(width: 8),
+                                Expanded(
+                                  flex: 3,
+                                  child: Text(
+                                    entry.value,
+                                    style: const TextStyle(fontFamily: 'monospace', fontSize: 12),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        )),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ],
+        ],
+      ),
+    );
+  }
+}

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);
+    });
+  });
+}