nakarte

commit 50763a5ef8a286ea75f0d06f1ce125d0eef5517f
parent c7f4296597e1142ca122fcafb97e42ff876c3a3d
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Sat, 10 Nov 2018 17:07:30 +0100

[print] disable print for layers OpenCylemap and OpenOutdoors

Diffstat:
M
src/layers.js
 | 
9
+++++++--
M
src/lib/leaflet.control.printPages/map-render.js
 | 
5
+++++

2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/layers.js b/src/layers.js
@@ -424,7 +424,7 @@ export default function getLayers() {
                             code: 'Ocm',
                             isOverlay: false,
                             scaleDependent: true,
-                            print: true,
+                            print: false,
                             jnx: true,
                             shortName: 'opencyclemap'
                         }
@@ -438,7 +438,7 @@ export default function getLayers() {
                             code: 'Oso',
                             isOverlay: false,
                             scaleDependent: true,
-                            print: true,
+                            print: false,
                             jnx: true,
                             shortName: 'osm_outdoors'
                         }
@@ -1165,6 +1165,11 @@ export default function getLayers() {
         'geocaching.su',
     ];
 
+    // set metadata
+    for (let layer of layers) {
+        layer.layer.meta = {title: layer.title}
+    }
+
     // assign order to layers
     const orderByTitle = {};
     for (let i=0; i < titlesByOrder.length; i++) {
diff --git a/src/lib/leaflet.control.printPages/map-render.js b/src/lib/leaflet.control.printPages/map-render.js
@@ -50,6 +50,11 @@ function getLayersForPrint(map, xhrQueue) {
     map.eachLayer((layer) => {
             if (layer.options.print) {
                 layers.push(layer);
+            } else {
+                if (!layer.isOverlay) {
+                    console.log(layer);
+                    throw new Error(`Print disabled for layer ${layer.meta.title}`);
+                }
             }
         }
     );