Fix WMS filter request with new API (ticket 7258)

qgis · Mar 1, 2013 · a777ce7 · a777ce7
1 parent 1a1a925
commit a777ce7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -149,7 +149,7 @@ IF (NOT ANDROID)
 ENDIF (NOT ANDROID)
 
 ADD_DEPENDENCIES(qgis_analysis qgis_core)
-TARGET_LINK_LIBRARIES(qgis_analysis qgis_core)
+TARGET_LINK_LIBRARIES(qgis_analysis qgis_core ${SQLITE3_LIBRARY} )
 
 # install
 

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1265,10 +1265,14 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
   bool addWktGeometry = mConfigParser && mConfigParser->featureInfoWithWktGeometry();
   const QSet<QString>& excludedAttributes = layer->excludeAttributesWMS();
 
-  QgsFeatureIterator fit = layer->getFeatures( QgsFeatureRequest()
-                           .setFilterRect( searchRect )
-                           .setFlags((( addWktGeometry || featureBBox ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect )
-                                             );
+  QgsFeatureRequest fReq;
+  fReq.setFlags((( addWktGeometry || featureBBox ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect );
+  if ( !searchRect.isEmpty() )
+  {
+    fReq.setFilterRect( searchRect );
+  }
+  QgsFeatureIterator fit = layer->getFeatures( fReq );
+
   while ( fit.nextFeature( feature ) )
   {
     ++featureCounter;