Merge pull request #3852 from 3liz/backport-3850-to-release_3_6

[Backport release_3_6] Fix popup from atlas not working with shortnames
3liz · Aug 21, 2023 · ab82b63 · ab82b63
2 parents a5e2e44 + 038fa9d
commit ab82b63
Show file tree

Hide file tree

Showing 3 changed files with 848 additions and 1 deletion.
diff --git a/assets/src/legacy/atlas.js b/assets/src/legacy/atlas.js
@@ -86,6 +86,7 @@
                 }
                 const layerConfig = getLayerConfig[1];
                 var featureType = getLayerConfig[0];
+                const wmsName = layerConfig?.shortname || featureType;
 
                 var atlasLayerOptions = lizAtlasLayers.layerOptions[layerId];
 
@@ -100,6 +101,7 @@
                 var lizAtlasConfig = {
                     'layername': featureType,
                     'layerId': layerConfig.id,
+                    'wmsName': wmsName,
                     'displayLayerDescription': atlasLayerOptions['atlasDisplayLayerDescription'] == 'True' ? true : false,
                     'primaryKey': primaryKey,
                     'titleField': titleField,
@@ -520,7 +522,7 @@
 
                 // Display popup
                 if (lizAtlasConfig['atlasDisplayPopup']) {
-                    lizMap.getFeaturePopupContent(lizAtlasConfig.featureType, feature, function (data) {
+                    lizMap.getFeaturePopupContent(lizAtlasConfig.wmsName, feature, function (data) {
                         var popupContainerId = 'liz-atlas-item-detail';
                         // Add class to table
                         var popupReg = new RegExp('lizmapPopupTable', 'g');