From cc6ae953716c7d6a172280a54265725f8a711f33 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yohanboniface@free.fr>
Date: Fri, 5 Jul 2024 14:06:56 +0200
Subject: [PATCH] wip: make Map.initialize async

We want to be able to await function there.

Specifically, we want to await the data creation when it comes from
the `data` url param, so when we also consume the `feature` url param,
that feature is already on the map so we can open it
---
 umap/static/umap/js/umap.js | 42 ++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js
index 00e14ded..021734f0 100644
--- a/umap/static/umap/js/umap.js
+++ b/umap/static/umap/js/umap.js
@@ -29,7 +29,7 @@ L.Map.mergeOptions({
 U.Map = L.Map.extend({
   includes: [ControlsMixin],
 
-  initialize: function (el, geojson) {
+  initialize: async function (el, geojson) {
     this.sync_engine = new U.SyncEngine(this)
     this.sync = this.sync_engine.proxy(this)
     // Locale name (pt_PT, en_US…)
@@ -176,23 +176,7 @@ U.Map = L.Map.extend({
       }
       this._default_extent = true
       this.options.name = L._('Untitled map')
-      let data = L.Util.queryString('data', null)
-      const url = new URL(window.location.href)
-      const dataUrls = new URLSearchParams(url.search).getAll('dataUrl')
-      const dataFormat = L.Util.queryString('dataFormat', 'geojson')
-      if (dataUrls.length) {
-        for (let dataUrl of dataUrls) {
-          dataUrl = decodeURIComponent(dataUrl)
-          dataUrl = this.localizeUrl(dataUrl)
-          dataUrl = this.proxyUrl(dataUrl)
-          const datalayer = this.createDataLayer()
-          datalayer.importFromUrl(dataUrl, dataFormat)
-        }
-      } else if (data) {
-        data = decodeURIComponent(data)
-        const datalayer = this.createDataLayer()
-        datalayer.importRaw(data, dataFormat)
-      }
+      await this.loadDataFromQueryString()
     }
 
     this.slideshow = new U.Slideshow(this, this.options.slideshow)
@@ -297,7 +281,27 @@ U.Map = L.Map.extend({
     }
   },
 
-  setViewFromQueryString: function () {
+  loadDataFromQueryString: async function() {
+      let data = L.Util.queryString('data', null)
+      const url = new URL(window.location.href)
+      const dataUrls = new URLSearchParams(url.search).getAll('dataUrl')
+      const dataFormat = L.Util.queryString('dataFormat', 'geojson')
+      if (dataUrls.length) {
+        for (let dataUrl of dataUrls) {
+          dataUrl = decodeURIComponent(dataUrl)
+          dataUrl = this.localizeUrl(dataUrl)
+          dataUrl = this.proxyUrl(dataUrl)
+          const datalayer = this.createDataLayer()
+          await datalayer.importFromUrl(dataUrl, dataFormat)
+        }
+      } else if (data) {
+        data = decodeURIComponent(data)
+        const datalayer = this.createDataLayer()
+        await datalayer.importRaw(data, dataFormat)
+      }
+  },
+
+  setViewFromQueryString: async function () {
     if (this.options.noControl) return
     this.initCaptionBar()
     if (L.Util.queryString('share')) {