Merge pull request #1541 from marcel-dancak/master

Mapserver: enhancements of searching with GetFeatureInfo request

Author: mhugent

src/mapserver/qgswmsserver.cpp

@@ -1207,7 +1207,8 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
       }
 
       //skip layer if not visible at current map scale
-      if ( currentLayer->hasScaleBasedVisibility() && ( currentLayer->minimumScale() > scaleDenominator || currentLayer->maximumScale() < scaleDenominator ) )
+      bool useScaleConstraint = ( scaleDenominator > 0 && currentLayer->hasScaleBasedVisibility() );
+      if ( useScaleConstraint && ( currentLayer->minimumScale() > scaleDenominator || currentLayer->maximumScale() < scaleDenominator ) )
       {
         continue;
       }
@@ -1706,6 +1707,10 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     searchRect.set( infoPoint->x() - searchRadius, infoPoint->y() - searchRadius,
                     infoPoint->x() + searchRadius, infoPoint->y() + searchRadius );
   }
+  else
+  {
+    searchRect = layerRect;
+  }
 
   //do a select with searchRect and go through all the features
 
@@ -2237,7 +2242,7 @@ QMap<QString, QString> QgsWMSServer::applyRequestedLayerFilters( const QStringLi
           continue;
         }
 
-        QgsRectangle layerExtent = mapLayer->extent();
+        QgsRectangle layerExtent = mMapRenderer->layerToMapCoordinates(mapLayer, mapLayer->extent());
         if ( filterExtent.isEmpty() )
         {
           filterExtent = layerExtent;

src/providers/wms/qgswmsprovider.cpp

@@ -404,6 +404,11 @@ bool QgsWmsProvider::setImageCrs( QString const & crs )
       {
         resolutions << key;
       }
+      if ( !mTileMatrixSet->tileMatrices.empty() )
+      {
+        setProperty( "tileWidth", mTileMatrixSet->tileMatrices.values().first().tileWidth );
+        setProperty( "tileHeight", mTileMatrixSet->tileMatrices.values().first().tileHeight );
+      }
     }
     else
     {