fix(edit): stop showing 'Edit cancelled' after successful update; show ft units on map popup

static/js/tree-track-app.js

@@ -105,7 +105,8 @@ export class TreeTrackApp {
             }
             
             if (e.target.matches('#cancelEdit')) {
-                this.handleCancelEdit();
+                // User explicitly cancelled edit
+                this.handleCancelEdit(true);
             }
         });
     }
@@ -156,7 +157,8 @@ export class TreeTrackApp {
             if (this.formManager.isInEditMode()) {
                 result = await this.apiClient.updateTree(this.formManager.getCurrentEditId(), treeData);
                 this.uiManager.showMessage(`Tree #${result.id} updated successfully!`, 'success');
-                this.handleCancelEdit();
+                // Exit edit mode silently after successful update
+                this.handleCancelEdit(false);
             } else {
                 result = await this.apiClient.saveTree(treeData);
                 this.uiManager.showMessage(
@@ -216,11 +218,13 @@ export class TreeTrackApp {
         }
     }
 
-    handleCancelEdit() {
+    handleCancelEdit(showMessage = false) {
         this.formManager.resetForm(true);
         this.formManager.exitEditMode();
         this.uiManager.clearFieldErrors();
-        this.uiManager.showMessage('Edit cancelled. Form cleared.', 'success');
+        if (showMessage) {
+            this.uiManager.showMessage('Edit cancelled. Form cleared.', 'success');
+        }
     }
 
     async loadTrees() {

static/map.js

@@ -626,8 +626,8 @@ class TreeTrackMap {
                             ${tree.scientific_name ? `<strong style="color: #374151;">Scientific:</strong><span style="word-wrap: break-word;"><em>${tree.scientific_name}</em></span>` : ''}
                             ${tree.common_name ? `<strong style="color: #374151;">Common:</strong><span style="word-wrap: break-word;">${tree.common_name}</span>` : ''}
                             <strong style="color: #374151;">Location:</strong><span style="font-family: monospace; font-size: 12px;">${tree.latitude.toFixed(4)}, ${tree.longitude.toFixed(4)}</span>
-                            ${tree.height ? `<strong style="color: #374151;">Height:</strong><span>${tree.height}m</span>` : ''}
-                            ${tree.width ? `<strong style="color: #374151;">Girth:</strong><span>${tree.width}cm</span>` : ''}
+${tree.height ? `<strong style="color: #374151;">Height:</strong><span>${tree.height} ft</span>` : ''}
+                            ${tree.width ? `<strong style="color: #374151;">Girth:</strong><span>${tree.width} ft</span>` : ''}
                             <strong style="color: #374151;">Added by:</strong><span>${tree.created_by || 'Unknown'}</span>
                             <strong style="color: #374151;">Date:</strong><span>${new Date(tree.created_at).toLocaleDateString()}</span>
                         </div>