Remove on-map permalink.

We retain the code as it is updating the URL on map move.

12 files changed, 9 insertions, 57 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18197b9ca..0f1c94da5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
         - Improve map JavaScript defensiveness.
         - Upgrade jquery-validation plugin. #2540
         - Pass ‘filter_category’ param to front page to pre-filter map.
+        - Remove on-map Permalink.
     - Admin improvements:
         - Add new roles system, to group permissions and apply to users. #2483
         - Contact form emails now include user admin links.
diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html
index 21591203d..5ccd9863e 100644
--- a/templates/web/base/js/translation_strings.html
+++ b/templates/web/base/js/translation_strings.html
@@ -68,8 +68,6 @@ fixmystreet.password_minimum_length = [% c.cobrand.password_minimum_length %];
         expand_map: '[% loc('Expand map') | replace("'", "\\'") %]',
         collapse_map: '[% loc('Collapse map') | replace("'", "\\'") %]',
 
-        permalink: '[% loc('Permalink') | replace("'", "\\'") %]',
-
         filter: '[% loc('Filter') | replace("'", "\\'") %]',
 
         show_pins: '[% loc('Show pins') | replace("'", "\\'") %]',
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 8bcb71a3a..24b8a6d0f 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -809,19 +809,14 @@ $.extend(fixmystreet.set_up, {
   },
 
   map_controls: function() {
-    //add permalink on desktop, force hide on mobile
     //add links container (if its not there)
     if (fixmystreet.cobrand != 'zurich') {
         if ($('#sub_map_links').length === 0) {
             $('<p class="sub-map-links" id="sub_map_links" />').insertAfter($('#map'));
         }
-        if ($('#map_permalink').length === 0) {
-            $('#sub_map_links').append('<a href="#" id="map_permalink">' + translation_strings.permalink + '</a>');
-        }
     }
 
     if ($('.mobile').length) {
-        $('#map_permalink').addClass('hidden');
         // Make sure we end up with one Get updates link
         if ($('#key-tools a.js-feed').length) {
             $('#sub_map_links a.js-feed').remove();
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 2d67b3986..bdfd619f2 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1761,11 +1761,6 @@ html.js #map .noscript {
         background-position: -24px 0;
     }
 
-    #map_permalink:after {
-        @extend %sub-map-link-icon;
-        background-position: -48px 0;
-    }
-
     #fms_shortlist_all:after {
         @extend %sub-map-link-icon;
         background-position: -60px 0;
@@ -1903,10 +1898,6 @@ html.js #map .noscript {
 .olControlAttribution img {
     vertical-align: bottom;
 }
-.olControlPermalink {
-    bottom: 3px !important;
-    #{$right}: 3px;
-}
 .olControlDragFeatureFMSOver {
     cursor: move;
     cursor: -webkit-grab;
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' })
     ];