Merge pull request #42276 from elpaso/bugfix-gh42275-wfs3-string-fids…

…-template Fix wfs3 template with string fids
qgis · Mar 16, 2021 · cdb3e7b21446d3863cb19385d2cf496f5acb234e · cdb3e7b
1 parent b2b7956
commit cdb3e7b21446d3863cb19385d2cf496f5acb234e
Unified Split

Showing with 185 additions and 1 deletion.

+1 −1 src/server/qgsserverogcapihandler.cpp

+9 −0 tests/src/python/test_qgsserver_api.py

+175 −0 tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé.html
diff --git a/src/server/qgsserverogcapihandler.cpp b/src/server/qgsserverogcapihandler.cpp
@@ -313,7 +313,7 @@ void QgsServerOgcApiHandler::htmlDump( const json &data, const QgsServerApiConte
       {
         fName.chop( 1 );
       }
-      fName += '/' + QString::number( args.at( 0 )->get<QgsFeatureId>( ) );
+      fName += '/' + QString::fromStdString( args.at( 0 )->get<std::string>( ) );
       if ( !suffix.isEmpty() )
       {
         fName += '.' + suffix;

diff --git a/tests/src/python/test_qgsserver_api.py b/tests/src/python/test_qgsserver_api.py
@@ -527,6 +527,15 @@ def test_wfs3_collection_items(self):
         self.compareApi(request, project,
                         'test_wfs3_collections_items_testlayer_èé.json')
 
+    def test_wfs3_collection_items_html(self):
+        """Test WFS3 API items"""
+        project = QgsProject()
+        project.read(unitTestDataPath('qgis_server') + '/test_project_api.qgs')
+        request = QgsBufferServerRequest(
+            'http://server.qgis.org/wfs3/collections/testlayer%20èé/items.html')
+        self.compareApi(request, project,
+                        'test_wfs3_collections_items_testlayer_èé.html')
+
     def test_wfs3_collection_items_crs(self):
         """Test WFS3 API items with CRS"""
         project = QgsProject()

diff --git a/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé.html b/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé.html
@@ -0,0 +1,175 @@
+<!-- template for the WFS3 API getFeatures page -->
+<!doctype html>
+<html lang="en">
+  <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"
+            integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
+            crossorigin=""/>
+    <link rel="stylesheet" href="/wfs3/static/style.css" />
+    <script src="https://code.jquery.com/jquery-3.4.1.min.js"
+            integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
+            crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="/wfs3/static/jsonFormatter/jsonFormatter.min.css" crossorigin="anonymous">
+    <script src="/wfs3/static/jsonFormatter/jsonFormatter.min.js" crossorigin="anonymous"></script>
+
+    <!-- template for the WFS3 API links list, to be included in HEAD -->
+
+    <link rel="alternate" href="http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.geojson" title="Retrieve the features of the collection as GEOJSON" type="application/geo+json">
+
+    <link rel="self" href="http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.html" title="Retrieve the features of the collection as HTML" type="text/html">
+
+
+
+    <title>Features in layer A test vector layer èé</title>
+  </head>
+  <body>
+  <nav class="navbar navbar-light bg-light navbar-expand-sm">
+      <div class="container">
+          <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/collections/" >Collections</a></li>
+
+                  <li class="breadcrumb-item"><a href="http://server.qgis.org/wfs3/collections/testlayer èé/" >A test vector layer èé</a></li>
+
+                  <li class="breadcrumb-item active">
+                     Features in layer A test vector layer èé
+                  </li>
+              </ol>
+              <ul class="list-unstyled list-separated m-0 p-0 text-muted">
+
+                  <li><a rel="alternate" href="http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.geojson" target="_blank">GEOJSON</a></li>
+
+              </ul>
+          </div>
+
+
+      </div>
+  </nav>
+  <div class="container pt-4">
+  <!-- END HEADER TEMPLATE header.html -->
+
+
+    <div class="row">
+        <nav aria-label="Page navigation example">
+          <ul class="pagination">
+
+            <!-- TODO: full pagination: li class="page-item"><a class="page-link" href="#">1</a></li>
+            <li class="page-item"><a class="page-link" href="#">2</a></li>
+            <li class="page-item"><a class="page-link" href="#">3</a></li-->
+
+          </ul>
+        </nav>
+    </div>
+
+    <div class="row">
+        <div class="col-md-6">
+            <h1>Features in layer A test vector layer èé</h1>
+
+
+                <h2><a href="http://server.qgis.org/wfs3/collections/testlayer èé/items/0.html">A test vector layer èé 0</a></h2>
+                <dl class="row">
+
+                    <dt class="col-sm-3">id</dt>
+                    <dd class="col-sm-9">1</dd>
+
+                    <dt class="col-sm-3">name</dt>
+                    <dd class="col-sm-9">one</dd>
+
+                    <dt class="col-sm-3">utf8nameè</dt>
+                    <dd class="col-sm-9">one èé</dd>
+
+                </dl>
+
+                <h2><a href="http://server.qgis.org/wfs3/collections/testlayer èé/items/1.html">A test vector layer èé 1</a></h2>
+                <dl class="row">
+
+                    <dt class="col-sm-3">id</dt>
+                    <dd class="col-sm-9">2</dd>
+
+                    <dt class="col-sm-3">name</dt>
+                    <dd class="col-sm-9">two</dd>
+
+                    <dt class="col-sm-3">utf8nameè</dt>
+                    <dd class="col-sm-9">two àò</dd>
+
+                </dl>
+
+                <h2><a href="http://server.qgis.org/wfs3/collections/testlayer èé/items/2.html">A test vector layer èé 2</a></h2>
+                <dl class="row">
+
+                    <dt class="col-sm-3">id</dt>
+                    <dd class="col-sm-9">3</dd>
+
+                    <dt class="col-sm-3">name</dt>
+                    <dd class="col-sm-9">three</dd>
+
+                    <dt class="col-sm-3">utf8nameè</dt>
+                    <dd class="col-sm-9">three èé↓</dd>
+
+                </dl>
+
+        </div>
+
+        <!-- template for the WFS3 API leaflet map -->
+<div class="col-md-6">
+    <div id="mapid" class="small"></div>
+
+    <script type="text/javascript">
+    jQuery( document ).ready(function( $ ) {
+        var map = L.map('mapid').setView([0, 0], 13);
+        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+        }).addTo(map)
+        $.get( "http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.geojson", function( data ) {
+          var jl = L.geoJSON( data, {
+              onEachFeature: function (feature, layer) {
+                    layer.bindPopup('<h1>'+feature.id +'</h1>');
+              }
+          }).addTo(map);
+          map.setView(jl.getBounds().getCenter());
+          if ( jl.getBounds().getEast() != jl.getBounds().getWest() && jl.getBounds().getNorth() != jl.getBounds().getSouth() )
+          {
+            map.fitBounds(jl.getBounds());
+          }
+          jl.on('featureOver', featureOver);
+        });
+    });
+
+    </script>
+</div>
+
+
+    </div>
+
+    <!-- FOOTER TEMPLATE footer.html -->
+    </div> <!-- //container -->
+
+    <footer class="footer bg-light py-4 d-flex flex-column justify-content-around align-items-center">
+        <div class="container d-flex flex-row justify-content-between align-items-center w-100">
+                <span><span class="text-muted small mr-2">powered by</span><a class="navbar-brand" href="https://www.qgis.org/" target="_blank">QGIS Server</a></span>
+        </div>
+    </footer>
+
+    <!-- Optional JavaScript -->
+    <!-- jQuery first, then Popper.js, then Bootstrap JS -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+    <!-- Make sure you put this AFTER Leaflet's CSS -->
+     <script src="https://unpkg.com/leaflet@1.5.1/dist/leaflet.js"
+       integrity="sha512-GffPMF3RvMeYyc1LWMHtK8EbPv0iNZ8/oTtHPx9/cc2ILxQ+u905qIwdpULaqDkyBKgOaB57QTMg7ztg8Jm2Og=="
+       crossorigin=""></script>
+    <script>
+      jQuery('.jref').jsonFormatter();
+    </script>
+  </body>
+</html>
+