wms: add support for svg getmap requests (implements #10060)

jef-n · jef-n · commit b118213d7bf8 · 2014-04-14T00:36:59.000+02:00
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -509,7 +509,14 @@ QImage *QgsWmsProvider::draw( QgsRectangle  const &viewExtent, int pixelWidth, i
     setQueryItem( url, "HEIGHT", QString::number( pixelHeight ) );
     setQueryItem( url, "LAYERS", layers );
     setQueryItem( url, "STYLES", styles );
-    setQueryItem( url, "FORMAT", mSettings.mImageMimeType );
+    if( mSettings.mImageMimeType.contains( "+" ) )
+    {
+      QString format( mSettings.mImageMimeType );
+      format.replace( "+", "%2b" );
+      url.addEncodedQueryItem( "FORMAT", format.toUtf8() );
+    }
+    else
+      setQueryItem( url, "FORMAT", mSettings.mImageMimeType );
 
     if ( mDpi != -1 )
     {
@@ -2897,6 +2904,14 @@ QVector<QgsWmsSupportedFormat> QgsWmsProvider::supportedFormats()
     formats << t1;
   }
 
+  if ( supportedFormats.contains( "svg" ) )
+  {
+    QgsWmsSupportedFormat s1 = { "image/svg", "SVG" };
+    QgsWmsSupportedFormat s2 = { "image/svgz", "SVG" };
+    QgsWmsSupportedFormat s3 = { "image/svg+xml", "SVG" };
+    formats << s1 << s2 << s3;
+  }
+
   return formats;
 }
 
