From 01e75082d60be4f6f876016cc63dba2964d7de15 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Tue, 18 Aug 2020 09:34:40 +0200 Subject: [PATCH] Fix tests for travis env --- .../src/python/test_qgsserver_landingpage.py | 2 +- .../landingpage/test_landing_page_index.json | 802 +++++++++--------- .../test_project_Project1_Title.json | 2 +- .../test_project_Project2_Title.json | 2 +- .../test_project_Project3_Title.json | 2 +- ...ct_QGIS_Server_-_Grouped_Nested_Layer.json | 2 +- 6 files changed, 418 insertions(+), 394 deletions(-) diff --git a/tests/src/python/test_qgsserver_landingpage.py b/tests/src/python/test_qgsserver_landingpage.py index a986e563c873..fc927a727e4b 100644 --- a/tests/src/python/test_qgsserver_landingpage.py +++ b/tests/src/python/test_qgsserver_landingpage.py @@ -115,7 +115,7 @@ def compareProjects(self, actual, expected, expected_path): print("Reference file %s regenerated!" % expected_path.encode('utf8')) for title in expected_projects.keys(): - self.assertLinesEqual(json.dumps(actual_projects[title]), json.dumps(expected_projects[title]), expected_path.encode('utf8')) + self.assertLinesEqual(json.dumps(actual_projects[title], indent=4), json.dumps(expected_projects[title], indent=4), expected_path.encode('utf8')) def test_landing_page_json(self): """Test landing page in JSON format""" diff --git a/tests/testdata/qgis_server/landingpage/test_landing_page_index.json b/tests/testdata/qgis_server/landingpage/test_landing_page_index.json index 6e0c0c3b67e9..4c951c8b298b 100644 --- a/tests/testdata/qgis_server/landingpage/test_landing_page_index.json +++ b/tests/testdata/qgis_server/landingpage/test_landing_page_index.json @@ -35,11 +35,15 @@ Content-Type: application/json "owsServiceTitle": "Service Capabilities Title", "wcsLayerIds": [], "wcsServiceUrl": "", - "wfsLayerIds": [], + "wfsLayerIds": [ + "points_842425df_7f45_4091_a6c9_086e1dc1edd1" + ], "wfsServiceUrl": "", "wfstDeleteLayerIds": [], "wfstInsertLayerIds": [], - "wfstUpdateLayerIds": [], + "wfstUpdateLayerIds": [ + "points_842425df_7f45_4091_a6c9_086e1dc1edd1" + ], "wmsDefaultMapUnitsPerMm": 1.0, "wmsFeatureInfoAddWktGeometry": false, "wmsFeatureInfoDocumentElement": "", @@ -60,34 +64,38 @@ Content-Type: application/json "wmsMaxHeight": -1, "wmsMaxWidth": -1, "wmsOutputCrsList": [ - "EPSG:3857", - "EPSG:4326" + "EPSG:4326", + "EPSG:3857" ], "wmsRestrictedComposers": [], - "wmsRestrictedLayers": [ - "points restricted" - ], + "wmsRestrictedLayers": [], "wmsRootName": "ShortNameForRootLayer", "wmsServiceUrl": "", "wmsTileBuffer": 0, - "wmsUseLayerIds": true, + "wmsUseLayerIds": false, "wmtsServiceUrl": "" }, "crs": "EPSG:4326", "description": "Metadata abstract lorem ipsum...", "extent": [ - -25.49314196409667, - 41.98773931833632, - 38.23087034040887, - 55.95129087846767 + -1.1236584186554, + 43.239185333252, + 11.1218662261963, + 52.2622108459473 ], "geographic_extent": [ - -25.49314196409667, - 41.98773931833632, - 38.23087034040887, - 55.95129087846767 + -1.1236584186554, + 43.239185333252, + 11.1218662261963, + 52.2622108459473 + ], + "id": "1928dc5b256258863b109480732d6ccc", + "initial_extent": [ + -23.310879982571294, + 32.04119099639189, + 28.120323525805844, + 69.93789814971217 ], - "id": "3b4a3e5d9025926cb673805b914646fa", "metadata": { "abstract": "Metadata abstract lorem ipsum...", "author": "Alessandro Pasotti", @@ -134,28 +142,28 @@ Content-Type: application/json } ], "parentIdentifier": "ParentIdentifier00001", - "title": "Project3 Title", + "title": "Project1 Title", "type": "dataset" }, - "title": "Project3 Title", + "title": "Project1 Title", "toc": { "children": [ { "children": [], "expanded": true, "has_scale_based_visibility": false, - "id": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84", + "id": "points_842425df_7f45_4091_a6c9_086e1dc1edd1", "is_layer": true, "layer_type": "vector", - "name": "points_3857", + "name": "points", "queryable": true, "searchable": true, - "title": "points_3857", - "tree_id": "root.points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84", - "tree_id_hash": "dfb1cd2c3d157baaa2173aaf6c566340", - "typename": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84", + "title": "Qgis Server Layer Properties Title", + "tree_id": "root.points_842425df_7f45_4091_a6c9_086e1dc1edd1", + "tree_id_hash": "1c00afb810e8ab0e8edd209f0d198fc0", + "typename": "PointsLayerShortName", "visible": true, - "wfs_enabled": false + "wfs_enabled": true } ], "expanded": true, @@ -167,13 +175,13 @@ Content-Type: application/json "visible": true }, "wms_layers": { - "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84": { - "crs": "EPSG:3857", + "points_842425df_7f45_4091_a6c9_086e1dc1edd1": { + "crs": "EPSG:4326", "extent": [ - -212121.859375, - 5831559.5, - 1121598.5, - 7120824.0 + -1.1236584186554, + 43.239185333252, + 11.1218662261963, + 52.2622108459473 ], "fields": { "fid": { @@ -201,28 +209,79 @@ Content-Type: application/json "unique": false } }, - "id": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84", + "id": "points_842425df_7f45_4091_a6c9_086e1dc1edd1", "metadata": { - "abstract": "", - "categories": [], - "constraints": [], - "contacts": [], - "crs": "", + "abstract": "Layer Metadata Abstract", + "categories": [ + "Geoscientific Information", + "Imagery Base Maps Earth Cover" + ], + "constraints": [ + { + "constraint": "use if you like but not on sunday night", + "type": "use" + } + ], + "contacts": [ + { + "addresses": [ + { + "address": "street 1", + "administrativeArea": "Lombardy", + "city": "Milan", + "country": "Italy", + "postalCode": "10021", + "type": "postal" + } + ], + "email": "Layer Metadata Contact Email", + "fax": "Layer Metadata Contact Fax", + "name": "Layer Metadata Contact Name", + "organization": "Layer Metadata Contact Organization", + "position": "Layer Metadata Contact Position", + "role": "distributor", + "voice": "Layer Metadata Contact Voice" + } + ], + "crs": "EPSG:4326", "encoding": "", - "fees": "", - "history": [], - "identifier": "", - "keywordVocabularies": [], - "keywords": {}, - "language": "", - "licenses": [], - "links": [], - "parentIdentifier": "", - "rights": [], - "title": "", + "fees": "None", + "history": [ + "Once upon a time ..." + ], + "identifier": "IdentifierForLayer", + "keywordVocabularies": [ + "gmd:topicCategory" + ], + "keywords": { + "gmd:topicCategory": [ + "Geoscientific Information", + "Imagery Base Maps Earth Cover" + ] + }, + "language": "ITA", + "licenses": [ + "Creative Commons Attribution 4.0" + ], + "links": [ + { + "description": "An interesting link", + "format": "HTML", + "mimeType": "text/html", + "name": "A link", + "size": "unknown", + "type": "https", + "url": "https://www.itopen.it" + } + ], + "parentIdentifier": "ParentIdentifierForLayer", + "rights": [ + "All rights reversed" + ], + "title": "Layer Metadata Title", "type": "dataset" }, - "name": "points_3857", + "name": "points", "pk": [ 0 ], @@ -230,16 +289,16 @@ Content-Type: application/json } }, "wms_layers_map": { - "points_3857": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84" + "Qgis Server Layer Properties Title": "PointsLayerShortName" }, "wms_layers_queryable": [ - "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84" + "points_842425df_7f45_4091_a6c9_086e1dc1edd1" ], "wms_layers_searchable": [ - "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84" + "points_842425df_7f45_4091_a6c9_086e1dc1edd1" ], "wms_layers_typename_id_map": { - "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84" + "PointsLayerShortName": "points_842425df_7f45_4091_a6c9_086e1dc1edd1" }, "wms_root_name": "ShortNameForRootLayer" }, @@ -314,7 +373,13 @@ Content-Type: application/json 38.23087034040887, 55.95129087846767 ], - "id": "471b5bb5dbe79f72149529f700d948a3", + "id": "841cac3a81f3c122c10dc5e3be19dbf6", + "initial_extent": [ + -4.550318430316912, + 41.98773931833632, + 17.28804680662911, + 55.95129087846767 + ], "metadata": { "abstract": "Metadata abstract lorem ipsum...", "author": "Alessandro Pasotti", @@ -361,10 +426,10 @@ Content-Type: application/json } ], "parentIdentifier": "ParentIdentifier00001", - "title": "Project2 Title", + "title": "Project3 Title", "type": "dataset" }, - "title": "Project2 Title", + "title": "Project3 Title", "toc": { "children": [ { @@ -472,47 +537,30 @@ Content-Type: application/json }, { "capabilities": { - "owsServiceAbstract": "", + "owsServiceAbstract": "Service Capabilities Abstract Lorem Ipsum ...", "owsServiceAccessConstraints": "None", - "owsServiceCapabilities": false, - "owsServiceContactMail": "", - "owsServiceContactOrganization": "", - "owsServiceContactPerson": "", - "owsServiceContactPhone": "", - "owsServiceContactPosition": "", - "owsServiceFees": "conditions unknown", - "owsServiceKeywords": [], - "owsServiceOnlineResource": "", - "owsServiceTitle": "", + "owsServiceCapabilities": true, + "owsServiceContactMail": "Service Capabilities Email", + "owsServiceContactOrganization": "Service Capabilities Organization", + "owsServiceContactPerson": "Service Capabilities Person", + "owsServiceContactPhone": "Service Capabilities Phone", + "owsServiceContactPosition": "custodian", + "owsServiceFees": "no conditions apply", + "owsServiceKeywords": [ + "Service Capabilities Keyword1", + "Service Capabilities Keyword2" + ], + "owsServiceOnlineResource": "Service Capabilities Oline Resource", + "owsServiceTitle": "Service Capabilities Title", "wcsLayerIds": [], "wcsServiceUrl": "", - "wfsLayerIds": [ - "as_areas_bbe3c71b_356c_49f5_9fc2_ae771bcdd467", - "as_symbols_3a1cdeef_9082_4d07_be5c_47c956bd7e76", - "cdb_labels_8ee74af8_e7ba_4d80_9e0d_5b0b956d3daf", - "cdb_lines_3f5c3c6d_db6d_4681_9291_7109f8d69f8b" - ], + "wfsLayerIds": [], "wfsServiceUrl": "", - "wfstDeleteLayerIds": [ - "as_areas_bbe3c71b_356c_49f5_9fc2_ae771bcdd467", - "as_symbols_3a1cdeef_9082_4d07_be5c_47c956bd7e76", - "cdb_labels_8ee74af8_e7ba_4d80_9e0d_5b0b956d3daf", - "cdb_lines_3f5c3c6d_db6d_4681_9291_7109f8d69f8b" - ], - "wfstInsertLayerIds": [ - "as_areas_bbe3c71b_356c_49f5_9fc2_ae771bcdd467", - "as_symbols_3a1cdeef_9082_4d07_be5c_47c956bd7e76", - "cdb_labels_8ee74af8_e7ba_4d80_9e0d_5b0b956d3daf", - "cdb_lines_3f5c3c6d_db6d_4681_9291_7109f8d69f8b" - ], - "wfstUpdateLayerIds": [ - "as_areas_bbe3c71b_356c_49f5_9fc2_ae771bcdd467", - "as_symbols_3a1cdeef_9082_4d07_be5c_47c956bd7e76", - "cdb_labels_8ee74af8_e7ba_4d80_9e0d_5b0b956d3daf", - "cdb_lines_3f5c3c6d_db6d_4681_9291_7109f8d69f8b" - ], + "wfstDeleteLayerIds": [], + "wfstInsertLayerIds": [], + "wfstUpdateLayerIds": [], "wmsDefaultMapUnitsPerMm": 1.0, - "wmsFeatureInfoAddWktGeometry": true, + "wmsFeatureInfoAddWktGeometry": false, "wmsFeatureInfoDocumentElement": "", "wmsFeatureInfoDocumentElementNs": "", "wmsFeatureInfoLayerAliasMap": {}, @@ -531,33 +579,289 @@ Content-Type: application/json "wmsMaxHeight": -1, "wmsMaxWidth": -1, "wmsOutputCrsList": [ - "EPSG:25832", - "EPSG:4326", - "EPSG:3857" + "EPSG:3857", + "EPSG:4326" ], "wmsRestrictedComposers": [], - "wmsRestrictedLayers": [], - "wmsRootName": "", + "wmsRestrictedLayers": [ + "points restricted" + ], + "wmsRootName": "ShortNameForRootLayer", "wmsServiceUrl": "", "wmsTileBuffer": 0, - "wmsUseLayerIds": false, + "wmsUseLayerIds": true, "wmtsServiceUrl": "" }, "crs": "EPSG:4326", - "description": "", + "description": "Metadata abstract lorem ipsum...", "extent": [ - 10.638291712484028, - 52.3189157285489, - 10.910092015289333, - 52.49310455554394 + -25.49314196409667, + 41.98773931833632, + 38.23087034040887, + 55.95129087846767 ], "geographic_extent": [ - 10.638291712484028, - 52.3189157285489, - 10.910092015289333, - 52.49310455554394 + -25.49314196409667, + 41.98773931833632, + 38.23087034040887, + 55.95129087846767 + ], + "id": "cbbf3fcb3fc7fbe823cc6c0c5dd744c1", + "initial_extent": [ + -4.550318430316912, + 41.98773931833632, + 17.28804680662911, + 55.95129087846767 + ], + "metadata": { + "abstract": "Metadata abstract lorem ipsum...", + "author": "Alessandro Pasotti", + "categories": [ + "Boundaries", + "Farming" + ], + "contacts": [ + { + "addresses": [ + { + "address": "a street", + "administrativeArea": "Admin area", + "city": "Nodebo", + "country": "Denmark", + "postalCode": "11222", + "type": "postal" + } + ], + "email": "Metadata Contact Email", + "fax": "Metadata Contact Fax (really?)", + "name": "Metadata Contact Name", + "organization": "Metadata Contact Organization", + "position": "Metadata Contact Position", + "role": "custodian", + "voice": "Metadata Contact Voice" + } + ], + "creationDateTime": "2020-04-24T14:59:45", + "history": [ + "History1" + ], + "identifier": "Identifier00001", + "language": "ITA", + "links": [ + { + "description": "A link", + "format": "WTF", + "mimeType": "application/octet-stream", + "name": "link1", + "size": "big", + "type": "OpenSearch1.1:Description", + "url": "http://url.com" + } + ], + "parentIdentifier": "ParentIdentifier00001", + "title": "Project2 Title", + "type": "dataset" + }, + "title": "Project2 Title", + "toc": { + "children": [ + { + "children": [], + "expanded": true, + "has_scale_based_visibility": false, + "id": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84", + "is_layer": true, + "layer_type": "vector", + "name": "points_3857", + "queryable": true, + "searchable": true, + "title": "points_3857", + "tree_id": "root.points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84", + "tree_id_hash": "dfb1cd2c3d157baaa2173aaf6c566340", + "typename": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84", + "visible": true, + "wfs_enabled": false + } + ], + "expanded": true, + "is_layer": false, + "name": "root", + "title": "root", + "tree_id": "root", + "tree_id_hash": "63a9f0ea7bb98050796b649e85481845", + "visible": true + }, + "wms_layers": { + "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84": { + "crs": "EPSG:3857", + "extent": [ + -212121.859375, + 5831559.5, + 1121598.5, + 7120824.0 + ], + "fields": { + "fid": { + "default": "Autogenerate", + "editable": false, + "expression": "", + "has_expression": false, + "label": "fid", + "length": 0, + "not_null": true, + "precision": 0, + "type": "Integer64", + "unique": true + }, + "name": { + "default": "", + "editable": true, + "expression": "", + "has_expression": false, + "label": "name", + "length": 0, + "not_null": false, + "precision": 0, + "type": "String", + "unique": false + } + }, + "id": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84", + "metadata": { + "abstract": "", + "categories": [], + "constraints": [], + "contacts": [], + "crs": "", + "encoding": "", + "fees": "", + "history": [], + "identifier": "", + "keywordVocabularies": [], + "keywords": {}, + "language": "", + "licenses": [], + "links": [], + "parentIdentifier": "", + "rights": [], + "title": "", + "type": "dataset" + }, + "name": "points_3857", + "pk": [ + 0 + ], + "type": "vector" + } + }, + "wms_layers_map": { + "points_3857": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84" + }, + "wms_layers_queryable": [ + "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84" + ], + "wms_layers_searchable": [ + "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84" + ], + "wms_layers_typename_id_map": { + "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84": "points_3857_6c1395a0_1065_41f7_9cf4_8109e268ac84" + }, + "wms_root_name": "ShortNameForRootLayer" + }, + { + "capabilities": { + "owsServiceAbstract": "", + "owsServiceAccessConstraints": "None", + "owsServiceCapabilities": false, + "owsServiceContactMail": "", + "owsServiceContactOrganization": "", + "owsServiceContactPerson": "", + "owsServiceContactPhone": "", + "owsServiceContactPosition": "", + "owsServiceFees": "conditions unknown", + "owsServiceKeywords": [], + "owsServiceOnlineResource": "", + "owsServiceTitle": "", + "wcsLayerIds": [], + "wcsServiceUrl": "", + "wfsLayerIds": [ + "as_areas_bbe3c71b_356c_49f5_9fc2_ae771bcdd467", + "as_symbols_3a1cdeef_9082_4d07_be5c_47c956bd7e76", + "cdb_labels_8ee74af8_e7ba_4d80_9e0d_5b0b956d3daf", + "cdb_lines_3f5c3c6d_db6d_4681_9291_7109f8d69f8b" + ], + "wfsServiceUrl": "", + "wfstDeleteLayerIds": [ + "as_areas_bbe3c71b_356c_49f5_9fc2_ae771bcdd467", + "as_symbols_3a1cdeef_9082_4d07_be5c_47c956bd7e76", + "cdb_labels_8ee74af8_e7ba_4d80_9e0d_5b0b956d3daf", + "cdb_lines_3f5c3c6d_db6d_4681_9291_7109f8d69f8b" + ], + "wfstInsertLayerIds": [ + "as_areas_bbe3c71b_356c_49f5_9fc2_ae771bcdd467", + "as_symbols_3a1cdeef_9082_4d07_be5c_47c956bd7e76", + "cdb_labels_8ee74af8_e7ba_4d80_9e0d_5b0b956d3daf", + "cdb_lines_3f5c3c6d_db6d_4681_9291_7109f8d69f8b" + ], + "wfstUpdateLayerIds": [ + "as_areas_bbe3c71b_356c_49f5_9fc2_ae771bcdd467", + "as_symbols_3a1cdeef_9082_4d07_be5c_47c956bd7e76", + "cdb_labels_8ee74af8_e7ba_4d80_9e0d_5b0b956d3daf", + "cdb_lines_3f5c3c6d_db6d_4681_9291_7109f8d69f8b" + ], + "wmsDefaultMapUnitsPerMm": 1.0, + "wmsFeatureInfoAddWktGeometry": true, + "wmsFeatureInfoDocumentElement": "", + "wmsFeatureInfoDocumentElementNs": "", + "wmsFeatureInfoLayerAliasMap": {}, + "wmsFeatureInfoPrecision": 8, + "wmsFeatureInfoSchema": "", + "wmsFeatureInfoSegmentizeWktGeometry": false, + "wmsImageQuality": 90, + "wmsInfoFormatSia2045": false, + "wmsInspireActivate": false, + "wmsInspireLanguage": "", + "wmsInspireMetadataDate": "", + "wmsInspireMetadataUrl": "", + "wmsInspireMetadataUrlType": "", + "wmsInspireTemporalReference": "", + "wmsMaxAtlasFeatures": 1, + "wmsMaxHeight": -1, + "wmsMaxWidth": -1, + "wmsOutputCrsList": [ + "EPSG:25832", + "EPSG:4326", + "EPSG:3857" + ], + "wmsRestrictedComposers": [], + "wmsRestrictedLayers": [], + "wmsRootName": "", + "wmsServiceUrl": "", + "wmsTileBuffer": 0, + "wmsUseLayerIds": false, + "wmtsServiceUrl": "" + }, + "crs": "EPSG:4326", + "description": "", + "extent": [ + 10.638291712484028, + 52.3189157285489, + 10.910092015289333, + 52.49310455554394 + ], + "geographic_extent": [ + 10.638291712484028, + 52.3189157285489, + 10.910092015289333, + 52.49310455554394 + ], + "id": "e5a6ae4fd29b15cc4f96997aabddfc2c", + "initial_extent": [ + 10.727170893991817, + 52.37605728414485, + 10.87181360592575, + 52.467415956752426 ], - "id": "9124ec69db7f0687f760504aa10e3362", "metadata": { "abstract": "", "author": "Burghardt Scholle", @@ -3125,286 +3429,6 @@ Content-Type: application/json "osm": "osm_85c8eb94_b6fa_437b_b91a_7816ef2e2243" }, "wms_root_name": "QGIS Server - Grouped Nested Layer" - }, - { - "capabilities": { - "owsServiceAbstract": "Service Capabilities Abstract Lorem Ipsum ...", - "owsServiceAccessConstraints": "None", - "owsServiceCapabilities": true, - "owsServiceContactMail": "Service Capabilities Email", - "owsServiceContactOrganization": "Service Capabilities Organization", - "owsServiceContactPerson": "Service Capabilities Person", - "owsServiceContactPhone": "Service Capabilities Phone", - "owsServiceContactPosition": "custodian", - "owsServiceFees": "no conditions apply", - "owsServiceKeywords": [ - "Service Capabilities Keyword1", - "Service Capabilities Keyword2" - ], - "owsServiceOnlineResource": "Service Capabilities Oline Resource", - "owsServiceTitle": "Service Capabilities Title", - "wcsLayerIds": [], - "wcsServiceUrl": "", - "wfsLayerIds": [ - "points_842425df_7f45_4091_a6c9_086e1dc1edd1" - ], - "wfsServiceUrl": "", - "wfstDeleteLayerIds": [], - "wfstInsertLayerIds": [], - "wfstUpdateLayerIds": [ - "points_842425df_7f45_4091_a6c9_086e1dc1edd1" - ], - "wmsDefaultMapUnitsPerMm": 1.0, - "wmsFeatureInfoAddWktGeometry": false, - "wmsFeatureInfoDocumentElement": "", - "wmsFeatureInfoDocumentElementNs": "", - "wmsFeatureInfoLayerAliasMap": {}, - "wmsFeatureInfoPrecision": 8, - "wmsFeatureInfoSchema": "", - "wmsFeatureInfoSegmentizeWktGeometry": false, - "wmsImageQuality": 90, - "wmsInfoFormatSia2045": false, - "wmsInspireActivate": false, - "wmsInspireLanguage": "", - "wmsInspireMetadataDate": "", - "wmsInspireMetadataUrl": "", - "wmsInspireMetadataUrlType": "", - "wmsInspireTemporalReference": "", - "wmsMaxAtlasFeatures": 1, - "wmsMaxHeight": -1, - "wmsMaxWidth": -1, - "wmsOutputCrsList": [ - "EPSG:4326", - "EPSG:3857" - ], - "wmsRestrictedComposers": [], - "wmsRestrictedLayers": [], - "wmsRootName": "ShortNameForRootLayer", - "wmsServiceUrl": "", - "wmsTileBuffer": 0, - "wmsUseLayerIds": false, - "wmtsServiceUrl": "" - }, - "crs": "EPSG:4326", - "description": "Metadata abstract lorem ipsum...", - "extent": [ - -1.1236584186554, - 43.239185333252, - 11.1218662261963, - 52.2622108459473 - ], - "geographic_extent": [ - -1.1236584186554, - 43.239185333252, - 11.1218662261963, - 52.2622108459473 - ], - "id": "de8d9e4e8b448f0bf0a0eb1e0806b763", - "metadata": { - "abstract": "Metadata abstract lorem ipsum...", - "author": "Alessandro Pasotti", - "categories": [ - "Boundaries", - "Farming" - ], - "contacts": [ - { - "addresses": [ - { - "address": "a street", - "administrativeArea": "Admin area", - "city": "Nodebo", - "country": "Denmark", - "postalCode": "11222", - "type": "postal" - } - ], - "email": "Metadata Contact Email", - "fax": "Metadata Contact Fax (really?)", - "name": "Metadata Contact Name", - "organization": "Metadata Contact Organization", - "position": "Metadata Contact Position", - "role": "custodian", - "voice": "Metadata Contact Voice" - } - ], - "creationDateTime": "2020-04-24T14:59:45", - "history": [ - "History1" - ], - "identifier": "Identifier00001", - "language": "ITA", - "links": [ - { - "description": "A link", - "format": "WTF", - "mimeType": "application/octet-stream", - "name": "link1", - "size": "big", - "type": "OpenSearch1.1:Description", - "url": "http://url.com" - } - ], - "parentIdentifier": "ParentIdentifier00001", - "title": "Project1 Title", - "type": "dataset" - }, - "title": "Project1 Title", - "toc": { - "children": [ - { - "children": [], - "expanded": true, - "has_scale_based_visibility": false, - "id": "points_842425df_7f45_4091_a6c9_086e1dc1edd1", - "is_layer": true, - "layer_type": "vector", - "name": "points", - "queryable": true, - "searchable": true, - "title": "Qgis Server Layer Properties Title", - "tree_id": "root.points_842425df_7f45_4091_a6c9_086e1dc1edd1", - "tree_id_hash": "1c00afb810e8ab0e8edd209f0d198fc0", - "typename": "PointsLayerShortName", - "visible": true, - "wfs_enabled": true - } - ], - "expanded": true, - "is_layer": false, - "name": "root", - "title": "root", - "tree_id": "root", - "tree_id_hash": "63a9f0ea7bb98050796b649e85481845", - "visible": true - }, - "wms_layers": { - "points_842425df_7f45_4091_a6c9_086e1dc1edd1": { - "crs": "EPSG:4326", - "extent": [ - -1.1236584186554, - 43.239185333252, - 11.1218662261963, - 52.2622108459473 - ], - "fields": { - "fid": { - "default": "Autogenerate", - "editable": false, - "expression": "", - "has_expression": false, - "label": "fid", - "length": 0, - "not_null": true, - "precision": 0, - "type": "Integer64", - "unique": true - }, - "name": { - "default": "", - "editable": true, - "expression": "", - "has_expression": false, - "label": "name", - "length": 0, - "not_null": false, - "precision": 0, - "type": "String", - "unique": false - } - }, - "id": "points_842425df_7f45_4091_a6c9_086e1dc1edd1", - "metadata": { - "abstract": "Layer Metadata Abstract", - "categories": [ - "Geoscientific Information", - "Imagery Base Maps Earth Cover" - ], - "constraints": [ - { - "constraint": "use if you like but not on sunday night", - "type": "use" - } - ], - "contacts": [ - { - "addresses": [ - { - "address": "street 1", - "administrativeArea": "Lombardy", - "city": "Milan", - "country": "Italy", - "postalCode": "10021", - "type": "postal" - } - ], - "email": "Layer Metadata Contact Email", - "fax": "Layer Metadata Contact Fax", - "name": "Layer Metadata Contact Name", - "organization": "Layer Metadata Contact Organization", - "position": "Layer Metadata Contact Position", - "role": "distributor", - "voice": "Layer Metadata Contact Voice" - } - ], - "crs": "EPSG:4326", - "encoding": "", - "fees": "None", - "history": [ - "Once upon a time ..." - ], - "identifier": "IdentifierForLayer", - "keywordVocabularies": [ - "gmd:topicCategory" - ], - "keywords": { - "gmd:topicCategory": [ - "Geoscientific Information", - "Imagery Base Maps Earth Cover" - ] - }, - "language": "ITA", - "licenses": [ - "Creative Commons Attribution 4.0" - ], - "links": [ - { - "description": "An interesting link", - "format": "HTML", - "mimeType": "text/html", - "name": "A link", - "size": "unknown", - "type": "https", - "url": "https://www.itopen.it" - } - ], - "parentIdentifier": "ParentIdentifierForLayer", - "rights": [ - "All rights reversed" - ], - "title": "Layer Metadata Title", - "type": "dataset" - }, - "name": "points", - "pk": [ - 0 - ], - "type": "vector" - } - }, - "wms_layers_map": { - "Qgis Server Layer Properties Title": "PointsLayerShortName" - }, - "wms_layers_queryable": [ - "points_842425df_7f45_4091_a6c9_086e1dc1edd1" - ], - "wms_layers_searchable": [ - "points_842425df_7f45_4091_a6c9_086e1dc1edd1" - ], - "wms_layers_typename_id_map": { - "PointsLayerShortName": "points_842425df_7f45_4091_a6c9_086e1dc1edd1" - }, - "wms_root_name": "ShortNameForRootLayer" } ], "projects_count": 4, diff --git a/tests/testdata/qgis_server/landingpage/test_project_Project1_Title.json b/tests/testdata/qgis_server/landingpage/test_project_Project1_Title.json index 95f7a613a164..a50ec21bd380 100644 --- a/tests/testdata/qgis_server/landingpage/test_project_Project1_Title.json +++ b/tests/testdata/qgis_server/landingpage/test_project_Project1_Title.json @@ -75,7 +75,7 @@ Content-Type: application/json 11.1218662261963, 52.2622108459473 ], - "id": "de8d9e4e8b448f0bf0a0eb1e0806b763", + "id": "1928dc5b256258863b109480732d6ccc", "initial_extent": [ -23.310879982571294, 32.04119099639189, diff --git a/tests/testdata/qgis_server/landingpage/test_project_Project2_Title.json b/tests/testdata/qgis_server/landingpage/test_project_Project2_Title.json index 34f66d5090d2..8490ecc01a09 100644 --- a/tests/testdata/qgis_server/landingpage/test_project_Project2_Title.json +++ b/tests/testdata/qgis_server/landingpage/test_project_Project2_Title.json @@ -73,7 +73,7 @@ Content-Type: application/json 38.23087034040887, 55.95129087846767 ], - "id": "471b5bb5dbe79f72149529f700d948a3", + "id": "cbbf3fcb3fc7fbe823cc6c0c5dd744c1", "initial_extent": [ -4.550318430316912, 41.98773931833632, diff --git a/tests/testdata/qgis_server/landingpage/test_project_Project3_Title.json b/tests/testdata/qgis_server/landingpage/test_project_Project3_Title.json index fb42b466adcc..55e160dc3189 100644 --- a/tests/testdata/qgis_server/landingpage/test_project_Project3_Title.json +++ b/tests/testdata/qgis_server/landingpage/test_project_Project3_Title.json @@ -73,7 +73,7 @@ Content-Type: application/json 38.23087034040887, 55.95129087846767 ], - "id": "3b4a3e5d9025926cb673805b914646fa", + "id": "841cac3a81f3c122c10dc5e3be19dbf6", "initial_extent": [ -4.550318430316912, 41.98773931833632, diff --git a/tests/testdata/qgis_server/landingpage/test_project_QGIS_Server_-_Grouped_Nested_Layer.json b/tests/testdata/qgis_server/landingpage/test_project_QGIS_Server_-_Grouped_Nested_Layer.json index 16a6706fbe8b..836d64d0fc44 100644 --- a/tests/testdata/qgis_server/landingpage/test_project_QGIS_Server_-_Grouped_Nested_Layer.json +++ b/tests/testdata/qgis_server/landingpage/test_project_QGIS_Server_-_Grouped_Nested_Layer.json @@ -89,7 +89,7 @@ Content-Type: application/json 10.910092015289333, 52.49310455554394 ], - "id": "9124ec69db7f0687f760504aa10e3362", + "id": "e5a6ae4fd29b15cc4f96997aabddfc2c", "initial_extent": [ 10.727170893991817, 52.37605728414485,