From 5c0ca55f8c4d0e06e050f1a70f8b4bf0fa754146 Mon Sep 17 00:00:00 2001
From: David Larlet <david@larlet.fr>
Date: Mon, 19 Feb 2024 17:08:48 -0500
Subject: [PATCH] chore: generate messages following map creation

Also, reuse the `U` global namespace for `MAP`.
---
 umap/templates/umap/map_detail.html   |  1 -
 umap/templates/umap/map_init.html     | 13 ++++++++++---
 umap/templates/umap/map_messages.html | 12 ------------
 3 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 umap/templates/umap/map_messages.html

diff --git a/umap/templates/umap/map_detail.html b/umap/templates/umap/map_detail.html
index fd57fc8b..4252ca60 100644
--- a/umap/templates/umap/map_detail.html
+++ b/umap/templates/umap/map_detail.html
@@ -24,5 +24,4 @@
   {% block map_init %}
     {% include "umap/map_init.html" %}
   {% endblock map_init %}
-  {% include "umap/map_messages.html" %}
 {% endblock content %}
diff --git a/umap/templates/umap/map_init.html b/umap/templates/umap/map_init.html
index 91713b35..f3701593 100644
--- a/umap/templates/umap/map_init.html
+++ b/umap/templates/umap/map_init.html
@@ -2,9 +2,16 @@
 <div id="map"></div>
 <!-- djlint:off -->
 <script defer type="text/javascript">
-  let MAP
   window.addEventListener('DOMContentLoaded', (event) => {
-    MAP = new U.Map("map", {{ map_settings|notag|safe }});
-  });
+    U.MAP = new U.Map("map", {{ map_settings|notag|safe }})
+    {% for m in messages %}
+      {# We have just one, but we need to loop, as for messages API #}
+      U.MAP.ui.alert({
+        content: "{{ m }}",
+        level: "{{ m.tags }}",
+        duration: 100000
+      })
+    {% endfor %}
+  })
 </script>
 <!-- djlint:on -->
diff --git a/umap/templates/umap/map_messages.html b/umap/templates/umap/map_messages.html
deleted file mode 100644
index edeb3e3a..00000000
--- a/umap/templates/umap/map_messages.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script type="text/javascript">
-  window.addEventListener('DOMContentLoaded', (event) => {
-    {% for m in messages %}
-    {# We have just one, but we need to loop, as for messages API #}
-    MAP.ui.alert({
-      content: "{{ m }}",
-      level: "{{ m.tags }}",
-      duration: 100000
-    })
-  {% endfor %}
-})
-</script>