Merge branch 'master' into snapshotserver

[potlatch2.git] / net / systemeD / potlatch2 / utils / SnapshotConnection.as

diff --git a/net/systemeD/potlatch2/utils/SnapshotConnection.as b/net/systemeD/potlatch2/utils/SnapshotConnection.as
index 6709b27d4220d50190c844ca0b6d5adf0331289d..96322c2f2e0c81a14cb81c7fa8b3865256becd4d 100644 (file)
--- a/net/systemeD/potlatch2/utils/SnapshotConnection.as
+++ b/net/systemeD/potlatch2/utils/SnapshotConnection.as
@@ -11,27 +11,56 @@ package net.systemeD.potlatch2.utils {
             inlineStatus = true;
         }
 
-        /** Send a "complete" call to the server, and remove it from the current layer */
+        // As it stands, the following two functions could be refactored further.
+
+        /** Post a status update call to the server and update entity.status if successful */
         public function markComplete(entity:Entity):void {
+            var urlReq:URLRequest;
+
             if (entity is Node) {
-              var node:Node = Node(entity);
-              if (node == getNode(node.id)) { // confirm it's from this connection
-                  var urlReq:URLRequest = new URLRequest(apiBaseURL+"node/"+node.id+"/complete");
-                  urlReq.method = "POST";
-                  urlReq.data = '   ';
-                  urlReq.contentType = "application/xml";
-                  urlReq.requestHeaders = [ new URLRequestHeader("X_HTTP_METHOD_OVERRIDE", "PUT"),
-                                            new URLRequestHeader("X-Error-Format", "XML") ];
-                  var loader:URLLoader = new URLLoader();
-                  loader.addEventListener(Event.COMPLETE, function(e:Event):void { killNode(node.id) });
-                  loader.load(urlReq);
-              }
+                var node:Node = Node(entity);
+                if (node == getNode(node.id)) { // confirm it's from this connection
+                    makeRequest(entity, 'complete');
+                }
 
             } else if (entity is Way) {
-              var way:Way = Way(entity);
-              trace("not implemented");
+                var way:Way = Way(entity);
+                if (way == getWay(way.id)) { // confirm it's from this connection
+                    makeRequest(entity, 'complete');
+                }
             }
         }
 
+        /** Send a "complete" call to the server and update entity.status if successful */
+        public function markNotComplete(entity:Entity):void {
+            var urlReq:URLRequest;
+
+            if (entity is Node) {
+                var node:Node = Node(entity);
+                if (node == getNode(node.id)) { // confirm it's from this connection
+                    makeRequest(entity, 'incomplete');
+                }
+
+            } else if (entity is Way) {
+                var way:Way = Way(entity);
+                if (way == getWay(way.id)) { // confirm it's from this connection
+                    makeRequest(entity, 'incomplete');
+                }
+            }
+        }
+
+        private function makeRequest(entity:Entity, status:String):void {
+            var urlReq:URLRequest = new URLRequest(apiBaseURL+entity.getType()+"/"+entity.id+"/status");
+            urlReq.method = "POST";
+            urlReq.data = status;
+            var loader:URLLoader = new URLLoader();
+            loader.addEventListener(Event.COMPLETE, function(e:Event):void { updateStatus(entity, status) });
+            loader.load(urlReq);
+        }
+
+        private function updateStatus(e:Entity, s:String):void {
+            e.setStatus(s);
+        }
+
     }
 }
\ No newline at end of file