diff options
Diffstat (limited to 'web/js')
| -rw-r--r-- | web/js/map-OpenStreetMap.js | 6 | ||||
| -rw-r--r-- | web/js/map-bing-ol.js | 7 | ||||
| -rw-r--r-- | web/js/map-google-ol.js | 7 | ||||
| -rw-r--r-- | web/js/map-streetview.js | 2 | ||||
| -rw-r--r-- | web/js/map-toner-lite.js | 6 | ||||
| -rw-r--r-- | web/js/map-wmts-bristol.js | 7 | ||||
| -rw-r--r-- | web/js/map-wmts-buckinghamshire.js | 7 | ||||
| -rw-r--r-- | web/js/map-wmts-hounslow.js | 7 |
8 files changed, 8 insertions, 41 deletions
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 52eb95493..9ed3a2ee3 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -1,14 +1,10 @@ fixmystreet.maps.config = function() { - var permalink_id; - if ($('#map_permalink').length) { - permalink_id = 'map_permalink'; - } fixmystreet.controls = [ new OpenLayers.Control.ArgParserFMS(), new OpenLayers.Control.Attribution(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PermalinkFMS(permalink_id), + new OpenLayers.Control.PermalinkFMS('map'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; }; diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 6c9ab8a62..4e01ff58b 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -1,14 +1,9 @@ fixmystreet.maps.config = function() { - var permalink_id; - if ($('#map_permalink').length) { - permalink_id = 'map_permalink'; - } - fixmystreet.controls = [ new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParserFMS(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PermalinkFMS(permalink_id), + new OpenLayers.Control.PermalinkFMS('map'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; /* Linking back to around from report page, keeping track of map moves */ diff --git a/web/js/map-google-ol.js b/web/js/map-google-ol.js index 4b2d818c9..2769853ce 100644 --- a/web/js/map-google-ol.js +++ b/web/js/map-google-ol.js @@ -17,15 +17,10 @@ $(function(){ }); fixmystreet.maps.config = function() { - var permalink_id; - if ($('#map_permalink').length) { - permalink_id = 'map_permalink'; - } - fixmystreet.controls = [ new OpenLayers.Control.ArgParserFMS(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PermalinkFMS(permalink_id), + new OpenLayers.Control.PermalinkFMS('map'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js index 4701a7f20..f36b7eaea 100644 --- a/web/js/map-streetview.js +++ b/web/js/map-streetview.js @@ -2,7 +2,7 @@ fixmystreet.maps.config = function() { fixmystreet.controls = [ new OpenLayers.Control.ArgParserFMS(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.Permalink(), + new OpenLayers.Control.PermalinkFMS('map'), new OpenLayers.Control.PanZoomFMS() ]; fixmystreet.map_type = OpenLayers.Layer.StreetView; diff --git a/web/js/map-toner-lite.js b/web/js/map-toner-lite.js index 0700dbb55..6e44437a0 100644 --- a/web/js/map-toner-lite.js +++ b/web/js/map-toner-lite.js @@ -1,12 +1,8 @@ fixmystreet.maps.config = function() { - var permalink_id; - if ($('#map_permalink').length) { - permalink_id = 'map_permalink'; - } fixmystreet.controls = [ new OpenLayers.Control.ArgParserFMS(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PermalinkFMS(permalink_id), + new OpenLayers.Control.PermalinkFMS('map'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; fixmystreet.layer_options = [ { diff --git a/web/js/map-wmts-bristol.js b/web/js/map-wmts-bristol.js index 88db20c52..757f347df 100644 --- a/web/js/map-wmts-bristol.js +++ b/web/js/map-wmts-bristol.js @@ -98,15 +98,10 @@ fixmystreet.maps.matrix_ids = [ * to setup the way the map should operate. */ fixmystreet.maps.config = function() { - var permalink_id; - if ($('#map_permalink').length) { - permalink_id = 'map_permalink'; - } - fixmystreet.controls = [ new OpenLayers.Control.ArgParserFMS(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PermalinkFMS(permalink_id) + new OpenLayers.Control.PermalinkFMS('map') ]; if ( fixmystreet.page != 'report' || !$('html').hasClass('mobile') ) { fixmystreet.controls.push( new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ); diff --git a/web/js/map-wmts-buckinghamshire.js b/web/js/map-wmts-buckinghamshire.js index bb76a800b..ee5ac8753 100644 --- a/web/js/map-wmts-buckinghamshire.js +++ b/web/js/map-wmts-buckinghamshire.js @@ -115,15 +115,10 @@ fixmystreet.maps.matrix_ids = [ * to setup the way the map should operate. */ fixmystreet.maps.config = function() { - var permalink_id; - if ($('#map_permalink').length) { - permalink_id = 'map_permalink'; - } - fixmystreet.controls = [ new OpenLayers.Control.ArgParserFMS(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PermalinkFMS(permalink_id), + new OpenLayers.Control.PermalinkFMS('map'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; diff --git a/web/js/map-wmts-hounslow.js b/web/js/map-wmts-hounslow.js index ea414a3d8..1f8927b3f 100644 --- a/web/js/map-wmts-hounslow.js +++ b/web/js/map-wmts-hounslow.js @@ -162,15 +162,10 @@ fixmystreet.maps.matrix_ids = [ * to setup the way the map should operate. */ fixmystreet.maps.config = function() { - var permalink_id; - if ($('#map_permalink').length) { - permalink_id = 'map_permalink'; - } - fixmystreet.controls = [ new OpenLayers.Control.ArgParserFMS(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PermalinkFMS(permalink_id), + new OpenLayers.Control.PermalinkFMS('map'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; |