Fix for hidden styles in print legend (origo-map#1695)

Flodkvist · Mar 1, 2023 · 5331fd3 · 5331fd3
1 parent a47af1d
commit 5331fd3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/controls/print/print-legend.js b/src/controls/print/print-legend.js
@@ -1,6 +1,6 @@
 import { ImageArcGISRest, ImageWMS } from 'ol/source';
 import { Component } from '../../ui';
-import { renderSvgIcon } from '../../utils/legendmaker';
+import { isHidden, renderSvgIcon } from '../../utils/legendmaker';
 
 /**
  * More information: https://developers.arcgis.com/rest/services-reference/enterprise/legend-map-service-.htm
@@ -168,9 +168,12 @@ const LayerRow = function LayerRow(options) {
     }
 
     const children = style.map((thisStyle, index) => {
-      const styleIcon = getStyleIcon(thisStyle);
-      const rowTitle = thisStyle[0].label ? thisStyle[0].label : index + 1;
-      return getListItem(rowTitle, styleIcon);
+      if (!isHidden(thisStyle)) {
+        const styleIcon = getStyleIcon(thisStyle);
+        const rowTitle = thisStyle[0].label ? thisStyle[0].label : index + 1;
+        return getListItem(rowTitle, styleIcon);
+      }
+      return '';
     });
     return getTitleWithChildren(title, children);
   };

diff --git a/src/utils/legendmaker.js b/src/utils/legendmaker.js
@@ -2,7 +2,7 @@ import { renderIcon, renderSvg } from './legendrender';
 
 const size = 24;
 
-const isHidden = function isHidden(arr) {
+export const isHidden = function isHidden(arr) {
   const hiddenItem = arr.find(item => item.hidden);
   if (hiddenItem) {
     if (hiddenItem.hidden === true) {