Omit background layer if baseLayer is specified in the map export for…

…mat config
jotapei · Nov 8, 2023 · abfbe07 · abfbe07
1 parent a24ac71
commit abfbe07
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2023.11.07-master",
+    "version": "2023.11.08-master",
     "description": "QGIS Web Client 2 core",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

diff --git a/plugins/MapExport.jsx b/plugins/MapExport.jsx
@@ -171,7 +171,8 @@ class MapExport extends React.Component {
         if (this.state.pageSize === null && this.props.allowedScales !== false) {
             scaleFactor = mapScale / this.state.scale;
         }
-        const exportParams = LayerUtils.collectPrintParams(this.props.layers, this.props.theme, mapScale, this.props.map.projection, exportExternalLayers);
+        const selectedFormatConfiguration = formatConfiguration.find(entry => entry.name === this.state.selectedFormatConfiguration) || {};
+        const exportParams = LayerUtils.collectPrintParams(this.props.layers, this.props.theme, mapScale, this.props.map.projection, exportExternalLayers, !!selectedFormatConfiguration.baseLayer);
         const highlightParams = VectorLayerUtils.createPrintHighlighParams(this.props.layers, this.props.map.projection, mapScale, this.state.dpi);
 
         return (

diff --git a/utils/LayerUtils.js b/utils/LayerUtils.js
@@ -747,7 +747,7 @@ const LayerUtils = {
             }
         }
     },
-    collectPrintParams(layers, theme, printScale, printCrs, printExternalLayers) {
+    collectPrintParams(layers, theme, printScale, printCrs, printExternalLayers, omitBackgroundLayer) {
         const params = {
             LAYERS: [],
             OPACITIES: [],
@@ -766,7 +766,7 @@ const LayerUtils = {
         }
 
         const backgroundLayer = layers.find(layer => layer.role === LayerRole.BACKGROUND && layer.visibility === true);
-        if (backgroundLayer) {
+        if (backgroundLayer && !omitBackgroundLayer) {
             const backgroundLayerName = backgroundLayer.name;
             const themeBackgroundLayer = theme.backgroundLayers.find(entry => entry.name === backgroundLayerName);
             const printBackgroundLayer = themeBackgroundLayer ? themeBackgroundLayer.printLayer : null;