From fb5d74df55cd82c44f114177d06f26d5353f7627 Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Mon, 21 Nov 2022 17:38:05 +0300
Subject: [PATCH] GeoData: save current zoom level of map view

---
 packages/nc-gui/components/smartsheet/Map.vue | 31 +++++++++++++++++--
 .../nc-gui/composables/useMapViewDataStore.ts |  2 --
 packages/nocodb-sdk/src/lib/Api.ts            |  1 +
 scripts/sdk/swagger.json                      |  4 +++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index e9a9a2c83c..a345c293c6 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -12,6 +12,9 @@ const { formattedData, loadMapData, loadMapMeta, mapMetaData, geoDataFieldColumn
 
 const markersClusterGroupRef = ref<L.MarkerClusterGroup>()
 const mapContainerRef = ref<HTMLElement>()
+const myMapRef = ref<L.Map>()
+
+console.log('meta', mapMetaData)
 
 onBeforeMount(async () => {
   await loadMapMeta()
@@ -68,10 +71,16 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
 })
 
 onMounted(async () => {
-  const myMap = L.map(mapContainerRef.value!).setView([51.505, -0.09], 13)
+  // TODO: also here add/use viewId suffix approach (see comment below)
+  const initialZoomLevel = parseInt(localStorage.getItem(`mapView.zoom${mapMetaData.value.fk_view_id}`) || '10')
+  // const initialBounds = parseInt(localStorage.getItem(`mapView.bounds${mapMetaData.value.fk_view_id}`) || '10')
+  // myMap.setZoom(initialZoomLevel)
+
+  const myMap = L.map(mapContainerRef.value!).setView([51.505, -0.09], initialZoomLevel)
+  myMapRef.value = myMap
 
   L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    maxZoom: 10,
+    maxZoom: 19,
     attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
   }).addTo(myMap)
 
@@ -81,6 +90,24 @@ onMounted(async () => {
     },
   })
   myMap.addLayer(markersClusterGroupRef.value)
+
+  myMap.on('zoomend', function (params) {
+    const bounds = myMap.getBounds()
+    const newS = bounds.getSouthWest()
+
+    console.log('bounds', newS)
+    console.log('params', params)
+
+    if (localStorage != null) {
+      // TODO: use current mapView id as suffix to the local storage key,
+      // so there are no clashes when there are multiple map views, e.g.:
+      // localStorage.setItem(`mapView.${meta?.value.id || 'DEFAULT_ID'}`, this.input)
+      localStorage.setItem(`mapView.zoom${mapMetaData.value.fk_view_id}`, myMap.getZoom().toString())
+    }
+  })
+
+  const bounds = myMap.getBounds()
+  console.log(bounds)
 })
 </script>
 
diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index 6bbee4dbe9..ca7fb49e28 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -32,8 +32,6 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
       const res = await api.dbViewRow.list('noco', project.value.id!, meta.value!.id!, viewMeta.value!.id!)
 
-      console.log('in useMapViewDataStore - res.list: ', res.list)
-
       formattedData.value = res.list
     }
 
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index da28ad8f27..1d58a4f775 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -407,6 +407,7 @@ export interface MapType {
   alias?: string;
   initial_geo_position?: GeoLocationType;
   fk_model_id?: string;
+  fk_view_id?: string;
   fk_geo_data_col_id?: string | null;
   columns?: MapColumnType[];
   meta?: string | object;
diff --git a/scripts/sdk/swagger.json b/scripts/sdk/swagger.json
index 5fe2178b94..42c636c9ff 100644
--- a/scripts/sdk/swagger.json
+++ b/scripts/sdk/swagger.json
@@ -8065,6 +8065,10 @@
           "fk_model_id": {
             "type": "string"
           },
+          "fk_view_id": {
+            "type": "string",
+            "minLength": 1
+          },
           "fk_geo_data_col_id": {
             "type": [
               "string",