From a2028312b9f0891a2c00ce1763c762c9b3eacb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20P?= Date: Fri, 15 Nov 2024 16:12:10 +0100 Subject: [PATCH] Add not conserved points --- img/icons/non_conserv.png | Bin 0 -> 27977 bytes js/components/SiteSheet.js | 39 ++++++++++++++++++------------------- js/gis.js | 39 +++++++++++++++++++++++++++++-------- js/ui.js | 23 ++++++++++++---------- 4 files changed, 63 insertions(+), 38 deletions(-) create mode 100644 img/icons/non_conserv.png diff --git a/img/icons/non_conserv.png b/img/icons/non_conserv.png new file mode 100644 index 0000000000000000000000000000000000000000..13b2c8083ab2f090326336d9d69f5446d37a6fa2 GIT binary patch literal 27977 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 JX;6F-`G4%LGqC^w literal 0 HcmV?d00001 diff --git a/js/components/SiteSheet.js b/js/components/SiteSheet.js index 404d59d..c6cbac4 100644 --- a/js/components/SiteSheet.js +++ b/js/components/SiteSheet.js @@ -14,27 +14,26 @@ export class SiteSheet { return `

`; } @@ -46,22 +45,22 @@ export class SiteSheet { - Denominazione: ${this._siteData.denominazione} + Denominazione: ${this._siteData.denomination}

- Periodo: ${this._siteData.periodo} + Periodo: ${this._siteData.period}

- Località generica: ${this._siteData.loc_generica} + Località generica: ${this._siteData.genericPlace}

- ${this._siteData.desc_breve} + ${this._siteData.shortDescription}

`; } diff --git a/js/gis.js b/js/gis.js index a6bdca7..6fe06e6 100644 --- a/js/gis.js +++ b/js/gis.js @@ -4,7 +4,8 @@ import UI from "./ui.js"; const MAPBOX_TOKEN = 'pk.eyJ1Ijoibmljb3BhIiwiYSI6ImNseWNwZjJjbjFidzcya3BoYTU0bHg4NnkifQ.3036JnCXZTEMt6jVgMzVRw'; const BASE_URL = location.href; -const API_URL = 'https://testaec.electricmandarine.cloud/gisdb/gis'; +//const API_URL = 'https://testaec.electricmandarine.cloud/gisdb/gis'; +const API_URL = 'https://localhost:8001'; // Global leaflet /** @@ -39,7 +40,7 @@ const optionsFabbricati = { color: '#222', opacity: 1, weight: 1.5, - fillColor: '#ff8000', + fillColor: '#5b5d5f', fillOpacity: 0.8 }; @@ -102,8 +103,9 @@ GIS.initMap = async function (mapId, zoomLevel = this.INIT_ZOOM) { const {baseMap, sitesGroup} = await this.initLayers(map); let layerVincoli = await this.loadLayer('vincoli.geojson', optionsVincoli); - // TODO named parameters?? let layerPaesistici = await this.loadLayer('paesistici.geojson', optionsPaesistici); + let notConserData = await fetch(`${API_URL}/not_conserved`) + .then(data => data.json()); // Add scale and ruler controls L.control.scale({imperial: false}).addTo(map); @@ -118,6 +120,24 @@ GIS.initMap = async function (mapId, zoomLevel = this.INIT_ZOOM) { tooltipAnchor: [0, -26], } ); + let notConserIcon = L.icon( + { + iconUrl: 'img/icons/non_conserv.png', + iconSize: [24, 36], + iconAnchor: [12, 32], + tooltipAnchor: [0, -26], + } + ); + + let notConserved = []; + + for (let record of notConserData.records) { + notConserved.push(L.marker( + record.coordinates, + {icon: notConserIcon} + ).bindTooltip(record.denomination) + ); + } for (let id in MARKER_NAMES.sites) { let layer = sitesGroup.customGetLayer(id); @@ -128,14 +148,14 @@ GIS.initMap = async function (mapId, zoomLevel = this.INIT_ZOOM) { if (fromStorage !== 'undefined') { try { data = JSON.parse(fromStorage); - const lat = data?.lat ?? coords.lat; - const lon = data?.lon ?? coords.lng; + const lat = data?.coordinates[0] ?? coords.lat; + const lon = data?.coordinates[1] ?? coords.lng; coords = [lat, lon]; } catch (error) { console.log(error); } } else { - data = await GIS._fetchData(id); + data = await GIS._fetchData('site/' + id); } const marker = L.marker(coords, { icon: siteIcon }) @@ -148,16 +168,19 @@ GIS.initMap = async function (mapId, zoomLevel = this.INIT_ZOOM) { } let markersGroup = L.layerGroup(sitesMarkers); + let notConservedGroup = L.layerGroup(notConserved); const archeo = { 'Beni archeologici (punti)' : markersGroup, 'Beni archeologici (strutture)' : sitesGroup, + 'Beni non conservati' : notConservedGroup, 'Vincoli archeologici' : layerVincoli, 'Vincoli paesistici' : layerPaesistici, }; markersGroup.addTo(map); sitesGroup.addTo(map); + notConservedGroup.addTo(map); L.control.layers( baseMap, @@ -324,7 +347,7 @@ GIS.layerData = async function (layerId) { console.log(error); } } else { - data = await GIS._fetchData(layerId); + data = await GIS._fetchData('site/' + layerId); } return data; @@ -335,7 +358,7 @@ GIS.layerData = async function (layerId) { * @param {string} layerId */ GIS.cacheDBData = async function (layerId) { - const data = await this._fetchData(layerId); + const data = await this._fetchData('site/' + layerId); localStorage.setItem(layerId, JSON.stringify(data)); } /** diff --git a/js/ui.js b/js/ui.js index f8a00b7..7949431 100644 --- a/js/ui.js +++ b/js/ui.js @@ -87,22 +87,25 @@ UI.openModal = async function (data, selector) { modal.querySelector('#short-sheet').innerHTML = siteSheet.renderShort(); modal.querySelector('#site-sheet').innerHTML = siteSheet.render(); - let photos = modal.querySelector('#photos'); + let images = modal.querySelector('#photos'); - if (data.documents.length) { + if (data.documents?.length) { let siteDocs = new SiteDocuments; siteDocs.siteData = data; modal.querySelector('#documents').innerHTML = siteDocs.render(); } - if (photos.innerHTML.length === 0) { + let surveys = data.images.filter(i => i.type === 'Survey'); + let photos = data.images.filter(i => i.type === 'Photo'); + + if (images.innerHTML.length === 0) { let siteSurveys = new SiteSurveys; - siteSurveys.siteData = data.surveys[0] ?? undefined; - photos.innerHTML += data.surveys[0] ? siteSurveys.render() : ''; + siteSurveys.siteData = surveys.length !== 0 ? surveys[0] : undefined; + images.innerHTML += surveys ? siteSurveys.render() : ''; let sitePhotos = new SitePhotos; - sitePhotos.siteData = data.photos[0] ?? undefined; - photos.innerHTML += data.photos[0] ? sitePhotos.render() : ''; + sitePhotos.siteData = photos[0] ?? undefined; + images.innerHTML += photos[0] ? sitePhotos.render() : ''; } let dataTabs = modal.querySelectorAll('.data-tabs'); @@ -136,8 +139,8 @@ UI.openModal = async function (data, selector) { closeBtn.addEventListener('click', () => closeModal()); modalBg.addEventListener('click', () => closeModal()); - this.imageGallery('gallery-1', data.surveys); - this.imageGallery('gallery-2', data.photos); + this.imageGallery('gallery-1', surveys); + this.imageGallery('gallery-2', photos); } /** * Open a modal with project info @@ -194,7 +197,7 @@ UI.imageGallery = function (galleryId, images) { if (element) { let gallery = []; for (let img of images) { - gallery.push({src: `img/${img.filename}`, description: img.didascalia}); + gallery.push({src: `img/${img.filename}`, description: img.caption}); } document.querySelector(`#${galleryId}`).addEventListener('click', () => {