From: Tom Hughes <tom@compton.nu>
Date: Sat, 21 May 2011 16:25:36 +0000 (+0100)
Subject: Update Potlatch 2 to 2.1 build
X-Git-Tag: live~6853^2~7
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ddc9446ed812cf5ca044bded4c91b6d30a5dd8b0

Update Potlatch 2 to 2.1 build
---

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index f09c1bda6..5caaf3b0c 100644
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -12,6 +12,15 @@
 		<terms_url>http://opengeodata.org/microsoft-imagery-details</terms_url>
 		<default>yes</default>
 	</set>
+    <set>
+        <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>
@@ -27,6 +36,11 @@
     <set>
         <name>OSM - MapQuest</name>
         <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/$z/$x/$y.png</url>
+    </set>
+    <set minlat="17" minlon="175" maxlat="72" maxlon="-46">
+      <name>OSM - Tiger Edited Map</name>
+      <type>900913</type>
+      <url>http://tiger-osm.mapquest.com/tiles/1.0.0/tiger/$z/$x/$y.png</url>
     </set>
 	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
 		<name>OS OpenData Streetview</name>
@@ -84,7 +98,16 @@
 		<url>http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg</url>
 		<sourcetag>Haiti streetnames</sourcetag>
 	</set>
-
+	<set minlat="24.2" minlon="-125.8" maxlat="49.5" maxlon="-62.3">
+		<name>National Agriculture Imagery Program</name>
+		<url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url>
+		<sourcetag>NAIP</sourcetag>
+	</set>
+	<set minlat="55.3" minlon="-168.5" maxlat="71.5" maxlon="-140">
+		<name>National Agriculture Imagery Program</name>
+		<url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url>
+		<sourcetag>NAIP</sourcetag>
+	</set>
     <set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49">
         <name>Denmark - Fugro Aerial Imagery</name>
         <url>http://fugro.findvej.dk/fugro2005/$z/$x/$y.jpg</url>
diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index 52b2aba9e..bfadae6bf 100644
Binary files a/public/potlatch2/locales/de_DE.swf and b/public/potlatch2/locales/de_DE.swf differ
diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf
index e31445824..e9274d8b3 100644
Binary files a/public/potlatch2/locales/en_GB.swf and b/public/potlatch2/locales/en_GB.swf differ
diff --git a/public/potlatch2/locales/en_US.swf b/public/potlatch2/locales/en_US.swf
index ae43790e2..00d242c24 100644
Binary files a/public/potlatch2/locales/en_US.swf and b/public/potlatch2/locales/en_US.swf differ
diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf
index a787bd001..092e5862d 100644
Binary files a/public/potlatch2/locales/fr_FR.swf and b/public/potlatch2/locales/fr_FR.swf differ
diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf
index 86fde4678..c7860c01d 100644
Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 814547018..5cc9fa34e 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ