Avoid '?&' for prev/next link query string

qgis · Apr 1, 2023 · 53a71e5 · 53a71e5
1 parent 6ef6414
commit 53a71e5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/server/services/wfs3/qgswfs3handlers.cpp b/src/server/services/wfs3/qgswfs3handlers.cpp
@@ -1383,6 +1383,10 @@ void QgsWfs3CollectionsItemsHandler::handleRequest( const QgsServerApiContext &c
       {
         cleanedUrlAsString += '?';
       }
+      else
+      {
+        cleanedUrlAsString += '&';
+      }
 
       // Get the self link
       json selfLink;
@@ -1399,7 +1403,7 @@ void QgsWfs3CollectionsItemsHandler::handleRequest( const QgsServerApiContext &c
       if ( offset != 0 )
       {
         json prevLink = selfLink;
-        prevLink["href"] = QStringLiteral( "%1&offset=%2&limit=%3" ).arg( cleanedUrlAsString ).arg( std::max<long>( 0, offset - limit ) ).arg( limit ).toStdString();
+        prevLink["href"] = QStringLiteral( "%1offset=%2&limit=%3" ).arg( cleanedUrlAsString ).arg( std::max<long>( 0, offset - limit ) ).arg( limit ).toStdString();
         prevLink["rel"] = "prev";
         prevLink["title"] = "Previous page";
         data["links"].push_back( prevLink );
@@ -1408,7 +1412,7 @@ void QgsWfs3CollectionsItemsHandler::handleRequest( const QgsServerApiContext &c
       if ( limit + offset < matchedFeaturesCount )
       {
         json nextLink = selfLink;
-        nextLink["href"] = QStringLiteral( "%1&offset=%2&limit=%3" ).arg( cleanedUrlAsString ).arg( std::min<long>( matchedFeaturesCount, limit + offset ) ).arg( limit ).toStdString();
+        nextLink["href"] = QStringLiteral( "%1offset=%2&limit=%3" ).arg( cleanedUrlAsString ).arg( std::min<long>( matchedFeaturesCount, limit + offset ) ).arg( limit ).toStdString();
         nextLink["rel"] = "next";
         nextLink["title"] = "Next page";
         data["links"].push_back( nextLink );

diff --git a/.../testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé_limit_1.json b/.../testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé_limit_1.json
@@ -33,7 +33,7 @@ Content-Type: application/geo+json
       "type": "text/html"
     },
     {
-      "href": "http://server.qgis.org/wfs3/collections/testlayer èé/items?&offset=1&limit=1",
+      "href": "http://server.qgis.org/wfs3/collections/testlayer èé/items?offset=1&limit=1",
       "rel": "next",
       "title": "Next page",
       "type": "application/geo+json"

diff --git a/.../qgis_server/api/test_wfs3_collections_items_testlayer_èé_limit_1_offset_1.json b/.../qgis_server/api/test_wfs3_collections_items_testlayer_èé_limit_1_offset_1.json
@@ -33,13 +33,13 @@ Content-Type: application/geo+json
       "type": "text/html"
     },
     {
-      "href": "http://server.qgis.org/wfs3/collections/testlayer èé/items?&offset=0&limit=1",
+      "href": "http://server.qgis.org/wfs3/collections/testlayer èé/items?offset=0&limit=1",
       "rel": "prev",
       "title": "Previous page",
       "type": "application/geo+json"
     },
     {
-      "href": "http://server.qgis.org/wfs3/collections/testlayer èé/items?&offset=2&limit=1",
+      "href": "http://server.qgis.org/wfs3/collections/testlayer èé/items?offset=2&limit=1",
       "rel": "next",
       "title": "Next page",
       "type": "application/geo+json"

diff --git a/.../qgis_server/api/test_wfs3_collections_items_testlayer_èé_limit_1_offset_2.json b/.../qgis_server/api/test_wfs3_collections_items_testlayer_èé_limit_1_offset_2.json
@@ -33,7 +33,7 @@ Content-Type: application/geo+json
       "type": "text/html"
     },
     {
-      "href": "http://server.qgis.org/wfs3/collections/testlayer èé/items?&offset=1&limit=1",
+      "href": "http://server.qgis.org/wfs3/collections/testlayer èé/items?offset=1&limit=1",
       "rel": "prev",
       "title": "Previous page",
       "type": "application/geo+json"