Update InvalidFormat exception

qgis · Mar 28, 2019 · 37b9499 · 37b9499
1 parent daa5e42
commit 37b9499
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp
@@ -66,8 +66,8 @@ namespace QgsWms
           saveFormat = "JPEG";
           break;
         default:
-          throw QgsServiceException( "InvalidFormat",
-                                     QString( "Output format '%1' is not supported in the GetLegendGraphic request" ).arg( format ) );
+          throw QgsBadRequestException( QgsServiceException::OGC_INVALID_FORMAT,
+                                        mWmsParameters[QgsWmsParameter::FORMAT] );
           break;
       }
 

diff --git a/src/server/services/wms/qgswmsgetprint.cpp b/src/server/services/wms/qgswmsgetprint.cpp
@@ -50,8 +50,8 @@ namespace QgsWms
         contentType = QStringLiteral( "application/pdf" );
         break;
       default:
-        throw QgsServiceException( QStringLiteral( "InvalidFormat" ),
-                                   QString( "Output format %1 is not supported by the GetPrint request" ).arg( wmsParameters.formatAsString() ) );
+        throw QgsBadRequestException( QgsServiceException::OGC_INVALID_FORMAT,
+                                      mWmsParameters[QgsWmsParameter::FORMAT] );
         break;
     }
 

diff --git a/src/server/services/wms/qgswmsutils.cpp b/src/server/services/wms/qgswmsutils.cpp
@@ -161,8 +161,8 @@ namespace QgsWms
     }
     else
     {
-      throw QgsServiceException( "InvalidFormat",
-                                 QString( "Output format '%1' is not supported in the GetMap request" ).arg( formatStr ) );
+      throw QgsBadRequestException( QgsServiceException::OGC_INVALID_FORMAT,
+                                    mWmsParameters[QgsWmsParameter::FORMAT] );
     }
   }
 } // namespace QgsWms