From 7b1c31c9e5eac1fb51a7f73a2733318d5fab2a06 Mon Sep 17 00:00:00 2001
From: gwen <gwenaelremond@free.fr>
Date: Mon, 18 Sep 2023 20:59:39 +0200
Subject: [PATCH] =?UTF-8?q?geolocalisation=20(g=C3=A9n=C3=A9ration=20dynam?=
 =?UTF-8?q?ique)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/routes.py            | 24 ++++++++++++++++++++++--
 app/templates/about.html |  2 +-
 app/templates/acte.html  |  2 +-
 app/templates/map.html   |  5 +++++
 requirements.txt         |  2 +-
 5 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 app/templates/map.html

diff --git a/app/routes.py b/app/routes.py
index a3091c7..538665a 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -4,6 +4,7 @@ from unidecode import unidecode # to remove accents in house and prince names i
 
 from flask import Blueprint, abort, render_template, request, send_from_directory
 from pymongo import MongoClient
+import folium
 
 from .config import dbadmin, dbpassword, server_ip
 from .helper import find_one_or_404
@@ -21,6 +22,7 @@ actesdb = dbclient["actesdb"]
 housecol = actesdb["house"]
 actecol = actesdb["acte"]
 helpers = actesdb["helpers"]
+#folium_map = actesdb["folium_map"]
 #
 
 helpers_dicts = helpers.find_one()
@@ -120,10 +122,28 @@ def acte(house=None, prince=None, dateitem=None):
         #infos=None, place=None, doc=None, arch=None,
         #diplo=diplo_t[0].replace("_", " "), state=state[0],
         output_doc=result.get('xmlcontent'), name_prince=result.get("prince_name"),
-        folium = result.get("folium"),
+        folium=result.get("folium"),
         transcribers=result.get('transcribers'))
 
-
+@main.route("/geoloc")
+def geoloc():
+    "global folium/leaflet map"
+    m = folium.Map(location=[46.603354, 1.888334], zoom_start=6)
+    for result in actecol.find():
+        place = result['place']
+        if place.get('latitude') is not None:
+            folium.Marker(
+                location=[place['latitude'], place['longitude']],
+                popup=place['name'],
+                #icon=folium.Icon(icon="cloud")
+                #icon=folium.Icon(color='lightgray', icon='home', prefix='fa')
+            ).add_to(m)
+    geolocalisation = m._repr_html_()
+    return render_template("map.html", geolocalisation=geolocalisation)
+    #geolocalisation = folium_map.find_one()
+    #geolocalisation = geolocalisation['globalmap']
+    #return render_template("map.html", geolocalisation=geolocalisation)
+    
 @main.route("/contact")
 def contact() -> t.Text:
     """Displays the Contact page"""
diff --git a/app/templates/about.html b/app/templates/about.html
index b708e0c..08a3509 100644
--- a/app/templates/about.html
+++ b/app/templates/about.html
@@ -20,4 +20,4 @@
             </div>
         </div>
     </div><!-- /.container -->
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/app/templates/acte.html b/app/templates/acte.html
index 0b37e85..17cf0f0 100644
--- a/app/templates/acte.html
+++ b/app/templates/acte.html
@@ -16,7 +16,7 @@
             <p>{{item.analysis}}.</p>
             <p>{{state}}, {{diplo}}, {{arch}}, {{doc}}, {{item.ref_acte}}.</p>
         {% endfor %}-->
-        {{output_doc|safe}}
+        {{ output_doc | safe }}
     
     <p class="font-italic font-weight-light fs-6">
         Transcription : 
diff --git a/app/templates/map.html b/app/templates/map.html
new file mode 100644
index 0000000..2bb0e0b
--- /dev/null
+++ b/app/templates/map.html
@@ -0,0 +1,5 @@
+{% extends "container.html" %}
+{% block corps %}
+<h1 class="text-center">Géolocalisation des actes </h1>
+{{ geolocalisation | safe }}
+{% endblock %}
diff --git a/requirements.txt b/requirements.txt
index d1e0e3e..903d0e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,4 +21,4 @@ WTForms==3.0.1
 zipp==3.9.0
 pyyaml==6.0.1
 Unidecode==1.3.6
-
+folium==0.14.0