Sort out junction highlighting when deleting a way, and leave POIs in situ

diff --git a/TODO.txt b/TODO.txt
index 15c17c357c71fe2b38e4de5bbb711a65537fe1e3..3127b61770c524bb6491ef391080682e19506a7d 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -44,8 +44,7 @@ Potlatch 2: main outstanding issues
 * small node hitzone when creating areas - hitzone and mouseover UI don't match up
 * GPS loading should have a loading... label
 * Pressing undo/redo sometimes doesn't change controllerstate. (e.g. create POI + undo leaves the tag panel still referring to POI)
-* Deleting a way doesn't update the junction highlighting on the remaining junctions
-* Deleting a way also deletes POIs without warning (ooh, look I found a modal dialog in p1. Do I win a prize? :-) )
+* Deleting a way containing POIs leaves the POIs in wrong state (black vs green) - sorts out on mouseover
 
 == Rendering (Halcyon) ==
 

diff --git a/net/systemeD/halcyon/connection/actions/DeleteWayAction.as b/net/systemeD/halcyon/connection/actions/DeleteWayAction.as
index da515955a64e88afa1cd64da9c165fc1ee6a512b..191e5ff56d783e2651bacf44cbf18f82032d7637 100644 (file)
--- a/net/systemeD/halcyon/connection/actions/DeleteWayAction.as
+++ b/net/systemeD/halcyon/connection/actions/DeleteWayAction.as
@@ -28,7 +28,9 @@ package net.systemeD.halcyon.connection.actions {
                                node=nodeList.pop();
                                way.dispatchEvent(new WayNodeEvent(Connection.WAY_NODE_REMOVED, node, way, 0));
                                node.removeParent(way);
-                               if (!node.hasParents) { node.remove(effects.push); }
+                if (!node.hasParents && !node.hasInterestingTags()) { //need to trigger redraw of new POIs?
+                  node.remove(effects.push);
+                }
                        }
                        effects.doAction();
                        setDeleted(true);

diff --git a/net/systemeD/potlatch2/controller/SelectedWay.as b/net/systemeD/potlatch2/controller/SelectedWay.as
index 88883c8a525f3bf6158c46287d0e91b9686cbe8e..23e56710e52142ff54880ff47173a504c51b6766 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWay.as
+++ b/net/systemeD/potlatch2/controller/SelectedWay.as
@@ -115,6 +115,7 @@ package net.systemeD.potlatch2.controller {
                }
         
                public function deleteWay():ControllerState {
+            controller.map.setHighlightOnNodes(selectedWay, {selectedway: false});
                        selectedWay.remove(MainUndoStack.getGlobalStack().addAction);
                        return new NoSelection();
                }