Fix labeling using perimeter with repeating label distance set

nyalldawson · nyalldawson · commit bfa771414f31 · 2016-07-30T09:22:36.000+10:00
If the visible part of a polygon is clipped and becomes a multipolygon, only one label is plotted on the wrong side of the polygon. Settings: Placement: Using Perimeter Allowed positions: Below line / Line orientation dependent position checked Repeat: 100 mm Fix #15341 (cherry-picked from c0b1684)
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2517,7 +2517,8 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
   }
 
   GEOSGeometry* geos_geom_clone;
-  if ( GEOSGeomTypeId_r( QgsGeometry::getGEOSHandler(), geos_geom ) == GEOS_POLYGON && repeatDistance > 0 && placement == Line )
+  GEOSGeomTypes geomType = (GEOSGeomTypes) GEOSGeomTypeId_r( QgsGeometry::getGEOSHandler(), geos_geom );
+  if ( (geomType == GEOS_POLYGON || geomType == GEOS_MULTIPOLYGON) && repeatDistance > 0 && placement == Line )
   {
     geos_geom_clone = GEOSBoundary_r( QgsGeometry::getGEOSHandler(), geos_geom );
   }

Original file line number	Diff line number	Diff line change
`@@ -2517,7 +2517,8 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont`
`2517`	`2517`	`}`
`2518`	`2518`
`2519`	`2519`	`GEOSGeometry* geos_geom_clone;`
`2520`		`- if ( GEOSGeomTypeId_r( QgsGeometry::getGEOSHandler(), geos_geom ) == GEOS_POLYGON && repeatDistance > 0 && placement == Line )`
	`2520`	`+ GEOSGeomTypes geomType = (GEOSGeomTypes) GEOSGeomTypeId_r( QgsGeometry::getGEOSHandler(), geos_geom );`
	`2521`	`+ if ( (geomType == GEOS_POLYGON \|\| geomType == GEOS_MULTIPOLYGON) && repeatDistance > 0 && placement == Line )`
`2521`	`2522`	`{`
`2522`	`2523`	`geos_geom_clone = GEOSBoundary_r( QgsGeometry::getGEOSHandler(), geos_geom );`
`2523`	`2524`	`}`