diff options
| -rw-r--r-- | templates/web/base/common_footer_tags.html | 6 | ||||
| -rw-r--r-- | web/js/map-wmts-bristol.js | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/templates/web/base/common_footer_tags.html b/templates/web/base/common_footer_tags.html index 302d802d0..debcde402 100644 --- a/templates/web/base/common_footer_tags.html +++ b/templates/web/base/common_footer_tags.html @@ -11,12 +11,12 @@ <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> <script type="text/javascript" src="[% version('/js/dropzone.min.js') %]"></script> -[% map_js %] -<script src="[% version('/cobrands/fixmystreet/map.js') %]"></script> - <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> <script type="text/javascript" src="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script> +[% map_js %] +<script src="[% version('/cobrands/fixmystreet/map.js') %]"></script> + [% IF admin %] <script src="[% version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js') %]"></script> <script type="text/javascript" src="[% version('/js/fixmystreet-admin.js') %]"></script> diff --git a/web/js/map-wmts-bristol.js b/web/js/map-wmts-bristol.js index 3e5de0c27..58edb0fd1 100644 --- a/web/js/map-wmts-bristol.js +++ b/web/js/map-wmts-bristol.js @@ -98,17 +98,15 @@ fixmystreet.maps.matrix_ids = [ * to setup the way the map should operate. */ fixmystreet.maps.config = function() { - // This stuff is copied from js/map-bing-ol.js - - var nav_opts = { zoomWheelEnabled: false }; - if (fixmystreet.page == 'around' && $('html').hasClass('mobile')) { - nav_opts = {}; + var permalink_id; + if ($('#map_permalink').length) { + permalink_id = 'map_permalink'; } - fixmystreet.nav_control = new OpenLayers.Control.Navigation(nav_opts); fixmystreet.controls = [ new OpenLayers.Control.ArgParser(), - fixmystreet.nav_control + new OpenLayers.Control.Navigation(), + new OpenLayers.Control.PermalinkFMS(permalink_id) ]; if ( fixmystreet.page != 'report' || !$('html').hasClass('mobile') ) { fixmystreet.controls.push( new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ); |