Allow a parameter to set the default value for the username

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

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index b246a52f4926fbd98c2983dacd1debf5641d1aea..eaf416acb6b76664e7e12977a89fe1e1614e3a66 100644 (file)
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -12,9 +12,18 @@
                <terms_url>http://opengeodata.org/microsoft-imagery-details</terms_url>
                <default>yes</default>
        </set>
                <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>
        <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>
        </set>
        <set>
                <name>OSM - Osmarender</name>


@@ -27,26 +36,31 @@
     <set>
         <name>OSM - MapQuest</name>
         <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/$z/$x/$y.png</url>
     <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>
     </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>
        </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>
                <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>
                <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">
                <sourcetag>OS7</sourcetag>
        </set>
        <set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9">


@@ -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>
                <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>
     <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>