WCS / OWS select format fix

qgis · May 2, 2012 · 70b68be · 70b68be
1 parent 988a7da
commit 70b68be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/gui/qgsowssourceselect.cpp b/src/gui/qgsowssourceselect.cpp
@@ -158,7 +158,8 @@ void QgsOWSSourceSelect::populateFormats()
   }
 
   // selectedLayersFormats may come in various forms:
-  // image/tiff, GTiff, GeoTIFF, TIFF, PNG, GTOPO30, ARCGRID, IMAGEMOSAIC ...
+  // image/tiff, GTiff, GeoTIFF, TIFF, geotiff_int16, geotiff_rgb,
+  // PNG, GTOPO30, ARCGRID, IMAGEMOSAIC,
   QMap<QString, QString> formatsMap;
   formatsMap.insert( "geotiff", "tiff" );
   formatsMap.insert( "gtiff", "tiff" );
@@ -176,7 +177,7 @@ void QgsOWSSourceSelect::populateFormats()
   {
     QString format = layersFormats.value( i );
     QgsDebugMsg( "server format = " + format );
-    QString simpleFormat = format.toLower().replace( "image/", "" );
+    QString simpleFormat = format.toLower().replace( "image/", "" ).replace( QRegExp( "_.*" ), "" );
     QgsDebugMsg( "server simpleFormat = " + simpleFormat );
     QString mimeFormat = "image/" + formatsMap.value( simpleFormat );
     QgsDebugMsg( "server mimeFormat = " + mimeFormat );

diff --git a/src/providers/gdal/qgswcssourceselect.cpp b/src/providers/gdal/qgswcssourceselect.cpp
@@ -137,7 +137,10 @@ void QgsWCSSourceSelect::addClicked( )
   }
 
   QgsDebugMsg( "selectedFormat = " +  selectedFormat() );
-  uri.setParam( "format", selectedFormat() );
+  if ( !selectedFormat().isEmpty() )
+  {
+    uri.setParam( "format", selectedFormat() );
+  }
 
   emit addRasterLayer( uri.encodedUri(), identifier, "gdal" );
 }