fix: respect layers parameter in getFeatureInfoRequests (#1865)

* respect layers parameter in getFeatureInfoRequests * lint
origo-map · Oct 31, 2023 · 754cb1a · 754cb1a
1 parent e06b796
commit 754cb1a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/src/featureinfo.js b/src/featureinfo.js
@@ -634,7 +634,6 @@ const Featureinfo = function Featureinfo(options = {}) {
     const pixel = evt.pixel;
     const map = viewer.getMap();
     const coordinate = evt.coordinate;
-    const layers = viewer.getQueryableLayers();
     const clientResult = getFeatureInfo.getFeaturesAtPixel({
       coordinate,
       clusterFeatureinfoLevel,
@@ -646,7 +645,6 @@ const Featureinfo = function Featureinfo(options = {}) {
     if (clientResult !== false) {
       getFeatureInfo.getFeaturesFromRemote({
         coordinate,
-        layers,
         map,
         pixel
       }, viewer)

diff --git a/src/getfeatureinfo.js b/src/getfeatureinfo.js
@@ -189,27 +189,33 @@ function getGetFeatureInfoRequest({ layer, coordinate }, viewer) {
 
 function getFeatureInfoRequests({
   coordinate,
-  pixel
+  pixel,
+  layers
 }, viewer) {
   const imageFeatureInfoMode = viewer.getViewerOptions().featureinfoOptions.imageFeatureInfoMode || 'pixel';
   const requests = [];
-  const queryableLayers = viewer.getLayersByProperty('queryable', true);
-  const layerGroups = viewer.getGroupLayers();
-  layerGroups.forEach(layerGroup => {
-    if (layerGroup.get('visible')) {
-      layerGroup.getLayersArray().forEach(layer => {
-        if ((layer.get('queryable'))) {
-          queryableLayers.push(layer);
-        }
-      });
-    } else {
-      layerGroup.getLayersArray().forEach(layer => {
-        if (layer.get('queryable') && ((layer.get('imageFeatureInfoMode') && layer.get('imageFeatureInfoMode') === 'always') || (!layer.get('imageFeatureInfoMode') && imageFeatureInfoMode === 'always'))) {
-          queryableLayers.push(layer);
-        }
-      });
-    }
-  });
+  let queryableLayers;
+  if (layers) {
+    queryableLayers = layers;
+  } else {
+    queryableLayers = viewer.getLayersByProperty('queryable', true);
+    const layerGroups = viewer.getGroupLayers();
+    layerGroups.forEach(layerGroup => {
+      if (layerGroup.get('visible')) {
+        layerGroup.getLayersArray().forEach(layer => {
+          if ((layer.get('queryable'))) {
+            queryableLayers.push(layer);
+          }
+        });
+      } else {
+        layerGroup.getLayersArray().forEach(layer => {
+          if (layer.get('queryable') && ((layer.get('imageFeatureInfoMode') && layer.get('imageFeatureInfoMode') === 'always') || (!layer.get('imageFeatureInfoMode') && imageFeatureInfoMode === 'always'))) {
+            queryableLayers.push(layer);
+          }
+        });
+      }
+    });
+  }
 
   const imageLayers = queryableLayers.filter(layer => layer instanceof BaseTileLayer || layer instanceof ImageLayer);
   imageLayers.forEach(layer => {