Deletions!

lib/services/node_cache.dart

@@ -60,6 +60,13 @@ class NodeCache {
       );
     }
   }
+
+  /// Remove a node by ID from the cache (used for successful deletions)
+  void removeNodeById(int nodeId) {
+    if (_nodes.remove(nodeId) != null) {
+      print('[NodeCache] Removed node $nodeId from cache (successful deletion)');
+    }
+  }
   
   /// Remove temporary nodes (negative IDs) with _pending_upload marker at the given coordinate
   /// This is used when a real node ID is assigned to clean up temp placeholders

lib/services/uploader.dart

@@ -17,7 +17,18 @@ class Uploader {
       print('Uploader: Starting upload for node at ${p.coord.latitude}, ${p.coord.longitude}');
       
       // 1. open changeset
-      final action = p.isEdit ? 'Update' : 'Add';
+      String action;
+      switch (p.operation) {
+        case UploadOperation.create:
+          action = 'Add';
+          break;
+        case UploadOperation.modify:
+          action = 'Update';
+          break;
+        case UploadOperation.delete:
+          action = 'Delete';
+          break;
+      }
       final csXml = '''
         <osm>
           <changeset>
@@ -35,63 +46,100 @@ class Uploader {
       final csId = csResp.body.trim();
       print('Uploader: Created changeset ID: $csId');
 
-      // 2. create or update node
-      final mergedTags = p.getCombinedTags();
-      final tagsXml = mergedTags.entries.map((e) =>
-        '<tag k="${e.key}" v="${e.value}"/>').join('\n            ');
-      
+      // 2. create, update, or delete node
       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 = '''
+      switch (p.operation) {
+        case UploadOperation.create:
+          // Create new node
+          final mergedTags = p.getCombinedTags();
+          final tagsXml = mergedTags.entries.map((e) =>
+            '<tag k="${e.key}" v="${e.value}"/>').join('\n            ');
+          final nodeXml = '''
         <osm>
           <node changeset="$csId" lat="${p.coord.latitude}" lon="${p.coord.longitude}">
             $tagsXml
           </node>
         </osm>''';
-        print('Uploader: Creating new node...');
-        nodeResp = await _put('/api/0.6/node/create', nodeXml);
-        nodeId = nodeResp.body.trim();
+          print('Uploader: Creating new node...');
+          nodeResp = await _put('/api/0.6/node/create', nodeXml);
+          nodeId = nodeResp.body.trim();
+          break;
+
+        case UploadOperation.modify:
+          // 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 mergedTags = p.getCombinedTags();
+          final tagsXml = mergedTags.entries.map((e) =>
+            '<tag k="${e.key}" v="${e.value}"/>').join('\n            ');
+          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();
+          break;
+
+        case UploadOperation.delete:
+          // First, fetch the current node to get its version and coordinates
+          print('Uploader: Fetching current node ${p.originalNodeId} for deletion...');
+          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 and tags 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');
+          
+          // Delete node - OSM requires current tags and coordinates
+          final nodeXml = '''
+        <osm>
+          <node changeset="$csId" id="${p.originalNodeId}" version="$currentVersion" lat="${p.coord.latitude}" lon="${p.coord.longitude}">
+          </node>
+        </osm>''';
+          print('Uploader: Deleting node ${p.originalNodeId}...');
+          nodeResp = await _delete('/api/0.6/node/${p.originalNodeId}', nodeXml);
+          nodeId = p.originalNodeId.toString();
+          break;
       }
       
       print('Uploader: Node response: ${nodeResp.statusCode} - ${nodeResp.body}');
       if (nodeResp.statusCode != 200) {
-        print('Uploader: Failed to ${p.isEdit ? "update" : "create"} node');
+        print('Uploader: Failed to ${p.operation.name} node');
         return false;
       }
-      print('Uploader: ${p.isEdit ? "Updated" : "Created"} node ID: $nodeId');
+      print('Uploader: ${p.operation.name.capitalize()} node ID: $nodeId');
 
       // 3. close changeset
       print('Uploader: Closing changeset...');
@@ -135,9 +183,21 @@ class Uploader {
         body: body,
       );
 
+  Future<http.Response> _delete(String path, String body) => http.delete(
+        Uri.https(_host, path),
+        headers: _headers,
+        body: body,
+      );
+
   Map<String, String> get _headers => {
         'Authorization': 'Bearer $accessToken',
         'Content-Type': 'text/xml',
       };
 }
 
+extension StringExtension on String {
+  String capitalize() {
+    return "${this[0].toUpperCase()}${substring(1)}";
+  }
+}
+