Fixes: Search services are not saved GeoNode/geonode-mapstore-client#58

GeoNode · Sep 28, 2020 · 7ce4649 · 7ce4649
1 parent 4b88668
commit 7ce4649
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/mapstore2_adapter/plugins/geonode.py b/mapstore2_adapter/plugins/geonode.py
@@ -203,6 +203,9 @@ def convert(self, viewer, request):
                 if isinstance(ms2_map_data, string_types):
                     ms2_map_data = json.loads(ms2_map_data)
                 if 'map' in ms2_map_data:
+                    for _k, _v in ms2_map_data['map'].items():
+                        if _k not in data['map']:
+                            data['map'][_k] = ms2_map_data['map'][_k]
                     del ms2_map_data['map']
                 data.update(ms2_map_data)
             except Exception:

diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,8 @@
 django>=2.2.0,<4.0
 idna>=2.5,<2.11
 requests>=2.13.0
-Markdown==3.2.2
-MarkupSafe==1.1.1
-jsonfield==3.1.0
+Markdown>=3.2.2
+MarkupSafe>=1.1.1
+jsonfield>=3.1.0
 djangorestframework>=3.8.2
-urllib3==1.25.9
+urllib3>=1.25.9