Merge branch 'master' into mapquest
authorAntony Pegg <antthelimey@gmail.com>
Thu, 14 Apr 2011 11:51:10 +0000 (07:51 -0400)
committerAntony Pegg <antthelimey@gmail.com>
Thu, 14 Apr 2011 11:51:10 +0000 (07:51 -0400)
1  2 
resources/imagery.xml

diff --combined resources/imagery.xml
index 5b470cd4d8e000efa18f4076572f2c7f7735b3e5,a079a2b07cf4b6ea0ff9e218d1eb70e117242ba0..783f62bdbb21092f3fb7353fca704d1b26437c1e
                <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>OSM - Mapnik</name>
                <url>http://tile.openstreetmap.org/$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>
@@@ -50,7 -41,7 +50,7 @@@
        </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">