Remove final comma from JS array which confused older versions of IE

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

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 4012e79cfe1e02bbe1bdf1d23d614e671f9c4f06..a916c984ae9b54ed290aba786bc9b37f3de96f5e 100644 (file)
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -2,42 +2,60 @@
 
 <imagery>
        <set>
 
 <imagery>
        <set>

-               <name>Bing</name>
+               <name>Bing aerial imagery</name>

                <url>http://ecn.t0.tiles.virtualearth.net/tiles/a$quadkey.jpeg?g=587&mkt=en-gb&n=z</url>
                <scheme>microsoft</scheme>
                <sourcetag>Bing</sourcetag>
                <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>
                <url>http://ecn.t0.tiles.virtualearth.net/tiles/a$quadkey.jpeg?g=587&mkt=en-gb&n=z</url>
                <scheme>microsoft</scheme>
                <sourcetag>Bing</sourcetag>
                <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>
                <default>yes</default>
        </set>

+    <set>
+        <name>MapQuest Open Aerial</name>
+        <url>http://oatile1.mqcdn.com/naip/$z/$x/$y.png</url>
+    </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>
                <url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
        </set>
        </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>
        <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>
        </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">


@@ -47,7 +65,7 @@
        </set>
        <set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1">
                <name>OS Scottish Popular historic</name>
        </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">
                <sourcetag>NPE</sourcetag>
        </set>
        <set minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062">


@@ -75,4 +93,52 @@
                <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='51.32' minlon='-10.71' maxlat='55.46' maxlon='-5.37'>
+               <name>Ireland - NLS Historic Maps</name>
+               <scheme>tms</scheme>
+               <sourcetag>NLS Historic Maps</sourcetag>
+               <url>http://geo.nls.uk/maps/ireland/gsgs4136/$z/$x/$y.png</url>
+               <logo>icons/logo_nls70-nq8.png</logo>
+               <logo_url>http://geo.nls.uk/maps/</logo_url>
+       </set>
+       <set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49">
+               <name>Denmark - Fugro Aerial Imagery</name>
+               <url>http://tile.openstreetmap.dk/fugro2005/$z/$x/$y.jpg</url>
+               <sourcetag>Fugro (2005)</sourcetag>
+       </set>
+       <set minlat="55.23403" minlon="12.09144" maxlat="55.43647" maxlon="12.47712">
+               <name>Denmark - Stevns Kommune</name>
+               <url>http://tile.openstreetmap.dk/stevns/2009/$z/$x/$y.jpg</url>
+               <sourcetag>Stevns Kommune (2009)</sourcetag>
+    </set>
+       <set minlat="46.33" minlon="9.36" maxlat="49.09" maxlon="17.28">
+               <name>Austria - geoimage.at</name>
+               <url>http://geoimage.openstreetmap.at/4d80de696cd562a63ce463a58a61488d/$z/$x/$y.jpg</url>
+               <sourcetag>geoimage.at</sourcetag>
+       </set>
+       <set minlon="19.02" minlat="40.96" maxlon="77.34" maxlat="70.48">
+               <name>Russia - Kosmosnimki.ru IRS Satellite</name>
+               <url>http://irs.gis-lab.info/?layers=irs&request=GetTile&z=$z&x=$x&y=$y</url>
+               <sourcetag>Kosmosnimki.ru IRS</sourcetag>
+       </set>
+       <set minlon="23.16" minlat="51.25" maxlon="32.83" maxlat="56.19">
+               <name>Belarus - Kosmosnimki.ru SPOT4 Satellite</name>
+               <url>http://irs.gis-lab.info/?layers=spot&request=GetTile&z=$z&x=$x&y=$y</url>
+               <sourcetag>Kosmosnimki.ru SPOT4</sourcetag>
+       </set>
+       <set minlon="96" minlat="-44" maxlon="168" maxlat="-9">
+               <name>Australia - Geographic Reference Image</name>
+               <url>http://agri.openstreetmap.org/$z/$x/$y.png</url>
+               <sourcetag>AGRI</sourcetag>
+       </set>

 </imagery>
 </imagery>