From 40f7fa390a22d5a84c7efcf4bc6e8e553778550f Mon Sep 17 00:00:00 2001
From: csae8092 <peter.andorfer@oeaw.ac.at>
Date: Fri, 12 Jan 2024 12:50:46 +0100
Subject: [PATCH] added map to place detail view

---
 apis_core/apis_entities/detail_views.py       |  2 +-
 .../detail_views/entity_detail_generic.html   | 22 +++----
 ...detail_generic.html => person_detail.html} |  0
 .../detail_views/place_detail.html            | 57 +++++++++++++++++++
 templates/partials/head.html                  |  6 ++
 5 files changed, 75 insertions(+), 12 deletions(-)
 rename apis_core/apis_entities/templates/apis_entities/detail_views/{person_detail_generic.html => person_detail.html} (100%)
 create mode 100644 apis_core/apis_entities/templates/apis_entities/detail_views/place_detail.html

diff --git a/apis_core/apis_entities/detail_views.py b/apis_core/apis_entities/detail_views.py
index aa66839..11a959e 100644
--- a/apis_core/apis_entities/detail_views.py
+++ b/apis_core/apis_entities/detail_views.py
@@ -79,7 +79,7 @@ def get(self, request, *args, **kwargs):
         RequestConfig(request, paginate={"per_page": 10}).configure(tb_label)
         template = select_template(
             [
-                "apis_entities/detail_views/{}_detail_generic.html".format(entity),
+                "apis_entities/detail_views/{}_detail.html".format(entity),
                 "apis_entities/detail_views/entity_detail_generic.html",
             ]
         )
diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html b/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html
index 2d45c1e..78c11be 100644
--- a/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html
+++ b/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html
@@ -29,6 +29,7 @@ <h2 class="display-4 text-center">
                     <small>{{ entity_type }}s</small>
                 {% endif %}
                 {{ object }}
+                </h2>
                 {% if user.is_authenticated %}
                 <h2 class="text-center">
                     {% if object.get_edit_url %}
@@ -44,7 +45,6 @@ <h2 class="text-center">
                     {% endif %}
                 </h2>
                 {% endif %}
-            </h2>
         </div>
         <div class="col-md-2">
             {% if object.get_next_url %}
@@ -146,30 +146,30 @@ <h3 class="text-center">
             {% endblock info-table %}
             {% block info-metadata %}
                 <table class="table">
-                    {% if object.collection.all %}
                     <tr>
                         <th>
-                            Collection(s)
+                            Uri(s)
                         </th>
                         <td>
-                            {% for x in object.collection.all %}
-                                <li>
-                                    {{ x }}
-                                </li>
+                            {% for x in object.uri_set.all %}
+                                <a href="{{ x }}">{{ x }}</a> <br />
                             {% endfor %}
                         </td>
                     </tr>
-                    {% endif %}
+                    {% if object.collection.all %}
                     <tr>
                         <th>
-                            Uri(s)
+                            Collection(s)
                         </th>
                         <td>
-                            {% for x in object.uri_set.all %}
-                                <a href="{{ x }}">{{ x }}</a> <br />
+                            {% for x in object.collection.all %}
+                                <li>
+                                    {{ x }}
+                                </li>
                             {% endfor %}
                         </td>
                     </tr>
+                    {% endif %}
                     {% if object.notes %}
                         <tr>
                             <th>
diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/person_detail_generic.html b/apis_core/apis_entities/templates/apis_entities/detail_views/person_detail.html
similarity index 100%
rename from apis_core/apis_entities/templates/apis_entities/detail_views/person_detail_generic.html
rename to apis_core/apis_entities/templates/apis_entities/detail_views/person_detail.html
diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/place_detail.html b/apis_core/apis_entities/templates/apis_entities/detail_views/place_detail.html
new file mode 100644
index 0000000..d012151
--- /dev/null
+++ b/apis_core/apis_entities/templates/apis_entities/detail_views/place_detail.html
@@ -0,0 +1,57 @@
+{% extends "apis_entities/detail_views/entity_detail_generic.html" %}
+
+    {% block info-table %}
+    {% if object.lat %}
+        <div id="map" style="height: 300px;"></div>
+        <script>
+            var lat = "{{ object.lat }}".replace(",", "."); 
+            var lng = "{{ object.lng }}".replace(",", "."); 
+            console.log(lat, lng)
+            var map = L.map('map').setView([lat, lng], 13);
+            L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                maxZoom: 19,
+                attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+            }).addTo(map);
+            var marker = L.marker([lat, lng]).addTo(map);
+            marker.bindPopup("{{ object.name }}").openPopup();
+        </script>
+    {% endif %}
+    <table class="table">
+        {% if no_merge_labels %}
+        <tr>
+            <th>
+                Alternative Namen
+            </th>
+            <td>
+                {% for x in no_merge_labels %}
+                    <li class="list-unstyled">
+                        <small>{{ x.label_type }}: </small>{{ x.label }}
+                    </li>
+                {% endfor %}
+                
+            </td>
+        </tr>
+        {% endif %}
+        <tr>
+            <th>
+                ID
+            </th>
+            <td>
+                {{ object.id }}
+            </td>
+        </tr>
+        <tr>
+            <th>
+                Koordinaten
+            </th>
+            <td>
+                {{ object.lat }} {{ object.lng}}
+            </td>
+        </tr>
+        <tr>
+            <th>Ortstype</th>
+            <td>{{ object.kind }}</td>
+        </tr>
+    </table>
+    
+    {% endblock info-table %}
diff --git a/templates/partials/head.html b/templates/partials/head.html
index a2c8c7f..e9837f5 100644
--- a/templates/partials/head.html
+++ b/templates/partials/head.html
@@ -19,5 +19,11 @@
 <meta name="msapplication-TileColor" content="#da532c">
 <meta name="msapplication-config" content="{% static 'img/browserconfig.xml' %}">
 <meta name="theme-color" content="#ffffff">
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
+integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
+crossorigin=""/>
+<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
+integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
+crossorigin=""></script>
 {% block scriptHeader %}
 {% endblock scriptHeader %}
\ No newline at end of file