nicolo/caprigis
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Use labels everywhere + ordering for underwater...

Browse Source
This commit is contained in:
Nicolò P 2025-06-06 14:14:15 +02:00
parent b51d701830
commit 71f111d5df
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
webgis/index.html
View File

@ -225,30 +225,36 @@
Bocca Grande - relitto con carico Bocca Grande - relitto con carico
</a> </a>
</li> </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> <li>
<a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.5870549 14.2887986"> <a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.5870549 14.2887986">
Bocca Piccola - relitto con carico Bocca Piccola - relitto con carico
</a> </a>
</li> </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> <li>
<a class="button" data-action="marker#go" data-controller="marker" data-marker-coords-value="40.54468634 14.23392751"> <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 Marina Piccola, Scoglio delle Sirene - strutture portuali, approdo
</a> </a>
</li> </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> </ul>
</aside> </aside>
</div> </div>
</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 --> <!-- Sites data modal -->
<div class="modal" id="site-data" data-controller="modal biblio tabs marker" data-modal-target="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> <div class="modal-background" data-action="click->modal#close click->tabs#reset"></div>

16
webgis/js/gis.js
View File

@ -166,7 +166,7 @@ GIS.sites = async function () {
record.coordinates, record.coordinates,
{icon: Icons.site, label: record.label} {icon: Icons.site, label: record.label}
) )
.bindTooltip(record.label + '<br>(Clicca per aprire scheda)') .bindTooltip(record.label)
.on( .on(
'click', 'click',
() => UI.openSiteModal(record, '#site-data') () => UI.openSiteModal(record, '#site-data')
@ -199,7 +199,7 @@ GIS.notConserved = async function () {
record.coordinates, record.coordinates,
{icon: Icons.notConserved, label: record.label} {icon: Icons.notConserved, label: record.label}
) )
.bindTooltip(record.denomination) .bindTooltip(record.label)
.on('click', () => UI.openNotConserModal(record, '#not-conser-data')); .on('click', () => UI.openNotConserModal(record, '#not-conser-data'));
notConserved.addLayer(marker); notConserved.addLayer(marker);
@ -229,7 +229,7 @@ GIS.findings = async function () {
const marker = L.marker( const marker = L.marker(
record.coordinates, record.coordinates,
{icon: Icons.finding, label: record.label} {icon: Icons.finding, label: record.label}
).bindTooltip(record.object) ).bindTooltip(record.label)
.on( .on(
'click', 'click',
() => UI.openFindingModal(record, '#finding-data') () => UI.openFindingModal(record, '#finding-data')
@ -261,7 +261,7 @@ GIS.prehistoric = async function () {
const marker = L.marker( const marker = L.marker(
record.coordinates, record.coordinates,
{icon: Icons.prehistoric, label: record.label} {icon: Icons.prehistoric, label: record.label}
).bindTooltip(record.denomination) ).bindTooltip(record.label)
.on( .on(
'click', 'click',
() => UI.openPrehistModal(record, '#prehist-data') () => UI.openPrehistModal(record, '#prehist-data')
@ -292,7 +292,7 @@ GIS.underwater = async function () {
const marker = L.marker( const marker = L.marker(
record.coordinates, record.coordinates,
{icon: Icons.underwater} {icon: Icons.underwater}
).bindTooltip(record.denomination) ).bindTooltip(record.label)
.on( .on(
'click', 'click',
() => UI.openUnderwaterModal(record, '#underwater-data') () => UI.openUnderwaterModal(record, '#underwater-data')
@ -517,10 +517,10 @@ GIS.featurePopup = function (layerName, feature) {
} }
/** /**
* Fetch data from API * 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) { GIS._fetchData = async function (recordUri) {
const data = await fetch(`${API_URL}/${recordId}`) const data = await fetch(`${API_URL}/${recordUri}`)
.then(res => res.json()) .then(res => res.json())
.catch(err => console.log('Error fetching data from DB: ' + err)); .catch(err => console.log('Error fetching data from DB: ' + err));