Add option to deactivate search in layers

Terralego · Jan 30, 2024 · 292b8a6 · 292b8a6
1 parent a55bd93
commit 292b8a6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 23 deletions.
diff --git a/src/views/Main/Provider/SettingsProvider.js b/src/views/Main/Provider/SettingsProvider.js
@@ -27,6 +27,7 @@ const DEFAULT_SETTINGS = {
       enable: false,
       styles: [],
     },
+    searchInLayers: true,
     searchInLocations: {
       enable: false,
       searchProvider: {

diff --git a/src/views/Visualizer/View/View.js b/src/views/Visualizer/View/View.js
@@ -858,6 +858,7 @@ export class Visualizer extends React.Component {
             enable: measureControl,
             styles: measureDrawStyles,
           } = {},
+          searchInLayers: layersEnable,
           searchInLocations: {
             enable: locationsEnable,
             searchProvider,
@@ -923,6 +924,7 @@ export class Visualizer extends React.Component {
         language,
         searchProvider,
         locationsEnable,
+        layersEnable,
         translate: t,
         layers: activeAndSearchableLayers,
       });

diff --git a/src/views/Visualizer/View/search.js b/src/views/Visualizer/View/search.js
@@ -59,6 +59,7 @@ const searchInMap = ({
   layers,
   translate,
   locationsEnable,
+  layersEnable = true,
   language = 'en',
 }) => async query => {
   let locations = [];
@@ -68,29 +69,31 @@ const searchInMap = ({
 
   if (!layers.length && !locations.length) return undefined;
 
-  const { responses } = await searchService.msearch(
-    layers.map(([{ filters: { layer }, baseEsQuery }]) => ({
-      query,
-      index: layer,
-      baseQuery: baseEsQuery,
-      size: 6,
-    })),
-  );
-
-  const results = layers.map(([{
-    label, layers: resultsLayers, filters: { mainField },
-  }], index) => ({
-    group: label,
-    total: responses[index].hits.total.value,
-    results: responses[index].hits.hits.map(({ _id: id, _source: source }) => ({
-      label: source[mainField] || id,
-      id,
-      ...source,
-      center: turfCenter(source.geom).geometry.coordinates,
-      bounds: turfBbox(source.geom),
-      layers: resultsLayers,
-    })),
-  }));
+  let results = [];
+  if (layersEnable) {
+    const { responses } = await searchService.msearch(
+      layers.map(([{ filters: { layer }, baseEsQuery }]) => ({
+        query,
+        index: layer,
+        baseQuery: baseEsQuery,
+        size: 6,
+      })),
+    );
+    results = layers.map(([{
+      label, layers: resultsLayers, filters: { mainField },
+    }], index) => ({
+      group: label,
+      total: responses[index].hits.total.value,
+      results: responses[index].hits.hits.map(({ _id: id, _source: source }) => ({
+        label: source[mainField] || id,
+        id,
+        ...source,
+        center: turfCenter(source.geom).geometry.coordinates,
+        bounds: turfBbox(source.geom),
+        layers: resultsLayers,
+      })),
+    }));
+  }
 
   return [...results, ...locations];
 };