From c378d5dc60cd23d3ba47dc800f4cbc4e3cec22ac Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yohanboniface@free.fr>
Date: Mon, 12 Feb 2024 09:51:13 +0100
Subject: [PATCH] feat: allow to set zoomTo from query string

When using data/dataUrl querystring, uMap will import data at load,
and will set view using this data bounds. In some situation (Deveco),
the user wants to control the max zoom of the final view.

Also add labelKey and showLabel to be parsed from query string, still
for Deveco needs.
---
 umap/static/umap/js/umap.core.js  |  4 ++++
 umap/static/umap/js/umap.js       | 10 +++++++---
 umap/static/umap/js/umap.layer.js |  5 ++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/umap/static/umap/js/umap.core.js b/umap/static/umap/js/umap.core.js
index 55388cbb..1dcda4b2 100644
--- a/umap/static/umap/js/umap.core.js
+++ b/umap/static/umap/js/umap.core.js
@@ -27,6 +27,10 @@ L.Util.setBooleanFromQueryString = (options, name) => {
   const value = L.Util.queryString(name)
   if (typeof value !== 'undefined') options[name] = value == '1' || value == 'true'
 }
+L.Util.setNumberFromQueryString = (options, name) => {
+  const value = +L.Util.queryString(name)
+  if (!isNaN(value)) options[name] = value
+}
 L.Util.setNullableBooleanFromQueryString = (options, name) => {
   let value = L.Util.queryString(name)
   if (typeof value !== 'undefined') {
diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js
index 7d98a8ac..dacfb9eb 100644
--- a/umap/static/umap/js/umap.js
+++ b/umap/static/umap/js/umap.js
@@ -86,16 +86,16 @@ U.Map = L.Map.extend({
     popupShape: String,
     popupTemplate: String,
     popupContentTemplate: String,
-    zoomTo: undefined,
+    zoomTo: Number,
     captionBar: Boolean,
     captionMenus: Boolean,
     slideshow: undefined,
     sortKey: undefined,
-    labelKey: undefined,
+    labelKey: String,
     filterKey: undefined,
     facetKey: undefined,
     slugKey: undefined,
-    showLabel: undefined,
+    showLabel: 'NullableBoolean',
     labelDirection: undefined,
     labelInteractive: undefined,
     outlinkTarget: undefined,
@@ -342,8 +342,12 @@ U.Map = L.Map.extend({
         case 'NullableBoolean':
           L.Util.setNullableBooleanFromQueryString(options, key)
           break
+        case Number:
+          L.Util.setNumberFromQueryString(options, key)
+          break
         case String:
           L.Util.setFromQueryString(options, key)
+          break
       }
     }
     // Specific case for datalayersControl
diff --git a/umap/static/umap/js/umap.layer.js b/umap/static/umap/js/umap.layer.js
index 5031479a..8fd86b97 100644
--- a/umap/static/umap/js/umap.layer.js
+++ b/umap/static/umap/js/umap.layer.js
@@ -1458,7 +1458,10 @@ U.DataLayer = L.Evented.extend({
   zoomTo: function () {
     if (!this.isVisible()) return
     const bounds = this.layer.getBounds()
-    if (bounds.isValid()) this.map.fitBounds(bounds)
+    if (bounds.isValid()) {
+      const options = {maxZoom: this.getOption("zoomTo")}
+      this.map.fitBounds(bounds, options)
+    }
   },
 
   // Is this layer type browsable in theorie