Merge branch 'master' into ISSUE_10192

GeoNode · Oct 27, 2022 · da22773 · da22773
2 parents e731eb3 + d69e514
commit da22773
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git 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
@@ -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",