Pull in updated imagery metadata from potlatch Fixes #681

This commit is contained in:
Tom MacWright
2013-02-08 13:19:21 -05:00
parent afcb1837e7
commit 2e3580954e
3 changed files with 21 additions and 5 deletions

View File

@@ -1,12 +1,18 @@
iD.data.imagery = [
{
"name": "Bing aerial imagery",
"template": "http://ecn.t0.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z",
"template": "http://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z",
"description": "Satellite imagery.",
"scaleExtent": [
0,
20
],
"subdomains": [
"0",
"1",
"2",
"3"
],
"default": "yes",
"sourcetag": "Bing",
"logo": "bing_maps.png",
@@ -25,7 +31,8 @@ iD.data.imagery = [
"a",
"b",
"c"
]
],
"terms_url": "http://mapbox.com/tos/"
},
{
"name": "OpenStreetMap",

View File

@@ -1,12 +1,18 @@
[
{
"name": "Bing aerial imagery",
"template": "http://ecn.t0.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z",
"template": "http://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z",
"description": "Satellite imagery.",
"scaleExtent": [
0,
20
],
"subdomains": [
"0",
"1",
"2",
"3"
],
"default": "yes",
"sourcetag": "Bing",
"logo": "bing_maps.png",
@@ -25,7 +31,8 @@
"a",
"b",
"c"
]
],
"terms_url": "http://mapbox.com/tos/"
},
{
"name": "OpenStreetMap",

View File

@@ -2,7 +2,7 @@
<imagery>
<set>
<name>Bing aerial imagery</name>
<url>http://ecn.t0.tiles.virtualearth.net/tiles/a$quadkey.jpeg?g=587&amp;mkt=en-gb&amp;n=z</url>
<url>http://ecn.t${0|1|2|3}.tiles.virtualearth.net/tiles/a$quadkey.jpeg?g=587&amp;mkt=en-gb&amp;n=z</url>
<scheme>microsoft</scheme>
<sourcetag>Bing</sourcetag>
<attribution_url>http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial/0,0?zl=1&amp;mapVersion=v1&amp;key=Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU&amp;include=ImageryProviders&amp;output=xml</attribution_url>
@@ -14,10 +14,12 @@
<set>
<name>MapBox Satellite</name>
<url>http://${a|b|c}.tiles.mapbox.com/v3/openstreetmap.map-4wvf9l0l/$z/$x/$y.png</url>
<terms_url>http://mapbox.com/tos/</terms_url>
</set>
<set>
<name>MapQuest Open Aerial</name>
<url>http://oatile1.mqcdn.com/tiles/1.0.0/sat/$z/$x/$y.jpg</url>
<terms_url>http://developer.mapquest.com/web/products/open/map#terms</terms_url>
</set>
<set>
<name>OSM - Mapnik</name>