Update changelog

README.md

@@ -98,16 +98,24 @@ cp lib/keys.dart.example lib/keys.dart
 ## Roadmap
 
 ### Needed Bugfixes
+- Update node cache to reflect cleared queue entries
+- Decide what to do for extracting nodes attached to a way/relation:
+  - Auto extract (how?)
+  - Leave it alone (wrong answer unless user chooses intentionally)
+  - Manual cleanup (cognitive load for users)
+  - Delete the old one (also wrong answer unless user chooses intentionally)
+  - Give multiple of these options??
+- Nav start+end too close together error (warning + disable submit button?)
+- Improve/retune tile fetching backoff/retry
+- Add some builtin satellite tile provider
 - Are offline areas preferred for fast loading even when online? Check working.
 - Fix network indicator - only done when fetch queue is empty!
 
 ### Current Development
-- Add some builtin satellite tile provider
-- Option to pull in profiles from NSI (man_made=surveillance only)
-- Persistent cache for MY submissions: clean up when we see that node appear in overpass results or when older than 24h
-- Dropdown on "refine tags" page to select acceptable options for camera:mount=
-- Tutorial / info guide before submitting first node
-- Link to "my changes" on osm (username edit history)
+- Persistent cache for MY submissions: assume submissions worked, cache,clean up when we see that node appear in overpass/OSM results or when older than 24h
+- Dropdown on "refine tags" page to select acceptable options for camera:mount= (is this a boolean property of a profile?)
+- Tutorial / info guide before submitting first node, info and links before creating first profile
+- Option to pull in profiles from NSI (man_made=surveillance only?)
 
 ### On Pause
 - Suspected locations expansion to more regions

assets/changelog.json

@@ -1,18 +1,24 @@
 {
+  "1.4.3": {
+    "content": [
+      "• NEW: Proximity warning when placing nodes too close together - prevents accidental duplicate submissions"
+    ]
+  },
+  "1.4.2": {
+    "content": [
+      "• NEW: Dedicated 'Upload Queue' page - queue items are now shown in a proper list view instead of a popup",
+      "• NEW: 'OpenStreetMap Account' page for managing OSM login and account settings",
+      "• NEW: 'View My Edits on OSM' button takes you directly to your edit history on OpenStreetMap"
+    ]
+  },
   "1.4.1": {
     "content": [
-      "• NEW: 'Extract node from way/relation' option for constrained nodes",
-      "• When editing nodes that are part of ways or relations, you can now check 'Extract node from way' to create a new node with the same tags at a new location",
-      "• This preserves the original node in its way/relation while creating an independent copy that can be moved freely",
-      "• Useful for cases where surveillance equipment has been relocated but the original node must remain for mapping accuracy",
-      "• Extraction creates a separate OSM changeset and node, leaving the original node untouched"
+      "• NEW: 'Extract node from way/relation' option for constrained nodes (currently disabled while we decide what that means)"
     ]
   },
   "1.4.0": {
     "content": [
       "• IMPROVED: Advanced editing options now only show apps available on your platform (iOS/Android)",
-      "• IMPROVED: When an OSM editor app isn't installed, automatically redirect to the appropriate app store",
-      "• IMPROVED: Better error handling for external editor launches with app store fallback",
       "• Supported editors: Vespucci (Android), StreetComplete (Android), EveryDoor (both), Go Map!! (iOS)",
       "• Web editors (iD, RapiD) remain available on all platforms as before"
     ]
@@ -21,27 +27,17 @@
     "content": [
       "• NEW: 'Pause Upload Queue' toggle in Offline Settings - stops uploads while keeping live data access",
       "• Useful for metered connections or when you want to batch uploads later",
-      "• Upload queue is now disabled if either full offline mode OR pause queue processing is enabled",
-      "• FIXED: Sheet buttons now remain visible when rotating from portrait to landscape mode",
-      "• FIXED: Sheets now properly resize when rotating between orientations without requiring user interaction", 
-      "• IMPROVED: Tag list height adapts automatically for landscape orientation to prevent covering map",
-      "• IMPROVED: Sheets with few tags now shrink to appropriate size rather than maintaining fixed height",
-      "• IMPROVED: More reliable sheet layout using proper flexible height constraints",
-      "• CLEANED: Fixed minor code formatting inconsistencies"
+      "• FIXED: Sheets now resize when rotating between orientations"
     ]
   },
   "1.3.3": {
     "content": [
+      "• UX: Edits re-enabled. Only nodes which are part of ways/relations cannot be moved",
       "• NEW: Added builtin surveillance device profiles for Rekor and Axis Communications ALPR cameras",
-      "• Both profiles include proper OSM tags for manufacturer identification and require direction setting",
       "• NEW: Advanced editing options - access iD Editor, RapiD, Vespucci, StreetComplete, and other OSM editors",
       "• NEW: 'View on OSM' links to see nodes directly on OpenStreetMap website", 
-      "• UX: Constrained nodes (part of ways/relations) cannot be moved to prevent data corruption",
       "• UX: Auto-clickable URLs in all tag values - any URL becomes a tappable link",
-      "• UX: Tag lists now scroll with max height to keep buttons and map visible",
-      "• UX: Improved button layout on mobile with two rows for better accessibility",
-      "• UX: Localized network status messages in all supported languages",
-      "• FIXED: Duplicate changelog service calls eliminated"
+      "• UX: Tag lists now scroll with max height to keep buttons and map visible"
     ]
   },
   "1.3.2": {

lib/app_state.dart

@@ -17,6 +17,8 @@ import 'services/changelog_service.dart';
 import 'services/operator_profile_service.dart';
 import 'services/profile_service.dart';
 import 'widgets/camera_provider_with_cache.dart';
+import 'widgets/proximity_warning_dialog.dart';
+import 'dev_config.dart';
 import 'state/auth_state.dart';
 import 'state/navigation_state.dart';
 import 'state/operator_profile_state.dart';

lib/dev_config.dart

@@ -57,7 +57,7 @@ const String kClientName = 'DeFlock';
 const String kSuspectedLocationsCsvUrl = 'https://stopflock.com/app/flock_utilities_mini_latest.csv';
 
 // Development/testing features - set to false for production builds
-const bool kEnableDevelopmentModes = true; // Set to false to hide sandbox/simulate modes and force production mode
+const bool kEnableDevelopmentModes = false; // Set to false to hide sandbox/simulate modes and force production mode
 
 // Navigation features - set to false to hide navigation UI elements while in development
 const bool kEnableNavigationFeatures = kEnableDevelopmentModes; // Hide navigation until fully implemented
@@ -65,6 +65,9 @@ const bool kEnableNavigationFeatures = kEnableDevelopmentModes; // Hide navigati
 // Node editing features - set to false to temporarily disable editing
 const bool kEnableNodeEdits = true; // Set to false to temporarily disable node editing
 
+// Node extraction features - set to false to hide extract functionality for constrained nodes
+const bool kEnableNodeExtraction = false; // Set to true to enable extract from way/relation feature (WIP)
+
 /// Navigation availability: only dev builds, and only when online
 bool enableNavigationFeatures({required bool offlineMode}) {
   if (!kEnableDevelopmentModes) {
@@ -104,11 +107,14 @@ double getTagListHeightRatio(BuildContext context) {
 }
 
 // Proximity alerts configuration
-const int kProximityAlertDefaultDistance = 200; // meters
+const int kProximityAlertDefaultDistance = 400; // meters
 const int kProximityAlertMinDistance = 50; // meters
-const int kProximityAlertMaxDistance = 1000; // meters
+const int kProximityAlertMaxDistance = 1600; // meters
 const Duration kProximityAlertCooldown = Duration(minutes: 10); // Cooldown between alerts for same node
 
+// Node proximity warning configuration (for new/edited nodes that are too close to existing ones)
+const double kNodeProximityWarningDistance = 15.0; // meters - distance threshold to show warning
+
 // Map interaction configuration
 const double kNodeDoubleTapZoomDelta = 1.0; // How much to zoom in when double-tapping nodes (was 1.0)
 const double kScrollWheelVelocity = 0.01; // Mouse scroll wheel zoom speed (default 0.005)

lib/localizations/de.json

@@ -21,6 +21,24 @@
     "advanced": "Erweitert",
     "useAdvancedEditor": "Erweiterten Editor verwenden"
   },
+  "proximityWarning": {
+    "title": "Knoten sehr nah an vorhandenem Gerät",
+    "message": "Dieser Knoten ist nur {} Meter von einem vorhandenen Überwachungsgerät entfernt.",
+    "suggestion": "Wenn mehrere Geräte am selben Mast sind, verwenden Sie bitte mehrere Richtungen auf einem einzigen Knoten, anstatt separate Knoten zu erstellen.",
+    "nearbyNodes": "Nahegelegene Gerät(e) gefunden ({}):",
+    "nodeInfo": "Knoten #{} - {}",
+    "andMore": "...und {} weitere",
+    "goBack": "Zurück",
+    "submitAnyway": "Trotzdem senden",
+    "nodeType": {
+      "alpr": "ALPR/ANPR Kamera",
+      "publicCamera": "Öffentliche Überwachungskamera",
+      "camera": "Überwachungskamera",
+      "amenity": "{}",
+      "device": "{} Gerät",
+      "unknown": "Unbekanntes Gerät"
+    }
+  },
   "followMe": {
     "off": "Verfolgung aktivieren",
     "follow": "Verfolgung aktivieren (Rotation)",
@@ -129,6 +147,8 @@
     "simulateDescription": "Uploads simulieren (kontaktiert OSM-Server nicht)"
   },
   "auth": {
+    "osmAccountTitle": "OpenStreetMap-Konto",
+    "osmAccountSubtitle": "Ihr OSM-Login verwalten und Ihre Beiträge einsehen",
     "loggedInAs": "Angemeldet als {}",
     "loginToOSM": "Bei OpenStreetMap anmelden",
     "tapToLogout": "Zum Abmelden antippen",
@@ -138,6 +158,11 @@
     "testConnectionSubtitle": "OSM-Anmeldedaten überprüfen",
     "connectionOK": "Verbindung OK - Anmeldedaten sind gültig",
     "connectionFailed": "Verbindung fehlgeschlagen - bitte erneut anmelden",
+    "viewMyEdits": "Meine Änderungen bei OSM Anzeigen",
+    "viewMyEditsSubtitle": "Ihr Bearbeitungsverlauf bei OpenStreetMap einsehen",
+    "aboutOSM": "Über OpenStreetMap",
+    "aboutOSMDescription": "OpenStreetMap ist ein gemeinschaftliches Open-Source-Kartenprojekt, bei dem Mitwirkende eine kostenlose, bearbeitbare Karte der Welt erstellen und pflegen. Ihre Beiträge zu Überwachungsgeräten helfen dabei, diese Infrastruktur sichtbar und durchsuchbar zu machen.",
+    "visitOSM": "OpenStreetMap Besuchen",
     "deleteAccount": "OSM-Konto Löschen",
     "deleteAccountSubtitle": "Ihr OpenStreetMap-Konto verwalten",
     "deleteAccountExplanation": "Um Ihr OpenStreetMap-Konto zu löschen, müssen Sie die OpenStreetMap-Website besuchen. Dies entfernt dauerhaft Ihr OSM-Konto und alle zugehörigen Daten.",
@@ -145,7 +170,11 @@
     "goToOSM": "Zu OpenStreetMap gehen"
   },
   "queue": {
+    "title": "Upload-Warteschlange",
+    "subtitle": "Ausstehende Überwachungsgeräte-Uploads verwalten",
     "pendingUploads": "Ausstehende Uploads: {}",
+    "pendingItemsCount": "Ausstehende Elemente: {}",
+    "nothingInQueue": "Warteschlange ist leer",
     "simulateModeEnabled": "Simulationsmodus aktiviert – Uploads simuliert",
     "sandboxMode": "Sandbox-Modus – Uploads gehen an OSM Sandbox",
     "tapToViewQueue": "Zum Anzeigen der Warteschlange antippen",

lib/localizations/en.json

@@ -39,6 +39,24 @@
     "advanced": "Advanced",
     "useAdvancedEditor": "Use Advanced Editor"
   },
+  "proximityWarning": {
+    "title": "Node Very Close to Existing Device",
+    "message": "This node is only {} meters from an existing surveillance device.",
+    "suggestion": "If multiple devices are on the same pole, please use multiple directions on a single node instead of creating separate nodes.",
+    "nearbyNodes": "Nearby device(s) found ({}):",
+    "nodeInfo": "Node #{} - {}",
+    "andMore": "...and {} more",
+    "goBack": "Go Back",
+    "submitAnyway": "Submit Anyway",
+    "nodeType": {
+      "alpr": "ALPR/ANPR Camera",
+      "publicCamera": "Public Surveillance Camera", 
+      "camera": "Surveillance Camera",
+      "amenity": "{}",
+      "device": "{} Device",
+      "unknown": "Unknown Device"
+    }
+  },
   "followMe": {
     "off": "Enable follow-me",
     "follow": "Enable follow-me (rotating)",
@@ -147,6 +165,8 @@
     "simulateDescription": "Simulate uploads (does not contact OSM servers)"
   },
   "auth": {
+    "osmAccountTitle": "OpenStreetMap Account",
+    "osmAccountSubtitle": "Manage your OSM login and view your contributions",
     "loggedInAs": "Logged in as {}",
     "loginToOSM": "Log in to OpenStreetMap",
     "tapToLogout": "Tap to logout",
@@ -156,6 +176,11 @@
     "testConnectionSubtitle": "Verify OSM credentials are working",
     "connectionOK": "Connection OK - credentials are valid",
     "connectionFailed": "Connection failed - please re-login",
+    "viewMyEdits": "View My Edits on OSM",
+    "viewMyEditsSubtitle": "See your edit history on OpenStreetMap",
+    "aboutOSM": "About OpenStreetMap",
+    "aboutOSMDescription": "OpenStreetMap is a collaborative, open-source mapping project where contributors create and maintain a free, editable map of the world. Your surveillance device contributions help make this infrastructure visible and searchable.",
+    "visitOSM": "Visit OpenStreetMap",
     "deleteAccount": "Delete OSM Account",
     "deleteAccountSubtitle": "Manage your OpenStreetMap account",
     "deleteAccountExplanation": "To delete your OpenStreetMap account, you'll need to visit the OpenStreetMap website. This will permanently remove your OSM account and all associated data.",
@@ -163,7 +188,11 @@
     "goToOSM": "Go to OpenStreetMap"
   },
   "queue": {
+    "title": "Upload Queue",
+    "subtitle": "Manage pending surveillance device uploads",
     "pendingUploads": "Pending uploads: {}",
+    "pendingItemsCount": "Pending Items: {}",
+    "nothingInQueue": "Nothing in queue",
     "simulateModeEnabled": "Simulate mode enabled – uploads simulated",
     "sandboxMode": "Sandbox mode – uploads go to OSM Sandbox",
     "tapToViewQueue": "Tap to view queue",

lib/localizations/es.json

@@ -39,6 +39,24 @@
     "advanced": "Avanzado",
     "useAdvancedEditor": "Usar Editor Avanzado"
   },
+  "proximityWarning": {
+    "title": "Nodo Muy Cerca de Dispositivo Existente",
+    "message": "Este nodo está a solo {} metros de un dispositivo de vigilancia existente.",
+    "suggestion": "Si hay múltiples dispositivos en el mismo poste, use múltiples direcciones en un solo nodo en lugar de crear nodos separados.",
+    "nearbyNodes": "Dispositivo(s) cercano(s) encontrado(s) ({}):",
+    "nodeInfo": "Nodo #{} - {}",
+    "andMore": "...y {} más",
+    "goBack": "Volver",
+    "submitAnyway": "Enviar de Todas Formas",
+    "nodeType": {
+      "alpr": "Cámara ALPR/ANPR",
+      "publicCamera": "Cámara de Vigilancia Pública",
+      "camera": "Cámara de Vigilancia",
+      "amenity": "{}",
+      "device": "Dispositivo {}",
+      "unknown": "Dispositivo Desconocido"
+    }
+  },
   "followMe": {
     "off": "Activar seguimiento",
     "follow": "Activar seguimiento (rotación)",
@@ -147,6 +165,8 @@
     "simulateDescription": "Simular subidas (no contacta servidores OSM)"
   },
   "auth": {
+    "osmAccountTitle": "Cuenta de OpenStreetMap",
+    "osmAccountSubtitle": "Gestionar tu login de OSM y ver tus contribuciones",
     "loggedInAs": "Conectado como {}",
     "loginToOSM": "Iniciar sesión en OpenStreetMap",
     "tapToLogout": "Toque para cerrar sesión",
@@ -156,6 +176,11 @@
     "testConnectionSubtitle": "Verificar que las credenciales de OSM funcionen",
     "connectionOK": "Conexión OK - las credenciales son válidas",
     "connectionFailed": "Conexión falló - por favor, inicie sesión nuevamente",
+    "viewMyEdits": "Ver Mis Ediciones en OSM",
+    "viewMyEditsSubtitle": "Ver tu historial de ediciones en OpenStreetMap",
+    "aboutOSM": "Acerca de OpenStreetMap",
+    "aboutOSMDescription": "OpenStreetMap es un proyecto de mapeo colaborativo de código abierto donde los contribuyentes crean y mantienen un mapa gratuito y editable del mundo. Tus contribuciones de dispositivos de vigilancia ayudan a hacer visible y buscable esta infraestructura.",
+    "visitOSM": "Visitar OpenStreetMap",
     "deleteAccount": "Eliminar Cuenta OSM",
     "deleteAccountSubtitle": "Gestiona tu cuenta de OpenStreetMap",
     "deleteAccountExplanation": "Para eliminar tu cuenta de OpenStreetMap, necesitarás visitar el sitio web de OpenStreetMap. Esto eliminará permanentemente tu cuenta OSM y todos los datos asociados.",
@@ -163,7 +188,11 @@
     "goToOSM": "Ir a OpenStreetMap"
   },
   "queue": {
+    "title": "Cola de Subida",
+    "subtitle": "Gestionar subidas pendientes de dispositivos de vigilancia",
     "pendingUploads": "Subidas pendientes: {}",
+    "pendingItemsCount": "Elementos Pendientes: {}",
+    "nothingInQueue": "No hay nada en la cola",
     "simulateModeEnabled": "Modo simulación activado – subidas simuladas",
     "sandboxMode": "Modo sandbox – subidas van al Sandbox OSM",
     "tapToViewQueue": "Toque para ver cola",

lib/localizations/fr.json

@@ -39,6 +39,24 @@
     "advanced": "Avancé",
     "useAdvancedEditor": "Utiliser l'Éditeur Avancé"
   },
+  "proximityWarning": {
+    "title": "Nœud Très Proche d'un Dispositif Existant",
+    "message": "Ce nœud n'est qu'à {} mètres d'un dispositif de surveillance existant.",
+    "suggestion": "Si plusieurs dispositifs se trouvent sur le même poteau, veuillez utiliser plusieurs directions sur un seul nœud au lieu de créer des nœuds séparés.",
+    "nearbyNodes": "Dispositif(s) proche(s) trouvé(s) ({}) :",
+    "nodeInfo": "Nœud #{} - {}",
+    "andMore": "...et {} de plus",
+    "goBack": "Retour",
+    "submitAnyway": "Soumettre Quand Même",
+    "nodeType": {
+      "alpr": "Caméra ALPR/ANPR",
+      "publicCamera": "Caméra de Surveillance Publique",
+      "camera": "Caméra de Surveillance",
+      "amenity": "{}",
+      "device": "Dispositif {}",
+      "unknown": "Dispositif Inconnu"
+    }
+  },
   "followMe": {
     "off": "Activer le suivi",
     "follow": "Activer le suivi (rotation)",
@@ -147,6 +165,8 @@
     "simulateDescription": "Simuler les téléchargements (ne contacte pas les serveurs OSM)"
   },
   "auth": {
+    "osmAccountTitle": "Compte OpenStreetMap",
+    "osmAccountSubtitle": "Gérer votre connexion OSM et voir vos contributions",
     "loggedInAs": "Connecté en tant que {}",
     "loginToOSM": "Se connecter à OpenStreetMap",
     "tapToLogout": "Appuyer pour se déconnecter",
@@ -156,6 +176,11 @@
     "testConnectionSubtitle": "Vérifier que les identifiants OSM fonctionnent",
     "connectionOK": "Connexion OK - les identifiants sont valides",
     "connectionFailed": "Connexion échouée - veuillez vous reconnecter",
+    "viewMyEdits": "Voir Mes Modifications sur OSM",
+    "viewMyEditsSubtitle": "Voir votre historique de modifications sur OpenStreetMap",
+    "aboutOSM": "À Propos d'OpenStreetMap",
+    "aboutOSMDescription": "OpenStreetMap est un projet cartographique collaboratif open source où les contributeurs créent et maintiennent une carte gratuite et modifiable du monde. Vos contributions de dispositifs de surveillance aident à rendre cette infrastructure visible et consultable.",
+    "visitOSM": "Visiter OpenStreetMap",
     "deleteAccount": "Supprimer Compte OSM",
     "deleteAccountSubtitle": "Gérez votre compte OpenStreetMap",
     "deleteAccountExplanation": "Pour supprimer votre compte OpenStreetMap, vous devrez visiter le site web OpenStreetMap. Cela supprimera définitivement votre compte OSM et toutes les données associées.",
@@ -163,7 +188,11 @@
     "goToOSM": "Aller à OpenStreetMap"
   },
   "queue": {
+    "title": "File de Téléchargement",
+    "subtitle": "Gérer les téléchargements de dispositifs de surveillance en attente",
     "pendingUploads": "Téléchargements en attente: {}",
+    "pendingItemsCount": "Éléments en Attente: {}",
+    "nothingInQueue": "Rien dans la file",
     "simulateModeEnabled": "Mode simulation activé – téléchargements simulés",
     "sandboxMode": "Mode sandbox – téléchargements vont vers OSM Sandbox",
     "tapToViewQueue": "Appuyer pour voir la file",

lib/localizations/it.json

@@ -39,6 +39,24 @@
     "advanced": "Avanzato",
     "useAdvancedEditor": "Usa Editor Avanzato"
   },
+  "proximityWarning": {
+    "title": "Nodo Molto Vicino a Dispositivo Esistente",
+    "message": "Questo nodo è a soli {} metri da un dispositivo di sorveglianza esistente.",
+    "suggestion": "Se ci sono più dispositivi sullo stesso palo, utilizzare più direzioni su un singolo nodo invece di creare nodi separati.",
+    "nearbyNodes": "Dispositivo/i vicino/i trovato/i ({}):",
+    "nodeInfo": "Nodo #{} - {}",
+    "andMore": "...e altri {}",
+    "goBack": "Torna Indietro",
+    "submitAnyway": "Invia Comunque",
+    "nodeType": {
+      "alpr": "Telecamera ALPR/ANPR",
+      "publicCamera": "Telecamera di Sorveglianza Pubblica",
+      "camera": "Telecamera di Sorveglianza",
+      "amenity": "{}",
+      "device": "Dispositivo {}",
+      "unknown": "Dispositivo Sconosciuto"
+    }
+  },
   "followMe": {
     "off": "Attiva seguimi",
     "follow": "Attiva seguimi (rotazione)",
@@ -147,6 +165,8 @@
     "simulateDescription": "Simula upload (non contatta i server OSM)"
   },
   "auth": {
+    "osmAccountTitle": "Account OpenStreetMap",
+    "osmAccountSubtitle": "Gestisci il tuo login OSM e visualizza i tuoi contributi",
     "loggedInAs": "Loggato come {}",
     "loginToOSM": "Accedi a OpenStreetMap",
     "tapToLogout": "Tocca per disconnetterti",
@@ -156,6 +176,11 @@
     "testConnectionSubtitle": "Verifica che le credenziali OSM funzionino",
     "connectionOK": "Connessione OK - le credenziali sono valide",
     "connectionFailed": "Connessione fallita - per favore accedi di nuovo",
+    "viewMyEdits": "Visualizza le Mie Modifiche su OSM",
+    "viewMyEditsSubtitle": "Visualizza la cronologia delle tue modifiche su OpenStreetMap",
+    "aboutOSM": "Informazioni su OpenStreetMap",
+    "aboutOSMDescription": "OpenStreetMap è un progetto cartografico collaborativo open source dove i contributori creano e mantengono una mappa gratuita e modificabile del mondo. I tuoi contributi sui dispositivi di sorveglianza aiutano a rendere visibile e ricercabile questa infrastruttura.",
+    "visitOSM": "Visita OpenStreetMap",
     "deleteAccount": "Elimina Account OSM",
     "deleteAccountSubtitle": "Gestisci il tuo account OpenStreetMap",
     "deleteAccountExplanation": "Per eliminare il tuo account OpenStreetMap, dovrai visitare il sito web di OpenStreetMap. Questo rimuoverà permanentemente il tuo account OSM e tutti i dati associati.",
@@ -163,7 +188,11 @@
     "goToOSM": "Vai a OpenStreetMap"
   },
   "queue": {
+    "title": "Coda di Upload",
+    "subtitle": "Gestisci gli upload di dispositivi di sorveglianza in sospeso",
     "pendingUploads": "Upload in sospeso: {}",
+    "pendingItemsCount": "Elementi in Sospeso: {}",
+    "nothingInQueue": "Niente in coda",
     "simulateModeEnabled": "Modalità simulazione abilitata – upload simulati",
     "sandboxMode": "Modalità sandbox – upload vanno alla Sandbox OSM",
     "tapToViewQueue": "Tocca per vedere la coda",

lib/localizations/pt.json

@@ -39,6 +39,24 @@
     "advanced": "Avançado",
     "useAdvancedEditor": "Usar Editor Avançado"
   },
+  "proximityWarning": {
+    "title": "Nó Muito Próximo de Dispositivo Existente",
+    "message": "Este nó está a apenas {} metros de um dispositivo de vigilância existente.",
+    "suggestion": "Se vários dispositivos estão no mesmo poste, use várias direções em um único nó em vez de criar nós separados.",
+    "nearbyNodes": "Dispositivo(s) próximo(s) encontrado(s) ({}):",
+    "nodeInfo": "Nó #{} - {}",
+    "andMore": "...e mais {}",
+    "goBack": "Voltar",
+    "submitAnyway": "Enviar Mesmo Assim",
+    "nodeType": {
+      "alpr": "Câmera ALPR/ANPR",
+      "publicCamera": "Câmera de Vigilância Pública",
+      "camera": "Câmera de Vigilância",
+      "amenity": "{}",
+      "device": "Dispositivo {}",
+      "unknown": "Dispositivo Desconhecido"
+    }
+  },
   "followMe": {
     "off": "Ativar seguir-me",
     "follow": "Ativar seguir-me (rotação)",
@@ -147,6 +165,8 @@
     "simulateDescription": "Simular uploads (não contacta servidores OSM)"
   },
   "auth": {
+    "osmAccountTitle": "Conta OpenStreetMap",
+    "osmAccountSubtitle": "Gerencie seu login OSM e visualize suas contribuições",
     "loggedInAs": "Logado como {}",
     "loginToOSM": "Fazer login no OpenStreetMap",
     "tapToLogout": "Toque para sair",
@@ -156,6 +176,11 @@
     "testConnectionSubtitle": "Verificar se as credenciais OSM estão funcionando",
     "connectionOK": "Conexão OK - credenciais são válidas",
     "connectionFailed": "Conexão falhou - por favor, faça login novamente",
+    "viewMyEdits": "Ver Minhas Edições no OSM",
+    "viewMyEditsSubtitle": "Ver seu histórico de edições no OpenStreetMap",
+    "aboutOSM": "Sobre OpenStreetMap",
+    "aboutOSMDescription": "OpenStreetMap é um projeto de mapeamento colaborativo de código aberto onde os contribuintes criam e mantêm um mapa gratuito e editável do mundo. Suas contribuições de dispositivos de vigilância ajudam a tornar esta infraestrutura visível e pesquisável.",
+    "visitOSM": "Visitar OpenStreetMap",
     "deleteAccount": "Excluir Conta OSM",
     "deleteAccountSubtitle": "Gerencie sua conta OpenStreetMap",
     "deleteAccountExplanation": "Para excluir sua conta OpenStreetMap, você precisará visitar o site do OpenStreetMap. Isso removerá permanentemente sua conta OSM e todos os dados associados.",
@@ -163,7 +188,11 @@
     "goToOSM": "Ir para OpenStreetMap"
   },
   "queue": {
+    "title": "Fila de Upload",
+    "subtitle": "Gerenciar uploads pendentes de dispositivos de vigilância",
     "pendingUploads": "Uploads pendentes: {}",
+    "pendingItemsCount": "Itens Pendentes: {}",
+    "nothingInQueue": "Nada na fila",
     "simulateModeEnabled": "Modo simulação ativado – uploads simulados",
     "sandboxMode": "Modo sandbox – uploads vão para o Sandbox OSM",
     "tapToViewQueue": "Toque para ver a fila",

lib/localizations/zh.json

@@ -39,6 +39,24 @@
     "advanced": "高级",
     "useAdvancedEditor": "使用高级编辑器"
   },
+  "proximityWarning": {
+    "title": "节点过于靠近现有设备",
+    "message": "此节点距离现有监控设备仅 {} 米。",
+    "suggestion": "如果同一根杆上有多个设备，请在单个节点上使用多个方向，而不是创建单独的节点。",
+    "nearbyNodes": "发现附近设备 ({})：",
+    "nodeInfo": "节点 #{} - {}",
+    "andMore": "...还有 {} 个",
+    "goBack": "返回",
+    "submitAnyway": "仍然提交",
+    "nodeType": {
+      "alpr": "ALPR/ANPR 摄像头",
+      "publicCamera": "公共监控摄像头",
+      "camera": "监控摄像头",
+      "amenity": "{}",
+      "device": "{} 设备",
+      "unknown": "未知设备"
+    }
+  },
   "followMe": {
     "off": "启用跟随模式",
     "follow": "启用跟随模式（旋转）",
@@ -147,6 +165,8 @@
     "simulateDescription": "模拟上传（不联系 OSM 服务器）"
   },
   "auth": {
+    "osmAccountTitle": "OpenStreetMap 账户",
+    "osmAccountSubtitle": "管理您的 OSM 登录并查看您的贡献",
     "loggedInAs": "已登录为 {}",
     "loginToOSM": "登录 OpenStreetMap",
     "tapToLogout": "点击登出",
@@ -156,6 +176,11 @@
     "testConnectionSubtitle": "验证 OSM 凭据是否有效",
     "connectionOK": "连接正常 - 凭据有效",
     "connectionFailed": "连接失败 - 请重新登录",
+    "viewMyEdits": "在 OSM 上查看我的编辑",
+    "viewMyEditsSubtitle": "查看您在 OpenStreetMap 上的编辑历史",
+    "aboutOSM": "关于 OpenStreetMap",
+    "aboutOSMDescription": "OpenStreetMap 是一个协作的开源地图项目，贡献者创建和维护一个免费的、可编辑的世界地图。您的监控设备贡献有助于使这种基础设施可见和可搜索。",
+    "visitOSM": "访问 OpenStreetMap",
     "deleteAccount": "删除 OSM 账户",
     "deleteAccountSubtitle": "管理您的 OpenStreetMap 账户",
     "deleteAccountExplanation": "要删除您的 OpenStreetMap 账户，您需要访问 OpenStreetMap 网站。这将永久删除您的 OSM 账户和所有相关数据。",
@@ -163,7 +188,11 @@
     "goToOSM": "前往 OpenStreetMap"
   },
   "queue": {
+    "title": "上传队列",
+    "subtitle": "管理待上传的监控设备",
     "pendingUploads": "待上传：{}",
+    "pendingItemsCount": "待处理项目：{}",
+    "nothingInQueue": "队列中没有内容",
     "simulateModeEnabled": "模拟模式已启用 – 上传已模拟",
     "sandboxMode": "沙盒模式 – 上传到 OSM 沙盒",
     "tapToViewQueue": "点击查看队列",

lib/main.dart

@@ -11,6 +11,8 @@ import 'screens/advanced_settings_screen.dart';
 import 'screens/language_settings_screen.dart';
 import 'screens/about_screen.dart';
 import 'screens/release_notes_screen.dart';
+import 'screens/osm_account_screen.dart';
+import 'screens/upload_queue_screen.dart';
 import 'services/localization_service.dart';
 import 'services/version_service.dart';
 
@@ -69,6 +71,8 @@ class DeFlockApp extends StatelessWidget {
       routes: {
         '/': (context) => const HomeScreen(),
         '/settings': (context) => const SettingsScreen(),
+        '/settings/osm-account': (context) => const OSMAccountScreen(),
+        '/settings/queue': (context) => const UploadQueueScreen(),
         '/settings/profiles': (context) => const ProfilesSettingsScreen(),
         '/settings/navigation': (context) => const NavigationSettingsScreen(),
         '/settings/offline': (context) => const OfflineSettingsScreen(),

lib/screens/osm_account_screen.dart

@@ -0,0 +1,176 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
+import '../app_state.dart';
+import '../services/localization_service.dart';
+import '../dev_config.dart';
+import '../state/settings_state.dart';
+import '../screens/settings/sections/upload_mode_section.dart';
+
+class OSMAccountScreen extends StatelessWidget {
+  const OSMAccountScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: LocalizationService.instance,
+      builder: (context, child) {
+        final locService = LocalizationService.instance;
+        final appState = context.watch<AppState>();
+        
+        return Scaffold(
+          appBar: AppBar(
+            title: Text(locService.t('auth.osmAccountTitle')),
+          ),
+          body: ListView(
+            padding: EdgeInsets.fromLTRB(
+              16, 
+              16, 
+              16, 
+              16 + MediaQuery.of(context).padding.bottom,
+            ),
+            children: [
+              // Login/Account Status Section
+              Card(
+                child: Column(
+                  children: [
+                    ListTile(
+                      leading: Icon(
+                        appState.isLoggedIn ? Icons.person : Icons.login,
+                        color: appState.isLoggedIn ? Colors.green : null,
+                      ),
+                      title: Text(appState.isLoggedIn
+                          ? locService.t('auth.loggedInAs', params: [appState.username])
+                          : locService.t('auth.loginToOSM')),
+                      subtitle: appState.isLoggedIn
+                          ? Text(locService.t('auth.tapToLogout'))
+                          : Text(locService.t('auth.requiredToSubmit')),
+                      onTap: () async {
+                        if (appState.isLoggedIn) {
+                          await appState.logout();
+                          if (context.mounted) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(locService.t('auth.loggedOut')),
+                                backgroundColor: Colors.grey,
+                              ),
+                            );
+                          }
+                        } else {
+                          // Start login flow - the user will be redirected to browser
+                          await appState.forceLogin();
+                          
+                          // Don't show immediate feedback - the UI will update automatically
+                          // when the OAuth callback completes and notifyListeners() is called
+                        }
+                      },
+                    ),
+                    
+                    if (appState.isLoggedIn) ...[
+                      const Divider(),
+                      ListTile(
+                        leading: const Icon(Icons.wifi_protected_setup),
+                        title: Text(locService.t('auth.testConnection')),
+                        subtitle: Text(locService.t('auth.testConnectionSubtitle')),
+                        onTap: () async {
+                          final isValid = await appState.validateToken();
+                          if (context.mounted) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(isValid
+                                    ? locService.t('auth.connectionOK')
+                                    : locService.t('auth.connectionFailed')),
+                                backgroundColor: isValid ? Colors.green : Colors.red,
+                              ),
+                            );
+                          }
+                          if (!isValid) {
+                            await appState.logout();
+                          }
+                        },
+                      ),
+                      
+                      const Divider(),
+                      ListTile(
+                        leading: const Icon(Icons.history),
+                        title: Text(locService.t('auth.viewMyEdits')),
+                        subtitle: Text(locService.t('auth.viewMyEditsSubtitle')),
+                        trailing: const Icon(Icons.open_in_new),
+                        onTap: () async {
+                          final url = Uri.parse('https://openstreetmap.org/user/${Uri.encodeComponent(appState.username)}/history');
+                          if (await canLaunchUrl(url)) {
+                            await launchUrl(url, mode: LaunchMode.externalApplication);
+                          } else {
+                            if (context.mounted) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(content: Text(locService.t('advancedEdit.couldNotOpenOSMWebsite'))),
+                              );
+                            }
+                          }
+                        },
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+              
+              const SizedBox(height: 16),
+              
+              // Upload Mode Section (only show in development builds)
+              if (kEnableDevelopmentModes) ...[
+                Card(
+                  child: const Padding(
+                    padding: EdgeInsets.all(16.0),
+                    child: UploadModeSection(),
+                  ),
+                ),
+                const SizedBox(height: 16),
+              ],
+              
+              // Information Section
+              Card(
+                child: Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        locService.t('auth.aboutOSM'),
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                      const SizedBox(height: 8),
+                      Text(
+                        locService.t('auth.aboutOSMDescription'),
+                        style: Theme.of(context).textTheme.bodyMedium,
+                      ),
+                      const SizedBox(height: 16),
+                      SizedBox(
+                        width: double.infinity,
+                        child: OutlinedButton.icon(
+                          onPressed: () async {
+                            final url = Uri.parse('https://openstreetmap.org');
+                            if (await canLaunchUrl(url)) {
+                              await launchUrl(url, mode: LaunchMode.externalApplication);
+                            } else {
+                              if (context.mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(content: Text(locService.t('advancedEdit.couldNotOpenOSMWebsite'))),
+                                );
+                              }
+                            }
+                          },
+                          icon: const Icon(Icons.open_in_new),
+                          label: Text(locService.t('auth.visitOSM')),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/screens/settings_screen.dart

@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'settings/sections/auth_section.dart';
-import 'settings/sections/upload_mode_section.dart';
-import 'settings/sections/queue_section.dart';
 import '../services/localization_service.dart';
 import '../services/version_service.dart';
 import '../dev_config.dart';
@@ -25,14 +22,24 @@ class SettingsScreen extends StatelessWidget {
             16 + MediaQuery.of(context).padding.bottom,
           ),
           children: [
-            // Only show upload mode section in development builds
-            if (kEnableDevelopmentModes) ...[
-              const UploadModeSection(),
-              const Divider(),
-            ],
-            const AuthSection(),
+            // OpenStreetMap Account
+            _buildNavigationTile(
+              context,
+              icon: Icons.account_circle,
+              title: locService.t('auth.osmAccountTitle'),
+              subtitle: locService.t('auth.osmAccountSubtitle'),
+              onTap: () => Navigator.pushNamed(context, '/settings/osm-account'),
+            ),
             const Divider(),
-            const QueueSection(),
+            
+            // Upload Queue
+            _buildNavigationTile(
+              context,
+              icon: Icons.queue,
+              title: locService.t('queue.title'),
+              subtitle: locService.t('queue.subtitle'),
+              onTap: () => Navigator.pushNamed(context, '/settings/queue'),
+            ),
             const Divider(),
             
             // Navigation to sub-pages

lib/screens/upload_queue_screen.dart

@@ -0,0 +1,189 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../app_state.dart';
+import '../services/localization_service.dart';
+import '../state/settings_state.dart';
+
+class UploadQueueScreen extends StatelessWidget {
+  const UploadQueueScreen({super.key});
+
+  String _getUploadModeDisplayName(UploadMode mode) {
+    final locService = LocalizationService.instance;
+    switch (mode) {
+      case UploadMode.production:
+        return locService.t('uploadMode.production');
+      case UploadMode.sandbox:
+        return locService.t('uploadMode.sandbox');
+      case UploadMode.simulate:
+        return locService.t('uploadMode.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) {
+    return AnimatedBuilder(
+      animation: LocalizationService.instance,
+      builder: (context, child) {
+        final locService = LocalizationService.instance;
+        final appState = context.watch<AppState>();
+        
+        return Scaffold(
+          appBar: AppBar(
+            title: Text(locService.t('queue.title')),
+          ),
+          body: ListView(
+            padding: EdgeInsets.fromLTRB(
+              16, 
+              16, 
+              16, 
+              16 + MediaQuery.of(context).padding.bottom,
+            ),
+            children: [
+              // Clear Upload Queue button - always visible
+              SizedBox(
+                width: double.infinity,
+                child: ElevatedButton.icon(
+                  onPressed: appState.pendingCount > 0 ? () {
+                    showDialog(
+                      context: context,
+                      builder: (context) => AlertDialog(
+                        title: Text(locService.t('queue.clearQueueTitle')),
+                        content: Text(locService.t('queue.clearQueueConfirm', params: [appState.pendingCount.toString()])),
+                        actions: [
+                          TextButton(
+                            onPressed: () => Navigator.pop(context),
+                            child: Text(locService.cancel),
+                          ),
+                          TextButton(
+                            onPressed: () {
+                              appState.clearQueue();
+                              Navigator.pop(context);
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(content: Text(locService.t('queue.queueCleared'))),
+                              );
+                            },
+                            child: Text(locService.t('actions.clear')),
+                          ),
+                        ],
+                      ),
+                    );
+                  } : null,
+                  icon: const Icon(Icons.clear_all),
+                  label: Text(locService.t('queue.clearUploadQueue')),
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: appState.pendingCount > 0 ? null : Theme.of(context).disabledColor.withOpacity(0.1),
+                  ),
+                ),
+              ),
+              
+              const SizedBox(height: 16),
+              const Divider(),
+              const SizedBox(height: 8),
+              
+              // Queue list or empty message
+              if (appState.pendingUploads.isEmpty) ...[
+                Center(
+                  child: Padding(
+                    padding: const EdgeInsets.all(32.0),
+                    child: Column(
+                      children: [
+                        Icon(
+                          Icons.check_circle_outline,
+                          size: 64,
+                          color: Theme.of(context).textTheme.bodySmall?.color?.withOpacity(0.4),
+                        ),
+                        const SizedBox(height: 16),
+                        Text(
+                          locService.t('queue.nothingInQueue'),
+                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                            color: Theme.of(context).textTheme.bodySmall?.color?.withOpacity(0.6),
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ] else ...[
+                Text(
+                  locService.t('queue.pendingItemsCount', params: [appState.pendingCount.toString()]),
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
+                const SizedBox(height: 16),
+                
+                // Queue items
+                ...appState.pendingUploads.asMap().entries.map((entry) {
+                  final index = entry.key;
+                  final upload = entry.value;
+                  
+                  return Card(
+                    margin: const EdgeInsets.only(bottom: 8),
+                    child: ListTile(
+                      leading: Icon(
+                        upload.error ? Icons.error : Icons.camera_alt,
+                        color: upload.error 
+                            ? Colors.red 
+                            : _getUploadModeColor(upload.uploadMode),
+                      ),
+                      title: Text(
+                        locService.t('queue.cameraWithIndex', params: [(index + 1).toString()]) +
+                        (upload.error ? locService.t('queue.error') : "") +
+                        (upload.completing ? locService.t('queue.completing') : "")
+                      ),
+                      subtitle: Text(
+                        locService.t('queue.destination', params: [_getUploadModeDisplayName(upload.uploadMode)]) + '\n' +
+                        locService.t('queue.latitude', params: [upload.coord.latitude.toStringAsFixed(6)]) + '\n' +
+                        locService.t('queue.longitude', params: [upload.coord.longitude.toStringAsFixed(6)]) + '\n' +
+                        locService.t('queue.direction', params: [
+                          upload.direction is String 
+                              ? upload.direction.toString()
+                              : upload.direction.round().toString()
+                        ]) + '\n' +
+                        locService.t('queue.attempts', params: [upload.attempts.toString()]) +
+                        (upload.error ? "\n${locService.t('queue.uploadFailedRetry')}" : "")
+                      ),
+                      trailing: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          if (upload.error && !upload.completing)
+                            IconButton(
+                              icon: const Icon(Icons.refresh),
+                              color: Colors.orange,
+                              tooltip: locService.t('queue.retryUpload'),
+                              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);
+                              },
+                            ),
+                        ],
+                      ),
+                    ),
+                  );
+                }),
+              ],
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/services/node_cache.dart

@@ -2,6 +2,8 @@ import 'package:latlong2/latlong.dart';
 import '../models/osm_node.dart';
 import 'package:flutter_map/flutter_map.dart' show LatLngBounds;
 
+const Distance _distance = Distance();
+
 class NodeCache {
   // Singleton instance
   static final NodeCache instance = NodeCache._internal();
@@ -103,6 +105,34 @@ class NodeCache {
            (coord1.longitude - coord2.longitude).abs() < tolerance;
   }
 
+  /// Find nodes within the specified distance (in meters) of the given coordinate
+  /// Excludes nodes with the excludeNodeId (useful when checking proximity for edited nodes)
+  List<OsmNode> findNodesWithinDistance(LatLng coord, double distanceMeters, {int? excludeNodeId}) {
+    final nearbyNodes = <OsmNode>[];
+    
+    for (final node in _nodes.values) {
+      // Skip the excluded node (typically the node being edited)
+      if (excludeNodeId != null && node.id == excludeNodeId) {
+        continue;
+      }
+      
+      // Skip temporary nodes (negative IDs) with pending upload/edit/deletion markers
+      if (node.id < 0 && (
+          node.tags.containsKey('_pending_upload') ||
+          node.tags.containsKey('_pending_edit') ||
+          node.tags.containsKey('_pending_deletion'))) {
+        continue;
+      }
+      
+      final distance = _distance.as(LengthUnit.Meter, coord, node.coord);
+      if (distance <= distanceMeters) {
+        nearbyNodes.add(node);
+      }
+    }
+    
+    return nearbyNodes;
+  }
+
   /// Utility: point-in-bounds for coordinates
   bool _inBounds(LatLng coord, LatLngBounds bounds) {
     return coord.latitude >= bounds.southWest.latitude &&

lib/widgets/add_node_sheet.dart

@@ -6,13 +6,58 @@ import '../dev_config.dart';
 import '../models/node_profile.dart';
 import '../models/operator_profile.dart';
 import '../services/localization_service.dart';
+import '../services/node_cache.dart';
 import 'refine_tags_sheet.dart';
+import 'proximity_warning_dialog.dart';
 
 class AddNodeSheet extends StatelessWidget {
   const AddNodeSheet({super.key, required this.session});
 
   final AddNodeSession session;
 
+  void _checkProximityAndCommit(BuildContext context, AppState appState, LocalizationService locService) {
+    // Only check proximity if we have a target location
+    if (session.target == null) {
+      _commitWithoutCheck(context, appState, locService);
+      return;
+    }
+    
+    // Check for nearby nodes within the configured distance
+    final nearbyNodes = NodeCache.instance.findNodesWithinDistance(
+      session.target!, 
+      kNodeProximityWarningDistance,
+    );
+    
+    if (nearbyNodes.isNotEmpty) {
+      // Show proximity warning dialog
+      showDialog<void>(
+        context: context,
+        builder: (context) => ProximityWarningDialog(
+          nearbyNodes: nearbyNodes,
+          distance: kNodeProximityWarningDistance,
+          onGoBack: () {
+            Navigator.of(context).pop(); // Close dialog
+          },
+          onSubmitAnyway: () {
+            Navigator.of(context).pop(); // Close dialog
+            _commitWithoutCheck(context, appState, locService);
+          },
+        ),
+      );
+    } else {
+      // No nearby nodes, proceed with commit
+      _commitWithoutCheck(context, appState, locService);
+    }
+  }
+
+  void _commitWithoutCheck(BuildContext context, AppState appState, LocalizationService locService) {
+    appState.commitSession();
+    Navigator.pop(context);
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(locService.t('node.queuedForUpload'))),
+    );
+  }
+
   Widget _buildDirectionControls(BuildContext context, AppState appState, AddNodeSession session, LocalizationService locService) {
     final requiresDirection = session.profile != null && session.profile!.requiresDirection;
     
@@ -144,11 +189,7 @@ class AddNodeSheet extends StatelessWidget {
         final appState = context.watch<AppState>();
 
         void _commit() {
-          appState.commitSession();
-          Navigator.pop(context);
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(locService.t('node.queuedForUpload'))),
-          );
+          _checkProximityAndCommit(context, appState, locService);
         }
 
         void _cancel() {

lib/widgets/edit_node_sheet.dart

@@ -6,15 +6,55 @@ import '../dev_config.dart';
 import '../models/node_profile.dart';
 import '../models/operator_profile.dart';
 import '../services/localization_service.dart';
+import '../services/node_cache.dart';
 import '../state/settings_state.dart';
 import 'refine_tags_sheet.dart';
 import 'advanced_edit_options_sheet.dart';
+import 'proximity_warning_dialog.dart';
 
 class EditNodeSheet extends StatelessWidget {
   const EditNodeSheet({super.key, required this.session});
 
   final EditNodeSession session;
 
+  void _checkProximityAndCommit(BuildContext context, AppState appState, LocalizationService locService) {
+    // Check for nearby nodes within the configured distance, excluding the node being edited
+    final nearbyNodes = NodeCache.instance.findNodesWithinDistance(
+      session.target, 
+      kNodeProximityWarningDistance,
+      excludeNodeId: session.originalNode.id,
+    );
+    
+    if (nearbyNodes.isNotEmpty) {
+      // Show proximity warning dialog
+      showDialog<void>(
+        context: context,
+        builder: (context) => ProximityWarningDialog(
+          nearbyNodes: nearbyNodes,
+          distance: kNodeProximityWarningDistance,
+          onGoBack: () {
+            Navigator.of(context).pop(); // Close dialog
+          },
+          onSubmitAnyway: () {
+            Navigator.of(context).pop(); // Close dialog
+            _commitWithoutCheck(context, appState, locService);
+          },
+        ),
+      );
+    } else {
+      // No nearby nodes, proceed with commit
+      _commitWithoutCheck(context, appState, locService);
+    }
+  }
+
+  void _commitWithoutCheck(BuildContext context, AppState appState, LocalizationService locService) {
+    appState.commitEditSession();
+    Navigator.pop(context);
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(locService.t('node.editQueuedForUpload'))),
+    );
+  }
+
   Widget _buildDirectionControls(BuildContext context, AppState appState, EditNodeSession session, LocalizationService locService) {
     final requiresDirection = session.profile != null && session.profile!.requiresDirection;
     
@@ -146,11 +186,7 @@ class EditNodeSheet extends StatelessWidget {
         final appState = context.watch<AppState>();
 
         void _commit() {
-          appState.commitEditSession();
-          Navigator.pop(context);
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(locService.t('node.editQueuedForUpload'))),
-          );
+          _checkProximityAndCommit(context, appState, locService);
         }
 
         void _cancel() {
@@ -219,20 +255,22 @@ class EditNodeSheet extends StatelessWidget {
                   padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
                   child: Column(
                     children: [
-                      // Extract from way checkbox
-                      CheckboxListTile(
-                        title: Text(locService.t('editNode.extractFromWay')),
-                        subtitle: Text(locService.t('editNode.extractFromWaySubtitle')),
-                        value: session.extractFromWay,
-                        onChanged: (value) {
-                          appState.updateEditSession(extractFromWay: value);
-                        },
-                        controlAffinity: ListTileControlAffinity.leading,
-                        contentPadding: EdgeInsets.zero,
-                      ),
-                      const SizedBox(height: 8),
-                      // Constraint info message (only show if extract is not checked)
-                      if (!session.extractFromWay) ...[
+                      // Extract from way checkbox (only show if enabled in dev config)
+                      if (kEnableNodeExtraction) ...[
+                        CheckboxListTile(
+                          title: Text(locService.t('editNode.extractFromWay')),
+                          subtitle: Text(locService.t('editNode.extractFromWaySubtitle')),
+                          value: session.extractFromWay,
+                          onChanged: (value) {
+                            appState.updateEditSession(extractFromWay: value);
+                          },
+                          controlAffinity: ListTileControlAffinity.leading,
+                          contentPadding: EdgeInsets.zero,
+                        ),
+                        const SizedBox(height: 8),
+                      ],
+                      // Constraint info message (only show if extract is not checked or not enabled)
+                      if (!kEnableNodeExtraction || !session.extractFromWay) ...[
                         Row(
                           children: [
                             const Icon(Icons.info_outline, size: 20),

lib/widgets/node_tag_sheet.dart

@@ -209,12 +209,12 @@ class NodeTagSheet extends StatelessWidget {
                       ),
                       const SizedBox(width: 8),
                       ElevatedButton.icon(
-                        onPressed: _deleteNode,
+                        onPressed: node.isConstrained ? null : _deleteNode,
                         icon: const Icon(Icons.delete, size: 18),
                         label: Text(locService.t('actions.delete')),
                         style: ElevatedButton.styleFrom(
                           minimumSize: const Size(0, 36),
-                          foregroundColor: Colors.red,
+                          foregroundColor: node.isConstrained ? null : Colors.red,
                         ),
                       ),
                       const SizedBox(width: 12),

lib/widgets/proximity_warning_dialog.dart

@@ -0,0 +1,126 @@
+import 'package:flutter/material.dart';
+import 'package:latlong2/latlong.dart';
+
+import '../models/osm_node.dart';
+import '../services/localization_service.dart';
+
+class ProximityWarningDialog extends StatelessWidget {
+  final List<OsmNode> nearbyNodes;
+  final double distance;
+  final VoidCallback onGoBack;
+  final VoidCallback onSubmitAnyway;
+
+  const ProximityWarningDialog({
+    super.key,
+    required this.nearbyNodes,
+    required this.distance,
+    required this.onGoBack,
+    required this.onSubmitAnyway,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: LocalizationService.instance,
+      builder: (context, child) {
+        final locService = LocalizationService.instance;
+        
+        return AlertDialog(
+          icon: const Icon(
+            Icons.warning_amber_rounded,
+            color: Colors.orange,
+            size: 32,
+          ),
+          title: Text(locService.t('proximityWarning.title')),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                locService.t('proximityWarning.message', 
+                  params: [distance.toStringAsFixed(1)]),
+                style: Theme.of(context).textTheme.bodyMedium,
+              ),
+              const SizedBox(height: 16),
+              Text(
+                locService.t('proximityWarning.suggestion'),
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  fontStyle: FontStyle.italic,
+                ),
+              ),
+              const SizedBox(height: 16),
+              Text(
+                locService.t('proximityWarning.nearbyNodes', 
+                  params: [nearbyNodes.length.toString()]),
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(height: 8),
+              ...nearbyNodes.take(3).map((node) => Padding(
+                padding: const EdgeInsets.only(left: 8.0, bottom: 4.0),
+                child: Text(
+                  '• ${locService.t('proximityWarning.nodeInfo', params: [
+                    node.id.toString(),
+                    _getNodeTypeDescription(node, locService),
+                  ])}',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              )),
+              if (nearbyNodes.length > 3)
+                Padding(
+                  padding: const EdgeInsets.only(left: 8.0, top: 4.0),
+                  child: Text(
+                    locService.t('proximityWarning.andMore', 
+                      params: [(nearbyNodes.length - 3).toString()]),
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                      fontStyle: FontStyle.italic,
+                    ),
+                  ),
+                ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: onGoBack,
+              child: Text(locService.t('proximityWarning.goBack')),
+            ),
+            ElevatedButton(
+              onPressed: onSubmitAnyway,
+              style: ElevatedButton.styleFrom(
+                backgroundColor: Colors.orange,
+                foregroundColor: Colors.white,
+              ),
+              child: Text(locService.t('proximityWarning.submitAnyway')),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  String _getNodeTypeDescription(OsmNode node, LocalizationService locService) {
+    // Try to get a meaningful description from the node's tags
+    final manMade = node.tags['man_made'];
+    final amenity = node.tags['amenity'];
+    final surveillance = node.tags['surveillance'];
+    final surveillanceType = node.tags['surveillance:type'];
+    final manufacturer = node.tags['manufacturer'];
+    
+    if (manMade == 'surveillance') {
+      if (surveillanceType == 'ALPR' || surveillanceType == 'ANPR') {
+        return locService.t('proximityWarning.nodeType.alpr');
+      } else if (surveillance == 'public') {
+        return locService.t('proximityWarning.nodeType.publicCamera');
+      } else {
+        return locService.t('proximityWarning.nodeType.camera');
+      }
+    } else if (amenity != null) {
+      return locService.t('proximityWarning.nodeType.amenity', params: [amenity]);
+    } else if (manufacturer != null) {
+      return locService.t('proximityWarning.nodeType.device', params: [manufacturer]);
+    } else {
+      return locService.t('proximityWarning.nodeType.unknown');
+    }
+  }
+}

pubspec.yaml

@@ -1,7 +1,7 @@
 name: deflockapp
 description: Map public surveillance infrastructure with OpenStreetMap
 publish_to: "none"
-version: 1.4.1+14   # The thing after the + is the version code, incremented with each release
+version: 1.4.3+14   # The thing after the + is the version code, incremented with each release
 
 environment:
   sdk: ">=3.5.0 <4.0.0"   # oauth2_client 4.x needs Dart 3.5+