From 6a8358275ef5687ff1bb25fc8fbbd9390bfb5afc Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Sat, 7 May 2011 19:18:18 +0100 Subject: [PATCH] Move Yahoo into imagery.xml rather than hard-coding it into the menu --- net/systemeD/potlatch2/collections/Imagery.as | 6 ++---- resources/imagery.xml | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/systemeD/potlatch2/collections/Imagery.as b/net/systemeD/potlatch2/collections/Imagery.as index e837e105..d0443c55 100644 --- 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 ddb2b293..fc514196 100644 --- a/resources/imagery.xml +++ b/resources/imagery.xml @@ -16,6 +16,11 @@ MapQuest Open Aerial http://oatile1.mqcdn.com/naip/$z/$x/$y.png + + Yahoo + yahoo + yahoo + OSM - Mapnik http://c.tile.openstreetmap.org/$z/$x/$y.png -- 2.36.1