Address review

qgis · Sep 10, 2024 · 162b3cb · 162b3cb
1 parent 7216121
commit 162b3cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/core/labeling/rules/qgslabelingenginerule_impl.cpp b/src/core/labeling/rules/qgslabelingenginerule_impl.cpp
@@ -16,12 +16,15 @@
 #include "qgslabelingenginerule_impl.h"
 #include "qgsunittypes.h"
 #include "qgssymbollayerutils.h"
-#include "labelposition.h"
-#include "feature.h"
 #include "qgsvectorlayerfeatureiterator.h"
 #include "qgsthreadingutils.h"
 #include "qgsspatialindex.h"
 #include "qgsgeos.h"
+#include "labelposition.h"
+#include "feature.h"
+#if GEOS_VERSION_MAJOR == 3 && GEOS_VERSION_MINOR < 10
+#include "qgsmessagelog.h"
+#endif
 
 //
 // QgsAbstractLabelingEngineRuleDistanceFromFeature
@@ -210,7 +213,7 @@ bool QgsAbstractLabelingEngineRuleDistanceFromFeature::candidateExceedsTolerance
         return mMustBeDistant;
       }
 #else
-      QgsDebugError( QStringLiteral( "This rule requires GEOS 3.10+" ) );
+      QgsMessageLog::logMessage( QStringLiteral( "The %1 labeling rule requires GEOS 3.10+" ).arg( name().isEmpty() ? displayType() : name() ) );
       return false;
 #endif
     }
@@ -288,7 +291,7 @@ QString QgsLabelingEngineRuleMaximumDistanceLabelToFeature::id() const
 
 QString QgsLabelingEngineRuleMaximumDistanceLabelToFeature::displayType() const
 {
-  return QObject::tr( "Pull Labels toward Features" );
+  return QObject::tr( "Pull Labels Toward Features" );
 }
 
 QString QgsLabelingEngineRuleMaximumDistanceLabelToFeature::description() const
@@ -432,7 +435,7 @@ bool QgsLabelingEngineRuleMinimumDistanceLabelToLabel::candidatesAreConflicting(
         return true;
       }
 #else
-      QgsDebugError( QStringLiteral( "This rule requires GEOS 3.10+" ) );
+      QgsMessageLog::logMessage( QStringLiteral( "The %1 labeling rule requires GEOS 3.10+" ).arg( name().isEmpty() ? displayType() : name() ) );
       return false;
 #endif
     }

diff --git a/src/core/labeling/rules/qgslabelingengineruleregistry.cpp b/src/core/labeling/rules/qgslabelingengineruleregistry.cpp
@@ -19,12 +19,9 @@
 
 QgsLabelingEngineRuleRegistry::QgsLabelingEngineRuleRegistry()
 {
-#if GEOS_VERSION_MAJOR>3 || ( GEOS_VERSION_MAJOR == 3 && GEOS_VERSION_MINOR>=10 )
   addRule( new QgsLabelingEngineRuleMinimumDistanceLabelToFeature() );
   addRule( new QgsLabelingEngineRuleMaximumDistanceLabelToFeature() );
   addRule( new QgsLabelingEngineRuleMinimumDistanceLabelToLabel() );
-#endif
-
   addRule( new QgsLabelingEngineRuleAvoidLabelOverlapWithFeature() );
 }