aboutsummaryrefslogtreecommitdiffstats
path: root/web/js
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2017-08-15 13:31:17 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2017-08-18 09:43:42 +0100
commit31b8337e38b1b39db1660fb877bf1419cc6128f9 (patch)
treec66a0ab8fb93694688e08cf2f5cfcb7f5e0ed400 /web/js
parent918dc67ad5e3001e7d871b23beae4d36a028641f (diff)
[Zurich] Upgrade OpenLayers to master, matching others.
Diffstat (limited to 'web/js')
-rw-r--r--web/js/map-OpenLayers.js13
1 files changed, 1 insertions, 12 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 9e02c8ea9..dc65f750d 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -701,14 +701,6 @@ OpenLayers.Control.PanZoomFMS = OpenLayers.Class(OpenLayers.Control.PanZoom, {
btn.action = id;
btn.className = "olButton";
this.div.appendChild(btn);
- if (OpenLayers.VERSION_NUMBER.indexOf('2.11') > -1) {
- btn.map = this.map;
- OpenLayers.Event.observe(btn, "mousedown", OpenLayers.Function.bindAsEventListener(this.buttonDown, btn));
- var slideFactorPixels = this.slideFactor;
- btn.getSlideFactor = function() {
- return slideFactorPixels;
- };
- }
this.buttons.push(btn);
return btn;
},
@@ -776,10 +768,7 @@ OpenLayers.Strategy.FixMyStreet = OpenLayers.Class(OpenLayers.Strategy.BBOX, {
getMapBounds: function() {
var bounds = OpenLayers.Strategy.BBOX.prototype.getMapBounds.apply(this);
if (bounds) {
- // OpenLayers 2.11 (as used by Zürich) doesn't allow Bounds to be
- // created by passing an array to the constructor, so we have to use
- // this convenience method instead.
- bounds = OpenLayers.Bounds.fromArray(bounds.toArray());
+ bounds = new OpenLayers.Bounds(bounds.toArray());
}
return bounds;
},