Add support for stand-alone GeoWebCache WMS and improve WMS admin robustness

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Core, Admin: Added support for stand-alone GeoWebCache WMS Server. Issue: [#1469](https://github.com/hajkmap/Hajk/issues/1469). PR: [#1493](https://github.com/hajkmap/Hajk/pull/1493)
 - Print/Anchor: It's now possible to generate qr codes in Share and Print [#1482](https://github.com/hajkmap/Hajk/issues/1482)
 - Sketch: It's now possible to disable stroke for polygons and circles [#1177](https://github.com/hajkmap/Hajk/issues/1177)
 - Backend: The new .NET 6 backend. Issue: [#1210](https://github.com/hajkmap/Hajk/issues/1210). PR: [#1395](https://github.com/hajkmap/Hajk/pull/1395)

new-admin/public/config.docker.json

@@ -10,6 +10,7 @@
     "url_wmtslayer_settings": "/api/v1/settings/wmtslayer",
     "url_arcgislayer_settings": "/api/v1/settings/arcgislayer",
     "url_vectorlayer_settings": "/api/v1/settings/vectorlayer",
+    "default_server_type": "geoserver",
     "url_default_server": "https://geoservertest.halmstad.se/geoserver/wms",
     "owner_options": [
       { "value": "SBK", "title": "SBK" },

new-admin/public/config.json

@@ -10,6 +10,7 @@
     "url_wmtslayer_settings": "http://localhost:3002/api/v1/settings/wmtslayer",
     "url_arcgislayer_settings": "http://localhost:3002/api/v1/settings/arcgislayer",
     "url_vectorlayer_settings": "http://localhost:3002/api/v1/settings/vectorlayer",
+    "default_server_type": "geoserver",
     "url_default_server": "https://geoservertest.halmstad.se/geoserver/wms",
     "owner_options": [
       { "value": "SBK", "title": "SBK" },

new-admin/public/config_example.json

@@ -10,6 +10,7 @@
     "url_wmtslayer_settings": "https://YOUR_DOMAIN.COM/mapservice/settings/wmtslayer",
     "url_arcgislayer_settings": "https://YOUR_DOMAIN.COM/mapservice/settings/arcgislayer",
     "url_vectorlayer_settings": "https://YOUR_DOMAIN.COM/mapservice/settings/vectorlayer",
+    "default_server_type": "geoserver",
     "url_default_server": "https://YOUR_MAP_SERVER.COM/geoserver/wms",
     "owner_options": [
       { "value": "SBK", "title": "SBK" },

new-admin/src/models/layermanager.js

@@ -5,6 +5,18 @@ import $ from "jquery";
 import { prepareProxyUrl } from "../utils/ProxyHelper";
 import { hfetch } from "utils/FetchWrapper";
 
+const WMS_VERSION_1_3_0 = "1.3.0";
+const WMS_VERSION_1_1_1 = "1.1.1";
+const WMS_VERSION_1_1_0 = "1.1.0";
+const WMS_VERSION_1_0_0 = "1.0.0";
+
+const defaultVersions = [
+  WMS_VERSION_1_3_0,
+  WMS_VERSION_1_1_1,
+  WMS_VERSION_1_1_0,
+  WMS_VERSION_1_0_0
+];
+
 var manager = Model.extend({
   defaults: {
     layers: [],
@@ -33,18 +45,18 @@ var manager = Model.extend({
           hfetch(url).then((res) => {
             // JSONify, filter just for one tool (layerswitcher), and then use first element (it's an array…)
             res.json().then((d) => {
-              let layerswitcherConfig = d.tools.filter(
+              let layerswitcherConfig = d.tools?.filter(
                 (tool) => tool.type === "layerswitcher"
               )[0];
 
               // Created washed object that contains map title, baselayers and groups with layers.
               // This will be used for filtering.
               let washed = {
                 mapFilename: data[i],
-                mapTitle: d.map.title,
+                mapTitle: d.map?.title,
                 layers: {
-                  baseLayers: layerswitcherConfig.options.baselayers,
-                  groups: layerswitcherConfig.options.groups,
+                  baseLayers: layerswitcherConfig?.options.baselayers,
+                  groups: layerswitcherConfig?.options.groups,
                 },
               };
 
@@ -89,23 +101,30 @@ var manager = Model.extend({
     $.ajax(prepareProxyUrl(url, this.get("config").url_proxy), {
       success: (data) => {
         var layers = [];
-        data.wmslayers.forEach((l) => {
-          l.type = "WMS";
-        });
-        data.wmtslayers.forEach((l) => {
-          l.type = "WMTS";
-        });
-        data.arcgislayers.forEach((l) => {
-          l.type = "ArcGIS";
-        });
-        data.vectorlayers.forEach((l) => {
-          l.type = "Vector";
-        });
-
-        layers = data.wmslayers
-          .concat(data.wmtslayers)
-          .concat(data.arcgislayers)
-          .concat(data.vectorlayers);
+        if (data && Array.isArray(data.wmslayers)) {
+          data.wmslayers.forEach((l) => {
+            l.type = "WMS";
+          });
+          layers = layers.concat(data.wmslayers);
+        }
+        if (data && Array.isArray(data.wmtslayers)) {
+          data.wmtslayers.forEach((l) => {
+            l.type = "WMTS";
+          });
+          layers = layers.concat(data.wmtslayers);
+        }
+        if (data && Array.isArray(data.arcgislayers)) {
+          data.arcgislayers.forEach((l) => {
+            l.type = "ArcGIS";
+          });
+          layers = layers.concat(data.arcgislayers);
+        }
+        if (data && Array.isArray(data.vectorlayers)) {
+          data.vectorlayers.forEach((l) => {
+            l.type = "Vector";
+          });
+          layers = layers.concat(data.vectorlayers);
+        }
 
         layers.sort((a, b) => {
           var d1 = parseInt(a.date, 10),
@@ -380,7 +399,7 @@ var manager = Model.extend({
     });
   },
 
-  getAllWMSCapabilities: function (url) {
+  getAllWMSCapabilities: function (url, versions = defaultVersions) {
     var promises = [];
 
     var xmlParser = new X2JS({
@@ -393,8 +412,6 @@ var manager = Model.extend({
       ],
     });
 
-    var versions = ["1.3.0", "1.1.1", "1.1.0", "1.0.0"];
-
     versions.forEach((version) => {
       promises.push(
         $.ajax(prepareProxyUrl(url, this.get("config").url_proxy), {
@@ -426,6 +443,10 @@ var manager = Model.extend({
           // WMS_Capabilities or WMT_MS_Capabilities
           // First key in JSON
           var capabilitiesKey = Object.keys(json)[0];
+          // A HTML document returned is an error but e.g. dev servers can return this on server found, erroneously with HTTP/200 OK
+          if (capabilitiesKey === "html") {
+            throw new Error("Server returns HTML instead of expected WMS GetCapabilities response, check contents for e.g. proxy errors");
+          }
 
           return json[capabilitiesKey];
         })
@@ -458,4 +479,4 @@ var manager = Model.extend({
   },
 });
 
-export default manager;
+export { manager as default, WMS_VERSION_1_0_0, WMS_VERSION_1_1_0, WMS_VERSION_1_1_1, WMS_VERSION_1_3_0 };