Refactor the connection loading of traces, to not reload every time.

Also:
* Provide a mechanism to force a reload, and use it in MyGPX
* Move the once-only stuff in MyGPX to the init method1
* Rework the displayed text slightly
* Squish a timing-related bug with calling fetchUserTraces and *then* setting the display text

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index dfc8aa085ec8b273796fb9fa4ab07348226ff398..a2bbc68b3a35d75e580e37523d8db4225f8713b4 100755 (executable)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -97,6 +97,7 @@ package net.systemeD.halcyon.connection {
                public var waycount:int=0;
                public var relationcount:int=0;
         private var traces:Array = [];
+        protected var traces_loaded:Boolean = false;
 
         protected function get nextNegative():Number {
             return negativeID--;
@@ -363,7 +364,7 @@ package net.systemeD.halcyon.connection {
            public function createChangeset(tags:Object):void {}
                public function closeChangeset():void {}
            public function uploadChanges():void {}
-        public function fetchUserTraces():void {}
+        public function fetchUserTraces(refresh:Boolean=false):void {}
         public function fetchTrace(id:Number, callback:Function):void {}
     }
 

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index 63ea309344a49aff41dd12c7f503cb4a48898e00..30d3915a32c927d316e1e783cc9c2cd13ee5fc44 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -320,10 +320,14 @@ package net.systemeD.halcyon.connection {
             }
         }
 
-        override public function fetchUserTraces():void {
-            sendOAuthGet(Connection.apiBaseURL+"user/gpx_files",
-                         tracesLoadComplete, errorOnMapLoad, mapLoadStatus); //needs error handlers
-            dispatchEvent(new Event(LOAD_STARTED)); //specific to map or reusable?
+        override public function fetchUserTraces(refresh:Boolean=false):void {
+            if (traces_loaded && !refresh) {
+              dispatchEvent(new Event(TRACES_LOADED));
+            } else {
+              sendOAuthGet(Connection.apiBaseURL+"user/gpx_files",
+                          tracesLoadComplete, errorOnMapLoad, mapLoadStatus); //needs error handlers
+              dispatchEvent(new Event(LOAD_STARTED)); //specific to map or reusable?
+            }
         }
 
         private function tracesLoadComplete(event:Event):void {
@@ -333,6 +337,7 @@ package net.systemeD.halcyon.connection {
               var t:Trace = new Trace().fromXML(traceData);
               addTrace(t);
             }
+            traces_loaded = true;
             dispatchEvent(new Event(LOAD_COMPLETED));
             dispatchEvent(new Event(TRACES_LOADED));
         }

diff --git a/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml b/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
index c856891411e98613965f986af704b19e1cfdc832..11292b6bb3058f7c163e52533f8e95a8b36c9ad6 100644 (file)
--- a/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
+++ b/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
@@ -20,37 +20,38 @@
     import mx.controls.Alert;
 
     private var map:Map;
+    private var conn:Connection;
 
     public function init():void {
         PopUpManager.addPopUp(this, Application(Application.application), true);
         PopUpManager.centerPopUp(this);
         this.addEventListener(CloseEvent.CLOSE, myGpxDialog_close);
 
+        conn = Connection.getConnectionInstance();
         map = Globals.vars.root;
+
+        SaveManager.getAccessSorted();
+        conn.addEventListener(Connection.TRACES_LOADED, onTracesLoaded);
         fetchList();
     }
 
     private function myGpxDialog_close(evt:CloseEvent):void {
         PopUpManager.removePopUp(this);
+        conn.removeEventListener(Connection.TRACES_LOADED, onTracesLoaded);
     }
 
-    private function fetchList():void {
-        SaveManager.getAccessSorted();
-        var conn:Connection = Connection.getConnectionInstance();
-        conn.addEventListener(Connection.TRACES_LOADED, onTracesLoaded);
-        conn.fetchUserTraces();
-        
-        results.text = "fetching...";
+    private function fetchList(refresh:Boolean=false):void {
+        results.text = "Fetching Traces...";
+        conn.fetchUserTraces(refresh);
     }
 
     private function onTracesLoaded(e:Event):void {
-        results.text = "loaded!!";
+        results.text = "Traces Loaded";
         dispatchEvent(new Event("traces_loaded"));
     }
 
     [Bindable(event="traces_loaded")]
     private function get traces():Array {
-        var conn:Connection = Connection.getConnectionInstance();
         return conn.getTraces();
     }
 
@@ -68,7 +69,7 @@
               ]]>
   </mx:Script>
 
-  <mx:Text text="foo" id="results" />
+  <mx:Text text="Traces" id="results" />
   <mx:DataGrid dataProvider="{traces}" width="100%" height="100%" id="traceGrid">
     <mx:columns>
             <mx:DataGridColumn editable="false" dataField="id" headerText="id" width="45"/>
@@ -88,6 +89,6 @@
     </mx:columns>
   </mx:DataGrid>
   <mx:ControlBar>
-    <mx:Button label="Refresh List" click="fetchList()" />
+    <mx:Button label="Refresh List" click="fetchList(true)" />
   </mx:ControlBar>
 </mx:TitleWindow>
\ No newline at end of file