[Westminster] Update emergency message handling.

2 files changed, 6 insertions, 23 deletions

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 87ceb142a..46d3323e5 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -1100,7 +1100,8 @@ fixmystreet.message_controller = (function() {
     });
 
     $(fixmystreet).on('report_new:category_change', function() {
-        if (fixmystreet.body_overrides.get_only_send() == 'Highways England') {
+        var only_send = fixmystreet.body_overrides.get_only_send();
+        if (only_send == 'Highways England') {
             // If we're sending to Highways England, this message doesn't matter
             return;
         }
@@ -1116,6 +1117,9 @@ fixmystreet.message_controller = (function() {
             if (category != stopper.category) {
                 return false;
             }
+            if (only_send == 'TfL') {
+                return false;
+            }
 
             if (stopper.answers) {
                 var answer = $('#form_' + stopper.code).val();
diff --git a/web/cobrands/westminster/assets.js b/web/cobrands/westminster/assets.js
index 327abd967..e015f35a1 100644
--- a/web/cobrands/westminster/assets.js
+++ b/web/cobrands/westminster/assets.js
@@ -88,13 +88,11 @@ fixmystreet.assets.add(defaults, {
     }
 });
 
-var tfl_categories = [ 'Pavement damage', 'Pothole', 'Road pavement damage', 'Road or pavement damage' ];
-
 fixmystreet.assets.add(defaults, {
     http_options: {
         url: url_base + '2/query?'
     },
-    asset_category: tfl_categories,
+    asset_category: 'Road or pavement damage',
     non_interactive: true,
     road: true,
     nearest_radius: 25,
@@ -113,19 +111,6 @@ fixmystreet.assets.add(defaults, {
     }
 });
 
-fixmystreet.message_controller.register_category({
-    body: defaults.body,
-    category: function() {
-        var category = $('#form_category').val();
-        if (OpenLayers.Util.indexOf(tfl_categories, category) === -1 ||
-            fixmystreet.body_overrides.get_only_send() === 'TfL') {
-            return false;
-        }
-        return true;
-    },
-    message: 'Due to the need to consider a priority response we would ask you to call <a href="tel:+442076412000">020 7641 2000</a> with exact details of the problem.'
-});
-
 var layer_data = [
     { category: [ 'Food safety/hygiene' ] },
     { category: 'Damaged, dirty, or missing bin', subcategories: [ '1', '4' ], subcategory_id: '#form_bin_type' },
@@ -304,10 +289,4 @@ $(function(){
     });
 });
 
-fixmystreet.message_controller.register_category({
-    body: defaults.body,
-    category: 'Burst water main',
-    message: 'To report a burst water main, please <a href="https://www.thameswater.co.uk/help-and-advice/Report-a-problem/Report-a-problem">contact Thames Water</a>'
-});
-
 })();