[vector tiles] Fix editing of label styles results in missing labels

nirvn · nirvn · commit 60f7f89c0c0d · 2023-04-10T07:05:15.000+07:00
diff --git a/src/core/labeling/qgsvectorlayerlabelprovider.cpp b/src/core/labeling/qgsvectorlayerlabelprovider.cpp
@@ -809,3 +809,8 @@ const QgsPalLayerSettings &QgsVectorLayerLabelProvider::settings() const
 {
   return mSettings;
 }
+
+void QgsVectorLayerLabelProvider::setFields( const QgsFields &fields )
+{
+  mFields = fields;
+}
diff --git a/src/core/labeling/qgsvectorlayerlabelprovider.h b/src/core/labeling/qgsvectorlayerlabelprovider.h
@@ -116,7 +116,7 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider
      * a call to prepare() which uses the list of fields.
      * \since QGIS 3.14
      */
-    void setFields( const QgsFields &fields ) { mFields = fields; }
+    void setFields( const QgsFields &fields );
 
   protected:
     //! initialization method - called from constructors
@@ -147,6 +147,8 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider
   private:
 
     friend class TestQgsLabelingEngine;
+    friend class QgsVectorTileBasicLabelProvider;
+
     void drawCallout( QgsRenderContext &context, pal::LabelPosition *label ) const;
 };
 
diff --git a/src/core/vectortile/qgsvectortilebasiclabeling.cpp b/src/core/vectortile/qgsvectortilebasiclabeling.cpp
@@ -186,6 +186,8 @@ bool QgsVectorTileBasicLabelProvider::prepare( QgsRenderContext &context, QSet<Q
     QgsExpressionContextScopePopper popper( context.expressionContext(), scope );
 
     mSubProviders[i]->setFields( fields );
+    // check is required as fields are not available through the GUI, which can lead to isExpression wrongly set to true
+    mSubProviders[i]->mSettings.isExpression = !fields.names().contains( mSubProviders[i]->mSettings.fieldName );
     if ( !mSubProviders[i]->prepare( context, attributeNames ) )
     {
       QgsDebugMsg( QStringLiteral( "Failed to prepare labeling for style index" ) + QString::number( i ) );

Original file line number	Diff line number	Diff line change
`@@ -809,3 +809,8 @@ const QgsPalLayerSettings &QgsVectorLayerLabelProvider::settings() const`
`809`	`809`	`{`
`810`	`810`	`return mSettings;`
`811`	`811`	`}`
	`812`	`+`
	`813`	`+void QgsVectorLayerLabelProvider::setFields( const QgsFields &fields )`
	`814`	`+{`
	`815`	`+ mFields = fields;`
	`816`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,8 @@ bool QgsVectorTileBasicLabelProvider::prepare( QgsRenderContext &context, QSet<Q`
`186`	`186`	`QgsExpressionContextScopePopper popper( context.expressionContext(), scope );`
`187`	`187`
`188`	`188`	`mSubProviders[i]->setFields( fields );`
	`189`	`+ // check is required as fields are not available through the GUI, which can lead to isExpression wrongly set to true`
	`190`	`+ mSubProviders[i]->mSettings.isExpression = !fields.names().contains( mSubProviders[i]->mSettings.fieldName );`
`189`	`191`	`if ( !mSubProviders[i]->prepare( context, attributeNames ) )`
`190`	`192`	`{`
`191`	`193`	`QgsDebugMsg( QStringLiteral( "Failed to prepare labeling for style index" ) + QString::number( i ) );`