Allow scroll wheel to zoom map.

3 files changed, 2 insertions, 17 deletions

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index bef9bd58f..b3f3a38d1 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -700,9 +700,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
 
     trigger: function(e) {
         var cobrand = $('meta[name="cobrand"]').attr('content');
-        if (typeof fixmystreet.nav_control != 'undefined') {
-            fixmystreet.nav_control.disableZoomWheel();
-        }
         var lonlat = fixmystreet.map.getLonLatFromViewPortPx(e.xy);
         if (fixmystreet.page == 'new') {
             /* Already have a pin */
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 9b0a73fb8..5e29daea1 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -4,16 +4,10 @@ function _set_map_config() {
         permalink_id = 'map_permalink';
     }
 
-    var nav_opts = { zoomWheelEnabled: false };
-    if (fixmystreet.page == 'around' && $('html').hasClass('mobile')) {
-        nav_opts = {};
-    }
-    fixmystreet.nav_control = new OpenLayers.Control.Navigation(nav_opts);
-
     fixmystreet.controls = [
         new OpenLayers.Control.Attribution(),
         new OpenLayers.Control.ArgParser(),
-        fixmystreet.nav_control,
+        new OpenLayers.Control.Navigation(),
         new OpenLayers.Control.PermalinkFMS(permalink_id),
         new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
     ];
diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js
index 4c386e87d..9e0555079 100644
--- a/web/js/map-wmts-zurich.js
+++ b/web/js/map-wmts-zurich.js
@@ -56,15 +56,9 @@ $(function(){
  function set_map_config(perm) {
     // This stuff is copied from js/map-bing-ol.js
 
-    var nav_opts = { zoomWheelEnabled: false };
-    if (fixmystreet.page == 'around' && $('html').hasClass('mobile')) {
-        nav_opts = {};
-    }
-    fixmystreet.nav_control = new OpenLayers.Control.Navigation(nav_opts);
-
     fixmystreet.controls = [
         new OpenLayers.Control.ArgParser(),
-        fixmystreet.nav_control
+        new OpenLayers.Control.Navigation()
     ];
     if ( fixmystreet.page != 'report' || !$('html').hasClass('mobile') ) {
         fixmystreet.controls.push( new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) );