diff options
| author | Dave Arter <davea@mysociety.org> | 2018-10-10 15:18:27 +0100 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2018-10-10 15:18:33 +0100 |
| commit | 43703a325e39864ae698b6a5c861e170d72c2ad2 (patch) | |
| tree | 6f712b3178c94b63e2fdb09a8497934c58fb3db0 | |
| parent | 30235fe3eede4d6b4ae68e97bf902ea6fbc16086 (diff) | |
Update Bing Maps parameter ID and copyright year
| -rw-r--r-- | www/js/map-fms.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/js/map-fms.js b/www/js/map-fms.js index 0ef30a5..b91b2e9 100644 --- a/www/js/map-fms.js +++ b/www/js/map-fms.js @@ -37,10 +37,10 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { var c = this.map.getCenter(); var in_uk = c ? this.in_uk(c) : true; if (z >= 16 && in_uk) { - copyrights = 'Contains Ordnance Survey data © Crown copyright and database right 2014'; + copyrights = 'Contains Ordnance Survey data © Crown copyright and database right 2018'; } else { logo = '<a href="https://www.bing.com/maps/"><img border=0 src="https://dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; - copyrights = '© 2011 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; + copyrights = '© 2018 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; } this._updateAttribution(copyrights, logo); }, @@ -55,14 +55,14 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { } } else { var type = ''; - if (z > 10 && in_uk) { + if (z > 11 && in_uk) { type = '&productSet=mmOS&key=' + CONFIG.BING_MAPS_API_KEY; } urls = [ - "https://ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + type, - "https://ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + type, - "https://ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + type, - "https://ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + type + "https://ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, + "https://ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, + "https://ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, + "https://ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type ]; } return urls; |