Merge pull request #6439 from pblottiere/bugfix_server_selection

[server] Fixes issue when selecting multiple ids
qgis · Feb 23, 2018 · 2de99fb · 2de99fb
2 parents c1ef8f0 + 46eb6e3
commit 2de99fb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -1658,7 +1658,7 @@ namespace QgsWms
 
   QStringList QgsWmsParameters::selections() const
   {
-    return toStringList( ParameterName::SELECTION );
+    return toStringList( ParameterName::SELECTION, ';' );
   }
 
   QStringList QgsWmsParameters::opacities() const

diff --git a/tests/src/python/test_qgsserver_wms_getmap.py b/tests/src/python/test_qgsserver_wms_getmap.py
@@ -750,7 +750,7 @@ def test_wms_getmap_selection(self):
             "HEIGHT": "500",
             "WIDTH": "500",
             "SRS": "EPSG:3857",
-            "SELECTION": "Country: 4"
+            "SELECTION": "Country: 4,1;Hello: 2,5"
         }.items())])
 
         r, h = self._result(self._execute_request(qs))

diff --git a/...stdata/control_images/qgis_server/WMS_GetMap_Selection/WMS_GetMap_Selection.png b/...stdata/control_images/qgis_server/WMS_GetMap_Selection/WMS_GetMap_Selection.png
diff --git a/...a/control_images/qgis_server/WMS_GetMap_Selection/WMS_GetMap_Selection_mask.png b/...a/control_images/qgis_server/WMS_GetMap_Selection/WMS_GetMap_Selection_mask.png