nakarte

commit 51581b988d1f76875e1e50aabed293780f648233
parent 62ff6bc80c6f216a0cfd4ffbb9ecf3a47a9a0c2e
Author: Igor Sidorov <igor.sidorov@binarycode.ru>
Date:   Thu, 31 May 2018 18:04:20 +0300

Simplified PDF filename generation logic

Diffstat:
M
src/lib/leaflet.control.printPages/control.js
 | 
15
++++++---------

1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/lib/leaflet.control.printPages/control.js b/src/lib/leaflet.control.printPages/control.js
@@ -488,8 +488,7 @@ L.Control.PrintPages = L.Control.extend({
         getFileName: function({renderedLayers, scale, width, height, extension}) {
             let fileName = '';
 
-            let baseLayer;
-            let overlayLayer;
+            let opaqueLayer;
             const transparentOverlayLayers = [];
 
             renderedLayers.forEach(layer => {
@@ -509,20 +508,18 @@ L.Control.PrintPages = L.Control.extend({
                     if (isOverlayTransparent) {
                         transparentOverlayLayers.push(layer);
                     } else {
-                        overlayLayer = layer;
+                        opaqueLayer = layer;
                     }
-                } else {
-                    baseLayer = layer;
+                } else if (!opaqueLayer) {
+                    opaqueLayer = layer;
                 }
             });
 
             const appendLayerShortName = (layer) => {
                 fileName += `${layer.options.shortName}_`;
             }
-            if (overlayLayer) {
-                appendLayerShortName(overlayLayer);
-            } else if (baseLayer) {
-                appendLayerShortName(baseLayer);
+            if (opaqueLayer) {
+                appendLayerShortName(opaqueLayer);
             }
             transparentOverlayLayers.forEach(appendLayerShortName);