Fix backspaceNode leaving junctions highlighted

diff --git a/TODO.txt b/TODO.txt
index a6a2204a60299716a8468b240e23c3a1a70593f4..dfaed151e941a0e07ba62bbb4080150185e8dd08 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -29,7 +29,6 @@ Potlatch 2: main outstanding issues
 * Multiple selection
 * Options should be remembered via SharedObjects
 * small node hitzone when creating areas - hitzone and mouseover UI don't match up
-* backspaceNode leaves junctions on other ways highlighted
 * 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)
 * Can't use + for second tag

diff --git a/net/systemeD/potlatch2/controller/DrawWay.as b/net/systemeD/potlatch2/controller/DrawWay.as
index 5d4ad08981edb57e6a1f81e36757f8d798bd1636..a665ec82486c35ec21541c983aebf4626b4a509a 100644 (file)
--- a/net/systemeD/potlatch2/controller/DrawWay.as
+++ b/net/systemeD/potlatch2/controller/DrawWay.as
@@ -232,6 +232,10 @@ package net.systemeD.potlatch2.controller {
                        }
 
             performAction(undo);
+
+            if(!node.isDeleted()) { // i.e. was junction with another way (or is now POI)
+              controller.map.setHighlight(node, {selectedway: false});
+            }
             return state;
                }