Merge pull request #3374 from nirvn/label_repeat_improvement

nyalldawson · web-flow · commit 44d6d21a3449 · 2016-08-11T04:13:43.000+10:00
[pal] fix repeated labels on curved lines when label width &gt; repeat distance
diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp
@@ -426,6 +426,7 @@ void Layer::chopFeaturesAtRepeatDistance()
     double chopInterval = fpart->repeatDistance();
     if ( chopInterval != 0. && GEOSGeomTypeId_r( geosctxt, geom ) == GEOS_LINESTRING )
     {
+      chopInterval *= ceil( fpart->getLabelWidth() / fpart->repeatDistance() );
 
       double bmin[2], bmax[2];
       fpart->getBoundingBox( bmin, bmax );

Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,7 @@ void Layer::chopFeaturesAtRepeatDistance()`
`426`	`426`	`double chopInterval = fpart->repeatDistance();`
`427`	`427`	`if ( chopInterval != 0. && GEOSGeomTypeId_r( geosctxt, geom ) == GEOS_LINESTRING )`
`428`	`428`	`{`
	`429`	`+ chopInterval *= ceil( fpart->getLabelWidth() / fpart->repeatDistance() );`
`429`	`430`
`430`	`431`	`double bmin[2], bmax[2];`
`431`	`432`	`fpart->getBoundingBox( bmin, bmax );`