add for second case as well the default scale fallback

signedav · signedav · commit c22effb545b5 · 2019-04-11T17:01:09.000+02:00
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();
