Reinstate the long-lost G shortcut

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index 7acac44f21b4b2316f69faed701dcf59f6ad381c..27f3b56754e5baeff5e5e6c1dc798fc596b24cbc 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -11,6 +11,7 @@ package net.systemeD.potlatch2.controller {
        import flash.ui.Keyboard;
        import mx.controls.Alert;
        import mx.events.CloseEvent;
+       import mx.core.FlexGlobals;
        
     /** Represents a particular state of the controller, such as "dragging a way" or "nothing selected". Key methods are 
     * processKeyboardEvent and processMouseEvent which take some action, and return a new state for the controller. 
@@ -77,6 +78,7 @@ package net.systemeD.potlatch2.controller {
                                case 66:        setSourceTag(); break;                                                                                                  // B - set source tag for current object
                                case 67:        editableLayer.connection.closeChangeset(); break;                                               // C - close changeset
                                case 68:        editableLayer.alpha=1.3-editableLayer.alpha; return null;                               // D - dim
+                               case 71:        FlexGlobals.topLevelApplication.trackLoader.load(); break;                              // G - GPS tracks **FIXME: move from Application to Map
                                case 83:        SaveManager.saveChanges(editableLayer.connection); break;                               // S - save
                                case 84:        controller.tagViewer.togglePanel(); return null;                                                // T - toggle tags panel
                                case 90:        if (!event.shiftKey) { MainUndoStack.getGlobalStack().undo(); return null;}// Z - undo

diff --git a/net/systemeD/potlatch2/help/HelpDialog.mxml b/net/systemeD/potlatch2/help/HelpDialog.mxml
index 0c64b4d645d22ce0deaad796c10033b4d6f42906..45f2972e9c305f6368a93b80fca668f69f31d284 100644 (file)
--- a/net/systemeD/potlatch2/help/HelpDialog.mxml
+++ b/net/systemeD/potlatch2/help/HelpDialog.mxml
@@ -113,6 +113,7 @@
                             [", .", "Cycle through nodes in way"],
                             ["D", "Dim features"],
                             ["F", "Follow existing way"],
+                            ["G", "Load GPS points"],
                             ["M", "Maximise editor"],
                             ["P", "Create parallel way"],
                             ["Q", "Make area right-angled"],

diff --git a/net/systemeD/potlatch2/utils/TrackLoader.as b/net/systemeD/potlatch2/utils/TrackLoader.as
index 2c7dcbe7bf0e69c704bde885e2bc5515006e221f..c2b1f9fe1b3ca5205b6ed9d9dceb80b57ccd5466 100644 (file)
--- a/net/systemeD/potlatch2/utils/TrackLoader.as
+++ b/net/systemeD/potlatch2/utils/TrackLoader.as
@@ -62,16 +62,8 @@ package net.systemeD.potlatch2.utils {
                private function parseGPX(event:Event):void {
                        var file:XML = new XML(event.target.data);
                        var action:CompositeUndoableAction = new CompositeUndoableAction("add track objects");
-                       for each (var ns:Namespace in file.namespaceDeclarations()) {
-                               if (ns.uri.match(/^http:\/\/www\.topografix\.com\/GPX\/1\/[01]$/)) {
-                                       default xml namespace = ns;
-                               }
-                       }
-
                        Trace.parseTrkSegs(file,connection,action);
             action.doAction(); /* just do it, don't add to undo stack */
-
-                       default xml namespace = new Namespace("");
                        layer.updateEntityUIs(false, false);
                }