optionally use base url for WMTS GetTile requests (implements #8595)

jef-n · jef-n · commit 8248239a7972 · 2013-10-31T01:08:57.000+01:00
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
@@ -31570,8 +31570,8 @@ Note: giving the password is optional. It will be requested interactivly, when n
     </message>
     <message>
         <location filename="../src/ui/qgsnewhttpconnectionbase.ui" line="157"/>
-        <source>Ignore GetMap URI reported in capabilities</source>
-        <translation>Gemeldete GetMap-URI aus Diensteigenschaften ignorieren</translation>
+        <source>Ignore GetMap/GetTile URI reported in capabilities</source>
+        <translation>Gemeldete GetMap/GetTile-URI aus Diensteigenschaften ignorieren</translation>
     </message>
     <message>
         <location filename="../src/ui/qgsnewhttpconnectionbase.ui" line="164"/>
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -889,7 +889,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle  const &viewExtent, int pixelWidth, i
         if ( !getTileUrl().isNull() )
         {
           // KVP
-          QUrl url( getTileUrl() );
+          QUrl url( mIgnoreGetMapUrl ? mBaseUrl : getTileUrl() );
 
           // compose static request arguments.
           setQueryItem( url, "SERVICE", "WMTS" );
diff --git a/src/ui/qgsnewhttpconnectionbase.ui b/src/ui/qgsnewhttpconnectionbase.ui
@@ -154,7 +154,7 @@
       <item row="12" column="0" colspan="2">
        <widget class="QCheckBox" name="cbxIgnoreGetMapURI">
         <property name="text">
-         <string>Ignore GetMap URI reported in capabilities</string>
+         <string>Ignore GetMap/GetTile URI reported in capabilities</string>
         </property>
        </widget>
       </item>

Original file line number	Diff line number	Diff line change
`@@ -889,7 +889,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i`
`889`	`889`	`if ( !getTileUrl().isNull() )`
`890`	`890`	`{`
`891`	`891`	`// KVP`
`892`		`- QUrl url( getTileUrl() );`
	`892`	`+ QUrl url( mIgnoreGetMapUrl ? mBaseUrl : getTileUrl() );`
`893`	`893`
`894`	`894`	`// compose static request arguments.`
`895`	`895`	`setQueryItem( url, "SERVICE", "WMTS" );`