Add BBOX and CRS before layers definition

pblottiere · pblottiere · commit e39e3b5dfe0b · 2018-04-26T16:14:19.000+01:00
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -1205,6 +1205,13 @@ namespace QgsWms
       QDomElement abstractElement = layerElement.firstChildElement( QStringLiteral( "Abstract" ) );
       QDomElement CRSPrecedingElement = abstractElement.isNull() ? titleElement : abstractElement; //last element before the CRS elements
 
+      if ( CRSPrecedingElement.isNull() )
+      {
+        // keyword list element is never empty
+        const QDomElement keyElement = layerElement.firstChildElement( QStringLiteral( "KeywordList" ) );
+        CRSPrecedingElement = keyElement;
+      }
+
       //In case the number of advertised CRS is constrained
       if ( !constrainedCrsList.isEmpty() )
       {
