From e65221e401819759bdc1e7b96f4ceac691f3dfa3 Mon Sep 17 00:00:00 2001 From: rldhont Date: Fri, 21 Jul 2023 11:36:52 +0200 Subject: [PATCH] Remove calls to getLayerByTypeName() --- assets/src/legacy/map.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/src/legacy/map.js b/assets/src/legacy/map.js index 62d901866e..4431ea687f 100644 --- a/assets/src/legacy/map.js +++ b/assets/src/legacy/map.js @@ -2254,8 +2254,8 @@ window.lizMap = function() { pcontent = ''; $('#popupcontent div.menu-content').html(pcontent); window.setTimeout(function(){ - if ( $('#mapmenu .nav-list > li.popupcontent').hasClass('active') && - $('#popupcontent .lizmapPopupContent').hasClass('noContent') && + if ( $('#mapmenu .nav-list > li.popupcontent').hasClass('active') && + $('#popupcontent .lizmapPopupContent').hasClass('noContent') && config.options.popupLocation != 'right-dock'){ $('#button-popupcontent').click(); } @@ -4599,7 +4599,7 @@ window.lizMap = function() { }else{ var lfilter = layerWmsName + ':' + filter; } - wmsParams['FILTER'] = lfilter; + if( !('request_params' in config.layers[layername]) ){ config.layers[layername]['request_params'] = {}; } @@ -4629,7 +4629,7 @@ window.lizMap = function() { token: result.token }; - + // Tell popup to be aware of the filter lizMap.events.triggerEvent("layerFilterParamChanged", {