aboutsummaryrefslogtreecommitdiffstats
path: root/web/js/map-bing-ol.js
diff options
context:
space:
mode:
Diffstat (limited to 'web/js/map-bing-ol.js')
-rw-r--r--web/js/map-bing-ol.js26
1 files changed, 15 insertions, 11 deletions
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 254d407f4..032ac1e89 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -1,6 +1,6 @@
function set_map_config(perm) {
- fixmystreet.ZOOM_OFFSET = 13;
fixmystreet.controls = [
+ new OpenLayers.Control.Attribution(),
new OpenLayers.Control.ArgParser(),
new OpenLayers.Control.Navigation(),
perm,
@@ -10,6 +10,9 @@ function set_map_config(perm) {
}
OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
+ attribution: '<a href="http://www.bing.com/maps/">' +
+ '<img border=0 src="http://dev.virtualearth.net/Branding/logo_powered_by.png"></a>',
+
initialize: function(name, options) {
var url = [];
options = OpenLayers.Util.extend({
@@ -18,8 +21,8 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
numZoomLevels: 18,
transitionEffect: "resize",
sphericalMercator: true,
- buffer: 0,
- attribution: "© Microsoft / OS 2010"
+ buffer: 0
+ //attribution: "© Microsoft / OS 2010"
}, options);
var newArguments = [name, url, options];
OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArguments);
@@ -51,18 +54,19 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
OpenLayers.Util.indexOf(this.serverResolutions, res) :
this.map.getZoom() + this.zoomOffset;
- if (z == 16) {
+ 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;