Indentation

mhugent · mhugent · commit e7ea972c649a · 2017-06-24T14:33:55.000+02:00
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -717,9 +717,9 @@ namespace QgsWms
 
     //read FILTER_GEOM
     std::unique_ptr<QgsGeometry> filterGeom;
-    if( mParameters.contains( QStringLiteral( "FILTER_GEOM" ) ) )
+    if ( mParameters.contains( QStringLiteral( "FILTER_GEOM" ) ) )
     {
-        filterGeom.reset( new QgsGeometry( QgsGeometry::fromWkt( mParameters.value( QStringLiteral( "FILTER_GEOM" ) ) ) ) );
+      filterGeom.reset( new QgsGeometry( QgsGeometry::fromWkt( mParameters.value( QStringLiteral( "FILTER_GEOM" ) ) ) ) );
     }
 
     //In case the output image is distorted (WIDTH/HEIGHT ratio not equal to BBOX width/height), I and J need to be adapted as well
@@ -743,7 +743,7 @@ namespace QgsWms
       {
         featuresRect.reset( new QgsRectangle() );
       }
-      else if( !filterGeom.get() )
+      else if ( !filterGeom.get() )
       {
         throw QgsBadRequestException( QStringLiteral( "ParameterMissing" ),
                                       QStringLiteral( "I/J parameters are required for GetFeatureInfo" ) );
@@ -1254,7 +1254,7 @@ namespace QgsWms
       const QString &version,
       const QString &infoFormat,
       QgsRectangle *featureBBox,
-      QgsGeometry* filterGeom ) const
+      QgsGeometry *filterGeom ) const
   {
     if ( !layer )
     {
@@ -1273,7 +1273,7 @@ namespace QgsWms
     {
       searchRect = featureInfoSearchRect( layer, mapSettings, renderContext, *infoPoint );
     }
-    else if( filterGeom )
+    else if ( filterGeom )
     {
       searchRect = filterGeom->boundingBox();
     }
@@ -1306,9 +1306,9 @@ namespace QgsWms
       fReq.setFlags( fReq.flags() & ~ QgsFeatureRequest::ExactIntersect );
     }
 
-    if( filterGeom )
+    if ( filterGeom )
     {
-        fReq.setFilterExpression( QString("intersects( $geometry, geom_from_wkt('%1') )").arg( filterGeom->exportToWkt() ) );
+      fReq.setFilterExpression( QString( "intersects( $geometry, geom_from_wkt('%1') )" ).arg( filterGeom->exportToWkt() ) );
     }
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
diff --git a/src/server/services/wms/qgswmsrenderer.h b/src/server/services/wms/qgswmsrenderer.h
@@ -224,7 +224,7 @@ namespace QgsWms
                                        const QString &version,
                                        const QString &infoFormat,
                                        QgsRectangle *featureBBox = nullptr,
-                                       QgsGeometry* filterGeom = nullptr ) const;
+                                       QgsGeometry *filterGeom = nullptr ) const;
       //! Appends feature info xml for the layer to the layer element of the dom document
       bool featureInfoFromRasterLayer( QgsRasterLayer *layer,
                                        const QgsMapSettings &mapSettings,
diff --git a/tests/src/python/test_qgsserver_wms.py b/tests/src/python/test_qgsserver_wms.py
@@ -125,7 +125,7 @@ def test_project_wms(self):
                                  'query_layers=testlayer%20%C3%A8%C3%A9&' +
                                  'FEATURE_COUNT=10&FILTER=testlayer%20%C3%A8%C3%A9' + urllib.parse.quote(':"NAME" = \'two\' OR "utf8nameè" = \'three èé↓\''),
                                  'wms_getfeatureinfo_filter_or_utf8')
-        
+
         # Test feature info request with filter geometry
         self.wms_request_compare('GetFeatureInfo',
                                  '&layers=testlayer%20%C3%A8%C3%A9&' +

Original file line number	Diff line number	Diff line change
`@@ -717,9 +717,9 @@ namespace QgsWms`
`717`	`717`
`718`	`718`	`//read FILTER_GEOM`
`719`	`719`	`std::unique_ptr<QgsGeometry> filterGeom;`
`720`		`- if( mParameters.contains( QStringLiteral( "FILTER_GEOM" ) ) )`
	`720`	`+ if ( mParameters.contains( QStringLiteral( "FILTER_GEOM" ) ) )`
`721`	`721`	`{`
`722`		`- filterGeom.reset( new QgsGeometry( QgsGeometry::fromWkt( mParameters.value( QStringLiteral( "FILTER_GEOM" ) ) ) ) );`
	`722`	`+ filterGeom.reset( new QgsGeometry( QgsGeometry::fromWkt( mParameters.value( QStringLiteral( "FILTER_GEOM" ) ) ) ) );`
`723`	`723`	`}`
`724`	`724`
`725`	`725`	`//In case the output image is distorted (WIDTH/HEIGHT ratio not equal to BBOX width/height), I and J need to be adapted as well`
`@@ -743,7 +743,7 @@ namespace QgsWms`
`743`	`743`	`{`
`744`	`744`	`featuresRect.reset( new QgsRectangle() );`
`745`	`745`	`}`
`746`		`- else if( !filterGeom.get() )`
	`746`	`+ else if ( !filterGeom.get() )`
`747`	`747`	`{`
`748`	`748`	`throw QgsBadRequestException( QStringLiteral( "ParameterMissing" ),`
`749`	`749`	`QStringLiteral( "I/J parameters are required for GetFeatureInfo" ) );`
`@@ -1254,7 +1254,7 @@ namespace QgsWms`
`1254`	`1254`	`const QString &version,`
`1255`	`1255`	`const QString &infoFormat,`
`1256`	`1256`	`QgsRectangle *featureBBox,`
`1257`		`- QgsGeometry* filterGeom ) const`
	`1257`	`+ QgsGeometry *filterGeom ) const`
`1258`	`1258`	`{`
`1259`	`1259`	`if ( !layer )`
`1260`	`1260`	`{`
`@@ -1273,7 +1273,7 @@ namespace QgsWms`
`1273`	`1273`	`{`
`1274`	`1274`	`searchRect = featureInfoSearchRect( layer, mapSettings, renderContext, *infoPoint );`
`1275`	`1275`	`}`
`1276`		`- else if( filterGeom )`
	`1276`	`+ else if ( filterGeom )`
`1277`	`1277`	`{`
`1278`	`1278`	`searchRect = filterGeom->boundingBox();`
`1279`	`1279`	`}`
`@@ -1306,9 +1306,9 @@ namespace QgsWms`
`1306`	`1306`	`fReq.setFlags( fReq.flags() & ~ QgsFeatureRequest::ExactIntersect );`
`1307`	`1307`	`}`
`1308`	`1308`
`1309`		`- if( filterGeom )`
	`1309`	`+ if ( filterGeom )`
`1310`	`1310`	`{`
`1311`		`- fReq.setFilterExpression( QString("intersects( $geometry, geom_from_wkt('%1') )").arg( filterGeom->exportToWkt() ) );`
	`1311`	`+ fReq.setFilterExpression( QString( "intersects( $geometry, geom_from_wkt('%1') )" ).arg( filterGeom->exportToWkt() ) );`
`1312`	`1312`	`}`
`1313`	`1313`
`1314`	`1314`	`#ifdef HAVE_SERVER_PYTHON_PLUGINS`