From ce48a1a3f69c951c9c78825664897d595800dd65 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Fri, 8 Nov 2019 16:54:10 +0100 Subject: [PATCH 1/2] Server OAPIF: update conformance classes --- src/server/services/wfs3/qgswfs3handlers.cpp | 10 +++++----- .../qgis_server/api/test_wfs3_api_project.json | 5 +++-- .../api/test_wfs3_collection_points_timefilters.json | 8 +++++++- .../api/test_wfs3_collection_testlayer_èé.html | 6 ++++-- .../api/test_wfs3_collection_testlayer_èé.json | 8 +++++++- .../qgis_server/api/test_wfs3_collections_empty.html | 2 +- ...fs3_collections_items_as-areas-short-name_3857.json | 6 +++--- ...fs3_collections_items_as-areas-short-name_4326.json | 2 +- ...wfs3_collections_items_testlayer_èé_crs_3857.json | 2 +- .../qgis_server/api/test_wfs3_collections_project.html | 2 +- 10 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/server/services/wfs3/qgswfs3handlers.cpp b/src/server/services/wfs3/qgswfs3handlers.cpp index afea557d3ed..f36646df6dd 100644 --- a/src/server/services/wfs3/qgswfs3handlers.cpp +++ b/src/server/services/wfs3/qgswfs3handlers.cpp @@ -370,11 +370,11 @@ void QgsWfs3ConformanceHandler::handleRequest( const QgsServerApiContext &contex { { "links", links( context ) }, { - "conformsTo", { "http://www.opengis.net/spec/wfs-1/3.0/req/core", - "http://www.opengis.net/spec/wfs-1/3.0/req/oas30", - "http://www.opengis.net/spec/wfs-1/3.0/req/html", - "http://www.opengis.net/spec/wfs-1/3.0/req/gmlsf2", - "http://www.opengis.net/spec/wfs-1/3.0/req/geojson" + "conformsTo", { + "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/core", + "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/oas30", + "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/html", + "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/geojson" } } }; diff --git a/tests/testdata/qgis_server/api/test_wfs3_api_project.json b/tests/testdata/qgis_server/api/test_wfs3_api_project.json index 5013f2e3409..82a52b0781a 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_api_project.json +++ b/tests/testdata/qgis_server/api/test_wfs3_api_project.json @@ -1466,7 +1466,7 @@ Content-Type: application/openapi+json;version=3.0 }, "servers": [ { - "url": "http://server.qgis.org/wfs3" + "url": "http://server.qgis.org/wfs3/" } ], "tags": [ @@ -1478,5 +1478,6 @@ Content-Type: application/openapi+json;version=3.0 "description": "Access to data (features).", "name": "Features" } - ] + ], + "timeStamp": "2019-07-05T12:27:07Z" } \ No newline at end of file diff --git a/tests/testdata/qgis_server/api/test_wfs3_collection_points_timefilters.json b/tests/testdata/qgis_server/api/test_wfs3_collection_points_timefilters.json index 5481d7fb7de..b81c66f697e 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collection_points_timefilters.json +++ b/tests/testdata/qgis_server/api/test_wfs3_collection_points_timefilters.json @@ -53,8 +53,14 @@ Content-Type: application/json "rel": "items", "title": "points", "type": "text/html" + }, + { + "href": "http://server.qgis.org/?request=DescribeFeatureType&typenames=points&service=WFS&version=2.0", + "rel": "describedBy", + "title": "Schema for points", + "type": "application/xml" } ], - "timeStamp": "2019-10-20T16:29:01Z", + "timeStamp": "2019-07-05T12:27:07Z", "title": "points" } \ No newline at end of file diff --git a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html index db7d419df8f..3a70c2c0aa0 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html +++ b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html @@ -26,9 +26,9 @@
    -
  1. Landing page
    2. +
  2. Landing page
    3. -
  3. Collections
    4. +
  4. Collections
  5. A test vector layer èé @@ -60,6 +60,8 @@ http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.html + + ">A test vector layer èé

    Available CRSs

      diff --git a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json index e4ef561a1f7..b7e0765001a 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json +++ b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json @@ -48,8 +48,14 @@ Content-Type: application/json "rel": "items", "title": "A test vector layer èé", "type": "text/html" + }, + { + "href": "http://server.qgis.org/?request=DescribeFeatureType&typenames=testlayer%20èé&service=WFS&version=2.0", + "rel": "describedBy", + "title": "Schema for A test vector layer èé", + "type": "application/xml" } ], - "timeStamp": "2019-11-02T15:56:20Z", + "timeStamp": "2019-07-05T12:27:07Z", "title": "A test vector layer èé" } \ No newline at end of file diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html b/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html index efdf7213db1..ead16a367eb 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html +++ b/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html @@ -26,7 +26,7 @@
        -
      1. Landing page
        2. +
      2. Landing page
      3. Feature collections diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_3857.json b/tests/testdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_3857.json index b3e576c29d0..283a81acbbb 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_3857.json +++ b/tests/testdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_3857.json @@ -290,7 +290,7 @@ Content-Type: application/geo+json 6880002.440273 ], [ - 1194091.1897780001, + 1194091.189778, 6880070.493797 ], [ @@ -440,7 +440,7 @@ Content-Type: application/geo+json 6882593.73528 ], [ - 1190969.1369710001, + 1190969.136971, 6881661.977825 ], [ @@ -994,6 +994,6 @@ Content-Type: application/geo+json ], "numberMatched": 38, "numberReturned": 10, - "timeStamp": "2019-11-02T15:56:20Z", + "timeStamp": "2019-07-05T12:27:07Z", "type": "FeatureCollection" } \ No newline at end of file diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_4326.json b/tests/testdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_4326.json index a187df5dd7d..84a4e7e78f5 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_4326.json +++ b/tests/testdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_4326.json @@ -994,6 +994,6 @@ Content-Type: application/geo+json ], "numberMatched": 38, "numberReturned": 10, - "timeStamp": "2019-11-02T15:56:20Z", + "timeStamp": "2019-07-05T12:27:07Z", "type": "FeatureCollection" } \ No newline at end of file diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé_crs_3857.json b/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé_crs_3857.json index 531996fc599..f97d86a7d2e 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé_crs_3857.json +++ b/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé_crs_3857.json @@ -67,6 +67,6 @@ Content-Type: application/geo+json ], "numberMatched": 3, "numberReturned": 3, - "timeStamp": "2019-11-02T15:56:20Z", + "timeStamp": "2019-07-05T12:27:07Z", "type": "FeatureCollection" } \ No newline at end of file diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_project.html b/tests/testdata/qgis_server/api/test_wfs3_collections_project.html index 0b46b0eb54f..57ecdf351be 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collections_project.html +++ b/tests/testdata/qgis_server/api/test_wfs3_collections_project.html @@ -26,7 +26,7 @@
          -
        1. Landing page
          2. +
        2. Landing page
        3. Feature collections From c8d352bdc8239811b5a3ff185b4490cb1b5710fd Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Mon, 11 Nov 2019 09:36:49 +0100 Subject: [PATCH 2/2] Update test reference files --- .../testdata/qgis_server/api/test_wfs3_api_project.json | 2 +- .../api/test_wfs3_collection_points_timefilters.json | 6 ------ .../api/test_wfs3_collection_testlayer_èé.html | 6 ++---- .../api/test_wfs3_collection_testlayer_èé.json | 6 ------ .../qgis_server/api/test_wfs3_collections_empty.html | 2 +- .../qgis_server/api/test_wfs3_collections_project.html | 2 +- .../testdata/qgis_server/api/test_wfs3_conformance.json | 9 ++++----- 7 files changed, 9 insertions(+), 24 deletions(-) diff --git a/tests/testdata/qgis_server/api/test_wfs3_api_project.json b/tests/testdata/qgis_server/api/test_wfs3_api_project.json index 82a52b0781a..d8e753255f1 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_api_project.json +++ b/tests/testdata/qgis_server/api/test_wfs3_api_project.json @@ -1466,7 +1466,7 @@ Content-Type: application/openapi+json;version=3.0 }, "servers": [ { - "url": "http://server.qgis.org/wfs3/" + "url": "http://server.qgis.org/wfs3" } ], "tags": [ diff --git a/tests/testdata/qgis_server/api/test_wfs3_collection_points_timefilters.json b/tests/testdata/qgis_server/api/test_wfs3_collection_points_timefilters.json index b81c66f697e..7f0715e8d13 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collection_points_timefilters.json +++ b/tests/testdata/qgis_server/api/test_wfs3_collection_points_timefilters.json @@ -53,12 +53,6 @@ Content-Type: application/json "rel": "items", "title": "points", "type": "text/html" - }, - { - "href": "http://server.qgis.org/?request=DescribeFeatureType&typenames=points&service=WFS&version=2.0", - "rel": "describedBy", - "title": "Schema for points", - "type": "application/xml" } ], "timeStamp": "2019-07-05T12:27:07Z", diff --git a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html index 3a70c2c0aa0..db7d419df8f 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html +++ b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.html @@ -26,9 +26,9 @@
            -
          1. Landing page
            2. +
          2. Landing page
            3. -
          3. Collections
            4. +
          4. Collections
          5. A test vector layer èé @@ -60,8 +60,6 @@ http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.html - - ">A test vector layer èé

            Available CRSs

              diff --git a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json index b7e0765001a..3a505ba8b89 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json +++ b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.json @@ -48,12 +48,6 @@ Content-Type: application/json "rel": "items", "title": "A test vector layer èé", "type": "text/html" - }, - { - "href": "http://server.qgis.org/?request=DescribeFeatureType&typenames=testlayer%20èé&service=WFS&version=2.0", - "rel": "describedBy", - "title": "Schema for A test vector layer èé", - "type": "application/xml" } ], "timeStamp": "2019-07-05T12:27:07Z", diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html b/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html index ead16a367eb..efdf7213db1 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html +++ b/tests/testdata/qgis_server/api/test_wfs3_collections_empty.html @@ -26,7 +26,7 @@
                -
              1. Landing page
                2. +
              2. Landing page
              3. Feature collections diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_project.html b/tests/testdata/qgis_server/api/test_wfs3_collections_project.html index 57ecdf351be..0b46b0eb54f 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_collections_project.html +++ b/tests/testdata/qgis_server/api/test_wfs3_collections_project.html @@ -26,7 +26,7 @@
                  -
                1. Landing page
                  2. +
                2. Landing page
                3. Feature collections diff --git a/tests/testdata/qgis_server/api/test_wfs3_conformance.json b/tests/testdata/qgis_server/api/test_wfs3_conformance.json index fa4696fd4bb..70a1f407203 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_conformance.json +++ b/tests/testdata/qgis_server/api/test_wfs3_conformance.json @@ -2,11 +2,10 @@ Content-Type: application/json { "conformsTo": [ - "http://www.opengis.net/spec/wfs-1/3.0/req/core", - "http://www.opengis.net/spec/wfs-1/3.0/req/oas30", - "http://www.opengis.net/spec/wfs-1/3.0/req/html", - "http://www.opengis.net/spec/wfs-1/3.0/req/gmlsf2", - "http://www.opengis.net/spec/wfs-1/3.0/req/geojson" + "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/core", + "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/oas30", + "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/html", + "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/geojson" ], "links": [ {