From 1886fc3dde3e399a05a6c76a442a1ec5222008cb Mon Sep 17 00:00:00 2001 From: Nicolas Boisteault Date: Fri, 28 Jul 2023 14:38:01 +0200 Subject: [PATCH 1/4] Remove legacy OL2 baselayers code (#3812) Keep OL2 baselayer but hide it as there are still dependencies elsewhere in code --- assets/src/legacy/map.js | 46 +- tests/end2end/playwright/base-layers.spec.js | 2 +- tests/qgis-projects/tests/base_layers.qgs | 561 +++++++++++++++++- tests/qgis-projects/tests/base_layers.qgs.cfg | 40 +- 4 files changed, 599 insertions(+), 50 deletions(-) diff --git a/assets/src/legacy/map.js b/assets/src/legacy/map.js index edce851a16..f0587655b4 100644 --- a/assets/src/legacy/map.js +++ b/assets/src/legacy/map.js @@ -1819,10 +1819,8 @@ window.lizMap = function() { // get the baselayer select content // and adding baselayers to the map - var select = []; baselayers.reverse(); - for (var i=0,len=baselayers.length; i'+blConfig.title+''; - else - select += ''; - + map.baseLayer.setVisibility(false); } catch(e) { var qgisName = baselayer.name; if ( baselayer.name in cleanNameMap ) @@ -1847,37 +1837,7 @@ window.lizMap = function() { } } - if (baselayers.length!=0) { - // active the select element for baselayers - $('#switcher-baselayer-select').append(select); - $('#switcher-baselayer-select') - .change(function() { - var val = $(this).val(); - var blName = map.getLayersByName(val)[0]; - map.setBaseLayer( blName ); - - // Trigger event - lizMap.events.triggerEvent("lizmapbaselayerchanged", - { 'layer': blName} - ); - - $(this).blur(); - }); - // Hide switcher-baselayer if only one base layer inside - if (baselayers.length==1){ - $('#switcher-baselayer').hide(); - } - else if ( 'startupBaselayer' in config.options ) { - var startupBaselayer = config.options['startupBaselayer']; - if ( startupBaselayer in startupBaselayersReplacement ) - startupBaselayer = startupBaselayersReplacement[startupBaselayer]; - else if ( startupBaselayer in config.layers ) - startupBaselayer = cleanName(startupBaselayer); - - if ( $('#switcher-baselayer-select option[value="'+startupBaselayer+'"]').length != 0) - $('#switcher-baselayer-select').val(startupBaselayer).change(); - } - } else { + if (baselayers.length === 0) { // hide elements for baselayers map.addLayer(new OpenLayers.Layer.Vector('baselayer',{ maxExtent:map.maxExtent diff --git a/tests/end2end/playwright/base-layers.spec.js b/tests/end2end/playwright/base-layers.spec.js index 4252acbfbd..3e13fa8b90 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(11); + await expect(page.locator('lizmap-base-layers select option')).toHaveCount(12); 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.qgs b/tests/qgis-projects/tests/base_layers.qgs index c2e74b6f4a..a14403ecf5 100644 --- a/tests/qgis-projects/tests/base_layers.qgs +++ b/tests/qgis-projects/tests/base_layers.qgs @@ -1,4 +1,4 @@ - + @@ -26,13 +26,20 @@ + + + + + quartiers_c253f702_37b3_42f8_8e81_8458a742ec97 + quartiers_07141d42_3703_4726_9ff0_6afeb14b6bde + @@ -69,6 +76,11 @@ + + + @@ -123,6 +135,550 @@ + + + 3.80707036695971279 + 43.56670409545019851 + 3.94133068060567293 + 43.65337122449288643 + + + 3.80707036695971279 + 43.56670409545019851 + 3.94133068060567293 + 43.65337122449288643 + + quartiers_07141d42_3703_4726_9ff0_6afeb14b6bde + service='lizmapdb' sslmode=disable key='quartier' estimatedmetadata=true srid=4326 type=MultiPolygon checkPrimaryKeyUnicity='1' table="tests_projects"."quartiers" (geom) + quartiers_baselayer + + + + quartiers_baselayer + + + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + +proj=longlat +datum=WGS84 +no_defs + 3452 + 4326 + EPSG:4326 + WGS 84 + longlat + EPSG:7030 + true + + + + + + + dataset + + + + + + + + + + + + + + + + + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + +proj=longlat +datum=WGS84 +no_defs + 3452 + 4326 + EPSG:4326 + WGS 84 + longlat + EPSG:7030 + true + + + + + + + + + + + + + postgres + + + + + + + + + + + 1 + 1 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + # -*- coding: utf-8 -*- +""" +QGIS forms can have a Python function that is called when the form is +opened. + +Use this function to add extra logic to your forms. + +Enter the name of the function in the "Python Init function" +field. +An example follows: +""" +from qgis.PyQt.QtWidgets import QWidget + +def my_form_open(dialog, layer, feature): + geom = feature.geometry() + control = dialog.findChild(QWidget, "MyLineEdit") + + 0 + generatedlayout + + + + + + + + + + + + + + + + + + + + + + + + "quartmno" + + 3.80707036695971279 @@ -360,6 +916,7 @@ + @@ -529,7 +1086,7 @@ - + PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] +proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs diff --git a/tests/qgis-projects/tests/base_layers.qgs.cfg b/tests/qgis-projects/tests/base_layers.qgs.cfg index a0638ced20..4adf03b4ed 100644 --- a/tests/qgis-projects/tests/base_layers.qgs.cfg +++ b/tests/qgis-projects/tests/base_layers.qgs.cfg @@ -1,8 +1,8 @@ { "metadata": { "qgis_desktop_version": 32216, - "lizmap_plugin_version_str": "3.14.2-alpha", - "lizmap_plugin_version": 31402, + "lizmap_plugin_version_str": "3.15.2-alpha", + "lizmap_plugin_version": 31502, "lizmap_web_client_target_version": 30700, "lizmap_web_client_target_status": "Dev", "instance_target_url": "http://localhost:8130/", @@ -86,7 +86,6 @@ "maxScale": 1000000000000, "toggled": "False", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, @@ -100,7 +99,40 @@ "singleTile": "False", "imageFormat": "image/png; mode=8bit", "cached": "False", - "serverFrame": null, + "clientCacheExpiration": 300 + }, + "quartiers_baselayer": { + "id": "quartiers_07141d42_3703_4726_9ff0_6afeb14b6bde", + "name": "quartiers_baselayer", + "type": "layer", + "geometryType": "polygon", + "extent": [ + 3.807070366959713, + 43.5667040954502, + 3.941330680605673, + 43.653371224492886 + ], + "crs": "EPSG:4326", + "title": "quartiers_baselayer", + "abstract": "", + "link": "", + "minScale": 1, + "maxScale": 1000000000000, + "toggled": "False", + "popup": "False", + "popupSource": "auto", + "popupTemplate": "", + "popupMaxFeatures": 10, + "popupDisplayChildren": "False", + "popup_allow_download": true, + "legend_image_option": "hide_at_startup", + "groupAsLayer": "False", + "baseLayer": "True", + "displayInLegend": "True", + "group_visibility": [], + "singleTile": "True", + "imageFormat": "image/png", + "cached": "False", "clientCacheExpiration": 300 } }, From 0e8862d35b67ecd9c20bd0bfb2f589f3a0a4c746 Mon Sep 17 00:00:00 2001 From: nboisteault Date: Fri, 28 Jul 2023 14:38:40 +0200 Subject: [PATCH 2/4] Revert "Increase workers for Playwright in CI (#3806)" This reverts commit fd354cb6a03fb2805f7679b374c8762a2d057e79. --- tests/end2end/playwright.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/end2end/playwright.config.ts b/tests/end2end/playwright.config.ts index b4920370c5..331ae873b9 100644 --- a/tests/end2end/playwright.config.ts +++ b/tests/end2end/playwright.config.ts @@ -18,7 +18,7 @@ export default defineConfig({ /* Retry on CI only */ retries: process.env.CI ? 2 : 0, /* Opt out of parallel tests on CI. */ - workers: process.env.CI ? 2 : undefined, + workers: process.env.CI ? 1 : undefined, /* Reporter to use. See https://playwright.dev/docs/test-reporters */ reporter: 'html', /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ From beea07d667851710ce5c35f3b2087dbbbc4ba31e Mon Sep 17 00:00:00 2001 From: nboisteault Date: Thu, 27 Jul 2023 15:55:26 +0200 Subject: [PATCH 3/4] `overview` group name no more case sensitive --- assets/src/components/OverviewMap.js | 13 +- assets/src/index.js | 4 +- assets/src/legacy/map.js | 2 +- assets/src/modules/Lizmap.js | 4 - tests/qgis-projects/tests/overview-2154.qgs | 914 ++++++++--------- .../qgis-projects/tests/overview-2154.qgs.cfg | 44 +- tests/qgis-projects/tests/overview-3857.qgs | 919 +++++++++--------- .../qgis-projects/tests/overview-3857.qgs.cfg | 62 +- tests/qgis-projects/tests/overview-4326.qgs | 894 ++++++++--------- .../qgis-projects/tests/overview-4326.qgs.cfg | 46 +- 10 files changed, 1483 insertions(+), 1419 deletions(-) diff --git a/assets/src/components/OverviewMap.js b/assets/src/components/OverviewMap.js index 3b1a4f7df9..6377bebdd2 100644 --- a/assets/src/components/OverviewMap.js +++ b/assets/src/components/OverviewMap.js @@ -12,11 +12,20 @@ export default class OverviewMap extends HTMLElement { connectedCallback() { + let overviewInCfg = mainLizmap.state.layersAndGroupsCollection.groups + .find(group => group.name.toLowerCase() === 'overview' && group.level === 1); + + if (!overviewInCfg) { + return; + } + const overviewLayer = new ImageLayer({ source: new ImageWMS({ url: mainLizmap.serviceURL, - params: { 'LAYERS': 'Overview' }, - ratio: 1, + params: { + LAYERS: overviewInCfg.wmsName + }, + ratio: 1.1, serverType: 'qgis', }), }); diff --git a/assets/src/index.js b/assets/src/index.js index 582f351397..66186bba78 100644 --- a/assets/src/index.js +++ b/assets/src/index.js @@ -28,9 +28,7 @@ lizMap.events.on({ window.customElements.define('lizmap-scaleline', Scaleline); window.customElements.define('lizmap-mouse-position', MousePosition); window.customElements.define('lizmap-digitizing', Digitizing); - if(mainLizmap.hasOverview){ - window.customElements.define('lizmap-overviewmap', OverviewMap); - } + window.customElements.define('lizmap-overviewmap', OverviewMap); window.customElements.define('lizmap-feature-toolbar', FeatureToolbar); window.customElements.define('lizmap-reverse-geom', ReverseGeom); window.customElements.define('lizmap-paste-geom', PasteGeom); diff --git a/assets/src/legacy/map.js b/assets/src/legacy/map.js index f0587655b4..7b30e16bce 100644 --- a/assets/src/legacy/map.js +++ b/assets/src/legacy/map.js @@ -847,7 +847,7 @@ window.lizMap = function() { if ( qgisLayerName.toLowerCase() == 'hidden' ) continue; - if ( qgisLayerName == 'Overview' ) { + if ( qgisLayerName.toLowerCase() == 'overview' ) { config.options.hasOverview = true; continue; } diff --git a/assets/src/modules/Lizmap.js b/assets/src/modules/Lizmap.js index db097ec53f..858661e858 100644 --- a/assets/src/modules/Lizmap.js +++ b/assets/src/modules/Lizmap.js @@ -147,10 +147,6 @@ export default class Lizmap { return lizUrls.media + '?' + (new URLSearchParams(lizUrls.params).toString()); } - get hasOverview() { - return this._lizmap3.config.layers.hasOwnProperty('Overview'); - } - get center() { const center = this._lizmap3.map.getCenter(); return [center.lon, center.lat]; diff --git a/tests/qgis-projects/tests/overview-2154.qgs b/tests/qgis-projects/tests/overview-2154.qgs index 16c858af3d..850dfee620 100644 --- a/tests/qgis-projects/tests/overview-2154.qgs +++ b/tests/qgis-projects/tests/overview-2154.qgs @@ -1,18 +1,17 @@ - - - + + - - - + + + - PROJCRS["RGF93 / Lambert-93",BASEGEOGCRS["RGF93",DATUM["Reseau Geodesique Francais 1993",ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4171]],CONVERSION["Lambert-93",METHOD["Lambert Conic Conformal (2SP)",ID["EPSG",9802]],PARAMETER["Latitude of false origin",46.5,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8821]],PARAMETER["Longitude of false origin",3,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8822]],PARAMETER["Latitude of 1st standard parallel",49,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8823]],PARAMETER["Latitude of 2nd standard parallel",44,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8824]],PARAMETER["Easting at false origin",700000,LENGTHUNIT["metre",1],ID["EPSG",8826]],PARAMETER["Northing at false origin",6600000,LENGTHUNIT["metre",1],ID["EPSG",8827]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["unknown"],AREA["France"],BBOX[41.15,-9.86,51.56,10.38]],ID["EPSG",2154]] + PROJCRS["RGF93 v1 / Lambert-93",BASEGEOGCRS["RGF93 v1",DATUM["Reseau Geodesique Francais 1993 v1",ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4171]],CONVERSION["Lambert-93",METHOD["Lambert Conic Conformal (2SP)",ID["EPSG",9802]],PARAMETER["Latitude of false origin",46.5,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8821]],PARAMETER["Longitude of false origin",3,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8822]],PARAMETER["Latitude of 1st standard parallel",49,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8823]],PARAMETER["Latitude of 2nd standard parallel",44,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8824]],PARAMETER["Easting at false origin",700000,LENGTHUNIT["metre",1],ID["EPSG",8826]],PARAMETER["Northing at false origin",6600000,LENGTHUNIT["metre",1],ID["EPSG",8827]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Engineering survey, topographic mapping."],AREA["France - onshore and offshore, mainland and Corsica."],BBOX[41.15,-9.86,51.56,10.38]],ID["EPSG",2154]] +proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs 145 2154 EPSG:2154 - RGF93 / Lambert-93 + RGF93 v1 / Lambert-93 lcc EPSG:7019 false @@ -20,20 +19,22 @@ - - + - - + - + - + - @@ -42,15 +43,15 @@ quartiers_c6fea644_09fc_4f73_b4e8_201a2cc9f131 - + - - + + - - - + + + meters 764062.53160498512443155 @@ -61,38 +62,38 @@ 0 - PROJCRS["RGF93 / Lambert-93",BASEGEOGCRS["RGF93",DATUM["Reseau Geodesique Francais 1993",ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4171]],CONVERSION["Lambert-93",METHOD["Lambert Conic Conformal (2SP)",ID["EPSG",9802]],PARAMETER["Latitude of false origin",46.5,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8821]],PARAMETER["Longitude of false origin",3,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8822]],PARAMETER["Latitude of 1st standard parallel",49,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8823]],PARAMETER["Latitude of 2nd standard parallel",44,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8824]],PARAMETER["Easting at false origin",700000,LENGTHUNIT["metre",1],ID["EPSG",8826]],PARAMETER["Northing at false origin",6600000,LENGTHUNIT["metre",1],ID["EPSG",8827]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["unknown"],AREA["France"],BBOX[41.15,-9.86,51.56,10.38]],ID["EPSG",2154]] + PROJCRS["RGF93 v1 / Lambert-93",BASEGEOGCRS["RGF93 v1",DATUM["Reseau Geodesique Francais 1993 v1",ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4171]],CONVERSION["Lambert-93",METHOD["Lambert Conic Conformal (2SP)",ID["EPSG",9802]],PARAMETER["Latitude of false origin",46.5,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8821]],PARAMETER["Longitude of false origin",3,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8822]],PARAMETER["Latitude of 1st standard parallel",49,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8823]],PARAMETER["Latitude of 2nd standard parallel",44,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8824]],PARAMETER["Easting at false origin",700000,LENGTHUNIT["metre",1],ID["EPSG",8826]],PARAMETER["Northing at false origin",6600000,LENGTHUNIT["metre",1],ID["EPSG",8827]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Engineering survey, topographic mapping."],AREA["France - onshore and offshore, mainland and Corsica."],BBOX[41.15,-9.86,51.56,10.38]],ID["EPSG",2154]] +proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs 145 2154 EPSG:2154 - RGF93 / Lambert-93 + RGF93 v1 / Lambert-93 lcc EPSG:7019 false 0 - + - + - + - - + + - - - + + + Annotations_d1322743_072d_4574_a36c_fc1bb48f2b81 @@ -101,12 +102,12 @@ - PROJCRS["RGF93 / Lambert-93",BASEGEOGCRS["RGF93",DATUM["Reseau Geodesique Francais 1993",ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4171]],CONVERSION["Lambert-93",METHOD["Lambert Conic Conformal (2SP)",ID["EPSG",9802]],PARAMETER["Latitude of false origin",46.5,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8821]],PARAMETER["Longitude of false origin",3,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8822]],PARAMETER["Latitude of 1st standard parallel",49,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8823]],PARAMETER["Latitude of 2nd standard parallel",44,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8824]],PARAMETER["Easting at false origin",700000,LENGTHUNIT["metre",1],ID["EPSG",8826]],PARAMETER["Northing at false origin",6600000,LENGTHUNIT["metre",1],ID["EPSG",8827]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["unknown"],AREA["France"],BBOX[41.15,-9.86,51.56,10.38]],ID["EPSG",2154]] + PROJCRS["RGF93 v1 / Lambert-93",BASEGEOGCRS["RGF93 v1",DATUM["Reseau Geodesique Francais 1993 v1",ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4171]],CONVERSION["Lambert-93",METHOD["Lambert Conic Conformal (2SP)",ID["EPSG",9802]],PARAMETER["Latitude of false origin",46.5,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8821]],PARAMETER["Longitude of false origin",3,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8822]],PARAMETER["Latitude of 1st standard parallel",49,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8823]],PARAMETER["Latitude of 2nd standard parallel",44,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8824]],PARAMETER["Easting at false origin",700000,LENGTHUNIT["metre",1],ID["EPSG",8826]],PARAMETER["Northing at false origin",6600000,LENGTHUNIT["metre",1],ID["EPSG",8827]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Engineering survey, topographic mapping."],AREA["France - onshore and offshore, mainland and Corsica."],BBOX[41.15,-9.86,51.56,10.38]],ID["EPSG",2154]] +proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs 145 2154 EPSG:2154 - RGF93 / Lambert-93 + RGF93 v1 / Lambert-93 lcc EPSG:7019 false @@ -119,7 +120,7 @@ - + @@ -135,15 +136,15 @@ false - + - + 1 0 - + - + 3.80707036695971279 43.56670409545019851 @@ -158,13 +159,14 @@ quartiers_85875c04_220c_4cff_ad0d_f7e8c10aab4a service='lizmapdb' sslmode=disable key='quartier' estimatedmetadata=true srid=4326 type=MultiPolygon checkPrimaryKeyUnicity='1' table="tests_projects"."quartiers" (geom) + quartiers quartiers - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -191,12 +193,12 @@ - + - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -208,7 +210,7 @@ - + @@ -218,160 +220,160 @@ postgres - - - - + + + + - + - - + + 1 1 1 0 - + - + - + + + - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + 0 0 1 - - - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -379,116 +381,116 @@ - + + + - - + + + + - - + + - + - - + - - + - - + - - + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - + - - - + + - + - + 0 - # -*- coding: utf-8 -*- """ QGIS forms can have a Python function that is called when the form is opened. @@ -504,36 +506,36 @@ from qgis.PyQt.QtWidgets import QWidget def my_form_open(dialog, layer, feature): geom = feature.geometry() control = dialog.findChild(QWidget, "MyLineEdit") -]]> + 0 generatedlayout - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - + + "quartier" - + 3.80707036695971279 43.56670409545019851 @@ -555,7 +557,7 @@ def my_form_open(dialog, layer, feature): quartiers_overview - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -582,12 +584,12 @@ def my_form_open(dialog, layer, feature): - + - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -599,7 +601,7 @@ def my_form_open(dialog, layer, feature): - + @@ -609,160 +611,160 @@ def my_form_open(dialog, layer, feature): postgres - - - - + + + + - + - - + + 1 1 1 0 - + - + - + + + - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + 0 0 1 - - - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -770,116 +772,116 @@ def my_form_open(dialog, layer, feature): - + + + - - + + + + - - + + - + - - + - - + - - + - - + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - + - - - + + - + - + 0 - # -*- coding: utf-8 -*- """ QGIS forms can have a Python function that is called when the form is opened. @@ -895,39 +897,39 @@ from qgis.PyQt.QtWidgets import QWidget def my_form_open(dialog, layer, feature): geom = feature.geometry() control = dialog.findChild(QWidget, "MyLineEdit") -]]> + 0 generatedlayout - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - + + "quartier" - - + + @@ -990,21 +992,23 @@ def my_form_open(dialog, layer, feature): + lizmap_repository lizmap_user lizmap_user_groups + intranet - + - + - - - + + + None @@ -1035,45 +1039,45 @@ def my_form_open(dialog, layer, feature): 1 8 - + overview-2154 false - false - overview_map + true + overview_map_2154 0 false - - + + - - + + false - - + + false 5000 - - + + false + + - - + + @@ -1090,42 +1094,42 @@ def my_form_open(dialog, layer, feature): - + nboisteault 2022-04-04T16:35:57 - - - - - - + + + + + + - PROJCRS["RGF93 / Lambert-93",BASEGEOGCRS["RGF93",DATUM["Reseau Geodesique Francais 1993",ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4171]],CONVERSION["Lambert-93",METHOD["Lambert Conic Conformal (2SP)",ID["EPSG",9802]],PARAMETER["Latitude of false origin",46.5,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8821]],PARAMETER["Longitude of false origin",3,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8822]],PARAMETER["Latitude of 1st standard parallel",49,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8823]],PARAMETER["Latitude of 2nd standard parallel",44,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8824]],PARAMETER["Easting at false origin",700000,LENGTHUNIT["metre",1],ID["EPSG",8826]],PARAMETER["Northing at false origin",6600000,LENGTHUNIT["metre",1],ID["EPSG",8827]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["unknown"],AREA["France"],BBOX[41.15,-9.86,51.56,10.38]],ID["EPSG",2154]] + PROJCRS["RGF93 v1 / Lambert-93",BASEGEOGCRS["RGF93 v1",DATUM["Reseau Geodesique Francais 1993 v1",ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4171]],CONVERSION["Lambert-93",METHOD["Lambert Conic Conformal (2SP)",ID["EPSG",9802]],PARAMETER["Latitude of false origin",46.5,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8821]],PARAMETER["Longitude of false origin",3,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8822]],PARAMETER["Latitude of 1st standard parallel",49,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8823]],PARAMETER["Latitude of 2nd standard parallel",44,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8824]],PARAMETER["Easting at false origin",700000,LENGTHUNIT["metre",1],ID["EPSG",8826]],PARAMETER["Northing at false origin",6600000,LENGTHUNIT["metre",1],ID["EPSG",8827]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Engineering survey, topographic mapping."],AREA["France - onshore and offshore, mainland and Corsica."],BBOX[41.15,-9.86,51.56,10.38]],ID["EPSG",2154]] +proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs 145 2154 EPSG:2154 - RGF93 / Lambert-93 + RGF93 v1 / Lambert-93 lcc EPSG:7019 false - + + + + + + + + - + \ No newline at end of file diff --git a/tests/qgis-projects/tests/overview-2154.qgs.cfg b/tests/qgis-projects/tests/overview-2154.qgs.cfg index 51314d9c3f..2bbe8c2c69 100644 --- a/tests/qgis-projects/tests/overview-2154.qgs.cfg +++ b/tests/qgis-projects/tests/overview-2154.qgs.cfg @@ -1,11 +1,12 @@ { "metadata": { - "qgis_desktop_version": 32209, - "lizmap_plugin_version_str": "3.9.7", - "lizmap_plugin_version": 30907, - "lizmap_web_client_target_version": 30500, - "lizmap_web_client_target_status": "Stable", - "instance_target_url": "https://lizmap.aucame.fr/", + "qgis_desktop_version": 32216, + "lizmap_plugin_version_str": "3.15.2-alpha", + "lizmap_plugin_version": 31502, + "lizmap_web_client_target_version": 30700, + "lizmap_web_client_target_status": "Dev", + "instance_target_url": "http://localhost:8130/", + "instance_target_repository": "intranet", "project_valid": true }, "warnings": [], @@ -48,7 +49,8 @@ "tmAnimationFrameLength": 1000, "datavizLocation": "dock", "theme": "light", - "fixed_scale_overview_map": true + "fixed_scale_overview_map": true, + "dataviz_drag_drop": [] }, "layers": { "quartiers": { @@ -70,41 +72,38 @@ "maxScale": 1000000000000, "toggled": "False", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, "popupDisplayChildren": "False", "popup_allow_download": true, - "noLegendImage": "False", + "legend_image_option": "hide_at_startup", "groupAsLayer": "False", "baseLayer": "False", "displayInLegend": "True", "group_visibility": [], "singleTile": "True", - "imageFormat": "image/png", + "imageFormat": "image/png; mode=8bit", "cached": "False", - "serverFrame": null, "clientCacheExpiration": 300 }, - "Overview": { - "id": "Overview", - "name": "Overview", + "overview": { + "id": "overview", + "name": "overview", "type": "group", - "title": "Overview", + "title": "overview", "abstract": "", "link": "", "minScale": 1, "maxScale": 1000000000000, "toggled": "True", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, "popupDisplayChildren": "False", "popup_allow_download": true, - "noLegendImage": "False", + "legend_image_option": "hide_at_startup", "groupAsLayer": "False", "baseLayer": "False", "displayInLegend": "True", @@ -112,7 +111,6 @@ "singleTile": "True", "imageFormat": "image/png", "cached": "False", - "serverFrame": null, "clientCacheExpiration": 300 }, "quartiers_overview": { @@ -134,13 +132,12 @@ "maxScale": 1000000000000, "toggled": "False", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, "popupDisplayChildren": "False", "popup_allow_download": true, - "noLegendImage": "False", + "legend_image_option": "hide_at_startup", "groupAsLayer": "False", "baseLayer": "False", "displayInLegend": "True", @@ -148,7 +145,6 @@ "singleTile": "True", "imageFormat": "image/png", "cached": "False", - "serverFrame": null, "clientCacheExpiration": 300 } }, @@ -159,6 +155,12 @@ "attributeLayers": {}, "tooltipLayers": {}, "editionLayers": {}, + "layouts": { + "config": { + "default_popup_print": false + }, + "list": [] + }, "loginFilteredLayers": {}, "timemanagerLayers": {}, "datavizLayers": {}, diff --git a/tests/qgis-projects/tests/overview-3857.qgs b/tests/qgis-projects/tests/overview-3857.qgs index 83f7d21697..cc1e6950b8 100644 --- a/tests/qgis-projects/tests/overview-3857.qgs +++ b/tests/qgis-projects/tests/overview-3857.qgs @@ -1,13 +1,12 @@ - - - + + - - - + + + - PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["unknown"],AREA["World - 85°S to 85°N"],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] + PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] +proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs 3857 3857 @@ -20,32 +19,39 @@ - - + - - + - + - + + + + + + quartiers_c253f702_37b3_42f8_8e81_8458a742ec97 quartiers_8c8833fe_64df_4f42_81f8_7cc95b1b164f - + - - + + - - - + + + meters 411663.70288056740537286 @@ -56,7 +62,7 @@ 0 - PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["unknown"],AREA["World - 85°S to 85°N"],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] + PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] +proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs 3857 3857 @@ -68,24 +74,26 @@ 0 - + - + - - - - + + + + + + - - - + + + Annotations_23a1f26c_1934_499d_96e5_57b4a0f9a7b8 @@ -112,7 +120,7 @@ - + @@ -128,15 +136,15 @@ false - + - + 1 0 - + - + 3.80707036695971279 43.56670409545019851 @@ -151,13 +159,14 @@ quartiers_8c8833fe_64df_4f42_81f8_7cc95b1b164f service='lizmapdb' sslmode=disable key='quartier' estimatedmetadata=true srid=4326 type=MultiPolygon checkPrimaryKeyUnicity='1' table="tests_projects"."quartiers" (geom) + Overview - Overview + Overview-layer - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -184,12 +193,12 @@ - + - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -201,7 +210,7 @@ - + @@ -211,329 +220,330 @@ postgres - - - - + + + + - + 1 1 1 0 - + - - + + - + - + + + - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - + + - 0 0 1 - + - - + - - + + - + - - + - - + - - + - - + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - - + + - - + + - - - + + + 0 - - + + 0 generatedlayout - - - - - - - + + + + + + + 2 - + - - + + 1 1 1 0 - + - + - + + + - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + 0 0 1 - - - + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -541,116 +551,116 @@ - + + + - - + + + + - - + + - + - - + - - + - - + - - + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - + - - - + + - + - + 0 - # -*- coding: utf-8 -*- """ Les formulaires QGIS peuvent avoir une fonction Python qui est appelée lorsque le formulaire est ouvert. @@ -666,36 +676,36 @@ from qgis.PyQt.QtWidgets import QWidget def my_form_open(dialog, layer, feature): geom = feature.geometry() control = dialog.findChild(QWidget, "MyLineEdit") -]]> + 0 generatedlayout - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - + + "quartmno" - + 3.80707036695971279 43.56670409545019851 @@ -710,13 +720,14 @@ def my_form_open(dialog, layer, feature): quartiers_c253f702_37b3_42f8_8e81_8458a742ec97 service='lizmapdb' sslmode=disable key='quartier' estimatedmetadata=true srid=4326 type=MultiPolygon checkPrimaryKeyUnicity='1' table="tests_projects"."quartiers" (geom) + quartiers quartiers - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -734,12 +745,12 @@ def my_form_open(dialog, layer, feature): dataset - + - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -750,188 +761,188 @@ def my_form_open(dialog, layer, feature): true - + postgres - - - - + + + + - + - - + + 1 1 1 0 - + - + - + + + - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - + + - 0 0 1 - + - - + - - + + - + - - + - - + - - + - - + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - - + + - - + + - + - + 0 - + 0 generatedlayout - - - - - + + + + + - - + + @@ -961,7 +972,7 @@ def my_form_open(dialog, layer, feature): - WGS84 + NONE m2 @@ -988,26 +999,29 @@ def my_form_open(dialog, layer, feature): 2 MU + false 1 + lizmap_repository lizmap_user lizmap_user_groups + intranet - + - + - - - + + + None @@ -1027,6 +1041,7 @@ def my_form_open(dialog, layer, feature): 439120.56915665057022125 5413731.37831568531692028 + false conditions unknown 90 @@ -1035,45 +1050,45 @@ def my_form_open(dialog, layer, feature): 1 8 - + overview-3857 false true - overview + overview_map_3857 0 false - - + + - - + + false - - + + false 5000 - - + + false + + - - + + @@ -1090,18 +1105,18 @@ def my_form_open(dialog, layer, feature): - + nboisteault 2021-12-03T11:41:42 - - - - - - + + + + + + - PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["unknown"],AREA["World - 85°S to 85°N"],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] + PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] +proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs 3857 3857 @@ -1113,19 +1128,19 @@ def my_form_open(dialog, layer, feature): - + + + + + + + + - + \ No newline at end of file diff --git a/tests/qgis-projects/tests/overview-3857.qgs.cfg b/tests/qgis-projects/tests/overview-3857.qgs.cfg index 6fc9ca2e39..41081f2262 100644 --- a/tests/qgis-projects/tests/overview-3857.qgs.cfg +++ b/tests/qgis-projects/tests/overview-3857.qgs.cfg @@ -1,11 +1,12 @@ { "metadata": { - "qgis_desktop_version": 32209, - "lizmap_plugin_version_str": "3.9.7", - "lizmap_plugin_version": 30907, - "lizmap_web_client_target_version": 30500, - "lizmap_web_client_target_status": "Stable", - "instance_target_url": "https://lizmap.aucame.fr/", + "qgis_desktop_version": 32216, + "lizmap_plugin_version_str": "3.15.2-alpha", + "lizmap_plugin_version": 31502, + "lizmap_web_client_target_version": 30700, + "lizmap_web_client_target_status": "Dev", + "instance_target_url": "http://localhost:8130/", + "instance_target_repository": "intranet", "project_valid": true }, "warnings": [], @@ -55,7 +56,8 @@ "startupBaselayer": "ign-plan", "datavizLocation": "dock", "theme": "light", - "fixed_scale_overview_map": true + "fixed_scale_overview_map": true, + "dataviz_drag_drop": [] }, "layers": { "quartiers": { @@ -77,13 +79,38 @@ "maxScale": 1000000000000, "toggled": "False", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, "popupDisplayChildren": "False", "popup_allow_download": true, - "noLegendImage": "False", + "legend_image_option": "hide_at_startup", + "groupAsLayer": "False", + "baseLayer": "False", + "displayInLegend": "True", + "group_visibility": [], + "singleTile": "True", + "imageFormat": "image/png; mode=8bit", + "cached": "False", + "clientCacheExpiration": 300 + }, + "overview": { + "id": "overview", + "name": "overview", + "type": "group", + "title": "overview", + "abstract": "", + "link": "", + "minScale": 1, + "maxScale": 1000000000000, + "toggled": "True", + "popup": "False", + "popupSource": "auto", + "popupTemplate": "", + "popupMaxFeatures": 10, + "popupDisplayChildren": "False", + "popup_allow_download": true, + "legend_image_option": "hide_at_startup", "groupAsLayer": "False", "baseLayer": "False", "displayInLegend": "True", @@ -91,12 +118,11 @@ "singleTile": "True", "imageFormat": "image/png", "cached": "False", - "serverFrame": null, "clientCacheExpiration": 300 }, - "Overview": { + "Overview-layer": { "id": "quartiers_8c8833fe_64df_4f42_81f8_7cc95b1b164f", - "name": "Overview", + "name": "Overview-layer", "type": "layer", "geometryType": "polygon", "extent": [ @@ -110,20 +136,19 @@ "default", "d\u00e9faut" ], - "title": "Overview", + "title": "Overview-layer", "abstract": "", "link": "", "minScale": 1, "maxScale": 1000000000000, "toggled": "False", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, "popupDisplayChildren": "False", "popup_allow_download": true, - "noLegendImage": "False", + "legend_image_option": "hide_at_startup", "groupAsLayer": "False", "baseLayer": "False", "displayInLegend": "True", @@ -131,7 +156,6 @@ "singleTile": "True", "imageFormat": "image/png", "cached": "False", - "serverFrame": null, "clientCacheExpiration": 300 } }, @@ -142,6 +166,12 @@ "attributeLayers": {}, "tooltipLayers": {}, "editionLayers": {}, + "layouts": { + "config": { + "default_popup_print": false + }, + "list": [] + }, "loginFilteredLayers": {}, "timemanagerLayers": {}, "datavizLayers": {}, diff --git a/tests/qgis-projects/tests/overview-4326.qgs b/tests/qgis-projects/tests/overview-4326.qgs index 1c1d67f641..0027291ec4 100644 --- a/tests/qgis-projects/tests/overview-4326.qgs +++ b/tests/qgis-projects/tests/overview-4326.qgs @@ -1,13 +1,12 @@ - - - + + - - - + + + - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -20,20 +19,24 @@ - - + - - + - + + + - + - @@ -42,15 +45,15 @@ quartiers_c6fea644_09fc_4f73_b4e8_201a2cc9f131 - + - - + + - - - + + + degrees 3.80033339701863504 @@ -61,7 +64,7 @@ 0 - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -73,26 +76,26 @@ 0 - + - + - + - - + + - - - + + + Annotations_d1322743_072d_4574_a36c_fc1bb48f2b81 @@ -119,7 +122,7 @@ - + @@ -135,15 +138,15 @@ false - + - + 1 0 - + - + 3.80707036695971279 43.56670409545019851 @@ -158,13 +161,14 @@ quartiers_85875c04_220c_4cff_ad0d_f7e8c10aab4a service='lizmapdb' sslmode=disable key='quartier' estimatedmetadata=true srid=4326 type=MultiPolygon checkPrimaryKeyUnicity='1' table="tests_projects"."quartiers" (geom) + quartiers quartiers - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -191,12 +195,12 @@ - + - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -208,7 +212,7 @@ - + @@ -218,160 +222,160 @@ postgres - - - - + + + + - + - - + + 1 1 1 0 - + - + - + + + - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + 0 0 1 - - - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -379,116 +383,116 @@ - + + + - - + + + + - - + + - + - - + - - + - - + - - + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - + - - - + + - + - + 0 - # -*- coding: utf-8 -*- """ QGIS forms can have a Python function that is called when the form is opened. @@ -504,30 +508,30 @@ from qgis.PyQt.QtWidgets import QWidget def my_form_open(dialog, layer, feature): geom = feature.geometry() control = dialog.findChild(QWidget, "MyLineEdit") -]]> + 0 generatedlayout - - - - - + + + + + - - - - - + + + + + - - - + + + "quartier" - + 3.80707036695971279 43.56670409545019851 @@ -549,7 +553,7 @@ def my_form_open(dialog, layer, feature): quartiers_overview - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -576,12 +580,12 @@ def my_form_open(dialog, layer, feature): - + - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -593,7 +597,7 @@ def my_form_open(dialog, layer, feature): - + @@ -603,160 +607,160 @@ def my_form_open(dialog, layer, feature): postgres - - - - + + + + - + - - + + 1 1 1 0 - + - + - + + + - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + 0 0 1 - - - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -764,116 +768,116 @@ def my_form_open(dialog, layer, feature): - + + + - - + + + + - - + + - + - - + - - + - - + - - + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - + - - - + + - + - + 0 - # -*- coding: utf-8 -*- """ QGIS forms can have a Python function that is called when the form is opened. @@ -889,33 +893,33 @@ from qgis.PyQt.QtWidgets import QWidget def my_form_open(dialog, layer, feature): geom = feature.geometry() control = dialog.findChild(QWidget, "MyLineEdit") -]]> + 0 generatedlayout - - - - - + + + + + - - - - - + + + + + - - - + + + "quartier" - - + + @@ -945,7 +949,7 @@ def my_form_open(dialog, layer, feature): - WGS84 + NONE m2 @@ -972,26 +976,29 @@ def my_form_open(dialog, layer, feature): 2 MU + false 1 + lizmap_repository lizmap_user lizmap_user_groups + intranet - + - + - - - + + + None @@ -1008,6 +1015,7 @@ def my_form_open(dialog, layer, feature): 3.96733808301879298 43.70734251300326179 + false conditions unknown 90 @@ -1016,45 +1024,45 @@ def my_form_open(dialog, layer, feature): 1 8 - + overview-4326 false - false - overview_map + true + overview_map_4326 0 false - - + + - - + + false - - + + false 5000 - - + + false + + - - + + @@ -1071,18 +1079,18 @@ def my_form_open(dialog, layer, feature): - + nboisteault 2022-04-04T16:35:57 - - - - - - + + + + + + - GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 4326 @@ -1094,19 +1102,19 @@ def my_form_open(dialog, layer, feature): - + + + + + + + + - + \ No newline at end of file diff --git a/tests/qgis-projects/tests/overview-4326.qgs.cfg b/tests/qgis-projects/tests/overview-4326.qgs.cfg index 21d4de2ddf..cb6773e9d1 100644 --- a/tests/qgis-projects/tests/overview-4326.qgs.cfg +++ b/tests/qgis-projects/tests/overview-4326.qgs.cfg @@ -1,11 +1,12 @@ { "metadata": { - "qgis_desktop_version": 32209, - "lizmap_plugin_version_str": "3.9.7", - "lizmap_plugin_version": 30907, - "lizmap_web_client_target_version": 30500, - "lizmap_web_client_target_status": "Stable", - "instance_target_url": "https://lizmap.aucame.fr/", + "qgis_desktop_version": 32216, + "lizmap_plugin_version_str": "3.15.2-alpha", + "lizmap_plugin_version": 31502, + "lizmap_web_client_target_version": 30700, + "lizmap_web_client_target_status": "Dev", + "instance_target_url": "http://localhost:8130/", + "instance_target_repository": "intranet", "project_valid": true }, "warnings": [], @@ -48,7 +49,8 @@ "tmAnimationFrameLength": 1000, "datavizLocation": "dock", "theme": "light", - "fixed_scale_overview_map": true + "fixed_scale_overview_map": true, + "dataviz_drag_drop": [] }, "layers": { "quartiers": { @@ -70,41 +72,38 @@ "maxScale": 1000000000000, "toggled": "True", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, "popupDisplayChildren": "False", "popup_allow_download": true, - "noLegendImage": "False", + "legend_image_option": "hide_at_startup", "groupAsLayer": "False", "baseLayer": "False", "displayInLegend": "True", "group_visibility": [], "singleTile": "True", - "imageFormat": "image/png", + "imageFormat": "image/png; mode=8bit", "cached": "False", - "serverFrame": null, "clientCacheExpiration": 300 }, - "Overview": { - "id": "Overview", - "name": "Overview", + "overview": { + "id": "overview", + "name": "overview", "type": "group", - "title": "Overview", + "title": "overview", "abstract": "", "link": "", "minScale": 1, "maxScale": 1000000000000, - "toggled": "False", + "toggled": "True", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, "popupDisplayChildren": "False", "popup_allow_download": true, - "noLegendImage": "False", + "legend_image_option": "hide_at_startup", "groupAsLayer": "False", "baseLayer": "False", "displayInLegend": "True", @@ -112,7 +111,6 @@ "singleTile": "True", "imageFormat": "image/png", "cached": "False", - "serverFrame": null, "clientCacheExpiration": 300 }, "quartiers_overview": { @@ -134,13 +132,12 @@ "maxScale": 1000000000000, "toggled": "False", "popup": "False", - "popupFrame": null, "popupSource": "auto", "popupTemplate": "", "popupMaxFeatures": 10, "popupDisplayChildren": "False", "popup_allow_download": true, - "noLegendImage": "False", + "legend_image_option": "hide_at_startup", "groupAsLayer": "False", "baseLayer": "False", "displayInLegend": "True", @@ -148,7 +145,6 @@ "singleTile": "True", "imageFormat": "image/png", "cached": "False", - "serverFrame": null, "clientCacheExpiration": 300 } }, @@ -159,6 +155,12 @@ "attributeLayers": {}, "tooltipLayers": {}, "editionLayers": {}, + "layouts": { + "config": { + "default_popup_print": false + }, + "list": [] + }, "loginFilteredLayers": {}, "timemanagerLayers": {}, "datavizLayers": {}, From 0046f91d534dc2f6da9599082225e1b6817b4af5 Mon Sep 17 00:00:00 2001 From: nboisteault Date: Fri, 28 Jul 2023 16:01:49 +0200 Subject: [PATCH 4/4] e2e: overview w/ Playwright --- .../fixtures/images/overview/2154-to-3857.png | Bin 6855 -> 0 bytes .../cypress/fixtures/images/overview/2154.png | Bin 6950 -> 0 bytes .../cypress/fixtures/images/overview/3857.png | Bin 6152 -> 0 bytes .../fixtures/images/overview/4326-to-3857.png | Bin 7340 -> 0 bytes .../cypress/fixtures/images/overview/4326.png | Bin 8163 -> 0 bytes .../cypress/integration/overview-ghaction.js | 226 ------------------ tests/end2end/playwright/overview.spec.ts | 33 +++ .../qgis-projects/tests/overview-4326.qgs.cfg | 2 +- 8 files changed, 34 insertions(+), 227 deletions(-) delete mode 100644 tests/end2end/cypress/fixtures/images/overview/2154-to-3857.png delete mode 100644 tests/end2end/cypress/fixtures/images/overview/2154.png delete mode 100644 tests/end2end/cypress/fixtures/images/overview/3857.png delete mode 100644 tests/end2end/cypress/fixtures/images/overview/4326-to-3857.png delete mode 100644 tests/end2end/cypress/fixtures/images/overview/4326.png delete mode 100644 tests/end2end/cypress/integration/overview-ghaction.js create mode 100644 tests/end2end/playwright/overview.spec.ts diff --git a/tests/end2end/cypress/fixtures/images/overview/2154-to-3857.png b/tests/end2end/cypress/fixtures/images/overview/2154-to-3857.png deleted file mode 100644 index 869bac9d7632230959d3d949ec347da5dc53a83b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6855 zcmV;&8aU;NP)fJg1-M0?5e7$jHdZ$jEpJjHdKNv|6@o{P=0k~ zrP0%RWLl5xNNyr7E-w1w#fvpDJ$v2>ojZSQ`{L{NxbXOWAu46R+k%6CC@(MPJ*`p3 zd61_C_yYP7BR_=d>PcX=Iv}i_!?Jm6$IJg?cI^~ZOBXdDN*5V(az65;P8k`GV2Fzw zqaQF}Q&Va5eNq>8`oCp0;SB-}FS|%1&Q{X!2I0ED&P)GR6VoR(J32Z#&RzOtq(ko7 zwSvHy*mYuZO21H`b=7CjW?cLKs4iVnL9hS7{`xz?005v=0jSiCmL(1tq!QEmMX=df z69Pkm+tr*qx4p4+QBhHWK|w(&!J(legTljyS65cuGKY6NJ7&ThWy|HYoXlcNtXYT+Kdpkp8 zZwC_A?#iSp2fzqDrN5fe_uMPNWyv^++#)%_;K73xr>m-}8xCaqd0GnqfFga5gMDRb zj`_g8R8MR1Rj{W8+=`S|RLpWroZMzAAz{EE&hh5*WPNICzNfYLDn9Q>adC0UEzN`c z{O=?Q-L$UI<1AvY-i+;&HC^<{DW#E-k--TG32maa^c8$|j1(Iit0%$1pEB8I0E0hh+ms&x004x2YD+%d?w` z{i9P;kDCu3l)HOwpv`no+=)IVWjW|{kJw*%EmTZO24t}SlfE0+Pd~Qc($a$BqeoJ% zN}ratLrm_|4;xR`qjTpNs#e$9S9}sh;=6e25}HO70T>3f{gUbf6^h`jtSouggp2X1 z7AdA{*J*(9dyd&pEBOhJC@=qxYHNU7y0{Ke@_ccA{;DhUM90S7L*f&9+Lyhh0ss}V zSOArt3Tm@X1OUKXULHhHU0prPU@#OLjmBR+s>#doi3M4M!H^hei2Yd{I_zQF>MsMu z9=)!rKq$unvNSlb+0-*6AYf-zWo6~%{{`z~ezU#1q66ss|M-Drfrf^;_X3=R#Kr-H zgbo2w7#AW4nbp0JKR=mDNitf|r3o*Roz4pJo8b)rv!R{NS5*+hh(1{~P>y&e! z+6(}<0|4mb;^va^4~NhW9UITr#t{eI!HI+J;MldR)k?Ez008Xtv?g!Gt7q*DJ$k$- zju`#0^{Y)ccA_f~lt8H))VdB57mtab-#}06@MgT) zk-%cf!lz3wwIqw}c(OQ7^G9x56!Yz6#aW%9~nUj8{8SY;0^_3OEruMgmx^EzZv`T%u)6 zMh(=~xImrjVZYtTqwH$Z7@d{pFW%dD(x!%b#;wz^lhd*OHW!#MW}$dfN+2#tHWh zYxWwN=E1R|WyQw~v}^B5d6L8I{vFtj8>-Q%QyJ#pe;ej$J>HB@InrhH2?-WU=8?va zsx|_*>>mWQI_#J;*OjtdhI01ID)zv>@kXO@m#4LOD?ZueGfL%5<&uTf%}r0b^}slN zx5Jg1T!}DsdN2)ZztGbhla3S>6%~&f>XS(C#Ac-@aq-|-u&7ouepI8a5-KkT z<$}4``u<9+xobe1oS5LJ&hV#!fzNotc4TB^v%Ar^Dn98*I5_wv$Fv#2Ey*K{xj)GM z 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 BJ%a!M diff --git a/tests/end2end/cypress/fixtures/images/overview/2154.png b/tests/end2end/cypress/fixtures/images/overview/2154.png deleted file mode 100644 index 57c859d8a6e72599f2d5b69ff11e054df72e3a83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6950 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 diff --git a/tests/end2end/cypress/fixtures/images/overview/3857.png b/tests/end2end/cypress/fixtures/images/overview/3857.png deleted file mode 100644 index 503bcf5160faf561542a196fb1fc1a440f512d86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6152 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 Um_~|^p!NX@vZ^xwNtuTHALKUhz5oCK diff --git a/tests/end2end/cypress/fixtures/images/overview/4326-to-3857.png b/tests/end2end/cypress/fixtures/images/overview/4326-to-3857.png deleted file mode 100644 index 7c9335a8b3de9e9ece07e9a0774af95513cddfcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7340 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 S9w!|D0000u}x|WazN$KwH=9}-w+4(Wo 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 diff --git a/tests/end2end/cypress/integration/overview-ghaction.js b/tests/end2end/cypress/integration/overview-ghaction.js deleted file mode 100644 index c6159badf8..0000000000 --- a/tests/end2end/cypress/integration/overview-ghaction.js +++ /dev/null @@ -1,226 +0,0 @@ -import {arrayBufferToBase64} from '../support/function.js' - -describe('Overview', () => { - - it('3857', function () { - cy.intercept('*REQUEST=GetMap*LAYERS=Overview*', - { middleware: true }, - (req) => { - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - }).as('getMapOverview') - - cy.visit('/index.php/view/map/?repository=testsrepository&project=overview-3857') - - cy.wait('@getMapOverview').should(({ request, response }) => { - const responseBodyAsBase64 = arrayBufferToBase64(response.body) - - cy.fixture('images/overview/3857.png').then((image) => { - // image encoded as base64 - expect(image, 'expect overview 3857').to.equal(responseBodyAsBase64) - }) - }) - }) - - it('4326', function () { - cy.intercept('*REQUEST=GetMap*LAYERS=Overview*', - { middleware: true }, - (req) => { - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - }).as('getMapOverview') - - cy.visit('/index.php/view/map/?repository=testsrepository&project=overview-4326') - - cy.wait('@getMapOverview').should(({ request, response }) => { - const responseBodyAsBase64 = arrayBufferToBase64(response.body) - - cy.fixture('images/overview/4326.png').then((image) => { - // image encoded as base64 - expect(image, 'expect overview 4326').to.equal(responseBodyAsBase64) - }) - }) - }) - - it('2154', function () { - cy.intercept('*REQUEST=GetMap*LAYERS=Overview*', - { middleware: true }, - (req) => { - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - }).as('getMapOverview') - - cy.visit('/index.php/view/map/?repository=testsrepository&project=overview-2154') - - cy.wait('@getMapOverview').should(({ request, response }) => { - const responseBodyAsBase64 = arrayBufferToBase64(response.body) - - cy.fixture('images/overview/2154.png').then((image) => { - // image encoded as base64 - expect(image, 'expect overview 2154').to.equal(responseBodyAsBase64) - }) - }) - }) - - it('4326 to 3857', function () { - cy.intercept('/index.php/lizmap/service/getProjectConfig*', - { middleware: true }, - (req) => { - delete req.headers['if-none-match'] - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - req.continue((res) => { - //expect(res.body).to.include('options') - //res.body.options.ignStreets = 'True' - }) - req.on('response', (res) => { - expect(res).to.have.property('body') - expect(res.body).to.have.property('options') - res.body.options['ignStreets'] = 'True' - }) - }).as('getProjectConfig') - cy.intercept('*REQUEST=GetMap*LAYERS=Overview*', - { middleware: true }, - (req) => { - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - }).as('getMapOverview') - - cy.visit('/index.php/view/map/?repository=testsrepository&project=overview-4326') - - cy.wait('@getMapOverview').should(({ request, response }) => { - const responseBodyAsBase64 = arrayBufferToBase64(response.body) - - cy.fixture('images/overview/4326-to-3857.png').then((image) => { - // image encoded as base64 - expect(image, 'expect overview 4326 to 3857').to.equal(responseBodyAsBase64) - }) - }) - }) - - it('2154 to 3857', function () { - cy.intercept('/index.php/lizmap/service/getProjectConfig*', - { middleware: true }, - (req) => { - delete req.headers['if-none-match'] - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - req.continue((res) => { - //expect(res.body).to.include('options') - //res.body.options.ignStreets = 'True' - }) - req.on('response', (res) => { - expect(res).to.have.property('body') - expect(res.body).to.have.property('options') - res.body.options['ignStreets'] = 'True' - }) - }).as('getProjectConfig') - cy.intercept('*REQUEST=GetMap*LAYERS=Overview*', - { middleware: true }, - (req) => { - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - }).as('getMapOverview') - - cy.visit('/index.php/view/map/?repository=testsrepository&project=overview-2154') - - cy.wait('@getMapOverview').should(({ request, response }) => { - const responseBodyAsBase64 = arrayBufferToBase64(response.body) - - cy.fixture('images/overview/2154-to-3857.png').then((image) => { - // image encoded as base64 - expect(image, 'expect overview 2154 to 3857').to.equal(responseBodyAsBase64) - }) - }) - }) - - it('3857 overview with no fixed scale', function () { - cy.intercept('/index.php/lizmap/service/getProjectConfig*', - { middleware: true }, - (req) => { - delete req.headers['if-none-match'] - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - req.continue((res) => { - //expect(res.body).to.include('options') - //res.body.options.ignStreets = 'True' - }) - req.on('response', (res) => { - expect(res).to.have.property('body') - expect(res.body).to.have.property('options') - res.body.options['fixed_scale_overview_map'] = false - }) - }).as('getProjectConfig') - - cy.intercept('*REQUEST=GetMap*LAYERS=Overview*', - { middleware: true }, - (req) => { - req.on('before:response', (res) => { - // force all API responses to not be cached - // It is needed when launching tests multiple time in headed mode - res.headers['cache-control'] = 'no-store' - }) - }).as('getMapOverview') - - cy.visit('/index.php/view/map/?repository=testsrepository&project=overview-3857') - - cy.wait('@getMapOverview').should(({ request, response }) => { - const responseBodyAsBase64 = arrayBufferToBase64(response.body) - - cy.fixture('images/overview/3857.png').then((image) => { - // image encoded as base64 - expect(image, 'expect overview 3857').not.to.equal(responseBodyAsBase64) - }) - }) - - // Zoom twice to get new overview map - cy.get('#navbar button.btn.zoom-in').click() - cy.get('#navbar button.btn.zoom-in').click() - - cy.wait('@getMapOverview').should(({ request, response }) => { - const responseBodyAsBase64 = arrayBufferToBase64(response.body) - - cy.fixture('images/overview/3857.png').then((image) => { - // image encoded as base64 - expect(image, 'expect overview 3857').not.to.equal(responseBodyAsBase64) - }) - }) - - // Zoom twice to get new overview map - cy.get('#navbar button.btn.zoom-in').click() - cy.get('#navbar button.btn.zoom-in').click() - - cy.wait('@getMapOverview').should(({ request, response }) => { - const responseBodyAsBase64 = arrayBufferToBase64(response.body) - - cy.fixture('images/overview/3857.png').then((image) => { - // image encoded as base64 - expect(image, 'expect overview 3857').not.to.equal(responseBodyAsBase64) - }) - }) - }) -}) diff --git a/tests/end2end/playwright/overview.spec.ts b/tests/end2end/playwright/overview.spec.ts new file mode 100644 index 0000000000..7fc82376cf --- /dev/null +++ b/tests/end2end/playwright/overview.spec.ts @@ -0,0 +1,33 @@ +import { test, expect } from '@playwright/test'; + +test.describe('Overview', () => { + test('2154', async ({ page }) => { + const requestPromise = page.waitForRequest(/GetMap/); + + const url = '/index.php/view/map/?repository=testsrepository&project=overview-2154'; + await page.goto(url, { waitUntil: 'networkidle' }); + + const request = await requestPromise; + expect(request.url()).toBe('http://localhost:8130/index.php/lizmap/service?repository=testsrepository&project=overview-2154&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&LAYERS=Overview&CRS=EPSG%3A2154&STYLES=&WIDTH=231&HEIGHT=110&BBOX=758483.63%2C6273694.3%2C782170.37%2C6284973.7'); + }); + + test('4326', async ({ page }) => { + const requestPromise = page.waitForRequest(/GetMap/); + + const url = '/index.php/view/map/?repository=testsrepository&project=overview-4326'; + await page.goto(url, { waitUntil: 'networkidle' }); + + const request = await requestPromise; + expect(request.url()).toBe('http://localhost:8130/index.php/lizmap/service?repository=testsrepository&project=overview-4326&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&LAYERS=overview&CRS=EPSG%3A4326&STYLES=&WIDTH=231&HEIGHT=110&BBOX=43.55949198040038%2C3.765714500936302%2C43.65959251444461%2C3.9759256224291977'); + }); + + test('3857', async ({ page }) => { + const requestPromise = page.waitForRequest(/GetMap/); + + const url = '/index.php/view/map/?repository=testsrepository&project=overview-3857'; + await page.goto(url, { waitUntil: 'networkidle' }); + + const request = await requestPromise; + expect(request.url()).toBe('http://localhost:8130/index.php/lizmap/service?repository=testsrepository&project=overview-3857&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&LAYERS=Overview_1&CRS=EPSG%3A3857&STYLES=&WIDTH=231&HEIGHT=110&BBOX=411783.7006749792%2C5396012.897530658%2C450764.3584020709%2C5414575.115495941'); + }); +}); \ No newline at end of file diff --git a/tests/qgis-projects/tests/overview-4326.qgs.cfg b/tests/qgis-projects/tests/overview-4326.qgs.cfg index cb6773e9d1..51ec3b3c77 100644 --- a/tests/qgis-projects/tests/overview-4326.qgs.cfg +++ b/tests/qgis-projects/tests/overview-4326.qgs.cfg @@ -70,7 +70,7 @@ "link": "", "minScale": 1, "maxScale": 1000000000000, - "toggled": "True", + "toggled": "False", "popup": "False", "popupSource": "auto", "popupTemplate": "",