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

nirvn · github-actions[bot] · commit c5bf01d75dd3 · 2023-04-09T20:00:58.000Z
diff --git a/src/core/labeling/qgsvectorlayerlabelprovider.cpp b/src/core/labeling/qgsvectorlayerlabelprovider.cpp
@@ -712,3 +712,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
@@ -187,6 +187,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
`@@ -712,3 +712,8 @@ const QgsPalLayerSettings &QgsVectorLayerLabelProvider::settings() const`
`712`	`712`	`{`
`713`	`713`	`return mSettings;`
`714`	`714`	`}`
	`715`	`+`
	`716`	`+void QgsVectorLayerLabelProvider::setFields( const QgsFields &fields )`
	`717`	`+{`
	`718`	`+ mFields = fields;`
	`719`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,8 @@ bool QgsVectorTileBasicLabelProvider::prepare( QgsRenderContext &context, QSet<Q`
`187`	`187`	`QgsExpressionContextScopePopper popper( context.expressionContext(), scope );`
`188`	`188`
`189`	`189`	`mSubProviders[i]->setFields( fields );`
	`190`	`+ // check is required as fields are not available through the GUI, which can lead to isExpression wrongly set to true`
	`191`	`+ mSubProviders[i]->mSettings.isExpression = !fields.names().contains( mSubProviders[i]->mSettings.fieldName );`
`190`	`192`	`if ( !mSubProviders[i]->prepare( context, attributeNames ) )`
`191`	`193`	`{`
`192`	`194`	`QgsDebugMsg( QStringLiteral( "Failed to prepare labeling for style index" ) + QString::number( i ) );`