Merge pull request #667 from meyerlor/feature/dxf-export+access-control

Feature/dxf export+access control

Author: rldhont

lizmap/config/global_options.py

@@ -74,6 +74,8 @@ class GlobalOptionsDefinitions(TypedDict):
     atlasShowAtStartup: _Item
     atlasAutoPlay: _Item
     fixed_scale_overview_map: _Item
+    dxfExportEnabled: _Item
+    allowedGroups: _Item
 
 
 globalOptionDefinitions = {
@@ -252,4 +254,21 @@ class GlobalOptionsDefinitions(TypedDict):
         + tr("New in Lizmap Web Client 3.5.3"),
         "use_proper_boolean": True,
     },
+    "dxfExportEnabled": {
+        "wType": "checkbox",
+        "type": "boolean",
+        "default": False,
+        "tooltip": tr("Enable or disable the DXF export functionality globally."),
+        "use_proper_boolean": True,
+    },
+    "allowedGroups": {
+        "wType": "text",
+        "type": "string",
+        "default": "",
+        "tooltip": tr(
+            "Comma-separated list of Lizmap group IDs allowed to export DXF. "
+            "If empty, all users can export."
+        ),
+        "always_export": True,
+    },
 }

lizmap/definitions/definitions.py

@@ -46,7 +46,7 @@ def latest() -> "LwcVersions":
     @staticmethod
     def oldest() -> "LwcVersions":
         """ Oldest version definition in the Python file, like LWC 3.1 """
-        next(iter(LwcVersions))
+        return next(iter(LwcVersions))
 
     @classmethod
     def find(cls, version_string: str) -> Optional["LwcVersions"]:

lizmap/definitions/dxf_export.py

@@ -0,0 +1,57 @@
+"""Definitions for DXF export."""
+from lizmap.definitions.base import BaseDefinitions, InputType
+from lizmap.definitions.definitions import LwcVersions
+from lizmap.toolbelt.i18n import tr
+
+__copyright__ = 'Copyright 2025, 3Liz'
+__license__ = 'GPL version 3'
+__email__ = 'info@3liz.org'
+
+
+class DxfExportDefinitions(BaseDefinitions):
+
+    def __init__(self):
+        super().__init__()
+
+        # Layer-specific configuration
+        self._layer_config['layerId'] = {
+            'type': InputType.Layer,
+            'wfs_required': True,
+            'header': tr('Layer'),
+            'default': None,
+            'tooltip': tr('The vector layer for DXF export. Only WFS-enabled layers can be exported to DXF.')
+        }
+        self._layer_config['enabled'] = {
+            'type': InputType.CheckBox,
+            'header': tr('Enabled'),
+            'default': True,
+            'tooltip': tr('If the DXF export is enabled for this layer.'),
+            'version': LwcVersions.Lizmap_3_9,
+            'use_json': True,
+        }
+
+        # Global configuration
+        self._general_config['dxfExportEnabled'] = {
+            'type': InputType.CheckBox,
+            'header': tr('Allow DXF export'),
+            'default': False,
+            'tooltip': tr('Enable or disable the DXF export functionality globally.'),
+            'version': LwcVersions.Lizmap_3_9,
+        }
+        self._general_config['allowedGroups'] = {
+            'type': InputType.Text,
+            'header': tr('Allowed groups'),
+            'default': '',
+            'tooltip': tr('Comma-separated list of Lizmap group IDs allowed to export DXF. If empty, all users can export.'),
+            'version': LwcVersions.Lizmap_3_9,
+        }
+
+    @staticmethod
+    def primary_keys() -> tuple:
+        return ('layerId',)
+
+    def key(self) -> str:
+        return 'dxfExport'
+
+    def help_path(self) -> str:
+        return 'publish/lizmap_plugin/dxf_export.html'

lizmap/definitions/online_help.py

@@ -50,19 +50,20 @@ class Panels:
     AttributeTable = 4
     Editing = 5
     Layouts = 6
-    FormFiltering = 7
-    Dataviz = 8
-    FilteredLayers = 9
-    Actions = 10
-    TimeManager = 11
-    Atlas = 12
-    LocateByLayer = 13
-    ToolTip = 14
-    Checks = 15
-    AutoFix = 16
-    Settings = 17
-    Upload = 18
-    Training = 19
+    DxfExport = 7
+    FormFiltering = 8
+    Dataviz = 9
+    FilteredLayers = 10
+    Actions = 11
+    TimeManager = 12
+    Atlas = 13
+    LocateByLayer = 14
+    ToolTip = 15
+    Checks = 16
+    AutoFix = 17
+    Settings = 18
+    Upload = 19
+    Training = 20
 
 
 MAPPING_INDEX_DOC = {
@@ -86,6 +87,7 @@ class Panels:
     Panels.Settings: None,  # Settings
     Panels.Upload: None,
     Panels.Training: None,
+    Panels.DxfExport: 'publish/lizmap_plugin/dxf_export.html',
 }
 
 

lizmap/dialogs/main.py

@@ -954,6 +954,13 @@ def setup_icons(self):
         self.mOptionsListWidget.item(Panels.Layouts).setIcon(icon)
         self.mOptionsListWidget.item(Panels.Layouts).setData(Qt.ItemDataRole.UserRole, 'layouts')
 
+        # DXF Export
+        icon = QIcon()
+        icon.addFile(resources_path('icons', '19-dxfexport-white.png'), mode=QIcon.Mode.Normal)
+        icon.addFile(resources_path('icons', '19-dxfexport-dark.png'), mode=QIcon.Mode.Selected)
+        self.mOptionsListWidget.item(Panels.DxfExport).setIcon(icon)
+        self.mOptionsListWidget.item(Panels.DxfExport).setData(Qt.ItemDataRole.UserRole, 'dxf-export')
+
         # Filter data with form
         icon = QIcon()
         icon.addFile(resources_path('icons', 'filter-icon-white.png'), mode=QIcon.Mode.Normal)

lizmap/forms/dxf_export_edition.py

@@ -0,0 +1,62 @@
+"""Dialog for DXF export edition."""
+from typing import Dict, Optional
+
+from qgis.core import QgsMapLayerProxyModel
+from qgis.PyQt.QtWidgets import QWidget
+
+from lizmap.definitions.definitions import LwcVersions
+from lizmap.definitions.dxf_export import DxfExportDefinitions
+from lizmap.forms.base_edition_dialog import BaseEditionDialog
+from lizmap.toolbelt.i18n import tr
+from lizmap.toolbelt.resources import load_ui
+
+CLASS = load_ui('ui_form_dxf_export.ui')
+
+
+class DxfExportEditionDialog(BaseEditionDialog, CLASS):
+
+    def __init__(
+        self,
+        parent: Optional[QWidget] = None,
+        unicity: Optional[Dict[str, str]] = None,
+        lwc_version: Optional[LwcVersions] = None,
+    ):
+        super().__init__(parent, unicity, lwc_version)
+        self.setupUi(self)
+        self.config = DxfExportDefinitions()
+
+        # Layer configuration
+        self.config.add_layer_widget('layerId', self.layer)
+        self.config.add_layer_widget('enabled', self.enabled)
+
+        self.config.add_layer_label('layerId', self.label_layer)
+        self.config.add_layer_label('enabled', self.label_enabled)
+
+        # Set layer filter to only show vector layers
+        self.layer.setFilters(QgsMapLayerProxyModel.Filter.VectorLayer)
+        self.layer.layerChanged.connect(self.check_layer_wfs)
+
+        self.setup_ui()
+        self.check_layer_wfs()
+
+    def check_layer_wfs(self):
+        """When the layer has changed in the combobox, check if the layer is published as WFS."""
+        layer = self.layer.currentLayer()
+        if not layer:
+            self.show_error(tr('A layer is mandatory.'))
+            return
+
+        not_in_wfs = self.is_layer_in_wfs(layer)
+        self.show_error(not_in_wfs)
+
+    def validate(self) -> Optional[str]:
+        upstream = super().validate()
+        if upstream:
+            return upstream
+
+        layer = self.layer.currentLayer()
+        not_in_wfs = self.is_layer_in_wfs(layer)
+        if not_in_wfs:
+            return not_in_wfs
+
+        return None