[Bromley] Use service_sub_code for asset display.

2 files changed, 17 insertions, 1 deletions

diff --git a/web/cobrands/bromley/assets.js b/web/cobrands/bromley/assets.js
index 083d8210f..f88d06749 100644
--- a/web/cobrands/bromley/assets.js
+++ b/web/cobrands/bromley/assets.js
@@ -25,7 +25,20 @@ var defaults = {
     strategy_class: OpenLayers.Strategy.FixMyStreet
 };
 
+OpenLayers.Layer.VectorAssetBromley = OpenLayers.Class(OpenLayers.Layer.VectorAsset, {
+    relevant: function() {
+        var relevant = OpenLayers.Layer.VectorAsset.prototype.relevant.apply(this, arguments),
+            subcategories = this.fixmystreet.subcategories,
+            subcategory = $('#form_service_sub_code').val(),
+            relevant_sub = OpenLayers.Util.indexOf(subcategories, subcategory) > -1;
+        return relevant && relevant_sub;
+    },
+
+    CLASS_NAME: 'OpenLayers.Layer.VectorAssetBromley'
+});
+
 fixmystreet.assets.add($.extend(true, {}, defaults, {
+    class: OpenLayers.Layer.VectorAssetBromley,
     http_options: {
         params: {
             TYPENAME: "Streetlights"
@@ -36,16 +49,19 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
         feature_id: 'FEATURE_ID'
     },
     asset_category: ["Street Lighting and Road Signs"],
+    subcategories: [ 'SL_LAMP', 'SL_NOT_WORK', 'SL_ON_DAY', 'SL_BLOCK_VEG' ],
     asset_item: 'street light'
 }));
 
 fixmystreet.assets.add($.extend(true, {}, defaults, {
+    class: OpenLayers.Layer.VectorAssetBromley,
     http_options: {
         params: {
             TYPENAME: "Bins"
         }
     },
     asset_category: ["Parks and Greenspace", "Street Cleansing"],
+    subcategories: ['PG_OFLOW_DOG', 'SC_LIT_BIN'],
     asset_item: 'park bin',
     asset_item_message: 'For our parks, pick a <b class="asset-spot">bin</b> from the map &raquo;'
 }));
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 18974c8b7..5b356b125 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -555,7 +555,7 @@ fixmystreet.assets = {
             layer_options.strategies.push(new OpenLayers.Strategy.Filter({filter: layer_options.filter}));
         }
 
-        var layer_class = OpenLayers.Layer.VectorAsset;
+        var layer_class = options.class || OpenLayers.Layer.VectorAsset;
         if (options.usrn || options.road) {
             layer_class = OpenLayers.Layer.VectorNearest;
         }