Merge pull request #3960 from rldhont/server-wms-transparent-bgcolor

[BUGFIX][Server] Re-enable Transparent and Bgcolor parameter for GetMap
qgis · Jan 11, 2017 · bc4c470 · bc4c470
2 parents e656c63 + bf73e2c
commit bc4c470
Show file tree

Hide file tree

Showing 11 changed files with 159 additions and 0 deletions.
diff --git a/src/server/services/wms/qgswmsservertransitional.cpp b/src/server/services/wms/qgswmsservertransitional.cpp
@@ -1629,6 +1629,7 @@ namespace QgsWms
 
     QImage* theImage = nullptr;
 
+    //Define the image background color in case of map settings is not used
     //is format jpeg?
     QString format = mParameters.value( QStringLiteral( "FORMAT" ) );
     bool jpeg = format.compare( QLatin1String( "jpg" ), Qt::CaseInsensitive ) == 0
@@ -1757,6 +1758,37 @@ namespace QgsWms
     }
 
     mapSettings.setExtent( mapExtent );
+
+    /* Define the background color
+     * Transparent or colored
+     */
+    //is format jpeg?
+    QString format = mParameters.value( QStringLiteral( "FORMAT" ) );
+    bool jpeg = format.compare( QLatin1String( "jpg" ), Qt::CaseInsensitive ) == 0
+                || format.compare( QLatin1String( "jpeg" ), Qt::CaseInsensitive ) == 0
+                || format.compare( QLatin1String( "image/jpeg" ), Qt::CaseInsensitive ) == 0;
+
+    //transparent parameter
+    bool transparent = mParameters.value( QStringLiteral( "TRANSPARENT" ) ).compare( QLatin1String( "true" ), Qt::CaseInsensitive ) == 0;
+
+    //background  color
+    QString bgColorString = mParameters.value( "BGCOLOR" );
+    if ( bgColorString.startsWith( "0x", Qt::CaseInsensitive ) )
+    {
+      bgColorString.replace( 0, 2, "#" );
+    }
+    QColor backgroundColor;
+    backgroundColor.setNamedColor( bgColorString );
+
+    //set background color
+    if ( transparent && !jpeg )
+    {
+      mapSettings.setBackgroundColor( QColor( 0, 0, 0, 0 ) );
+    }
+    else if ( backgroundColor.isValid() )
+    {
+      mapSettings.setBackgroundColor( backgroundColor );
+    }
   }
 
   void QgsWmsServer::readLayersAndStyles( QStringList& layersList, QStringList& stylesList ) const

diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -409,6 +409,80 @@ def test_getfeature_post(self):
         for id, req in tests:
             self.wfs_getfeature_post_compare(id, req)
 
+    def test_wms_getmap_basic(self):
+        qs = "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetMap",
+            "LAYERS": "Country",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-16817707,-4710778,5696513,14587125",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857"
+        }.items())])
+
+        r, h = self._result(self.server.handleRequest(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Basic")
+
+    def test_wms_getmap_transparent(self):
+        qs = "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetMap",
+            "LAYERS": "Country",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-16817707,-4710778,5696513,14587125",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "TRANSPARENT": "TRUE"
+        }.items())])
+
+        r, h = self._result(self.server.handleRequest(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Transparent")
+
+    def test_wms_getmap_background(self):
+        qs = "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetMap",
+            "LAYERS": "Country",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-16817707,-4710778,5696513,14587125",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "BGCOLOR": "green"
+        }.items())])
+
+        r, h = self._result(self.server.handleRequest(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Background")
+
+        qs = "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetMap",
+            "LAYERS": "Country",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "-16817707,-4710778,5696513,14587125",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "BGCOLOR": "0x008000"
+        }.items())])
+
+        r, h = self._result(self.server.handleRequest(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Background_Hex")
+
     def test_wms_getmap_order(self):
         qs = "&".join(["%s=%s" % i for i in list({
             "MAP": urllib.parse.quote(self.projectPath),
@@ -699,6 +773,59 @@ def test_wms_GetLegendGraphic_Basic(self):
         r, h = self._result(self.server.handleRequest(qs))
         self._img_diff_error(r, h, "WMS_GetLegendGraphic_Basic")
 
+    def test_wms_GetLegendGraphic_Transparent(self):
+        qs = "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetLegendGraphic",
+            "LAYER": "Country,Hello",
+            "LAYERTITLE": "FALSE",
+            "FORMAT": "image/png",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "TRANSPARENT": "TRUE"
+        }.items())])
+
+        r, h = self._result(self.server.handleRequest(qs))
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_Transparent")
+
+    def test_wms_GetLegendGraphic_Background(self):
+        qs = "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetLegendGraphic",
+            "LAYER": "Country,Hello",
+            "LAYERTITLE": "FALSE",
+            "FORMAT": "image/png",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "BGCOLOR": "green"
+        }.items())])
+
+        r, h = self._result(self.server.handleRequest(qs))
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_Background")
+
+        qs = "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetLegendGraphic",
+            "LAYER": "Country,Hello",
+            "LAYERTITLE": "FALSE",
+            "FORMAT": "image/png",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "BGCOLOR": "0x008000"
+        }.items())])
+
+        r, h = self._result(self.server.handleRequest(qs))
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_Background_Hex")
+
     def test_wms_GetLegendGraphic_BoxSpace(self):
         qs = "&".join(["%s=%s" % i for i in list({
             "MAP": urllib.parse.quote(self.projectPath),

diff --git a/...qgis_server/WMS_GetLegendGraphic_Background/WMS_GetLegendGraphic_Background.png b/...qgis_server/WMS_GetLegendGraphic_Background/WMS_GetLegendGraphic_Background.png
diff --git a/...ver/WMS_GetLegendGraphic_Background_Hex/WMS_GetLegendGraphic_Background_Hex.png b/...ver/WMS_GetLegendGraphic_Background_Hex/WMS_GetLegendGraphic_Background_Hex.png
diff --git a/...is_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent.png b/...is_server/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent.png
diff --git a/...rver/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent_mask.png b/...rver/WMS_GetLegendGraphic_Transparent/WMS_GetLegendGraphic_Transparent_mask.png
diff --git a/...data/control_images/qgis_server/WMS_GetMap_Background/WMS_GetMap_Background.png b/...data/control_images/qgis_server/WMS_GetMap_Background/WMS_GetMap_Background.png
diff --git a/...trol_images/qgis_server/WMS_GetMap_Background_Hex/WMS_GetMap_Background_Hex.png b/...trol_images/qgis_server/WMS_GetMap_Background_Hex/WMS_GetMap_Background_Hex.png
diff --git a/tests/testdata/control_images/qgis_server/WMS_GetMap_Basic/WMS_GetMap_Basic.png b/tests/testdata/control_images/qgis_server/WMS_GetMap_Basic/WMS_GetMap_Basic.png
diff --git a/...ta/control_images/qgis_server/WMS_GetMap_Transparent/WMS_GetMap_Transparent.png b/...ta/control_images/qgis_server/WMS_GetMap_Transparent/WMS_GetMap_Transparent.png
diff --git a/...ntrol_images/qgis_server/WMS_GetMap_Transparent/WMS_GetMap_Transparent_mask.png b/...ntrol_images/qgis_server/WMS_GetMap_Transparent/WMS_GetMap_Transparent_mask.png