[afs] Correctly set picture marker size aspect ratio lock on load

qgis · Dec 6, 2018 · 89e9895 · 89e9895
1 parent b954008
commit 89e9895
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/providers/arcgisrest/qgsarcgisrestutils.cpp b/src/providers/arcgisrest/qgsarcgisrestutils.cpp
@@ -708,7 +708,11 @@ std::unique_ptr<QgsMarkerSymbol> QgsArcGisRestUtils::parseEsriPictureMarkerSymbo
   QgsSymbolLayerList layers;
   std::unique_ptr< QgsRasterMarkerSymbolLayer > markerLayer = qgis::make_unique< QgsRasterMarkerSymbolLayer >( symbolPath, widthInPixels, angleCW, QgsSymbol::ScaleArea );
   markerLayer->setSizeUnit( QgsUnitTypes::RenderPixels );
-  markerLayer->setFixedAspectRatio( static_cast< double >( widthInPixels ) / heightInPixels );
+
+  // only change the default aspect ratio if the server height setting requires this
+  if ( !qgsDoubleNear( static_cast< double >( widthInPixels ) / heightInPixels, markerLayer->defaultAspectRatio() ) )
+    markerLayer->setFixedAspectRatio( static_cast< double >( widthInPixels ) / heightInPixels );
+
   markerLayer->setOffset( QPointF( xOffset, yOffset ) );
   markerLayer->setOffsetUnit( QgsUnitTypes::RenderPoints );
   layers.append( markerLayer.release() );