maxzoomlevel for searchlist (#1919)

origo-map · Feb 14, 2024 · 4dae0b9 · 4dae0b9
1 parent e208a42
commit 4dae0b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/controls/search.js b/src/controls/search.js
@@ -363,7 +363,7 @@ const Search = function Search(options = {}) {
                     .then((res) => {
                       if (res.length > 0) {
                         const featLayerName = layer.get('name');
-                        featureInfo.showFeatureInfo({ feature: res, layerName: featLayerName });
+                        featureInfo.showFeatureInfo({ feature: res, layerName: featLayerName }, { maxZoomLevel });
                       }
                     });
                 });
@@ -391,7 +391,7 @@ const Search = function Search(options = {}) {
                     .then((res) => {
                       if (res.length > 0) {
                         const featureLayerName = layer.get('name');
-                        featureInfo.showFeatureInfo({ feature: res, layerName: featureLayerName });
+                        featureInfo.showFeatureInfo({ feature: res, layerName: featureLayerName }, { maxZoomLevel });
                       }
                     });
                 });

diff --git a/src/featureinfo.js b/src/featureinfo.js
@@ -605,9 +605,15 @@ const Featureinfo = function Featureinfo(options = {}) {
   * @param {any} featureObj An object containing layerName and feature. "feature" is either one Feature or an Array of Feature
   * @param {any} opts An object containing options. Supported options are : coordinate, the coordinate where popup will be shown. If omitted first feature is used.
   *                                                                         ignorePan, do not autopan if type is overlay. Pan should be supressed if view is changed manually to avoid contradicting animations.
+  *                                                                         maxZoomLevel, max level for zooming on feature.
   * @returns nothing
   */
-  const showFeatureInfo = function showFeatureInfo(featureObj, opts = { ignorePan: true }) {
+  const showFeatureInfo = function showFeatureInfo(featureObj, opts) {
+    const thisOpts = { ...{
+      ignorePan: true
+    },
+    ...opts };
+
     const newItems = [];
     const layerName = featureObj.layerName;
     const layer = viewer.getLayer(layerName);
@@ -623,8 +629,8 @@ const Featureinfo = function Featureinfo(options = {}) {
       newItems.push(newItem);
     }
     if (newItems.length > 0) {
-      render(newItems, identifyTarget, opts.coordinate || maputils.getCenter(newItems[0].getFeature().getGeometry()), opts);
-      viewer.getMap().getView().fit(maputils.getExtent(newItems.map(i => i.getFeature())));
+      render(newItems, identifyTarget, thisOpts.coordinate || maputils.getCenter(newItems[0].getFeature().getGeometry()), thisOpts);
+      viewer.getMap().getView().fit(maputils.getExtent(newItems.map(i => i.getFeature())), { maxZoom: thisOpts.maxZoomLevel });
     }
   };