Add BikeShopLoader to the autovectorbackground. Also remove the bugs and bike shops...

diff --git a/net/systemeD/potlatch2/AutoVectorBackground.as b/net/systemeD/potlatch2/AutoVectorBackground.as
index 3e93ea3842b0ae0b0a85e018a982ee14510e19d8..762f9509501495530503d5fdd54a6218bf7ca753 100644 (file)
--- a/net/systemeD/potlatch2/AutoVectorBackground.as
+++ b/net/systemeD/potlatch2/AutoVectorBackground.as
@@ -6,7 +6,7 @@ package net.systemeD.potlatch2 {
         import flash.net.*
         import net.systemeD.halcyon.Map;
         import net.systemeD.halcyon.DebugURLRequest;
-        import net.systemeD.potlatch2.utils.BugLoader;
+        import net.systemeD.potlatch2.utils.*;
 
         private var map:Map;
 
@@ -30,6 +30,7 @@ package net.systemeD.potlatch2 {
                   break;
                 case "KMLImporter":
                   break;
+
                 case "BugLoader":
                   if (set.url && set.apiKey) {
                     var bugLoader:BugLoader = new BugLoader(map, String(set.url), String(set.apikey));
@@ -40,6 +41,18 @@ package net.systemeD.potlatch2 {
                     trace("AutoVectorBackground: error with BugLoader");
                   }
                   break;
+
+                case "BikeShopLoader":
+                  if (set.url) {
+                    var bikeShopLoader:BikeShopLoader = new BikeShopLoader(map, String(set.url));
+                    if (set.@loaded == "true") {
+                      bikeShopLoader.load();
+                    }
+                  } else {
+                    trace("AutoVectorBackground: no url for BikeShopLoader");
+                  }
+                  break;
+
                 default:
                   trace("AutoVectorBackground: unknown loader");
               }

diff --git a/potlatch2.mxml b/potlatch2.mxml
index 42fa40a3a2f4e8bfca5db60d5c6ecc6e763323db..c01e734805cffc1e6deb2e0ba3b11989cdb18950 100644 (file)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -37,8 +37,6 @@
                                </mx:Array>
                        </mx:dataProvider>
                </mx:PopUpMenuButton>
-        <mx:Button id="bugsButton" label="Bugs" click="bugLoader.load();" visible="false"/>
-        <mx:Button id="bikeButton" label="Bike Shops" click="bikeShopLoader.load();" visible="false" />
         <mx:Spacer width="100%"/>
         <mx:Button label="Undo" click="MainUndoStack.getGlobalStack().undo();"
             enabled="{MainUndoStack.getGlobalStack().canUndo()}"/>
@@ -217,15 +215,6 @@
                        // create GPS trackloader
                        trackLoader=new TrackLoader(theMap,conn.apiBase);
 
-            // create Bug loader
-            if (loaderInfo.parameters["bugs_url"] && loaderInfo.parameters["bugs_apikey"]) {
-              bugsButton.visible = true;
-              bugLoader = new BugLoader(theMap, loaderInfo.parameters["bugs_url"], loaderInfo.parameters["bugs_apikey"]);
-            }
-
-            // create Bike Shop loader
-            bikeShopLoader = new BikeShopLoader(theMap, 'http://shaunmcdonald.dev.openstreetmap.org/bike-shop-locator/');
-
             // Force authentication on startup, if required
             // force_auth == force => checks for access token, and displays OAuth panel if needed
             var force_auth:String = loaderInfo.parameters["force_auth"];