Merge pull request #9115 from m-kuhn/wmts-getcapabilities-compat

m-kuhn · web-flow · commit 31ab3bb5d14b · 2019-02-06T22:01:53.000+01:00
Append ? to WMTS GetCapabilities
diff --git a/src/server/services/wmts/qgswmtsgetcapabilities.cpp b/src/server/services/wmts/qgswmtsgetcapabilities.cpp
@@ -272,8 +272,12 @@ namespace QgsWmts
     QDomElement httpElement = doc.createElement( QStringLiteral( "ows:HTTP" )/*ows:HTTP*/ );
     dcpElement.appendChild( httpElement );
 
-    //Prepare url
-    QString hrefString = serviceUrl( request, project );
+    // Get service URL
+    const QUrl href = serviceUrl( request, project );
+
+    //href needs to be a prefix
+    QString hrefString = href.toString();
+    hrefString.append( href.hasQuery() ? '&' : '?' );
 
     //ows:Get
     QDomElement getElement = doc.createElement( QStringLiteral( "ows:Get" )/*ows:Get*/ );
diff --git a/tests/testdata/qgis_server/wmts_getcapabilities_config.txt b/tests/testdata/qgis_server/wmts_getcapabilities_config.txt
@@ -20,21 +20,21 @@ Content-Type: text/xml; charset=utf-8
   <ows:Operation name="GetCapabilities">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="https://www.qgis.org/"/>
+     <ows:Get xlink:href="https://www.qgis.org/?"/>
     </ows:HTTP>
    </ows:DCP>
   </ows:Operation>
   <ows:Operation name="GetTile">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="https://www.qgis.org/"/>
+     <ows:Get xlink:href="https://www.qgis.org/?"/>
     </ows:HTTP>
    </ows:DCP>
   </ows:Operation>
   <ows:Operation name="GetFeatureInfo">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="https://www.qgis.org/"/>
+     <ows:Get xlink:href="https://www.qgis.org/?"/>
     </ows:HTTP>
    </ows:DCP>
   </ows:Operation>
diff --git a/tests/testdata/qgis_server/wmts_getcapabilities_config_3857.txt b/tests/testdata/qgis_server/wmts_getcapabilities_config_3857.txt
@@ -20,21 +20,21 @@ Content-Type: text/xml; charset=utf-8
   <ows:Operation name="GetCapabilities">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="https://www.qgis.org/"/>
+     <ows:Get xlink:href="https://www.qgis.org/?"/>
     </ows:HTTP>
    </ows:DCP>
   </ows:Operation>
   <ows:Operation name="GetTile">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="https://www.qgis.org/"/>
+     <ows:Get xlink:href="https://www.qgis.org/?"/>
     </ows:HTTP>
    </ows:DCP>
   </ows:Operation>
   <ows:Operation name="GetFeatureInfo">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="https://www.qgis.org/"/>
+     <ows:Get xlink:href="https://www.qgis.org/?"/>
     </ows:HTTP>
    </ows:DCP>
   </ows:Operation>
