From 4b16c3a2fdd159957de0eeac5bb1ae98ae9618c8 Mon Sep 17 00:00:00 2001 From: Dave Arter Date: Mon, 20 Jan 2025 11:28:19 +0000 Subject: [PATCH] Allow asset_group and asset_category to coexist in layer config For FD-5001 --- web/cobrands/fixmystreet/assets.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js index 8cf413afb14..2abb8bdefc3 100644 --- a/web/cobrands/fixmystreet/assets.js +++ b/web/cobrands/fixmystreet/assets.js @@ -38,7 +38,11 @@ OpenLayers.Layer.VectorBase = OpenLayers.Class(OpenLayers.Layer.Vector, { // layers attached with groups that should also apply to categories // with the same name relevant = (OpenLayers.Util.indexOf(layer.asset_group, group) != -1 || OpenLayers.Util.indexOf(layer.asset_group, category) != -1); - } else { + } + // if not already relevant, check asset_category next. Doing this independently + // of asset_group allows config to specific both asset_group and asset_category + // and layer will be relevant if either match. + if (!relevant && layer.asset_category) { relevant = (OpenLayers.Util.indexOf(layer.asset_category, category) != -1); } return relevant &&