Fix compilation

qgis · Mar 28, 2019 · 75ba909 · 75ba909
1 parent 4c09957
commit 75ba909
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp
@@ -67,7 +67,7 @@ namespace QgsWms
           break;
         default:
           throw QgsBadRequestException( QgsServiceException::OGC_INVALID_FORMAT,
-                                        mWmsParameters[QgsWmsParameter::FORMAT] );
+                                        parameters[QgsWmsParameter::FORMAT] );
           break;
       }
 

diff --git a/src/server/services/wms/qgswmsgetprint.cpp b/src/server/services/wms/qgswmsgetprint.cpp
@@ -30,10 +30,10 @@ namespace QgsWms
                       QgsServerResponse &response )
   {
     // get wms parameters from query
-    const QgsWmsParameters wmsParameters( QUrlQuery( request.url() ) );
+    const QgsWmsParameters parameters( QUrlQuery( request.url() ) );
 
     // GetPrint supports svg/png/pdf
-    const QgsWmsParameters::Format format = wmsParameters.format();
+    const QgsWmsParameters::Format format = parameters.format();
     QString contentType;
     switch ( format )
     {
@@ -51,7 +51,7 @@ namespace QgsWms
         break;
       default:
         throw QgsBadRequestException( QgsServiceException::OGC_INVALID_FORMAT,
-                                      mWmsParameters[QgsWmsParameter::FORMAT] );
+                                      parameters[QgsWmsParameter::FORMAT] );
         break;
     }
 
@@ -64,7 +64,7 @@ namespace QgsWms
     context.setFlag( QgsWmsRenderContext::SetAccessControl );
     context.setFlag( QgsWmsRenderContext::AddHighlightLayers );
     context.setFlag( QgsWmsRenderContext::AddExternalLayers );
-    context.setParameters( wmsParameters );
+    context.setParameters( parameters );
 
     // rendering
     QgsRenderer renderer( context );

diff --git a/src/server/services/wms/qgswmsrendercontext.cpp b/src/server/services/wms/qgswmsrendercontext.cpp
@@ -18,6 +18,7 @@
 #include "qgslayertree.h"
 
 #include "qgswmsrendercontext.h"
+#include "qgswmsserviceexception.h"
 #include "qgsserverprojectutils.h"
 
 using namespace QgsWms;

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -837,14 +837,18 @@ namespace QgsWms
     //check if i, j are in the pixel range of the image
     if ( i < 0 || i > mapSettings.outputSize().width() )
     {
-      throw QgsBadRequestException( QgsServiceException::INVALID_POINT,
-                                    mWmsParameters[QgsWmsParameter::I] );
+      QgsWmsParameter param( QgsWmsParameter::I );
+      param.mValue = i;
+      throw QgsBadRequestException( QgsServiceException::OGC_INVALID_POINT,
+                                    param );
     }
 
     if ( j < 0 || j > mapSettings.outputSize().height() )
     {
-      throw QgsBadRequestException( QgsServiceException::INVALID_POINT,
-                                    mWmsParameters[QgsWmsParameter::J] );
+      QgsWmsParameter param( QgsWmsParameter::J );
+      param.mValue = j;
+      throw QgsBadRequestException( QgsServiceException::OGC_INVALID_POINT,
+                                    param );
     }
 
     double xRes = mapSettings.extent().width() / mapSettings.outputSize().width();

diff --git a/src/server/services/wms/qgswmsserviceexception.h b/src/server/services/wms/qgswmsserviceexception.h
@@ -56,6 +56,7 @@ namespace QgsWms
         OGC_INVALID_UPDATE_SEQUENCE,
         OGC_MISSING_DIMENSION_VALUE,
         OGC_INVALID_DIMENSION_VALUE,
+        OGC_INVALID_POINT, // new in WMS 1.3.0
         OGC_INVALID_CRS, // new in WMS 1.3.0
         OGC_OPERATION_NOT_SUPPORTED, // new in WMS 1.3.0
         QGIS_MISSING_PARAMETER_VALUE,
@@ -137,6 +138,11 @@ namespace QgsWms
             message = QStringLiteral( "The layer '%1' is not queryable." ).arg( parameter.toString() );
             break;
           }
+          case OGC_INVALID_POINT:
+          {
+            message = QStringLiteral( "The point '%1' from '%2' is invalid." ).arg( parameter.toString(), name );
+            break;
+          }
           case OGC_STYLE_NOT_DEFINED:
           case OGC_CURRENT_UPDATE_SEQUENCE:
           case OGC_INVALID_UPDATE_SEQUENCE:

diff --git a/src/server/services/wms/qgswmsutils.cpp b/src/server/services/wms/qgswmsutils.cpp
@@ -161,8 +161,10 @@ namespace QgsWms
     }
     else
     {
+      QgsWmsParameter parameter( QgsWmsParameter::FORMAT );
+      parameter.mValue = formatStr;
       throw QgsBadRequestException( QgsServiceException::OGC_INVALID_FORMAT,
-                                    mWmsParameters[QgsWmsParameter::FORMAT] );
+                                    parameter );
     }
   }
 } // namespace QgsWms