Move Yahoo into imagery.xml rather than hard-coding it into the menu

diff --git a/net/systemeD/potlatch2/collections/Imagery.as b/net/systemeD/potlatch2/collections/Imagery.as
index e837e105c901f09a96112383583dcd2b167dd015..d0443c55c72853ed3761dc128e97a175d9218572 100644 (file)
--- a/net/systemeD/potlatch2/collections/Imagery.as
+++ b/net/systemeD/potlatch2/collections/Imagery.as
@@ -61,9 +61,7 @@ package net.systemeD.potlatch2.collections {
             var backgroundSet:Boolean = false;
 
                        // Read all values from XML file
-            collection=new Array(
-                               { name: "None", url: "" },
-                               { name: "Yahoo", url: "yahoo", sourcetag: "Yahoo" } );
+                       collection=new Array({ name: "None", url: "" });
                        for each(var set:XML in xml.set) {
                                var obj:Object={};
                                var a:XML;
@@ -75,7 +73,7 @@ package net.systemeD.potlatch2.collections {
                        }
 
                        // Add user's previous preference (from SharedObject) if we didn't find it in the XML file
-            if (!isSet && saved.name && saved.url && saved.url!='' && saved.url!='yahoo') {
+            if (!isSet && saved.name && saved.url && saved.url!='') {
                 collection.push(saved);
                 isSet=true;
             }

diff --git a/resources/imagery.xml b/resources/imagery.xml
index ddb2b29384a26d336ff8f05858ec6b1893032df9..fc514196e922a003926938394ef3c798384e7a9f 100644 (file)
--- a/resources/imagery.xml
+++ b/resources/imagery.xml
@@ -16,6 +16,11 @@
         <name>MapQuest Open Aerial</name>
         <url>http://oatile1.mqcdn.com/naip/$z/$x/$y.png</url>
     </set>
+       <set>
+               <name>Yahoo</name>
+               <url>yahoo</url>
+               <sourcetag>yahoo</sourcetag>
+       </set>
        <set>
                <name>OSM - Mapnik</name>
                <url>http://c.tile.openstreetmap.org/$z/$x/$y.png</url>