Merge branch 'master' into history

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

diff --git a/net/systemeD/potlatch2/utils/BugLoader.as b/net/systemeD/potlatch2/utils/BugLoader.as
index 6c486fd..d9caabc 100644 (file)
--- a/net/systemeD/potlatch2/utils/BugLoader.as
+++ b/net/systemeD/potlatch2/utils/BugLoader.as
@@ -1,59 +1,39 @@
 package net.systemeD.potlatch2.utils {
 
     import net.systemeD.halcyon.Map;
-    import net.systemeD.halcyon.VectorLayer;
+    import net.systemeD.halcyon.MapPaint;
     import net.systemeD.halcyon.connection.Marker;
+    import net.systemeD.potlatch2.BugConnection;
     import flash.net.*;
     import flash.events.*;
-    import com.adobe.serialization.json.JSON;
+    import flash.system.Security;
 
     public class BugLoader {
 
         private var map:Map;
         private var bugBaseURL:String;
         private var bugApiKey:String;
-        private var _layer:VectorLayer;
-        private static const STYLESHEET:String="bugs.css";
+        private var bugDetailsURL:String;
+        private var _layer:MapPaint;
+        private var name:String;
+        private static const STYLESHEET:String="stylesheets/bugs.css";
+        private var connection:BugConnection;
 
-        public function BugLoader(map:Map, url:String, bugApiKey:String):void {
+
+        public function BugLoader(map:Map, url:String, bugApiKey:String, name:String, details:String = ''):void {
             this.map = map;
             this.bugBaseURL = url;
             this.bugApiKey = bugApiKey;
+            this.name = name;
+            this.bugDetailsURL = details;
+            connection = new BugConnection(name, url, bugApiKey, details);
+            _layer = map.addLayer(connection, STYLESHEET, true, true);
+            _layer.visible = false;
         }
 
         public function load():void {
-            var loader:URLLoader = new URLLoader();
-            loader.load(new URLRequest(bugBaseURL+"getBugs.json?bbox="+map.edge_l+","+map.edge_b+","+map.edge_r+","+map.edge_t+"&key="+bugApiKey));
-            loader.addEventListener(Event.COMPLETE, parseJSON);
-        }
-
-        public function parseJSON(event:Event):void {
-            trace("parseJSON");
-            var result:String = String(event.target.data);
-            var featureCollection:Object = JSON.decode(result);
-            trace(featureCollection);
-            trace(featureCollection.type);
-            trace(featureCollection.features[0].type);
-            trace(featureCollection.features.length);
-            for each (var feature:Object in featureCollection.features) {
-              // geoJSON spec is x,y,z i.e. lon, lat, ele
-              var lon:Number = feature.geometry.coordinates[0];
-              var lat:Number = feature.geometry.coordinates[1];
-              trace(lat, lon);
-              var marker:Marker = layer.createMarker({"name":feature.properties.description,"bug_id":feature.id}, lat, lon);
-              //layer.registerPOI(node);
-            }
-            layer.paint.updateEntityUIs(layer.getObjectsByBbox(map.edge_l,map.edge_r,map.edge_t,map.edge_b), false, false);
-            //var json:Array =
-        }
-
-        private function get layer():VectorLayer {
-            if (!_layer) {
-                var n:String='Bugs';
-                _layer=new VectorLayer(n,map,STYLESHEET);
-                map.addVectorLayer(_layer);
-            }
-            return _layer;
+            _layer.visible = true;
+            connection.loadBbox(map.edge_l, map.edge_r, map.edge_t, map.edge_b);
         }
     }
 }
\ No newline at end of file