Fix layers + UI changes

js/gis.js

@@ -132,12 +132,16 @@ GIS.initMap = async function (mapId, zoomLevel = this.INIT_ZOOM) {
  */
 GIS.initLayers = async function(map) {
     let layerMater = await this.loadLayer('matermania.geojson', optionsSiti, false);
+    let layerMaterArea = await this.loadLayer('matermania_area.geojson', optionsSiti, false);
     let layerArsenale = await this.loadLayer('arsenale.geojson', optionsSiti, false);
     let layerArsenaleArea = await this.loadLayer('arsenale_area.geojson', optionsSiti, false);
     let layerGradola = await this.loadLayer('gradola.geojson', optionsSiti, false);
+    let layerGradolaArea = await this.loadLayer('gradola_area.geojson', optionsSiti, false);
 
     layerMater.id = 'matermania';
+    layerMaterArea.id = 'matermania_area';
     layerGradola.id = 'gradola';
+    layerGradolaArea.id = 'gradola_area';
     layerArsenale.id = 'arsenale';
     layerArsenaleArea.id = 'arsenale_area';
 
@@ -150,7 +154,14 @@ GIS.initLayers = async function(map) {
         attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
     });
 
-    const sitesGroup = new L.LayerGroup([layerMater, layerGradola, layerArsenale, layerArsenaleArea]);
+    const sitesGroup = new L.LayerGroup([
+        layerMater,
+        layerMaterArea,
+        layerGradola,
+        layerGradolaArea,
+        layerArsenale,
+        layerArsenaleArea,
+    ]);
     const baseGroup = new L.LayerGroup([osmap]);
     baseGroup.addTo(map);
     sitesGroup.addTo(map);
@@ -158,8 +169,10 @@ GIS.initLayers = async function(map) {
         "OpenStreetMap" : osmap
     };
     const archeo = {
-        "Villa di Gradola" : layerGradola,
-        "Grotta di Matermania" : layerMater,
+        "Villa di Gradola (planimetria)" : layerGradola,
+        "Villa di Gradola (area)" : layerGradolaArea,
+        "Grotta di Matermania (planimetria)" : layerMater,
+        "Grotta di Matermania (area)" : layerMaterArea,
         "Grotta dell'Arsenale (planimetria)" : layerArsenale,
         "Grotta dell'Arsenale (area)" : layerArsenaleArea,
         "Vincoli archeologici" : layerVincoli,

js/jsdoc.json

@@ -10,10 +10,6 @@
     "opts": {
         "encoding": "utf8",
         "destination": "docs/",
-        "recurse": true,
-        "verbose": true,
-        "theme_opts": {
-            "theme": "dark"
-        }
+        "recurse": true
     }
 }

js/ui.js

@@ -91,9 +91,36 @@ UI.openModal = async function (data) {
 			<tr><th>Documenti</th><td>${data.documenti}</td></tr>
 			<tr><th>Descrizione</th><td>${data.descrizione}</td></tr>
 	`;
-	if (data.images.length) {
-		table += `<tr><th class="has-text-centered" colspan="2">Immagini</th></tr>`;
-		for (const img of data.images) {
+	if (data.documents.length) {
+		table += `<tr>
+			<th class="has-text-centered">Pubblicazioni</th>
+			<td><ul>
+		`;
+		for (const doc of data.documents) {
+			table += `
+				<li><a href="docs/${doc.filename}">${doc.titolo}</a></li>
+			`;
+		}
+		table += '</ul></td></tr>';
+	}
+	if (data.surveys.length) {
+		table += `<tr><th class="has-text-centered" colspan="2">Elaborazioni CNR da rilievi</th></tr>`;
+		for (const img of data.surveys) {
+			table += `
+				<tr>
+				<td colspan="2" style="max-width: 70%">
+					<figure class="image">
+						<img src="/img/${img.filename}" />
+						<figcaption class="p-2 has-text-centered">${img.didascalia}</figcaption>
+					</figure>
+				</td>
+				</tr>
+			`;
+		}
+	}
+	if (data.photos.length) {
+		table += `<tr><th class="has-text-centered" colspan="2">Fotografie</th></tr>`;
+		for (const img of data.photos) {
 			table += `
 				<tr>
 				<td colspan="2" style="max-width: 70%">