[labelling] Fix suboptimal logic for polygon's default around centroi…

…d placement
qgis · Feb 27, 2020 · 0e5a985 · 0e5a985
1 parent c413595
commit 0e5a985
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 10 deletions.
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -231,16 +231,41 @@ void FeaturePart::setTotalRepeats( int totalRepeats )
   mTotalRepeats = totalRepeats;
 }
 
-int FeaturePart::createCandidatesOverPoint( double x, double y, QList< LabelPosition *> &lPos, double angle )
+int FeaturePart::createCandidateCenteredOverPoint( double x, double y, QList< LabelPosition *> &lPos, double angle )
 {
-  int nbp = 1;
+  // get from feature
+  double labelW = getLabelWidth( angle );
+  double labelH = getLabelHeight( angle );
+
+  double cost = 0.00005;
+  int id = lPos.size();
+
+  double xdiff = -labelW / 2.0;
+  double ydiff = -labelH / 2.0;
+
+  double lx = x + xdiff;
+  double ly = y + ydiff;
+
+  if ( mLF->permissibleZonePrepared() )
+  {
+    if ( !GeomFunction::containsCandidate( mLF->permissibleZonePrepared(), lx, ly, labelW, labelH, angle ) )
+    {
+      return 0;
+    }
+  }
 
+  lPos << new LabelPosition( id, lx, ly, labelW, labelH, angle, cost, this, false, LabelPosition::QuadrantOver );
+  return 1;
+}
+
+int FeaturePart::createCandidatesOverPoint( double x, double y, QList< LabelPosition *> &lPos, double angle )
+{
   // get from feature
   double labelW = getLabelWidth( angle );
   double labelH = getLabelHeight( angle );
 
   double cost = 0.0001;
-  int id = 0;
+  int id = lPos.size();
 
   double xdiff = -labelW / 2.0;
   double ydiff = -labelH / 2.0;
@@ -307,7 +332,7 @@ int FeaturePart::createCandidatesOverPoint( double x, double y, QList< LabelPosi
   }
 
   lPos << new LabelPosition( id, lx, ly, labelW, labelH, angle, cost, this, false, quadrantFromOffset() );
-  return nbp;
+  return 1;
 }
 
 std::unique_ptr<LabelPosition> FeaturePart::createCandidatePointOnSurface( PointSet *mapShape )
@@ -473,6 +498,7 @@ int FeaturePart::createCandidatesAroundPoint( double x, double y, QList< LabelPo
 
   int icost = 0;
   int inc = 2;
+  int id = lPos.size();
 
   double candidateAngleIncrement = 2 * M_PI / maxNumberCandidates; /* angle bw 2 pos */
 
@@ -588,7 +614,7 @@ int FeaturePart::createCandidatesAroundPoint( double x, double y, QList< LabelPo
       }
     }
 
-    candidates << new LabelPosition( i, labelX, labelY, labelWidth, labelHeight, angle, cost, this, false, quadrant );
+    candidates << new LabelPosition( id + i, labelX, labelY, labelWidth, labelHeight, angle, cost, this, false, quadrant );
 
     icost += inc;
 
@@ -1643,14 +1669,21 @@ QList<LabelPosition *> FeaturePart::createCandidates( const GEOSPreparedGeometry
         switch ( mLF->layer()->arrangement() )
         {
           case QgsPalLayerSettings::AroundPoint:
+          {
+            double cx, cy;
+            getCentroid( cx, cy, mLF->layer()->centroidInside() );
+            if ( qgsDoubleNear( mLF->distLabel(), 0.0 ) )
+              createCandidateCenteredOverPoint( cx, cy, lPos, angle );
+            createCandidatesAroundPoint( cx, cy, lPos, angle );
+            break;
+          }
           case QgsPalLayerSettings::OverPoint:
+          {
             double cx, cy;
-            mapShape->getCentroid( cx, cy, mLF->layer()->centroidInside() );
-            if ( mLF->layer()->arrangement() == QgsPalLayerSettings::OverPoint )
-              createCandidatesOverPoint( cx, cy, lPos, angle );
-            else
-              createCandidatesAroundPoint( cx, cy, lPos, angle );
+            getCentroid( cx, cy, mLF->layer()->centroidInside() );
+            createCandidatesOverPoint( cx, cy, lPos, angle );
             break;
+          }
           case QgsPalLayerSettings::Line:
             createCandidatesAlongLine( lPos, mapShape );
             break;

diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h
@@ -136,6 +136,16 @@ namespace pal
        */
       QList<LabelPosition *> createCandidates( const GEOSPreparedGeometry *mapBoundary, PointSet *mapShape, RTree<LabelPosition *, double, 2, double> *candidates );
 
+      /**
+       * Generate one candidate centered over the specified point.
+       * \param x x coordinate of the point
+       * \param y y coordinate of the point
+       * \param lPos pointer to an array of candidates, will be filled by generated candidate
+       * \param angle orientation of the label
+       * \returns the number of generated candidates (always 1)
+       */
+      int createCandidateCenteredOverPoint( double x, double y, QList<LabelPosition *> &lPos, double angle );
+
       /**
        * Generate candidates for point feature, located around a specified point.
        * \param x x coordinate of the point

diff --git a/...testdata/control_images/qgis_server/WMS_GetMap_Diagrams/WMS_GetMap_Diagrams.png b/...testdata/control_images/qgis_server/WMS_GetMap_Diagrams/WMS_GetMap_Diagrams.png
diff --git a/...s/testdata/control_images/qgis_server/WMS_GetMap_Filter5/WMS_GetMap_Filter5.png b/...s/testdata/control_images/qgis_server/WMS_GetMap_Filter5/WMS_GetMap_Filter5.png
diff --git a/...stdata/control_images/qgis_server/WMS_GetMap_Highlight/WMS_GetMap_Highlight.png b/...stdata/control_images/qgis_server/WMS_GetMap_Highlight/WMS_GetMap_Highlight.png
diff --git a/...trol_images/qgis_server/WMS_GetMap_Highlight_Line/WMS_GetMap_Highlight_Line.png b/...trol_images/qgis_server/WMS_GetMap_Highlight_Line/WMS_GetMap_Highlight_Line.png
diff --git a/...ol_images/qgis_server/WMS_GetMap_Highlight_Point/WMS_GetMap_Highlight_Point.png b/...ol_images/qgis_server/WMS_GetMap_Highlight_Point/WMS_GetMap_Highlight_Point.png
diff --git a/..._images/qgis_server/WMS_GetMap_LabelingSettings/WMS_GetMap_LabelingSettings.png b/..._images/qgis_server/WMS_GetMap_LabelingSettings/WMS_GetMap_LabelingSettings.png
diff --git a/...es/qgis_server/WMS_GetMap_LabelingSettings/WMS_GetMap_LabelingSettings_mask.png b/...es/qgis_server/WMS_GetMap_LabelingSettings/WMS_GetMap_LabelingSettings_mask.png
diff --git a/...ta/control_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom.png b/...ta/control_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom.png
diff --git a/.../control_images/qgis_server/WMS_GetMap_StyleDefault/WMS_GetMap_StyleDefault.png b/.../control_images/qgis_server/WMS_GetMap_StyleDefault/WMS_GetMap_StyleDefault.png
diff --git a/...data/control_images/qgis_server/WMS_GetMap_StyleMixed/WMS_GetMap_StyleMixed.png b/...data/control_images/qgis_server/WMS_GetMap_StyleMixed/WMS_GetMap_StyleMixed.png
diff --git a/...is_server/WMS_GetMap_StyleMixed_LayerOrder/WMS_GetMap_StyleMixed_LayerOrder.png b/...is_server/WMS_GetMap_StyleMixed_LayerOrder/WMS_GetMap_StyleMixed_LayerOrder.png
diff --git a/...ta/control_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight.png b/...ta/control_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight.png
diff --git a/...ontrol_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom.png b/...ontrol_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom.png
diff --git a/...trol_images/qgis_server/WMS_GetPrint_StyleDefault/WMS_GetPrint_StyleDefault.png b/...trol_images/qgis_server/WMS_GetPrint_StyleDefault/WMS_GetPrint_StyleDefault.png