Skip to content

Commit a777ce7

Browse files
committed
Fix WMS filter request with new API (ticket 7258)
1 parent 1a1a925 commit a777ce7

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/analysis/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ IF (NOT ANDROID)
149149
ENDIF (NOT ANDROID)
150150

151151
ADD_DEPENDENCIES(qgis_analysis qgis_core)
152-
TARGET_LINK_LIBRARIES(qgis_analysis qgis_core)
152+
TARGET_LINK_LIBRARIES(qgis_analysis qgis_core ${SQLITE3_LIBRARY} )
153153

154154
# install
155155

src/mapserver/qgswmsserver.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -1265,10 +1265,14 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
12651265
bool addWktGeometry = mConfigParser && mConfigParser->featureInfoWithWktGeometry();
12661266
const QSet<QString>& excludedAttributes = layer->excludeAttributesWMS();
12671267

1268-
QgsFeatureIterator fit = layer->getFeatures( QgsFeatureRequest()
1269-
.setFilterRect( searchRect )
1270-
.setFlags((( addWktGeometry || featureBBox ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect )
1271-
);
1268+
QgsFeatureRequest fReq;
1269+
fReq.setFlags((( addWktGeometry || featureBBox ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect );
1270+
if ( !searchRect.isEmpty() )
1271+
{
1272+
fReq.setFilterRect( searchRect );
1273+
}
1274+
QgsFeatureIterator fit = layer->getFeatures( fReq );
1275+
12721276
while ( fit.nextFeature( feature ) )
12731277
{
12741278
++featureCounter;

0 commit comments

Comments
 (0)