From 2e3580954e046c5d9beba34c587f552e4149aa6c Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Fri, 8 Feb 2013 13:19:21 -0500
Subject: [PATCH] Pull in updated imagery metadata from potlatch Fixes #681

---
 data/imagery.js   | 11 +++++++++--
 data/imagery.json | 11 +++++++++--
 data/imagery.xml  |  4 +++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/data/imagery.js b/data/imagery.js
index 6c232b626..5cda27b95 100644
--- a/data/imagery.js
+++ b/data/imagery.js
@@ -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",
diff --git a/data/imagery.json b/data/imagery.json
index ee9906d31..9cf657886 100644
--- a/data/imagery.json
+++ b/data/imagery.json
@@ -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",
diff --git a/data/imagery.xml b/data/imagery.xml
index c829ab141..91c52fef0 100644
--- a/data/imagery.xml
+++ b/data/imagery.xml
@@ -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>