Manage LayerNotDefined exception

qgis · Mar 28, 2019 · 2fc3da3 · 2fc3da3
1 parent 5eca1f1
commit 2fc3da3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/server/services/wms/qgswmsrendercontext.cpp b/src/server/services/wms/qgswmsrendercontext.cpp
@@ -395,8 +395,10 @@ void QgsWmsRenderContext::searchLayersToRenderSld()
       }
       else
       {
-        throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ),
-                                      QStringLiteral( "Layer \"%1\" does not exist" ).arg( lname ) );
+        QgsWmsParameter param( QgsWmsParameter::LAYER );
+        param.mValue = lname;
+        throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,
+                                      param );
       }
     }
   }
@@ -439,8 +441,10 @@ void QgsWmsRenderContext::searchLayersToRenderStyle()
     }
     else
     {
-      throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ),
-                                    QStringLiteral( "Layer \"%1\" does not exist" ).arg( nickname ) );
+      QgsWmsParameter param( QgsWmsParameter::LAYER );
+      param.mValue = nickname;
+      throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,
+                                    param );
     }
   }
 }

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1309,8 +1309,11 @@ namespace QgsWms
       }
       if ( !validLayer && !mContext.isValidLayer( queryLayer ) && !mContext.isValidGroup( queryLayer ) )
       {
-        QString msg = QObject::tr( "Layer '%1' not found" ).arg( queryLayer );
-        throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ), msg );
+        QgsWmsParameter param( QgsWmsParameter::LAYER );
+        param.mValue = queryLayer;
+        throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,
+                                      param );
+
       }
       else if ( ( validLayer && !queryableLayer ) || ( !validLayer && mContext.isValidGroup( queryLayer ) ) )
       {

diff --git a/src/server/services/wms/qgswmsserviceexception.h b/src/server/services/wms/qgswmsserviceexception.h
@@ -128,6 +128,10 @@ namespace QgsWms
             break;
           }
           case OGC_LAYER_NOT_DEFINED:
+          {
+            message = QStringLiteral( "The layer '%1' does not exist." ).arg( parameter.toString() );
+            break;
+          }
           case OGC_STYLE_NOT_DEFINED:
           case OGC_LAYER_NOT_QUERYABLE:
           case OGC_CURRENT_UPDATE_SEQUENCE: