[BUGFIX][Server] WMS compliance: stretched, distort, increase, decrease

The commit d44f1eb seems to break some WMS 1.3.0 client and WMS compliancy. The commit d44f1eb has been written to fix an issue with QGIS WMS Client and to render image like other WMS Server. This commit has been written to fix issue introduce by d44f1eb. It is based on MapServer code: * https://github.com/mapserver/mapserver/blob/master/mapdraw.c#L115 * https://github.com/mapserver/mapserver/blob/master/HISTORY.TXT#L3768 And take account of axis invertion for output CRS.
qgis · Jan 3, 2017 · 454df31 · 454df31
1 parent 47130a6
commit 454df31
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1974,26 +1974,32 @@ QImage* QgsWmsServer::createImage( int width, int height, bool useBbox ) const
 
   //Adapt width / height if the aspect ratio does not correspond with the BBOX.
   //Required by WMS spec. 1.3.
-  if ( useBbox )
+  QString version = mParameters.value( QStringLiteral( "VERSION" ), QStringLiteral( "1.3.0" ) );
+  if ( useBbox && version != QLatin1String( "1.1.1" ) )
   {
     bool bboxOk;
     QgsRectangle mapExtent = _parseBBOX( mParameters.value( "BBOX" ), bboxOk );
+    QString crs = mParameters.value( QStringLiteral( "CRS" ), mParameters.value( QStringLiteral( "SRS" ) ) );
+    if ( crs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )
+    {
+      crs = QString( "EPSG:4326" );
+      mapExtent.invert();
+    }
+    QgsCoordinateReferenceSystem outputCRS = QgsCoordinateReferenceSystem::fromOgcWmsCrs( crs );
+    if ( outputCRS.hasAxisInverted() )
+    {
+      mapExtent.invert();
+    }
     if ( bboxOk )
     {
       double mapWidthHeightRatio = mapExtent.width() / mapExtent.height();
       double imageWidthHeightRatio = ( double )width / ( double )height;
       if ( !qgsDoubleNear( mapWidthHeightRatio, imageWidthHeightRatio, 0.0001 ) )
       {
-        if ( mapWidthHeightRatio >= imageWidthHeightRatio )
-        {
-          //increase image height
-          height = width * mapWidthHeightRatio;
-        }
-        else
-        {
-          //increase image width
-          width = height / mapWidthHeightRatio;
-        }
+        // inspired by MapServer, mapdraw.c L115
+        double cellsize = ( mapExtent.width() / ( double )width ) * 0.5 + ( mapExtent.height() / ( double )height ) * 0.5;
+        width = mapExtent.width() / cellsize;
+        height = mapExtent.height() / cellsize;
       }
     }
   }

diff --git a/tests/testdata/control_images/qgis_server/WMS_GetMap_Filter/WMS_GetMap_Filter.png b/tests/testdata/control_images/qgis_server/WMS_GetMap_Filter/WMS_GetMap_Filter.png
diff --git a/...data/control_images/qgis_server/WMS_GetMap_LayerOrder/WMS_GetMap_LayerOrder.png b/...data/control_images/qgis_server/WMS_GetMap_LayerOrder/WMS_GetMap_LayerOrder.png
diff --git a/...stdata/control_images/qgis_server/WMS_GetMap_Opacities/WMS_GetMap_Opacities.png b/...stdata/control_images/qgis_server/WMS_GetMap_Opacities/WMS_GetMap_Opacities.png
diff --git a/tests/testdata/control_images/qgis_server/WMS_GetMap_SRS/WMS_GetMap_SRS.png b/tests/testdata/control_images/qgis_server/WMS_GetMap_SRS/WMS_GetMap_SRS.png
diff --git a/...stdata/control_images/qgis_server/WMS_GetMap_Selection/WMS_GetMap_Selection.png b/...stdata/control_images/qgis_server/WMS_GetMap_Selection/WMS_GetMap_Selection.png
diff --git a/...ta/control_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom.png b/...ta/control_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom.png
diff --git a/.../control_images/qgis_server/WMS_GetMap_StyleDefault/WMS_GetMap_StyleDefault.png b/.../control_images/qgis_server/WMS_GetMap_StyleDefault/WMS_GetMap_StyleDefault.png