From 91e787203b35bd3fcc9d4a197e6bc8ba78a64f41 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Wed, 23 Oct 2024 16:28:45 +0200 Subject: [PATCH] Tests - Add WFS external layer in the test project --- .../tests/external_wms_layer.qgs | 554 +++++++++++++----- .../tests/external_wms_layer.qgs.cfg | 77 ++- 2 files changed, 479 insertions(+), 152 deletions(-) diff --git a/tests/qgis-projects/tests/external_wms_layer.qgs b/tests/qgis-projects/tests/external_wms_layer.qgs index 449206a296..130d5f8d00 100644 --- a/tests/qgis-projects/tests/external_wms_layer.qgs +++ b/tests/qgis-projects/tests/external_wms_layer.qgs @@ -1,4 +1,4 @@ - + @@ -21,6 +21,18 @@ + + + + + + + + + + + - + @@ -67,11 +79,13 @@ défaut_7dd5aa41_b548_4c87_ac7d_106b30a87de2 OpenStreetMap_ac014497_16f3_48bb_9133_b374914e625a world_7121f8d0_2f6c_4f55_9a40_d1b2b1f55bf2 + polygons_62b88562_fea1_4528_a49e_687439cc018a + @@ -101,120 +115,15 @@ 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - degrees - - 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368 - 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368 - -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368 - -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368 - - 0 - - - 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 - - - 0 - - Annotations_2035c334_2452_4af4_be20_ea76c2b6df90 @@ -343,7 +227,7 @@ 85.05112877980660357 OpenStreetMap_ac014497_16f3_48bb_9133_b374914e625a - type=xyz&url=https://tile.openstreetmap.org/{z}/{x}/{y}.png&zmax=19&zmin=0 + crs=EPSG:3857&format&type=xyz&url=https://tile.openstreetmap.org/%7Bz%7D/%7Bx%7D/%7By%7D.png&zmax=19&zmin=0 OpenStreetMap_1 @@ -952,6 +836,389 @@ 0 + + + 518300 + 8593420 + 519000 + 8593920 + + + 45.16856701970435495 + -12.72363672523834133 + 45.17501801578399068 + -12.71911111191990074 + + polygons_62b88562_fea1_4528_a49e_687439cc018a + pagingEnabled='true' preferCoordinatesForWfsT11='false' restrictToRequestBBOX='1' srsname='EPSG:32738' typename='polygons' url='https://liz.lizmap.com/tests/index.php/lizmap/service?repository=testse2elwc&project=base_external_layers' url='https://liz.lizmap.com/tests/index.php/lizmap/service?repository=testse2elwc&project=base_external_layers&VERSION=1.3.0' version='auto' + polygons + + + + polygons + + + PROJCRS["WGS 84 / UTM zone 38S",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["UTM zone 38S",METHOD["Transverse Mercator",ID["EPSG",9807]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",45,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["Scale factor at natural origin",0.9996,SCALEUNIT["unity",1],ID["EPSG",8805]],PARAMETER["False easting",500000,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",10000000,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["(E)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["(N)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Navigation and medium accuracy spatial referencing."],AREA["Between 42°E and 48°E, southern hemisphere between 80°S and equator, onshore and offshore. Madagascar."],BBOX[-80,42,0,48]],ID["EPSG",32738]] + +proj=utm +zone=38 +south +datum=WGS84 +units=m +no_defs + 3188 + 32738 + EPSG:32738 + WGS 84 / UTM zone 38S + utm + EPSG:7030 + false + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + false + + + + + WFS + + + + + + + + + + + 1 + 1 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + 0 + generatedlayout + + + + + + "id" + + -180 @@ -2032,6 +2299,7 @@ + @@ -2208,7 +2476,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 @@ -2222,7 +2490,7 @@ - + @@ -2273,7 +2541,7 @@ - + diff --git a/tests/qgis-projects/tests/external_wms_layer.qgs.cfg b/tests/qgis-projects/tests/external_wms_layer.qgs.cfg index 7f4c76af93..09ffdbddb7 100644 --- a/tests/qgis-projects/tests/external_wms_layer.qgs.cfg +++ b/tests/qgis-projects/tests/external_wms_layer.qgs.cfg @@ -1,18 +1,16 @@ { "metadata": { - "qgis_desktop_version": 33406, - "lizmap_plugin_version_str": "4.3.8-alpha", - "lizmap_plugin_version": 40308, - "lizmap_web_client_target_version": 30800, - "lizmap_web_client_target_status": "Stable", + "qgis_desktop_version": 33411, + "lizmap_plugin_version_str": "4.4.4-alpha", + "lizmap_plugin_version": 40404, + "lizmap_web_client_target_version": 31000, + "lizmap_web_client_target_status": "Dev", "instance_target_url": "http://lizmap.local:8130/", "instance_target_repository": "testsrepository" }, - "warnings": { - "old_qgis_server_version": 1 - }, + "warnings": {}, "debug": { - "total_time": 0.575 + "total_time": 0.9430000000000001 }, "options": { "projection": { @@ -43,6 +41,7 @@ "pointTolerance": 25, "lineTolerance": 10, "polygonTolerance": 5, + "automatic_permalink": true, "tmTimeFrameSize": 10, "tmTimeFrameType": "seconds", "tmAnimationFrameLength": 1000, @@ -52,6 +51,66 @@ "dataviz_drag_drop": [] }, "layers": { + "WFS-liz-lizmap-com-tests": { + "id": "WFS-liz-lizmap-com-tests", + "name": "WFS-liz-lizmap-com-tests", + "type": "group", + "title": "WFS-liz-lizmap-com-tests", + "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", + "group_visibility": [], + "singleTile": "True", + "imageFormat": "image/png", + "cached": "False", + "clientCacheExpiration": 300 + }, + "polygons": { + "id": "polygons_62b88562_fea1_4528_a49e_687439cc018a", + "name": "polygons", + "type": "layer", + "geometryType": "polygon", + "extent": [ + 518300.0, + 8593420.0, + 519000.0, + 8593920.0 + ], + "crs": "EPSG:32738", + "title": "polygons", + "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": "False", + "displayInLegend": "True", + "group_visibility": [], + "singleTile": "True", + "imageFormat": "image/png", + "cached": "False", + "clientCacheExpiration": 300 + }, "liz-lizmap-com-tests": { "id": "liz-lizmap-com-tests", "name": "liz-lizmap-com-tests",