read default from imagery.xml rather than using yahoodefault

diff --git a/net/systemeD/potlatch2/collections/Imagery.as b/net/systemeD/potlatch2/collections/Imagery.as
index f022e45aa55586c5e02b33219571ce8fcd4d502c..d27445a1cda81b4a933ea12fa31156eb806d0cbd 100644 (file)
--- a/net/systemeD/potlatch2/collections/Imagery.as
+++ b/net/systemeD/potlatch2/collections/Imagery.as
@@ -26,18 +26,16 @@ package net.systemeD.potlatch2.collections {
                public var collection:Array=[];
                public var selected:Object={};
 
-               private var _yahooDefault:Boolean=false;
                private var _map:Map;
                private var _overlay:Sprite;
                private var _yahoo:Yahoo;
 
                /* Load catalogue file */
 
-               public function init(map:Map, overlay:Sprite, yahoo:Yahoo, yahooDefault:Boolean):void {
+               public function init(map:Map, overlay:Sprite, yahoo:Yahoo):void {
                        _map = map;
                        _overlay = overlay;
                        _yahoo = yahoo;
-                       _yahooDefault = yahooDefault;
 
                        // load imagery file
                var request:DebugURLRequest = new DebugURLRequest("imagery.xml");
@@ -85,16 +83,19 @@ package net.systemeD.potlatch2.collections {
             }
 
                        // Automatically select the user's previous preference
+                       var defaultBackground:Object=null;
                        for each (bg in collection) {
                                if (bg.name==saved.name || bg.url==saved.url) {
                                        setBackground(bg);
                     backgroundSet = true;
+                               } else if (bg.default) {
+                                       defaultBackground=bg;
                                }
                        }
 
-            // Otherwise, set Yahoo as default (if this was passed in as an option from the embedding page)
-            if (!backgroundSet && _yahooDefault) {
-                setBackground(collection[1]);
+            // Otherwise, set whatever's specified as default
+            if (!backgroundSet && defaultBackground) {
+                setBackground(defaultBackground);
             }
 
                        // Get any attribution and logo details

diff --git a/potlatch2.mxml b/potlatch2.mxml
index 144ea9335096b370021c083d845e75cd13d65a58..73da3b7e1b9956cb7d3fb159aebab715f5b65848 100644 (file)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -192,7 +192,7 @@
                        Globals.vars.map_area.addEventListener(MouseEvent.MOUSE_DOWN, theMap.mouseDownHandler);
 
                        // initialise imagery and stylesheets
-                       Imagery.instance().init(theMap, overlay, yahoo, loaderInfo.parameters['yahoo_default'] == 'true');
+                       Imagery.instance().init(theMap, overlay, yahoo);
                        Stylesheets.instance().init(theMap);
                        Imagery.instance().addEventListener(MapEvent.BUMP, bumpHandler);