Update InvalidPoint exception

pblottiere · pblottiere · commit 2430d9cc8b47 · 2019-03-28T11:44:29.000+01:00
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -835,9 +835,16 @@ namespace QgsWms
   static void infoPointToMapCoordinates( int i, int j, QgsPointXY *infoPoint, const QgsMapSettings &mapSettings )
   {
     //check if i, j are in the pixel range of the image
-    if ( i < 0 || i > mapSettings.outputSize().width() || j < 0 || j > mapSettings.outputSize().height() )
+    if ( i < 0 || i > mapSettings.outputSize().width() )
     {
-      throw QgsBadRequestException( "InvalidPoint", "I/J parameters not within the pixel range" );
+      throw QgsBadRequestException( QgsServiceException::INVALID_POINT,
+                                    mWmsParameters[QgsWmsParameter::I] );
+    }
+
+    if ( j < 0 || j > mapSettings.outputSize().height() )
+    {
+      throw QgsBadRequestException( QgsServiceException::INVALID_POINT,
+                                    mWmsParameters[QgsWmsParameter::J] );
     }
 
     double xRes = mapSettings.extent().width() / mapSettings.outputSize().width();

Original file line number	Diff line number	Diff line change
`@@ -835,9 +835,16 @@ namespace QgsWms`
`835`	`835`	`static void infoPointToMapCoordinates( int i, int j, QgsPointXY *infoPoint, const QgsMapSettings &mapSettings )`
`836`	`836`	`{`
`837`	`837`	`//check if i, j are in the pixel range of the image`
`838`		`- if ( i < 0 \|\| i > mapSettings.outputSize().width() \|\| j < 0 \|\| j > mapSettings.outputSize().height() )`
	`838`	`+ if ( i < 0 \|\| i > mapSettings.outputSize().width() )`
`839`	`839`	`{`
`840`		`- throw QgsBadRequestException( "InvalidPoint", "I/J parameters not within the pixel range" );`
	`840`	`+ throw QgsBadRequestException( QgsServiceException::INVALID_POINT,`
	`841`	`+ mWmsParameters[QgsWmsParameter::I] );`
	`842`	`+ }`
	`843`	`+`
	`844`	`+ if ( j < 0 \|\| j > mapSettings.outputSize().height() )`
	`845`	`+ {`
	`846`	`+ throw QgsBadRequestException( QgsServiceException::INVALID_POINT,`
	`847`	`+ mWmsParameters[QgsWmsParameter::J] );`
`841`	`848`	`}`
`842`	`849`
`843`	`850`	`double xRes = mapSettings.extent().width() / mapSettings.outputSize().width();`