From 0972e35bbc044ea1e8f76305010cd9089cf04374 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Mon, 27 Nov 2023 14:41:42 +0100 Subject: [PATCH] Remove Stamen key from CFG file --- extra-modules/lizmapdemo/qgis-projects/demoqgis/events.qgs.cfg | 3 +-- .../lizmapdemo/qgis-projects/demoqgis/montpellier.qgs.cfg | 3 +-- tests/end2end/playwright/base-layers.spec.js | 2 +- tests/qgis-projects/tests/base_layers with space.qgs.cfg | 1 - tests/qgis-projects/tests/base_layers.qgs.cfg | 1 - tests/qgis-projects/tests/base_layers.withdot.qgs.cfg | 1 - tests/qgis-projects/tests/events.qgs.cfg | 3 +-- tests/qgis-projects/tests/overview-3857.qgs.cfg | 1 - 8 files changed, 4 insertions(+), 11 deletions(-) diff --git a/extra-modules/lizmapdemo/qgis-projects/demoqgis/events.qgs.cfg b/extra-modules/lizmapdemo/qgis-projects/demoqgis/events.qgs.cfg index 32790e9c94..53fed62e34 100644 --- a/extra-modules/lizmapdemo/qgis-projects/demoqgis/events.qgs.cfg +++ b/extra-modules/lizmapdemo/qgis-projects/demoqgis/events.qgs.cfg @@ -33,7 +33,6 @@ 5436768.563052116 ], "osmMapnik": "True", - "osmStamenToner": "True", "popupLocation": "right-dock", "pointTolerance": 25, "lineTolerance": 10, @@ -41,7 +40,7 @@ "tmTimeFrameSize": 10, "tmTimeFrameType": "seconds", "tmAnimationFrameLength": 1000, - "startupBaselayer": "osm-stamen-toner", + "startupBaselayer": "osm-mapnik", "datavizLocation": "dock", "theme": "light", "fixed_scale_overview_map": true diff --git a/extra-modules/lizmapdemo/qgis-projects/demoqgis/montpellier.qgs.cfg b/extra-modules/lizmapdemo/qgis-projects/demoqgis/montpellier.qgs.cfg index 0372b37f15..83c4f8601a 100644 --- a/extra-modules/lizmapdemo/qgis-projects/demoqgis/montpellier.qgs.cfg +++ b/extra-modules/lizmapdemo/qgis-projects/demoqgis/montpellier.qgs.cfg @@ -35,7 +35,6 @@ 5414844.99481 ], "osmMapnik": "True", - "osmStamenToner": "True", "hideGroupCheckbox": "True", "popupLocation": "dock", "print": "True", @@ -50,7 +49,7 @@ "tmTimeFrameType": "seconds", "tmAnimationFrameLength": 1000, "emptyBaselayer": "True", - "startupBaselayer": "osm-stamen-toner", + "startupBaselayer": "osm-mapnik", "datavizLocation": "bottomdock", "datavizTemplate": "
\n
\n
$0
\n
$2
\n
\n
\n
$1
\n
", "theme": "light", diff --git a/tests/end2end/playwright/base-layers.spec.js b/tests/end2end/playwright/base-layers.spec.js index 3e13fa8b90..4252acbfbd 100644 --- a/tests/end2end/playwright/base-layers.spec.js +++ b/tests/end2end/playwright/base-layers.spec.js @@ -11,7 +11,7 @@ test.describe('Base layers', () => { }); test('Base layers list', async ({ page }) => { - await expect(page.locator('lizmap-base-layers select option')).toHaveCount(12); + await expect(page.locator('lizmap-base-layers select option')).toHaveCount(11); await expect(page.locator('lizmap-base-layers select')).toHaveValue('osm-mapnik'); await page.locator('lizmap-base-layers select').selectOption('empty'); await expect(page.locator('lizmap-base-layers select')).toHaveValue('empty'); diff --git a/tests/qgis-projects/tests/base_layers with space.qgs.cfg b/tests/qgis-projects/tests/base_layers with space.qgs.cfg index e9d2b0314e..ae7866e97c 100644 --- a/tests/qgis-projects/tests/base_layers with space.qgs.cfg +++ b/tests/qgis-projects/tests/base_layers with space.qgs.cfg @@ -33,7 +33,6 @@ 5413731.378315685 ], "osmMapnik": "True", - "osmStamenToner": "True", "ignKey": "xncfzodr1xmo4ou5cf89qlyz", "ignStreets": "True", "ignSatellite": "True", diff --git a/tests/qgis-projects/tests/base_layers.qgs.cfg b/tests/qgis-projects/tests/base_layers.qgs.cfg index 4adf03b4ed..e2adda0469 100644 --- a/tests/qgis-projects/tests/base_layers.qgs.cfg +++ b/tests/qgis-projects/tests/base_layers.qgs.cfg @@ -41,7 +41,6 @@ 5413731.378315685 ], "osmMapnik": "True", - "osmStamenToner": "True", "openTopoMap": true, "bingKey": "AgBOKzHM1S17uF6szXY93vepXIx2Cl91mkrlP-yrsngz1jdREjrtucUduz56hDNT", "bingStreets": "True", diff --git a/tests/qgis-projects/tests/base_layers.withdot.qgs.cfg b/tests/qgis-projects/tests/base_layers.withdot.qgs.cfg index e9d2b0314e..ae7866e97c 100644 --- a/tests/qgis-projects/tests/base_layers.withdot.qgs.cfg +++ b/tests/qgis-projects/tests/base_layers.withdot.qgs.cfg @@ -33,7 +33,6 @@ 5413731.378315685 ], "osmMapnik": "True", - "osmStamenToner": "True", "ignKey": "xncfzodr1xmo4ou5cf89qlyz", "ignStreets": "True", "ignSatellite": "True", diff --git a/tests/qgis-projects/tests/events.qgs.cfg b/tests/qgis-projects/tests/events.qgs.cfg index 6e4c96aac6..f8749c9cf6 100644 --- a/tests/qgis-projects/tests/events.qgs.cfg +++ b/tests/qgis-projects/tests/events.qgs.cfg @@ -34,7 +34,6 @@ 5436768.563052116 ], "osmMapnik": "True", - "osmStamenToner": "True", "popupLocation": "right-dock", "pointTolerance": 25, "lineTolerance": 10, @@ -42,7 +41,7 @@ "tmTimeFrameSize": 10, "tmTimeFrameType": "seconds", "tmAnimationFrameLength": 1000, - "startupBaselayer": "osm-stamen-toner", + "startupBaselayer": "osm-mapnik", "datavizLocation": "right-dock", "theme": "light", "fixed_scale_overview_map": true diff --git a/tests/qgis-projects/tests/overview-3857.qgs.cfg b/tests/qgis-projects/tests/overview-3857.qgs.cfg index 41081f2262..615031c45d 100644 --- a/tests/qgis-projects/tests/overview-3857.qgs.cfg +++ b/tests/qgis-projects/tests/overview-3857.qgs.cfg @@ -39,7 +39,6 @@ 5413731.378315685 ], "osmMapnik": "True", - "osmStamenToner": "True", "ignKey": "xncfzodr1xmo4ou5cf89qlyz", "ignStreets": "True", "ignSatellite": "True",