Provide a new 'View data' button in the upload dialogue.

If the upload freaks out and refuses to save, the user can at least copy and paste the raw XML for later use.

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index 56f474e0e46510a8b69ceac47a9972c3f4210323..4b2dbe410fe9f7f56bf2d6d22576a37ee8f2f072 100644 (file)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -582,7 +582,7 @@ package net.systemeD.halcyon.connection {
         public function setAccessToken(key:String, secret:String):void {}
            public function createChangeset(tags:Object):void {}
                public function closeChangeset():void {}
         public function setAccessToken(key:String, secret:String):void {}
            public function createChangeset(tags:Object):void {}
                public function closeChangeset():void {}

-           public function uploadChanges():void {}
+        public function uploadChanges():* {}

         public function fetchUserTraces(refresh:Boolean=false):void {}
         public function fetchTrace(id:Number, callback:Function):void {}
         public function hasAccessToken():Boolean { return false; }
         public function fetchUserTraces(refresh:Boolean=false):void {}
         public function fetchTrace(id:Number, callback:Function):void {}
         public function hasAccessToken():Boolean { return false; }

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index 0e6bb84488c25a6e2e6b560107604cc6be04a0e0..d87d87eed958aa92705f8eb76bdf2e650be1cb48 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -197,7 +197,10 @@ package net.systemeD.halcyon.connection {
             loader.load(urlReq);
         }
 
             loader.load(urlReq);
         }
 

-        override public function uploadChanges():void {
+               /** Create XML changeset and send it to the server. Returns the XML string for use in the 'Show data' button.
+                   (We don't mind what's returned as long as it implements .toString() ) */
+
+        override public function uploadChanges():* {

             var changeset:Changeset = getActiveChangeset();
             var upload:XML = <osmChange version="0.6"/>
             upload.appendChild(addCreated(changeset, getAllNodeIDs, getNode, serialiseNode));
             var changeset:Changeset = getActiveChangeset();
             var upload:XML = <osmChange version="0.6"/>
             upload.appendChild(addCreated(changeset, getAllNodeIDs, getNode, serialiseNode));


@@ -230,7 +233,8 @@ package net.systemeD.halcyon.connection {
                        serv.addEventListener(FaultEvent.FAULT, diffUploadIOError);
                        serv.send(upload);
                
                        serv.addEventListener(FaultEvent.FAULT, diffUploadIOError);
                        serv.send(upload);
                

-               dispatchEvent(new Event(SAVE_STARTED));
+                       dispatchEvent(new Event(SAVE_STARTED));
+                       return upload;

         }
 
         private function diffUploadComplete(event:ResultEvent):void {
         }
 
         private function diffUploadComplete(event:ResultEvent):void {

diff --git a/net/systemeD/potlatch2/save/SaveDialog.mxml b/net/systemeD/potlatch2/save/SaveDialog.mxml
index 4d87dd1395bc58177bbe817267d8d2f25f8031ca..676c446cd7c05b7fa6493415265ff6a1af291755 100644 (file)
--- a/net/systemeD/potlatch2/save/SaveDialog.mxml
+++ b/net/systemeD/potlatch2/save/SaveDialog.mxml
@@ -64,9 +64,14 @@
       <mx:Text width="100%" styleName="failText" text="{failureText}"/>
     </mx:VBox>
 
       <mx:Text width="100%" styleName="failText" text="{failureText}"/>
     </mx:VBox>
 

+    <mx:VBox width="100%" height="100%" id="dataTab">
+      <mx:TextArea width="100%" height="100%" id="dataText"/>
+    </mx:VBox>
+

   </mx:ViewStack>
 
   <mx:ControlBar>
   </mx:ViewStack>
 
   <mx:ControlBar>

+    <mx:Button id="dataButton" label="View data" visible="false" click="processSequence.selectedChild=dataTab" styleName="titleWindowButton" />

     <mx:Spacer width="100%"/>
     <mx:Button id="cancelButton" label="Cancel" click="close();" styleName="titleWindowButton" />
     <mx:Button id="saveButton" label="Save >" click="startSave();" styleName="titleWindowButton" />
     <mx:Spacer width="100%"/>
     <mx:Button id="cancelButton" label="Cancel" click="close();" styleName="titleWindowButton" />
     <mx:Button id="saveButton" label="Save >" click="startSave();" styleName="titleWindowButton" />


@@ -168,7 +173,11 @@
         
         saveProgress.label = "Uploading changes";
         _connection.addEventListener(Connection.SAVE_COMPLETED, saveCompleted);
         
         saveProgress.label = "Uploading changes";
         _connection.addEventListener(Connection.SAVE_COMPLETED, saveCompleted);

-        _connection.uploadChanges();
+        var rawData:*=_connection.uploadChanges();
+        if (rawData) {
+            dataText.text=rawData.toString();
+            dataButton.visible=true;
+        }

     }
     
     private function changesetError(event:Event):void {
     }
     
     private function changesetError(event:Event):void {


@@ -178,7 +187,7 @@
     private function saveCompleted(event:SaveCompleteEvent):void {
         if ( event.saveOK ) {
                        _connection.dispatchEvent(new AttentionEvent(AttentionEvent.ALERT, null, "Changes successfully saved"));
     private function saveCompleted(event:SaveCompleteEvent):void {
         if ( event.saveOK ) {
                        _connection.dispatchEvent(new AttentionEvent(AttentionEvent.ALERT, null, "Changes successfully saved"));

-            close();
+            if (processSequence.selectedChild!=dataTab) close();

         } else {
             fail("Failure when uploading data");
                }
         } else {
             fail("Failure when uploading data");
                }


@@ -197,7 +206,7 @@
         processSequence.selectedChild = failureTab;
         failureText = text;
     }
         processSequence.selectedChild = failureTab;
         failureText = text;
     }

-    
+

     private function close():void {
         _connection.removeEventListener(Connection.NEW_CHANGESET, changesetCreated);
         _connection.removeEventListener(Connection.NEW_CHANGESET_ERROR, changesetError);
     private function close():void {
         _connection.removeEventListener(Connection.NEW_CHANGESET, changesetCreated);
         _connection.removeEventListener(Connection.NEW_CHANGESET_ERROR, changesetError);