diff options
Diffstat (limited to 'web/js/map-fms.js')
| -rw-r--r-- | web/js/map-fms.js | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/web/js/map-fms.js b/web/js/map-fms.js index 014bd58bb..ac27cfbce 100644 --- a/web/js/map-fms.js +++ b/web/js/map-fms.js @@ -1,4 +1,4 @@ -fixmystreet.maps.tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/sv' ]; +fixmystreet.maps.tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/oml' ]; fixmystreet.maps.config = (function(original) { return function(){ @@ -39,10 +39,14 @@ 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 2016'; + copyrights = 'Contains Highways England and Ordnance Survey data © Crown copyright and database right 2016'; } else { logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; - copyrights = '© 2016 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; + if (in_uk) { + copyrights = '© 2016 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Highways England, Ordnance Survey'; + } else { + copyrights = '© 2016 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; + } } this._updateAttribution(copyrights, logo); }, @@ -57,14 +61,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=' + fixmystreet.key; } urls = [ - "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=5941" + type, - "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=5941" + type, - "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=5941" + type, - "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=5941" + type + "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, + "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, + "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, + "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type ]; } return urls; |