Merge pull request #607 from Gustry/max-scale-geom

Two new scales when zooming : max scale for points or other geom
3liz · Oct 29, 2024 · 44a6c9c · 44a6c9c
2 parents f10da23 + 269b932
commit 44a6c9c
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 13 deletions.
diff --git a/lizmap/dialogs/main.py b/lizmap/dialogs/main.py
@@ -1017,6 +1017,7 @@ def setup_icons(self):
             self.group_local_layers,
             self.group_project_status,
             self.group_links,
+            self.group_box_max_scale_zoom,
         )
         for widget in q_group_box:
             widget.setStyleSheet(COMPLETE_STYLE_SHEET)

diff --git a/lizmap/lizmap_api/config.py b/lizmap/lizmap_api/config.py
@@ -55,6 +55,12 @@ def __init__(self, project, fix_json=False):
             'maxScale': {
                 'wType': 'text', 'type': 'integer', 'default': 1000000000
             },
+            'max_scale_points': {
+                'wType': 'scale', 'type': 'float', 'default': 5000.0
+            },
+            'max_scale_lines_polygons': {
+                'wType': 'scale', 'type': 'float', 'default': 5000.0
+            },
             'use_native_zoom_levels': {
                 'wType': 'checkbox', 'type': 'boolean', 'default': True,
                 'always_export': True, 'use_proper_boolean': True,
@@ -169,6 +175,7 @@ def __init__(self, project, fix_json=False):
                     ),
                 ],
             },
+            # Deprecated, it has been removed in LWC 3.8
             'zoomHistory': {
                 'wType': 'checkbox', 'type': 'boolean', 'default': False
             },

diff --git a/lizmap/plugin.py b/lizmap/plugin.py
@@ -456,6 +456,7 @@ def write_log_message(message, tag, level):
             self.dlg.automatic_permalink,
         ]
         self.lwc_versions[LwcVersions.Lizmap_3_9] = [
+            self.dlg.group_box_max_scale_zoom,
         ]
         self.lwc_versions[LwcVersions.Lizmap_3_10] = [
         ]
@@ -471,6 +472,8 @@ def write_log_message(message, tag, level):
         # self.global_options['mapScales']['widget'] = self.dlg.list_map_scales
         # self.global_options['minScale']['widget'] = self.dlg.minimum_scale
         # self.global_options['maxScale']['widget'] = self.dlg.maximum_scale
+        self.global_options['max_scale_points']['widget'] = self.dlg.max_scale_points
+        self.global_options['max_scale_lines_polygons']['widget'] = self.dlg.max_scale_lines_polygons
         self.global_options['hide_numeric_scale_value']['widget'] = self.dlg.hide_scale_value
         self.global_options['acl']['widget'] = self.dlg.inAcl
         self.global_options['initialExtent']['widget'] = self.dlg.widget_initial_extent
@@ -1861,6 +1864,16 @@ def read_cfg_file(self, skip_tables=False) -> dict:
                     if key in json_options:
                         item['widget'].setChecked(to_bool(json_options[key]))
 
+                if item['wType'] == 'scale':
+                    item['widget'].setShowCurrentScaleButton(True)
+                    item['widget'].setMapCanvas(self.iface.mapCanvas())
+                    item['widget'].setAllowNull(False)
+                    value = json_options.get(key)
+                    if value:
+                        item['widget'].setScale(value)
+                    else:
+                        item['widget'].setScale(item['default'])
+
                 if item['wType'] in ('text', 'textarea'):
                     if isinstance(item['default'], (list, tuple)):
                         item['widget'].setText(", ".join(map(str, item['default'])))
@@ -3719,6 +3732,12 @@ def project_config_file(
                 if item['wType'] == 'text':
                     input_value = item['widget'].text().strip(' \t')
 
+                if item['wType'] == 'scale':
+                    input_value = item['widget'].scale()
+                    if input_value == item['default']:
+                        # Only save if different from the default value
+                        continue
+
                 if item['wType'] == 'wysiwyg':
                     input_value = item['widget'].html_content().strip(' \t')
 

diff --git a/lizmap/resources/ui/ui_lizmap.ui b/lizmap/resources/ui/ui_lizmap.ui
@@ -1132,20 +1132,30 @@ QListWidget::item::selected {
                   <string>Scales</string>
                  </property>
                  <layout class="QGridLayout" name="gridLayout_3">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="label_17">
+                  <item row="2" column="0">
+                   <widget class="QCheckBox" name="use_native_scales">
                     <property name="text">
-                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Write down integer scales separated by comma. You must enter at least 2 min and max values.&lt;br/&gt;Ex: 1000, 250000&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     <string>Use native scales according to the project CRS (better display)</string>
                     </property>
                    </widget>
                   </item>
-                  <item row="2" column="0">
-                   <widget class="QCheckBox" name="use_native_scales">
+                  <item row="3" column="0">
+                   <widget class="QCheckBox" name="hide_scale_value">
                     <property name="text">
-                     <string>Use native scales according to the project CRS (better display)</string>
+                     <string>Hide numeric scale value</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="label_17">
+                    <property name="text">
+                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Write down integer scales separated by comma. You must enter at least 2 min and max values.&lt;br/&gt;Ex: 1000, 250000&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                     </property>
                    </widget>
                   </item>
+                  <item row="4" column="0">
+                   <widget class="WarningWidget" name="scales_warning" native="true"/>
+                  </item>
                   <item row="7" column="0">
                    <layout class="QFormLayout" name="formLayout_6">
                     <item row="0" column="1">
@@ -1236,14 +1246,41 @@ QListWidget::item::selected {
                     </property>
                    </widget>
                   </item>
-                  <item row="4" column="0">
-                   <widget class="WarningWidget" name="scales_warning" native="true"/>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QCheckBox" name="hide_scale_value">
-                    <property name="text">
-                     <string>Hide numeric scale value</string>
+                  <item row="8" column="0">
+                   <widget class="QGroupBox" name="group_box_max_scale_zoom">
+                    <property name="title">
+                     <string>Maximum scale when zooming on a feature</string>
                     </property>
+                    <layout class="QFormLayout" name="formLayout_9">
+                     <item row="0" column="0">
+                      <widget class="QLabel" name="label_max_scale_points">
+                       <property name="text">
+                        <string>Points</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="0" column="1">
+                      <widget class="QgsScaleWidget" name="max_scale_points">
+                       <property name="showCurrentScaleButton">
+                        <bool>true</bool>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="0">
+                      <widget class="QLabel" name="label_max_scale_polygons">
+                       <property name="text">
+                        <string>Lines/polygons</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="1">
+                      <widget class="QgsScaleWidget" name="max_scale_lines_polygons">
+                       <property name="showCurrentScaleButton">
+                        <bool>true</bool>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
                    </widget>
                   </item>
                  </layout>
@@ -5514,6 +5551,11 @@ This is different to the map maximum extent (defined in QGIS project properties,
    <extends>QComboBox</extends>
    <header>qgis.gui</header>
   </customwidget>
+  <customwidget>
+   <class>QgsScaleWidget</class>
+   <extends>QWidget</extends>
+   <header>qgis.gui</header>
+  </customwidget>
   <customwidget>
    <class>HtmlEditorWidget</class>
    <extends>QWidget</extends>

diff --git a/lizmap/test/test_ui.py b/lizmap/test/test_ui.py
@@ -198,6 +198,24 @@ def test_lizmap_layer_properties(self):
         self.assertIsNone(output['layers']['lines'].get('externalWmsToggle'))
         self.assertIsNone(output['layers']['lines'].get('metatileSize'))
 
+    def test_max_scale_lwc_3_7(self):
+        """ Test about maximum scale when zooming. """
+        lizmap = self._setup_empty_project(LwcVersions.Lizmap_3_6)
+
+        self.assertEqual(5000.0, lizmap.dlg.max_scale_points.scale())
+        self.assertEqual(5000.0, lizmap.dlg.max_scale_lines_polygons.scale())
+
+        # Max scale when zoomin
+        # Only points with a different value
+        lizmap.dlg.max_scale_points.setScale(1000.0)
+
+        # Check new values in the output config
+        output = lizmap.project_config_file(LwcVersions.latest(), check_server=False, ignore_error=True)
+
+        # Check scales in the CFG
+        self.assertEqual(1000.0, output['options']['max_scale_points'])
+        self.assertIsNone(output['options'].get('max_scale_lines_polygons'))
+
     def test_general_scales_properties_lwc_3_6(self):
         """ Test some UI settings about general properties with LWC 3.6. """
         lizmap = self._setup_empty_project(LwcVersions.Lizmap_3_6)