diff options
| -rw-r--r-- | templates/web/base/maps/pins_js.html | 2 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 1 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/templates/web/base/maps/pins_js.html b/templates/web/base/maps/pins_js.html index d9c6b3531..10c5342e3 100644 --- a/templates/web/base/maps/pins_js.html +++ b/templates/web/base/maps/pins_js.html @@ -1,4 +1,4 @@ [ [% FOR pin IN map.pins -%] - [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', "[% pin.title | escape_js %]", '[% pin.type %]' ] + [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', [% pin.id %], "[% pin.title | escape_js %]", '[% pin.type %]' ] [%- IF !loop.last %],[% END %] [% END %] ] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index f9ce02f32..cf07fa17a 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -919,6 +919,7 @@ fixmystreet.display = { } fixmystreet.set_up.map_controls(); + $('.js-back-to-report-list').attr('href', location.href); $sideReport.find('#key-tool-problems-nearby').addClass('js-back-to-report-list'); fixmystreet.set_up.map_sidebar_key_tools(); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index f6e7e8a62..e1f152820 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -27,12 +27,17 @@ var fixmystreet = fixmystreet || {}; fixmystreet.map.updateSize(); // Dragging the map should fetch new local reports from server - fixmystreet.bbox_strategy.activate(); + if (fixmystreet.bbox_strategy) { + fixmystreet.bbox_strategy.activate(); + } // Should not be able to drag normal pins!! drag.deactivate(); // Force a redraw to return (de)selected marker to normal size + // Redraw for all pages, kick off a refresh too for around + // TODO Put 'new report' pin in different layer to simplify this and elsewhere + fixmystreet.maps.markers_resize(); fixmystreet.markers.refresh({force: true}); }, |