Change from 'nominatim' to 'geocoding'.

g3w-suite · Nov 29, 2023 · 9e86b36 · 9e86b36
1 parent 4530f18
commit 9e86b36
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/ci_scripts/setup_suite.sh b/ci_scripts/setup_suite.sh
@@ -65,8 +65,6 @@ if [ ! -e ${SETUP_DONE_FILE} ]; then
     echo "Installing fixtures ..."
     for FIXTURE in 'BaseLayer.json' 'G3WGeneralDataSuite.json' 'G3WMapControls.json' 'G3WSpatialRefSys.json'; do
         python3 manage.py loaddata  core/fixtures/${FIXTURE}
-        # With v3.7 nominatim mapcontrol canghed to geocoding
-        python3 manage.py dbshell -- -c  "UPDATE mapcontrol SET type = 'geocoding' WHERE type = 'nominatim'"
     done
     # sync menu tree items
     python3 manage.py sitetree_resync_apps

diff --git a/g3w-admin/client/tests/test_api.py b/g3w-admin/client/tests/test_api.py
@@ -133,7 +133,7 @@ def testGroupConfigApiView(self):
             'extent': [-180.0, -90.0, 180.0, 90.0]
         })
         print(resp["group"]["mapcontrols"])
-        self.assertEqual(resp["group"]["mapcontrols"], {'zoom': {}, 'zoombox': {}, 'zoomtoextent': {}, 'query': {}, 'querybbox': {}, 'querybypolygon': {}, 'overview': {}, 'scaleline': {}, 'geolocation': {}, 'streetview': {}, 'nominatim': {}, 'addlayers': {}, 'length': {}, 'area': {}, 'mouseposition': {}, 'scale': {}})
+        self.assertEqual(resp["group"]["mapcontrols"], {'zoom': {}, 'zoombox': {}, 'zoomtoextent': {}, 'query': {}, 'querybbox': {}, 'querybypolygon': {}, 'overview': {}, 'scaleline': {}, 'geolocation': {}, 'streetview': {}, 'geocoding': {}, 'addlayers': {}, 'length': {}, 'area': {}, 'mouseposition': {}, 'scale': {}})
         self.assertEqual(resp["group"]["header_logo_img"], "logo_img/qgis-logo.png")
         self.assertEqual(resp["group"]["name"], "Gruppo 1")
         self.assertIsNone(resp["group"]["header_logo_link"])

diff --git a/g3w-admin/core/fixtures/G3WMapControls.json b/g3w-admin/core/fixtures/G3WMapControls.json
@@ -94,7 +94,7 @@
    "pk": 11,
    "fields": {
       "order": 13,
-      "name": "nominatim",
+      "name": "geocoding",
       "description": ""
    }
 },