fix: make print preview not crash when drag and dropped layer present…

…; show theirs and other missing titles in legend (#1469)
origo-map · Feb 18, 2022 · 82d6c53 · 82d6c53
1 parent 4bf49d3
commit 82d6c53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/controls/print/print-legend.js b/src/controls/print/print-legend.js
@@ -124,7 +124,9 @@ const LayerRow = function LayerRow(options) {
       const style = viewer.getStyle(layer.get('styleName'));
       if (style && style[0]) {
         content = getStyleContent(title, style);
-      } else if (!layer.get('type').includes('AGS')) {
+      } else if ((!layer.get('type')) || (layer.get('type').includes('AGS'))) {
+        content = getTitleWithIcon(title, '');
+      } else {
         content = await getJSONContent(title);
       }
       return `

diff --git a/src/controls/print/print-resize.js b/src/controls/print/print-resize.js
@@ -424,7 +424,7 @@ export default function PrintResize(options = {}) {
         // Remove styles instead?
         const styles = feature.getStyle();
         const scale = 1;
-        if (styles) {
+        if (Array.isArray(styles)) {
           styles.forEach(style => {
             const image = style.getImage();
             if (image) {