Remove all mentions to OSM Stamen in the plugin

3liz · Jan 31, 2024 · 01ea092 · 01ea092
1 parent 30fdf80
commit 01ea092
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 35 deletions.
diff --git a/README.md b/README.md
@@ -180,7 +180,6 @@ if lv:
     my_global_options = {
         'mapScales': [1000, 2500, 5000, 10000, 25000, 50000, 100000, 250000], # set the map scales
         'osmMapnik': True, # add the OSM mapnik baselayer
-        'osmStamenToner': True, # add the OSM Stamen Toner baselayer
         'print': True # activate the print tool
     }
     my_layer_options = {

diff --git a/lizmap/lizmap_api/config.py b/lizmap/lizmap_api/config.py
@@ -90,9 +90,6 @@ def __init__(self, project, fix_json=False):
             'osmMapnik': {
                 'wType': 'checkbox', 'type': 'boolean', 'default': False
             },
-            'osmStamenToner': {
-                'wType': 'checkbox', 'type': 'boolean', 'default': False
-            },
             'openTopoMap': {
                 'wType': 'checkbox', 'type': 'boolean', 'default': False,
                 'use_proper_boolean': False,

diff --git a/lizmap/plugin.py b/lizmap/plugin.py
@@ -452,7 +452,6 @@ def write_log_message(message, tag, level):
         self.global_options['googleTerrain']['widget'] = self.dlg.cbGoogleTerrain
         self.global_options['googleStreets']['widget'] = self.dlg.cbGoogleStreets
         self.global_options['osmMapnik']['widget'] = self.dlg.cbOsmMapnik
-        self.global_options['osmStamenToner']['widget'] = self.dlg.cbOsmStamenToner
         self.global_options['openTopoMap']['widget'] = self.dlg.cb_open_topo_map
         self.global_options['bingKey']['widget'] = self.dlg.inBingKey
         self.global_options['bingStreets']['widget'] = self.dlg.cbBingStreets
@@ -493,14 +492,6 @@ def write_log_message(message, tag, level):
         self.global_options['atlasShowAtStartup']['widget'] = self.dlg.atlasShowAtStartup
         self.global_options['atlasAutoPlay']['widget'] = self.dlg.atlasAutoPlay
 
-        # Deprecated, it will be removed on October 31, 2023.
-        # https://stamen.com/faq
-        # https://stadiamaps.com/pricing/
-        self.dlg.cbOsmStamenToner.setEnabled(False)
-        self.dlg.cbOsmStamenToner.setToolTip(tr(
-            'This base-layer is now deprecated by Stamen, see https://stamen.com/faq how to migrate. The base layer '
-            'will be deactivated automatically when saving the Lizmap configuration file.'))
-
         self.layer_options_list = lizmap_config.layerOptionDefinitions
         # Add widget information
         self.layer_options_list['title']['widget'] = self.dlg.inLayerTitle
@@ -641,7 +632,6 @@ def write_log_message(message, tag, level):
 
         self.crs_3857_base_layers_list = {
             'osm-mapnik': self.dlg.cbOsmMapnik,
-            'osm-stamen-toner': self.dlg.cbOsmStamenToner,
             'opentopomap': self.dlg.cb_open_topo_map,
             'google-street': self.dlg.cbGoogleStreets,
             'google-satellite': self.dlg.cbGoogleSatellite,
@@ -4059,14 +4049,6 @@ def save_cfg_file(
             )
             return False
 
-        if self.dlg.cbOsmStamenToner.isChecked():
-            self.dlg.cbOsmStamenToner.setChecked(False)
-            self.dlg.log_panel.append(tr('Stamen tiles'), style=Html.H2)
-            self.dlg.log_panel.append(tr(
-                'This base-layer is now deprecated by Stamen, see https://stamen.com/faq how to migrate. The layer '
-                'has been automatically deactivated in the dialog.'
-            ))
-
         stop_process = tr("The CFG is not saved due to errors that must be fixed.")
 
         if not self.server_manager.check_admin_login_provided() and not self.is_dev_version:
@@ -4129,7 +4111,6 @@ def save_cfg_file(
         # Need to get these values to check for Pseudo Mercator projection
         mercator_layers = [
             self.dlg.cbOsmMapnik.isChecked(),
-            self.dlg.cbOsmStamenToner.isChecked(),
             self.dlg.cb_open_topo_map.isChecked(),
             self.dlg.cbGoogleStreets.isChecked(),
             self.dlg.cbGoogleSatellite.isChecked(),

diff --git a/lizmap/resources/ui/ui_lizmap.ui b/lizmap/resources/ui/ui_lizmap.ui
@@ -2490,16 +2490,6 @@ This is different to the map maximum extent (defined in QGIS project properties,
                       </property>
                      </widget>
                     </item>
-                    <item row="0" column="2">
-                     <widget class="QCheckBox" name="cbOsmStamenToner">
-                      <property name="styleSheet">
-                       <string notr="true"/>
-                      </property>
-                      <property name="text">
-                       <string>OSM Stamen Toner</string>
-                      </property>
-                     </widget>
-                    </item>
                     <item row="0" column="1">
                      <widget class="QCheckBox" name="cbOsmMapnik">
                       <property name="text">
@@ -2547,7 +2537,7 @@ This is different to the map maximum extent (defined in QGIS project properties,
                       </property>
                      </widget>
                     </item>
-                    <item row="0" column="3">
+                    <item row="0" column="2">
                      <widget class="QCheckBox" name="cb_open_topo_map">
                       <property name="text">
                        <string>OpenTopoMap</string>
@@ -5114,7 +5104,6 @@ This is different to the map maximum extent (defined in QGIS project properties,
   <tabstop>activate_first_map_theme</tabstop>
   <tabstop>scrollArea_3</tabstop>
   <tabstop>cbOsmMapnik</tabstop>
-  <tabstop>cbOsmStamenToner</tabstop>
   <tabstop>cbGoogleStreets</tabstop>
   <tabstop>cbGoogleSatellite</tabstop>
   <tabstop>cbGoogleHybrid</tabstop>