Merge pull request #354 from Terralego/add-measure-control-to-config

Add measure control to constance config
Terralego · Sep 12, 2023 · 2ca4601 · 2ca4601
2 parents e08bb84 + 241fcd7
commit 2ca4601
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/docs/source/others/changelog.rst b/docs/source/others/changelog.rst
@@ -3,6 +3,14 @@ Changelog
 ==========
 
 
+XXXX.X.X       (XXXX-XX-XX)
+---------------------------
+
+**New features:**
+
+- Add distance measurement map control (draw on the map and return the distance measured of the drawing)
+
+
 2023.8.3       (2023-08-29)
 ---------------------------
 

diff --git a/project/settings/__init__.py b/project/settings/__init__.py
@@ -255,6 +255,7 @@
         "django.forms.CharField",
         {"widget": "tinymce.widgets.TinyMCE", "required": False},
     ],
+    "json_field": ["django.forms.JSONField", {"required": False}],
 }
 CONSTANCE_CONFIG = {
     "INSTANCE_TITLE": ("TerraVisu", _("Instance title"), str),
@@ -289,6 +290,16 @@
         _("Content of info tab in frontend"),
         "tinymce_field",
     ),
+    "MEASURE_CONTROL": (
+        False,
+        _("Activate MapboxDraw Control to measure distance on the map"),
+        bool,
+    ),
+    "MEASURE_DRAW_STYLES": (
+        [],
+        _("Define custom MapboxDraw style for the distance measure control"),
+        "json_field",
+    ),
 }
 
 CONSTANCE_CONFIG_FIELDSETS = {
@@ -330,6 +341,8 @@
             "VIEW_ROOT_PATH",
             "OPENID_SSO_LOGIN_BUTTON_TEXT",
             "OPENID_DEFAULT_LOGIN_BUTTON_TEXT",
+            "MEASURE_CONTROL",
+            "MEASURE_DRAW_STYLES",
         ),
         "collapse": True,
     },

diff --git a/project/visu/api.py b/project/visu/api.py
@@ -144,6 +144,12 @@ def get(self, request, *args, **kwargs):
                 "user": user,
                 "token": token,
                 "ssoAuth": self.get_sso_auth_config(),
+                "frontendTools": {
+                    "measureControl": {
+                        "enable": config.MEASURE_CONTROL,
+                        "styles": config.MEASURE_DRAW_STYLES,
+                    },
+                },
             }
         )
 

diff --git a/project/visu/tests/test_api.py b/project/visu/tests/test_api.py
@@ -41,6 +41,12 @@ def test_default_values(self):
             {
                 "allowUserRegistration": False,
                 "credits": "Source: TerraVisu",
+                "frontendTools": {
+                    "measureControl": {
+                        "enable": False,
+                        "styles": [],
+                    },
+                },
                 "ssoAuth": {},
                 "extraMenuItems": [],
                 "favicon": "http://testserver/static_dj/img/favicon.ico",
@@ -80,6 +86,12 @@ def test_custom(self):
                 "allowUserRegistration": False,
                 "credits": "My Credits",
                 "extraMenuItems": [],
+                "frontendTools": {
+                    "measureControl": {
+                        "enable": False,
+                        "styles": [],
+                    },
+                },
                 "ssoAuth": {
                     "defaultButtonText": "Login via internal",
                     "loginUrl": "/api/auth/login/",