fix reading of parameters

qgis · Jan 7, 2021 · cfc8f03430c9c5bed36777017dca31b39568d67a · cfc8f03
1 parent 98d1be2
commit cfc8f03430c9c5bed36777017dca31b39568d67a
Unified Split

Showing with 2 additions and 9 deletions.

+2 −9 src/core/symbology/qgsmarkersymbollayer.cpp
diff --git a/src/core/symbology/qgsmarkersymbollayer.cpp b/src/core/symbology/qgsmarkersymbollayer.cpp
@@ -2279,7 +2279,7 @@ QVariantMap QgsSvgMarkerSymbolLayer::properties() const
   QMap<QString, QgsProperty>::const_iterator it = mParameters.constBegin();
   for ( ; it != mParameters.constEnd(); ++it )
     parameters.insert( it.key(), it.value().toVariant() );
-  map[QStringLiteral( "vertical_anchor_point" )] = parameters;
+  map[QStringLiteral( "parameters" )] = parameters;
 
   return map;
 }
@@ -2307,14 +2307,7 @@ QgsSvgMarkerSymbolLayer *QgsSvgMarkerSymbolLayer::clone() const
   m->setSizeMapUnitScale( mSizeMapUnitScale );
   m->setHorizontalAnchorPoint( mHorizontalAnchorPoint );
   m->setVerticalAnchorPoint( mVerticalAnchorPoint );
-
-  QMap<QString, QgsProperty> parameters;
-  QMap<QString, QgsProperty>::const_iterator paramIt = mParameters.constBegin();
-  for ( ; paramIt != mParameters.constEnd(); ++paramIt )
-  {
-    parameters.insert( paramIt.key(), QgsProperty::fromExpression( paramIt.value().expressionString() ) );
-  }
-  m->setParameters( parameters );
+  m->setParameters( mParameters );
 
   copyDataDefinedProperties( m );
   copyPaintEffect( m );