From 46b380ff3a1f0e5b0084d5c455676ff8be14933e Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 30 Nov 2023 08:05:59 +0100
Subject: [PATCH] Handle undefined WMS abstract
---
spatial/static/spatial/js/gridmap.js | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/spatial/static/spatial/js/gridmap.js b/spatial/static/spatial/js/gridmap.js
index d95464fa..c4cc3f06 100644
--- a/spatial/static/spatial/js/gridmap.js
+++ b/spatial/static/spatial/js/gridmap.js
@@ -114,19 +114,15 @@ async function initGridMap(inputModelId, mapAttribution) {
let response = await fetch(mapserverURL + modelId + "?service=WMS&version=1.3.0&request=GetCapabilities&language=" + settings.currentLanguage);
//console.info(response.status); // Response is 200 even if a model doesn't exist on the mapserver
let txt = await response.text();
- /*
-<HTML>
-<HEAD><TITLE>MapServer Message</TITLE></HEAD>
-<!-- MapServer version 7.6.4 OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=CAIRO SUPPORTS=SVG_SYMBOLS SUPPORTS=RSVG SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS SUPPORTS=POINT_Z_M SUPPORTS=PBF INPUT=JPEG INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
-<BODY BGCOLOR="#FFFFFF">
-msLoadMap(): Unable to access file. (/disks/data01/mapserver/wms/SEPTREFFUM/SEPTREFFUM.map) <=== Security issue on the mapserver!!!
-</BODY></HTML>
- */
+
//console.info(txt);
let capabilities = parser.read(txt);
let WMSLayers = capabilities.Capability.Layer.Layer;
document.getElementById("modelTitle").innerHTML = capabilities.Service.Title;
- document.getElementById("modelAbstract").innerHTML = capabilities.Service.Abstract.replaceAll("\n\n","XXX");
+ if(capabilities.Service.Abstract != undefined)
+ {
+ document.getElementById("modelAbstract").innerHTML = capabilities.Service.Abstract.replaceAll("\n\n","");
+ }
//console.info(capabilities);
// Analyze and organize layers
--
GitLab