diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-05-25 20:55:25 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-05-25 20:55:25 +0100 |
| commit | 99c9095b0028e6139e2732f7405991b1d8a5cc98 (patch) | |
| tree | 873e57c5a37006ecc9c332f282c34ce1054c7c00 /web/js | |
| parent | 498b51cc608c4fbd8bae187bf1c9849177134e58 (diff) | |
Integrate BingOL map package into the OSM one, thereby gaining non-JS functionality etc.
Diffstat (limited to 'web/js')
| -rw-r--r-- | web/js/map-OpenLayers.js | 4 | ||||
| -rw-r--r-- | web/js/map-bing-ol.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index ed3ca4653..d912b4b5f 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -1,6 +1,6 @@ YAHOO.util.Event.onContentReady('map', function() { - fixmystreet.ZOOM_OFFSET = 14; + fixmystreet.ZOOM_OFFSET = 13; var perm = new OpenLayers.Control.Permalink(); set_map_config(perm); @@ -13,7 +13,7 @@ YAHOO.util.Event.onContentReady('map', function() { fixmystreet.layer_options = OpenLayers.Util.extend({ zoomOffset: fixmystreet.ZOOM_OFFSET, transitionEffect: 'resize', - numZoomLevels: 4 + numZoomLevels: 5 }, fixmystreet.layer_options); var layer = new fixmystreet.map_type("", fixmystreet.layer_options); fixmystreet.map.addLayer(layer); diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 254d407f4..00c3a487f 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -51,7 +51,7 @@ 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", |