slash and burn trace statements, and fix areas on vector background layers

diff --git a/TODO.txt b/TODO.txt
index 184f3417810a3565985cefb182119e44445b14ba..0320f60546e6f275c9040f06c8267750be1354b9 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,8 +3,6 @@ Potlatch 2: main outstanding issues
 ** = required before P2 goes live
 
 
 ** = required before P2 goes live
 
 

-** Slash and burn trace statements
-

 == Core geometry ==
 
 * P1-style J (join) / shift-J (unjoin)
 == Core geometry ==
 
 * P1-style J (join) / shift-J (unjoin)


@@ -32,7 +30,6 @@ Potlatch 2: main outstanding issues
 
 == UI ==
 
 
 == UI ==
 

-** Clicking the menu on the SuperTabNavigator appears to boggle it completely

 * Escape should rewind the entity to how it was before the current ControllerState. (Record a position in the undo stack when exiting a ControllerState, and escape would rewind to that)
 * Potlatch 1-style "floaty warnings"
 * Custom imagery dialog fixes
 * Escape should rewind the entity to how it was before the current ControllerState. (Record a position in the undo stack when exiting a ControllerState, and escape would rewind to that)
 * Potlatch 1-style "floaty warnings"
 * Custom imagery dialog fixes

diff --git a/net/systemeD/halcyon/VectorLayer.as b/net/systemeD/halcyon/VectorLayer.as
index 9ef040ea912710f469db399f62473f8c7d9bae6a..d919e987b1d0580fad52383294822c34c0ba0a4e 100644 (file)
--- a/net/systemeD/halcyon/VectorLayer.as
+++ b/net/systemeD/halcyon/VectorLayer.as
@@ -70,14 +70,18 @@ package net.systemeD.halcyon {
                        if (entity is Way) {
                                // copy way through to main layer
                                // ** shouldn't do this if the nodes are already in the main layer
                        if (entity is Way) {
                                // copy way through to main layer
                                // ** shouldn't do this if the nodes are already in the main layer

+                               //    (or maybe we should just match on lat/long to avoid ways in background having nodes in foreground)

                                var oldWay:Way=Way(entity);
                                var newWay:Way=connection.createWay(oldWay.getTagsCopy(), [], MainUndoStack.getGlobalStack().addAction);
                                var oldWay:Way=Way(entity);
                                var newWay:Way=connection.createWay(oldWay.getTagsCopy(), [], MainUndoStack.getGlobalStack().addAction);

+                               var nodemap:Object={};
+                               var oldNode:Node, newNode:Node;

                                for (i=0; i<oldWay.length; i++) {
                                for (i=0; i<oldWay.length; i++) {

-                                       var oldNode:Node = oldWay.getNode(i);
-                                       var newNode:Node = connection.createNode(
+                                       oldNode = oldWay.getNode(i);
+                                       newNode = nodemap[oldNode.id] ? nodemap[oldNode.id] : connection.createNode(

                                                oldNode.getTagsCopy(), oldNode.lat, oldNode.lon, 
                                                MainUndoStack.getGlobalStack().addAction);
                                        newWay.appendNode(newNode, MainUndoStack.getGlobalStack().addAction);
                                                oldNode.getTagsCopy(), oldNode.lat, oldNode.lon, 
                                                MainUndoStack.getGlobalStack().addAction);
                                        newWay.appendNode(newNode, MainUndoStack.getGlobalStack().addAction);

+                                       nodemap[oldNode.id]=newNode;

                                }
                                // delete this way
                                while (oldWay.length) { 
                                }
                                // delete this way
                                while (oldWay.length) { 

diff --git a/net/systemeD/halcyon/connection/CompositeUndoableAction.as b/net/systemeD/halcyon/connection/CompositeUndoableAction.as
index 3cd4e11f143b011032eb57a6b410976c45afc87d..b5394abd060b2950f2abb3e2155eda5caba24f7f 100644 (file)
--- a/net/systemeD/halcyon/connection/CompositeUndoableAction.as
+++ b/net/systemeD/halcyon/connection/CompositeUndoableAction.as
@@ -53,7 +53,6 @@ package net.systemeD.halcyon.connection {
         public function undoFrom(index:int):void {
             for ( var i:int = index - 1; i >= 0; i-- ) {
                 var action:UndoableAction = actions[i];
         public function undoFrom(index:int):void {
             for ( var i:int = index - 1; i >= 0; i-- ) {
                 var action:UndoableAction = actions[i];

-                trace("going to do "+action);

                 
                 action.undoAction();
             }
                 
                 action.undoAction();
             }

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index f8e23713c8608df2d4dc572ee89f9ba359b83aae..13ee98f745ad07703418d1a2059bb652f905ff26 100755 (executable)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -34,7 +34,6 @@ package net.systemeD.halcyon.connection {
         }
 
         public static function getParam(name:String, defaultValue:String):String {
         }
 
         public static function getParam(name:String, defaultValue:String):String {

-            trace("Returning param "+name+" as "+(params[name] == null ? defaultValue : params[name]));

             return params[name] == null ? defaultValue : params[name];
         }
 
             return params[name] == null ? defaultValue : params[name];
         }
 

diff --git a/net/systemeD/halcyon/connection/MainUndoStack.as b/net/systemeD/halcyon/connection/MainUndoStack.as
index b302b2182c87cb42b04b1e3a283ec1b05e1ef9a9..e85c4ec8a9569e8b33098acc9365ac49c9067e0d 100644 (file)
--- a/net/systemeD/halcyon/connection/MainUndoStack.as
+++ b/net/systemeD/halcyon/connection/MainUndoStack.as
@@ -19,7 +19,6 @@ package net.systemeD.halcyon.connection {
          * stack -- find another one.
          */
         public function addAction(action:UndoableAction):void {
          * stack -- find another one.
          */
         public function addAction(action:UndoableAction):void {

-            trace("doing "+action);

             var result:uint = action.doAction();
             
             switch ( result ) {
             var result:uint = action.doAction();
             
             switch ( result ) {


@@ -73,7 +72,6 @@ package net.systemeD.halcyon.connection {
         public function undo():void {
                        if (!undoActions.length) { return; }
             var action:UndoableAction = undoActions.pop();
         public function undo():void {
                        if (!undoActions.length) { return; }
             var action:UndoableAction = undoActions.pop();

-            trace("undoing "+action);

             action.undoAction();
             redoActions.push(action);
             dispatchEvent(new Event("new_undo_item"));
             action.undoAction();
             redoActions.push(action);
             dispatchEvent(new Event("new_undo_item"));


@@ -83,7 +81,6 @@ package net.systemeD.halcyon.connection {
         public function redo():void {
                        if (!redoActions.length) { return; }
             var action:UndoableAction = redoActions.pop();
         public function redo():void {
                        if (!redoActions.length) { return; }
             var action:UndoableAction = redoActions.pop();

-            trace("redoing "+action);

             action.doAction();
             undoActions.push(action);
             dispatchEvent(new Event("new_undo_item"));
             action.doAction();
             undoActions.push(action);
             dispatchEvent(new Event("new_undo_item"));

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index a22bd4e6b9a26747aff4c6433bce07a3e5643f90..79ac70503e86e1f5dfa1905573cf7c06db6ee4c5 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -5,6 +5,7 @@ package net.systemeD.halcyon.connection {
        import flash.system.Security;
        import flash.net.*;
     import org.iotashan.oauth.*;
        import flash.system.Security;
        import flash.net.*;
     import org.iotashan.oauth.*;

+       import mx.controls.Alert;

 
        import net.systemeD.halcyon.Globals;
 
 
        import net.systemeD.halcyon.Globals;
 


@@ -18,7 +19,6 @@ package net.systemeD.halcyon.connection {
                 Security.loadPolicyFile(Connection.policyURL);
             var oauthPolicy:String = Connection.getParam("oauth_policy", "");
             if ( oauthPolicy != "" ) {
                 Security.loadPolicyFile(Connection.policyURL);
             var oauthPolicy:String = Connection.getParam("oauth_policy", "");
             if ( oauthPolicy != "" ) {

-                trace(oauthPolicy);

                 Security.loadPolicyFile(oauthPolicy);
             }
                }
                 Security.loadPolicyFile(oauthPolicy);
             }
                }


@@ -40,7 +40,7 @@ package net.systemeD.halcyon.connection {
                }
 
         private function errorOnMapLoad(event:Event):void {
                }
 
         private function errorOnMapLoad(event:Event):void {

-            trace("error loading map");
+                       Alert.show("Couldn't load the map", 'Error', mx.controls.Alert.OK);

         }
         private function mapLoadStatus(event:HTTPStatusEvent):void {
             trace("loading map status = "+event.status);
         }
         private function mapLoadStatus(event:HTTPStatusEvent):void {
             trace("loading map status = "+event.status);


@@ -180,8 +180,7 @@ package net.systemeD.halcyon.connection {
         }
 
         private function diffUploadError(event:IOErrorEvent):void {
         }
 
         private function diffUploadError(event:IOErrorEvent):void {

-            trace("error "+URLLoader(event.target).data + " "+httpStatus+ " " + event.text);
-
+                       Alert.show("Couldn't upload data: "+httpStatus+" "+event.text, 'Error', mx.controls.Alert.OK);

                dispatchEvent(new SaveCompleteEvent(SAVE_COMPLETED, false));
         }
 
                dispatchEvent(new SaveCompleteEvent(SAVE_COMPLETED, false));
         }
 

diff --git a/net/systemeD/halcyon/connection/actions/RemoveNodeFromWayAction.as b/net/systemeD/halcyon/connection/actions/RemoveNodeFromWayAction.as
index 2e29db06523c709dcbf99fdc33cd9d2a1ec2d9f3..239d8d69464d9885697ed736db10d8afc62e2fce 100644 (file)
--- a/net/systemeD/halcyon/connection/actions/RemoveNodeFromWayAction.as
+++ b/net/systemeD/halcyon/connection/actions/RemoveNodeFromWayAction.as
@@ -36,7 +36,6 @@ package net.systemeD.halcyon.connection.actions {
             
             for (var i:int = nodeRemovedFrom.length - 1; i >= 0; i--) {
                 var index:int = nodeRemovedFrom[i];
             
             for (var i:int = nodeRemovedFrom.length - 1; i >= 0; i--) {
                 var index:int = nodeRemovedFrom[i];

-                trace("node being added "+index+" "+i+" "+node);

                 nodeList.splice(index, 0, node);
                entity.dispatchEvent(new WayNodeEvent(Connection.WAY_NODE_ADDED, node, Way(entity), index));
             }
                 nodeList.splice(index, 0, node);
                entity.dispatchEvent(new WayNodeEvent(Connection.WAY_NODE_ADDED, node, Way(entity), index));
             }

diff --git a/net/systemeD/halcyon/styleparser/StyleList.as b/net/systemeD/halcyon/styleparser/StyleList.as
index 0f8c4c51423eff57911236ef120f6c99ea3c58b5..7822444643c138d64653740aba508d753d283d54 100755 (executable)
--- a/net/systemeD/halcyon/styleparser/StyleList.as
+++ b/net/systemeD/halcyon/styleparser/StyleList.as
@@ -26,6 +26,16 @@ package net.systemeD.halcyon.styleparser {
                        if (sublayers.indexOf(s)==-1) { sublayers.push(s); }
                }
 
                        if (sublayers.indexOf(s)==-1) { sublayers.push(s); }
                }
 

+               public function toString():String {
+                       var str:String='';
+                       var k:String;
+                       for (k in shapeStyles) { str+="- SS "+k+"="+shapeStyles[k]+"\n"; }
+                       for (k in textStyles) { str+="- TS "+k+"="+textStyles[k]+"\n"; }
+                       for (k in pointStyles) { str+="- PS "+k+"="+pointStyles[k]+"\n"; }
+                       for (k in shieldStyles) { str+="- sS "+k+"="+shieldStyles[k]+"\n"; }
+                       return str;
+               }
+

                private function hasShapeStyles():Boolean  { for (var a:String in shapeStyles ) { return true; }; return false; }
                private function hasTextStyles():Boolean   { for (var a:String in textStyles  ) { return true; }; return false; }
                private function hasPointStyles():Boolean  { for (var a:String in pointStyles ) { return true; }; return false; }
                private function hasShapeStyles():Boolean  { for (var a:String in shapeStyles ) { return true; }; return false; }
                private function hasTextStyles():Boolean   { for (var a:String in textStyles  ) { return true; }; return false; }
                private function hasPointStyles():Boolean  { for (var a:String in pointStyles ) { return true; }; return false; }

diff --git a/net/systemeD/potlatch2/RelationSelectPanel.mxml b/net/systemeD/potlatch2/RelationSelectPanel.mxml
index 0f7301f30accb338ed053d5b305ea18bb05d6add..93193768833fa9474ccf5697d6e1114949faaf80 100644 (file)
--- a/net/systemeD/potlatch2/RelationSelectPanel.mxml
+++ b/net/systemeD/potlatch2/RelationSelectPanel.mxml
@@ -49,7 +49,6 @@
           var relation:Relation = conn.createRelation(tags, [new RelationMember(entity, '')],
               MainUndoStack.getGlobalStack().addAction)
           PopUpManager.removePopUp(this);
           var relation:Relation = conn.createRelation(tags, [new RelationMember(entity, '')],
               MainUndoStack.getGlobalStack().addAction)
           PopUpManager.removePopUp(this);

-          trace("edit relation "+id);

           var panel:RelationEditorPanel = RelationEditorPanel(
               PopUpManager.createPopUp(Application(Application.application), RelationEditorPanel, true));
           panel.setRelation(relation);
           var panel:RelationEditorPanel = RelationEditorPanel(
               PopUpManager.createPopUp(Application(Application.application), RelationEditorPanel, true));
           panel.setRelation(relation);

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index 65695a4fffb80d0191659860e127c6e6f2b64552..086a0a3974420aa7c2be1dcb321e2cccc862ad52 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -487,7 +487,6 @@
           var rel:Relation = selectedEntity as Relation
           
           // drop members
           var rel:Relation = selectedEntity as Relation
           
           // drop members

-          trace("Dropping "+rel.length+" members");

           for (var i:int=rel.length-1 ; i>=0; i--) {
             rel.removeMemberByIndex(i);
           }
           for (var i:int=rel.length-1 ; i>=0; i--) {
             rel.removeMemberByIndex(i);
           }


@@ -504,9 +503,7 @@
               e = conn.getRelation(id);
             }
             rel.appendMember(new RelationMember(e, memberObject.role));
               e = conn.getRelation(id);
             }
             rel.appendMember(new RelationMember(e, memberObject.role));

-            trace("added member "+memberObject.type+" "+id+" in role "+memberObject.role);

           }
           }

-          trace("complete: relation "+rel.id+" now has "+rel.length+" members");

       }
       
       private function editRelation(id:Number):void {
       }
       
       private function editRelation(id:Number):void {


@@ -549,7 +546,6 @@
       }
 
       public function openDescription():void {
       }
 
       public function openDescription():void {

-          trace("open description here");

           if ( feature != null && feature.hasHelpURL() )
               navigateToURL(new URLRequest(feature.helpURL), "potlatch_help");
       }
           if ( feature != null && feature.hasHelpURL() )
               navigateToURL(new URLRequest(feature.helpURL), "potlatch_help");
       }

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index b7f0b590a4bc63aa747256850e00fb2e1b4521c7..42e1286897925ccff5c65af2bef050b15a7564a7 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -62,11 +62,16 @@ package net.systemeD.potlatch2.controller {
                        var paint:MapPaint = getMapPaint(DisplayObject(event.target));
             var focus:Entity = getTopLevelFocusEntity(entity);
 
                        var paint:MapPaint = getMapPaint(DisplayObject(event.target));
             var focus:Entity = getTopLevelFocusEntity(entity);
 

+                       if ( paint && paint.isBackground ) {
+                               if ( event.type == MouseEvent.MOUSE_DOWN && ((event.shiftKey && event.ctrlKey) || event.altKey) ) {
+                                       // pull data out of vector background layer
+                                       if (entity is Way) { return new SelectedWay(paint.findSource().pullThrough(entity,controller.connection)); }
+                               }
+                               return (this is NoSelection) ? this : new NoSelection();
+                       }
+

                        if ( event.type == MouseEvent.MOUSE_DOWN ) {
                        if ( event.type == MouseEvent.MOUSE_DOWN ) {

-                               if ( entity is Way && event.altKey && paint.isBackground ) {
-                                       // pull way out of vector background layer
-                                       return new SelectedWay(paint.findSource().pullThrough(entity,controller.connection));
-                               } else if ( entity is Way ) {
+                               if ( entity is Way ) {

                                        // click way
                                        return new DragWay(focus as Way, event);
                                } else if ( focus is Node ) {
                                        // click way
                                        return new DragWay(focus as Way, event);
                                } else if ( focus is Node ) {

diff --git a/net/systemeD/potlatch2/controller/DragBackground.as b/net/systemeD/potlatch2/controller/DragBackground.as
index 307695df8a0eca7fbe43ea4198b2dcb0351285be..af966b751271995a96009cfcdc6223d47fdd82fa 100644 (file)
--- a/net/systemeD/potlatch2/controller/DragBackground.as
+++ b/net/systemeD/potlatch2/controller/DragBackground.as
@@ -11,7 +11,6 @@ package net.systemeD.potlatch2.controller {
         private var downY:Number;
         
         public function DragBackground(event:MouseEvent) {
         private var downY:Number;
         
         public function DragBackground(event:MouseEvent) {

-                       trace ("starting DragBackground");

             downX = event.localX;
             downY = event.localY;
         }
             downX = event.localX;
             downY = event.localY;
         }

diff --git a/net/systemeD/potlatch2/save/OAuthPanel.mxml b/net/systemeD/potlatch2/save/OAuthPanel.mxml
index 5f892117b013c05e15fb4c6580c3fc74158a7fd6..5f56f4a6af9446d18df11e0f2e948b5b7d6bd3ad 100644 (file)
--- a/net/systemeD/potlatch2/save/OAuthPanel.mxml
+++ b/net/systemeD/potlatch2/save/OAuthPanel.mxml
@@ -21,7 +21,7 @@
                label="http://oauth.dev.openstreetmap.org/oauth/authorize?somekey"
                click="openURL(authoriseURL); tryAccessButton.enabled=true;"/>
            <mx:Text width="100%">
                label="http://oauth.dev.openstreetmap.org/oauth/authorize?somekey"
                click="openURL(authoriseURL); tryAccessButton.enabled=true;"/>
            <mx:Text width="100%">

-             <mx:text>Once you've authorised the access click the 'Try Access' button below</mx:text>
+             <mx:text>Once you've authorised the access click the 'Try Access' button below</mx:text> <!-- ' -->

            </mx:Text>
            <mx:Text styleName="failText" visible="false" id="deniedLabel">
              <mx:text><![CDATA[<b>Access was denied, please check, and try again</b>]]></mx:text>
            </mx:Text>
            <mx:Text styleName="failText" visible="false" id="deniedLabel">
              <mx:text><![CDATA[<b>Access was denied, please check, and try again</b>]]></mx:text>