Merge branch 'master' into openid

[rails.git] / public / potlatch2 / imagery.xml

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 4012e79cfe1e02bbe1bdf1d23d614e671f9c4f06..eaf416acb6b76664e7e12977a89fe1e1614e3a66 100644 (file)
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -9,35 +9,58 @@
                <attribution_url>http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial/0,0?zl=1&mapVersion=v1&key=Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU&include=ImageryProviders&output=xml</attribution_url>
                <logo>bing_maps.png</logo>
                <logo_url>http://www.bing.com/maps</logo_url>
-               <terms_url>http://www.microsoft.com/maps/product/terms.html</terms_url>
+               <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://tile.openstreetmap.org/$z/$x/$y.png</url>
+               <url>http://c.tile.openstreetmap.org/$z/$x/$y.png</url>
        </set>
        <set>
                <name>OSM - Osmarender</name>
                <url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
        </set>
+    <set>
+        <name>OSM - OpenCycleMap</name>
+        <url>http://tile.opencyclemap.org/cycle/$z/$x/$y.png</url>
+    </set>
+    <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>
                <url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>
-               <sourcetag>OS OpenData StreetView</sourcetag>
+               <sourcetag>OS_OpenData_StreetView</sourcetag>
        </set>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS OpenData Locator</name>
                <url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
-               <sourcetag>OS OpenData Locator</sourcetag>
+               <sourcetag>OS_OpenData_Locator</sourcetag>
+               <sourcekey>source:name</sourcekey>
        </set>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS 1:25k historic</name>
-               <url>http://ooc.openstreetmap.org/os1/$z/$x/$y.png</url>
+               <url>http://ooc.openstreetmap.org/os1/$z/$x/$y.jpg</url>
                <sourcetag>OS 1:25k</sourcetag>
        </set>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS 7th Series historic</name>
-               <url>http://ooc.openstreetmap.org/os7/$z/$x/$y.png</url>
+               <url>http://ooc.openstreetmap.org/os7/$z/$x/$y.jpg</url>
                <sourcetag>OS7</sourcetag>
        </set>
        <set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9">
@@ -47,7 +70,7 @@
        </set>
        <set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1">
                <name>OS Scottish Popular historic</name>
-               <url>http://gibin.geog.ucl.ac.uk/~ollie/scotland/tiles/$z/$x/$y.jpg</url>
+               <url>http://ooc.openstreetmap.org/npescotland/tiles/$z/$x/$y.jpg</url>
                <sourcetag>NPE</sourcetag>
        </set>
        <set minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062">
@@ -75,4 +98,19 @@
                <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>
+        <sourcetag>Fugro (2005)</sourcetag>
+    </set>
 </imagery>