From 249a31d11ab5f6417f6164da1de18222ec0e48d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20P?= Date: Fri, 7 Nov 2025 11:41:35 +0100 Subject: [PATCH] More marker changes... --- webgis/js/components/SiteSheet.js | 2 +- webgis/js/components/utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webgis/js/components/SiteSheet.js b/webgis/js/components/SiteSheet.js index 89df5fd..feae2df 100644 --- a/webgis/js/components/SiteSheet.js +++ b/webgis/js/components/SiteSheet.js @@ -44,7 +44,7 @@ export class SiteSheet { Ritrovamento e materiali Modalità e anno di ritrovamento${Utils.parseMarkers(this._siteData.finding)} Materiali rinvenuti${this._siteData.materials} - Luogo custodia materiali${this._siteData.conservationPlace} + Luogo custodia materiali${Utils.parseMarkers(this._siteData.conservationPlace)} Rilievi ${this._siteData.surveys ?? 'Nessun rilievo'} Descrizione diff --git a/webgis/js/components/utils.js b/webgis/js/components/utils.js index c3ab717..5cebc3a 100644 --- a/webgis/js/components/utils.js +++ b/webgis/js/components/utils.js @@ -151,7 +151,7 @@ Utils.buildBibliography = async function(recordUri, recordId) { * to Stimulus links */ Utils.parseMarkers = function(text) { - const regex = /(?\[marker coords=\"(?[\d\s\.]+)\"\ ?(group=\"(?\w+)\")?](?[\w\s\.;:\-\"\']+)\[\/marker\])/mig; + const regex = /(?\[marker coords=\"(?[\d\s\.]+)\"\ ?(group=\"(?\w+)\")?](?[\w\d\s\.;,:\-\(\)\"\']+)\[\/marker\])/mig; if (!text) return text;