Server OAPIF: update conformance classes

qgis · Nov 8, 2019 · ce48a1a · ce48a1a
1 parent 9dbfb6a
commit ce48a1a
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 18 deletions.
diff --git 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
@@ -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"
 }
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
@@ -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"
 }
diff --git 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 @@
           <div id="navbar" class="navbar-collapse collapse d-flex justify-content-between align-items-center">
               <ol class="breadcrumb bg-light my-0 pl-0">
 
-                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3" >Landing page</a></li>
+                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3/" >Landing page</a></li>
 
-                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3/collections" >Collections</a></li>
+                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3/collections/" >Collections</a></li>
 
                   <li class="breadcrumb-item active">
                      A test vector layer èé
@@ -60,6 +60,8 @@ <h1><a title="View items of: A test vector layer èé" href="
         
         http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.html
         
+        
+        
         ">A test vector layer èé</a></h1>
         <h3>Available CRSs</h3>
         <ul>

diff --git 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 èé"
 }
diff --git 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 @@
           <div id="navbar" class="navbar-collapse collapse d-flex justify-content-between align-items-center">
               <ol class="breadcrumb bg-light my-0 pl-0">
 
-                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3" >Landing page</a></li>
+                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3/" >Landing page</a></li>
 
                   <li class="breadcrumb-item active">
                      Feature collections

diff --git a/...tdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_3857.json b/...tdata/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"
 }
diff --git a/...tdata/qgis_server/api/test_wfs3_collections_items_as-areas-short-name_4326.json b/...tdata/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"
 }
diff --git a/...testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé_crs_3857.json b/...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"
 }
diff --git 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 @@
           <div id="navbar" class="navbar-collapse collapse d-flex justify-content-between align-items-center">
               <ol class="breadcrumb bg-light my-0 pl-0">
 
-                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3" >Landing page</a></li>
+                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3/" >Landing page</a></li>
 
                   <li class="breadcrumb-item active">
                      Feature collections