From 60a47c739d17672e0d0063a4b004f94def0c058c Mon Sep 17 00:00:00 2001 From: Suren Date: Tue, 30 Jan 2024 17:09:00 +0530 Subject: [PATCH 1/3] Update MS submodule to include Phase IV and #679 --- MapStore2 | 2 +- configs/config.json | 4 ++-- configs/localConfig.json | 26 ++++++++++++++++++++++++-- web/pom.xml | 2 +- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/MapStore2 b/MapStore2 index 7a3e2cd3a..43520f184 160000 --- a/MapStore2 +++ b/MapStore2 @@ -1 +1 @@ -Subproject commit 7a3e2cd3a04563f4be6cda1637a80de859f375a1 +Subproject commit 43520f184dd6fc950ea214bde5be711f24f4f335 diff --git a/configs/config.json b/configs/config.json index e66214586..821973304 100644 --- a/configs/config.json +++ b/configs/config.json @@ -1,11 +1,11 @@ { "map": { - "projection": "EPSG:3857", + "projection": "EPSG:900913", "units": "m", "center": { "x": 315445.640682, "y": 5971955.5, - "crs": "EPSG:3857" + "crs": "EPSG:900913" }, "zoom": 6, "maxExtent": [ diff --git a/configs/localConfig.json b/configs/localConfig.json index 29be156fc..0eff60c3d 100644 --- a/configs/localConfig.json +++ b/configs/localConfig.json @@ -370,7 +370,20 @@ } }, "Permalink", - "MetadataExplorer", + { + "name": "MetadataExplorer", + "cfg": { + "serviceTypes": [ + { "name": "csw", "label": "CSW" }, + { "name": "wms", "label": "WMS" }, + { "name": "wmts", "label": "WMTS" }, + { "name": "tms", "label": "TMS", "allowedProviders": ["OpenStreetMap", "OpenSeaMap", "Stamen"] }, + { "name": "wfs", "label": "WFS" }, + { "name": "3dtiles", "label": "3D Tiles" }, + { "name": "cog", "label": "COG" } + ] + } + }, "MapImport", "MapExport", "GlobeViewSwitcher" @@ -545,7 +558,16 @@ "name": "MetadataExplorer", "cfg": { "zoomToLayer": false, - "wrap": true + "wrap": true, + "serviceTypes": [ + { "name": "csw", "label": "CSW" }, + { "name": "wms", "label": "WMS" }, + { "name": "wmts", "label": "WMTS" }, + { "name": "tms", "label": "TMS", "allowedProviders": ["OpenStreetMap", "OpenSeaMap", "Stamen"] }, + { "name": "wfs", "label": "WFS" }, + { "name": "3dtiles", "label": "3D Tiles" }, + { "name": "cog", "label": "COG" } + ] } }, { "name": "MousePosition", diff --git a/web/pom.xml b/web/pom.xml index b05ad446e..a2d30fa1a 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -30,7 +30,7 @@ it.geosolutions.mapstore mapstore-services - 1.6.0 + 1.6.2 From 221083000327a2f88c2f1b9e3d654bcea8d5811f Mon Sep 17 00:00:00 2001 From: Suren Date: Wed, 31 Jan 2024 16:18:31 +0530 Subject: [PATCH 2/3] Revert config --- configs/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/config.json b/configs/config.json index 821973304..e66214586 100644 --- a/configs/config.json +++ b/configs/config.json @@ -1,11 +1,11 @@ { "map": { - "projection": "EPSG:900913", + "projection": "EPSG:3857", "units": "m", "center": { "x": 315445.640682, "y": 5971955.5, - "crs": "EPSG:900913" + "crs": "EPSG:3857" }, "zoom": 6, "maxExtent": [ From 6cb32495aa8a67059743702b27fea9ed63e51056 Mon Sep 17 00:00:00 2001 From: Suren Date: Thu, 1 Feb 2024 16:15:55 +0530 Subject: [PATCH 3/3] Update with fix #681 --- MapStore2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MapStore2 b/MapStore2 index 43520f184..1dfbf0844 160000 --- a/MapStore2 +++ b/MapStore2 @@ -1 +1 @@ -Subproject commit 43520f184dd6fc950ea214bde5be711f24f4f335 +Subproject commit 1dfbf08442bbe7445c35cda9f6da7aa1083e4cbd