From 71f111d5dfe6ea1c2bee514d54a7c3fbe6fe0eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20P?= <nicolo.paraciani@cnr.it>
Date: Fri, 6 Jun 2025 14:14:15 +0200
Subject: [PATCH] Use labels everywhere + ordering for underwater...

---
 webgis/index.html | 26 ++++++++++++++++----------
 webgis/js/gis.js  | 16 ++++++++--------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/webgis/index.html b/webgis/index.html
index 0510d4a..4f2f6ce 100644
--- a/webgis/index.html
+++ b/webgis/index.html
@@ -225,30 +225,36 @@
                             Bocca Grande - relitto con carico
                         </a>
                     </li>
-                    <li>
-                        <a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.5579004 14.2363139">
-                            Marina Grande - strutture portuali
-                        </a>
-                    </li>
-                    <li>
-                        <a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.5649884 14.1940185">
-                            Punta dell’Arcera - relitto con carico
-                        </a>
-                    </li>
                     <li>
                         <a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.5870549 14.2887986">
                             Bocca Piccola - relitto con carico
                         </a>
                     </li>
+                    <li>
+                        <a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.5579004 14.2363139">
+                            Marina Grande - strutture portuali
+                        </a>
+                    </li>
                     <li>
                         <a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.54468634 14.23392751">
                             Marina Piccola, Scoglio delle Sirene - strutture portuali, approdo
                         </a>
                     </li>
+                    <li>
+                        <a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.5649884 14.1940185">
+                            Punta dell’Arcera - relitto con carico
+                        </a>
+                    </li>
                 </ul>
             </aside>
         </div>
     </div>
+    <!-- Bibliography citations template -->
+    <template id="biblio-item-template">
+        <span class="is-clickable has-text-link"
+            data-action="click->biblio#open">
+        </span>
+    </template>
     <!-- Sites data modal -->
     <div class="modal" id="site-data" data-controller="modal biblio tabs marker" data-modal-target="modal">
         <div class="modal-background" data-action="click->modal#close click->tabs#reset"></div>
diff --git a/webgis/js/gis.js b/webgis/js/gis.js
index a7c8b90..97d6f4a 100644
--- a/webgis/js/gis.js
+++ b/webgis/js/gis.js
@@ -166,7 +166,7 @@ GIS.sites = async function () {
                 record.coordinates,
                 {icon: Icons.site, label: record.label}
             )
-            .bindTooltip(record.label + '<br>(Clicca per aprire scheda)')
+            .bindTooltip(record.label)
             .on(
                 'click',
                 () => UI.openSiteModal(record, '#site-data')
@@ -199,7 +199,7 @@ GIS.notConserved = async function () {
                 record.coordinates,
                 {icon: Icons.notConserved, label: record.label}
             )
-            .bindTooltip(record.denomination)
+            .bindTooltip(record.label)
             .on('click', () => UI.openNotConserModal(record, '#not-conser-data'));
         
         notConserved.addLayer(marker);
@@ -229,7 +229,7 @@ GIS.findings = async function () {
         const marker = L.marker(
                 record.coordinates,
                 {icon: Icons.finding, label: record.label}
-            ).bindTooltip(record.object)
+            ).bindTooltip(record.label)
             .on(
                 'click',
                 () => UI.openFindingModal(record, '#finding-data')
@@ -261,7 +261,7 @@ GIS.prehistoric = async function () {
         const marker = L.marker(
                 record.coordinates,
                 {icon: Icons.prehistoric, label: record.label}
-            ).bindTooltip(record.denomination)
+            ).bindTooltip(record.label)
             .on(
                 'click',
                 () => UI.openPrehistModal(record, '#prehist-data')
@@ -292,7 +292,7 @@ GIS.underwater = async function () {
         const marker = L.marker(
                 record.coordinates,
                 {icon: Icons.underwater}
-            ).bindTooltip(record.denomination)
+            ).bindTooltip(record.label)
             .on(
                 'click',
                 () => UI.openUnderwaterModal(record, '#underwater-data')
@@ -517,10 +517,10 @@ GIS.featurePopup = function (layerName, feature) {
 }
 /**
  * Fetch data from API
- * @param {string} recordId
+ * @param {string} recordUri The URI to be appendend to the API's base URL
  */
-GIS._fetchData = async function (recordId) {
-    const data = await fetch(`${API_URL}/${recordId}`)
+GIS._fetchData = async function (recordUri) {
+    const data = await fetch(`${API_URL}/${recordUri}`)
         .then(res => res.json())
         .catch(err => console.log('Error fetching data from DB: ' + err));