Minor changes

Adds an icon and makes a couple of minor non breaking changes
origo-map · Sep 11, 2023 · bd64d38 · bd64d38
1 parent 066d494
commit bd64d38
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 24 deletions.
diff --git a/css/svg/material-icons.svg b/css/svg/material-icons.svg
diff --git a/src/featureinfo.js b/src/featureinfo.js
@@ -266,30 +266,34 @@ const Featureinfo = function Featureinfo(options = {}) {
   };
 
   const addLinkListener = function addLinkListener(el) {
-    el.addEventListener('click', (e) => {
-      e.preventDefault();
-      const targ = e.target;
-      let modalStyle = '';
-      switch (targ.target) {
-        case 'modal-full':
-        {
-          modalStyle = 'max-width:unset;width:98%;height:98%;resize:both;overflow:auto;display:flex;flex-flow:column;';
-          break;
-        }
-        default:
-        {
-          modalStyle = 'resize:both;overflow:auto;display:flex;flex-flow:column;';
-          break;
+    // Check if element already has a listener
+    if (el && !el.hasAttribute('onClickModal')) {
+      el.addEventListener('click', (e) => {
+        e.preventDefault();
+        const targ = e.target;
+        let modalStyle = '';
+        switch (targ.target) {
+          case 'modal-full':
+          {
+            modalStyle = 'max-width:unset;width:98%;height:98%;resize:both;overflow:auto;display:flex;flex-flow:column;';
+            break;
+          }
+          default:
+          {
+            modalStyle = 'resize:both;overflow:auto;display:flex;flex-flow:column;';
+            break;
+          }
         }
-      }
-      Modal({
-        title: targ.title,
-        content: `<iframe src="${targ.href}" class=""style="width:100%;height:99%"></iframe>`,
-        target: viewer.getId(),
-        style: modalStyle,
-        newTabUrl: targ.href
+        Modal({
+          title: targ.title,
+          content: `<iframe src="${targ.href}" class=""style="width:100%;height:99%"></iframe>`,
+          target: viewer.getId(),
+          style: modalStyle,
+          newTabUrl: targ.href
+        });
       });
-    });
+      el.setAttribute('onClickModal', 'true');
+    }
   };
 
   /**
@@ -670,6 +674,7 @@ const Featureinfo = function Featureinfo(options = {}) {
   return Component({
     name: 'featureInfo',
     clear,
+    addLinkListener,
     getHitTolerance,
     getPin,
     getSelectionLayer,

diff --git a/src/viewer.js b/src/viewer.js
@@ -236,8 +236,15 @@ const Viewer = function Viewer(targetOption, options = {}) {
     return undefined;
   };
 
-  const getQueryableLayers = function getQueryableLayers() {
-    const queryableLayers = getLayers().filter(layer => layer.get('queryable') && layer.getVisible());
+  const getQueryableLayers = function getQueryableLayers(includeImageFeatureInfoMode = false) {
+    const queryableLayers = getLayers().filter(layer => {
+      if (layer.get('queryable') && layer.getVisible()) {
+        return true;
+      } else if (includeImageFeatureInfoMode && layer.get('queryable') && layer.get('imageFeatureInfoMode') === 'always') {
+        return true;
+      }
+      return false;
+    });
     return queryableLayers;
   };