Add BBOX and CRS before layers definition

qgis · May 2, 2018 · 1636e6a45aa0af5a29b46ac361f0ef3b76276f91 · 1636e6a
1 parent 9e5f382
commit 1636e6a45aa0af5a29b46ac361f0ef3b76276f91
Unified Split

Showing with 7 additions and 0 deletions.

+7 −0 src/server/services/wms/qgswmsgetcapabilities.cpp
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -1206,6 +1206,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() )
       {