add for second case as well the default scale fallback

qgis · Apr 11, 2019 · c22effb · c22effb
1 parent 8e62a89
commit c22effb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/server/qgsserverprojectutils.h b/src/server/qgsserverprojectutils.h
@@ -157,7 +157,7 @@ namespace QgsServerProjectUtils
   /**
    * Returns the denominator of the default scale used in case of the scale is not given
    * \param project the QGIS project
-   * \return the denominator of the scale
+   * \returns the denominator of the scale
    * \since QGIS 3.8
    */
   SERVER_EXPORT double wmsDefaultMapUnitsPerMm( const QgsProject &project );

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -176,6 +176,11 @@ namespace QgsWms
       settings.setMapScale( mapSettings.scale() );
       settings.setMapUnitsPerPixel( mapSettings.mapUnitsPerPixel() );
     }
+    else
+    {
+      double defaultMapUnitsPerPixel = QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mContext.project() ) / mContext.dotsPerMm();
+      settings.setMapUnitsPerPixel( defaultMapUnitsPerPixel );
+    }
 
     // create image
     const int width = mWmsParameters.widthAsInt();