From 1fcbaff9f8ec8c730f3c420752026f83c64391ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 15:19:18 +0200 Subject: [PATCH] [Fixes #10204] restore mapstore catalog settings (#10205) (#10206) Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com> --- geonode/local_settings.py.geoserver.sample | 8 ++++++++ geonode/settings.py | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/geonode/local_settings.py.geoserver.sample b/geonode/local_settings.py.geoserver.sample index b1bafebe4ae..ce76fd213b4 100644 --- a/geonode/local_settings.py.geoserver.sample +++ b/geonode/local_settings.py.geoserver.sample @@ -315,6 +315,14 @@ if GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == 'mapstore': GEONODE_CATALOGUE_SERVICE = get_geonode_catalogue_service() + MAPSTORE_CATALOGUE_SERVICES = {} + + MAPSTORE_CATALOGUE_SELECTED_SERVICE = "" + + if GEONODE_CATALOGUE_SERVICE: + MAPSTORE_CATALOGUE_SERVICES[list(GEONODE_CATALOGUE_SERVICE.keys())[0]] = GEONODE_CATALOGUE_SERVICE[list(GEONODE_CATALOGUE_SERVICE.keys())[0]] + MAPSTORE_CATALOGUE_SELECTED_SERVICE = list(GEONODE_CATALOGUE_SERVICE.keys())[0] + DEFAULT_MS2_BACKGROUNDS = [ { "type": "tileprovider", diff --git a/geonode/settings.py b/geonode/settings.py index 4caac02f33d..0857e2e1824 100644 --- a/geonode/settings.py +++ b/geonode/settings.py @@ -1463,6 +1463,14 @@ def get_geonode_catalogue_service(): GEONODE_CATALOGUE_SERVICE = get_geonode_catalogue_service() + MAPSTORE_CATALOGUE_SERVICES = {} + + MAPSTORE_CATALOGUE_SELECTED_SERVICE = "" + + if GEONODE_CATALOGUE_SERVICE: + MAPSTORE_CATALOGUE_SERVICES[list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0]] = GEONODE_CATALOGUE_SERVICE[list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0]] # noqa + MAPSTORE_CATALOGUE_SELECTED_SERVICE = list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0] + DEFAULT_MS2_BACKGROUNDS = [ { "type": "osm",