diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-07-26 16:57:08 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-07-26 16:57:08 +0100 |
| commit | 54066cd1387643dd6c6cb3040c520bee66881fd7 (patch) | |
| tree | eda84b3f347220ed12de3aa690116148287891bd /web/js/map-bing-ol.js | |
| parent | 8146bad18eeaab658871dd28eb38199a5d068395 (diff) | |
| parent | 198fcef62892fe0b2fbb3ea8a080fca87843445e (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/App/Controller/JSON.pm
perllib/FixMyStreet/Map/Tilma/Original.pm
web/css/core.css
Diffstat (limited to 'web/js/map-bing-ol.js')
| -rw-r--r-- | web/js/map-bing-ol.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 75bce80d3..032ac1e89 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -21,7 +21,7 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { numZoomLevels: 18, transitionEffect: "resize", sphericalMercator: true, - buffer: 0, + buffer: 0 //attribution: "© Microsoft / OS 2010" }, options); var newArguments = [name, url, options]; @@ -56,16 +56,17 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { if (z >= 16) { var url = [ - "http://a.os.openstreetmap.org/sv/${z}/${x}/${y}.png", - "http://b.os.openstreetmap.org/sv/${z}/${x}/${y}.png", - "http://c.os.openstreetmap.org/sv/${z}/${x}/${y}.png" + "http://tilma.mysociety.org/sv/${z}/${x}/${y}.png", + "http://a.tilma.mysociety.org/sv/${z}/${x}/${y}.png", + "http://b.tilma.mysociety.org/sv/${z}/${x}/${y}.png", + "http://c.tilma.mysociety.org/sv/${z}/${x}/${y}.png" ]; } else { var url = [ - "http://ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=587&productSet=mmOS", - "http://ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=587&productSet=mmOS", - "http://ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=587&productSet=mmOS", - "http://ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=587&productSet=mmOS" + "http://ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=701&productSet=mmOS", + "http://ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=701&productSet=mmOS", + "http://ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=701&productSet=mmOS", + "http://ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=701&productSet=mmOS" ]; } var s = '' + x + y + z; |