Merge remote-tracking branch 'richardf/flex4' into flex4
authorAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:35:35 +0000 (17:35 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:35:35 +0000 (17:35 +0100)
Conflicts:
resources/imagery.xml

1  2 
resources/imagery.xml
resources/map_features.xml
resources/map_features/paths.xml

                <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 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>
  </imagery>
Simple merge
Simple merge