Rename feature info parameters

mhugent · mhugent · commit 335ce446240c · 2015-02-23T10:57:34.000+01:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -3093,7 +3093,7 @@ QgsRectangle QgsWMSServer::featureInfoSearchRect( QgsVectorLayer* ml, QgsMapRend
   double mapUnitTolerance = 0.0;
   if ( ml->geometryType() == QGis::Polygon )
   {
-    QMap<QString, QString>::const_iterator tolIt = mParameters.find( "POLYGON_TOLERANCE" );
+    QMap<QString, QString>::const_iterator tolIt = mParameters.find( "FI_POLYGON_TOLERANCE" );
     if ( tolIt != mParameters.constEnd() )
     {
       mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();
@@ -3105,7 +3105,7 @@ QgsRectangle QgsWMSServer::featureInfoSearchRect( QgsVectorLayer* ml, QgsMapRend
   }
   else if ( ml->geometryType() == QGis::Line )
   {
-    QMap<QString, QString>::const_iterator tolIt = mParameters.find( "LINE_TOLERANCE" );
+    QMap<QString, QString>::const_iterator tolIt = mParameters.find( "FI_LINE_TOLERANCE" );
     if ( tolIt != mParameters.constEnd() )
     {
       mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();
@@ -3117,7 +3117,7 @@ QgsRectangle QgsWMSServer::featureInfoSearchRect( QgsVectorLayer* ml, QgsMapRend
   }
   else //points
   {
-    QMap<QString, QString>::const_iterator tolIt = mParameters.find( "POINT_TOLERANCE" );
+    QMap<QString, QString>::const_iterator tolIt = mParameters.find( "FI_POINT_TOLERANCE" );
     if ( tolIt != mParameters.constEnd() )
     {
       mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();

Original file line number	Diff line number	Diff line change
`@@ -3093,7 +3093,7 @@ QgsRectangle QgsWMSServer::featureInfoSearchRect( QgsVectorLayer* ml, QgsMapRend`
`3093`	`3093`	`double mapUnitTolerance = 0.0;`
`3094`	`3094`	`if ( ml->geometryType() == QGis::Polygon )`
`3095`	`3095`	`{`
`3096`		`- QMap<QString, QString>::const_iterator tolIt = mParameters.find( "POLYGON_TOLERANCE" );`
	`3096`	`+ QMap<QString, QString>::const_iterator tolIt = mParameters.find( "FI_POLYGON_TOLERANCE" );`
`3097`	`3097`	`if ( tolIt != mParameters.constEnd() )`
`3098`	`3098`	`{`
`3099`	`3099`	`mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();`
`@@ -3105,7 +3105,7 @@ QgsRectangle QgsWMSServer::featureInfoSearchRect( QgsVectorLayer* ml, QgsMapRend`
`3105`	`3105`	`}`
`3106`	`3106`	`else if ( ml->geometryType() == QGis::Line )`
`3107`	`3107`	`{`
`3108`		`- QMap<QString, QString>::const_iterator tolIt = mParameters.find( "LINE_TOLERANCE" );`
	`3108`	`+ QMap<QString, QString>::const_iterator tolIt = mParameters.find( "FI_LINE_TOLERANCE" );`
`3109`	`3109`	`if ( tolIt != mParameters.constEnd() )`
`3110`	`3110`	`{`
`3111`	`3111`	`mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();`
`@@ -3117,7 +3117,7 @@ QgsRectangle QgsWMSServer::featureInfoSearchRect( QgsVectorLayer* ml, QgsMapRend`
`3117`	`3117`	`}`
`3118`	`3118`	`else //points`
`3119`	`3119`	`{`
`3120`		`- QMap<QString, QString>::const_iterator tolIt = mParameters.find( "POINT_TOLERANCE" );`
	`3120`	`+ QMap<QString, QString>::const_iterator tolIt = mParameters.find( "FI_POINT_TOLERANCE" );`
`3121`	`3121`	`if ( tolIt != mParameters.constEnd() )`
`3122`	`3122`	`{`
`3123`	`3123`	`mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();`