Add new baselayers, based on previous checkbox

3liz · Nov 23, 2023 · f7c63b4 · f7c63b4
1 parent 1efc2be
commit f7c63b4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/lizmap/plugin.py b/lizmap/plugin.py
@@ -570,7 +570,11 @@ def write_log_message(message, tag, level):
         self.dlg.add_group_empty.clicked.connect(self.add_group_empty)
         self.dlg.add_group_overview.clicked.connect(self.add_group_overview)
 
+        osm_icon = QIcon(resources_path('icons', 'osm-32-32.png'))
         self.dlg.button_osm_mapnik.clicked.connect(self.add_osm_mapnik)
+        self.dlg.button_osm_mapnik.setIcon(osm_icon)
+        self.dlg.button_osm_opentopomap.clicked.connect(self.add_osm_opentopomap)
+        self.dlg.button_osm_opentopomap.setIcon(osm_icon)
         self.dlg.button_ign_orthophoto.clicked.connect(
             partial(self.add_french_ign_layer, IgnLayers.IgnOrthophoto))
         self.dlg.button_ign_plan.clicked.connect(
@@ -2520,6 +2524,15 @@ def add_osm_mapnik(self):
             'https://openstreetmap.org',
             '© ' + tr('OpenStreetMap contributors'))
 
+    def add_osm_opentopomap(self):
+        """ Add the OSM OpenTopoMap base layer. """
+        source = 'type=xyz&zmin=0&zmax=18&url=https://tile.opentopomap.org/{z}/{x}/{y}.png'
+        self._add_base_layer(
+            source,
+            'OpenTopoMap',
+            'https://openstreetmap.org',
+            '© ' + tr('OpenStreetMap contributors') + ', SRTM, © OpenTopoMap (CC-BY-SA)')
+
     def add_french_ign_layer(self, layer: IgnLayer):
         """ Add some French IGN layers. """
         params = {

diff --git a/lizmap/resources/ui/ui_lizmap.ui b/lizmap/resources/ui/ui_lizmap.ui
@@ -2693,14 +2693,25 @@ This is different to the map maximum extent (defined in QGIS project properties,
                       </widget>
                      </item>
                      <item>
-                      <layout class="QHBoxLayout" name="horizontalLayout_34">
+                      <layout class="QHBoxLayout" name="horizontalLayout_51">
                        <item>
                         <widget class="QPushButton" name="button_osm_mapnik">
                          <property name="text">
                           <string>OpenStreetMap Mapnik</string>
                          </property>
                         </widget>
                        </item>
+                       <item>
+                        <widget class="QPushButton" name="button_osm_opentopomap">
+                         <property name="text">
+                          <string notr="true">OpenTopoMap</string>
+                         </property>
+                        </widget>
+                       </item>
+                      </layout>
+                     </item>
+                     <item>
+                      <layout class="QHBoxLayout" name="horizontalLayout_34">
                        <item>
                         <widget class="QPushButton" name="button_ign_orthophoto">
                          <property name="text">
@@ -2718,7 +2729,7 @@ This is different to the map maximum extent (defined in QGIS project properties,
                        <item>
                         <widget class="QPushButton" name="button_ign_cadastre">
                          <property name="text">
-                          <string>IGN Parcellaire</string>
+                          <string notr="true">IGN Parcellaire</string>
                          </property>
                         </widget>
                        </item>