Complete polygon stroke

microg · Aug 26, 2023 · 1eb6f20 · 1eb6f20
1 parent 5d58b17
commit 1eb6f20
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Polygon.kt
@@ -191,11 +191,15 @@ class PolygonImpl(private val map: GoogleMapImpl, id: String, options: PolygonOp
 
  override val strokes = (listOf(
  PolylineImpl(
- map, "$id-stroke-main", PolylineOptions().color(strokeColor).width(strokeWidth).addAll(points)
+ map, "$id-stroke-main", PolylineOptions().color(strokeColor).width(strokeWidth).addAll(
+ (points + points.firstOrNull()).filterNotNull()
+ )
  )
- ) + holes.mapIndexed { idx, it ->
+ ) + holes.mapIndexed { idx, holePoints ->
  PolylineImpl(
- map, "$id-stroke-hole-$idx", PolylineOptions().color(strokeColor).width(strokeWidth).addAll(it)
+ map, "$id-stroke-hole-$idx", PolylineOptions().color(strokeColor).width(strokeWidth).addAll(
+ (holePoints + holePoints.firstOrNull()).filterNotNull()
+ )
  )
  }).toMutableList()
 
@@ -233,11 +237,15 @@ class LitePolygonImpl(id: String, options: PolygonOptions, private val map: Lite
 
  override val strokes: MutableList<AbstractPolylineImpl> = (listOf(
  LitePolylineImpl(
- map, "$id-stroke-main", PolylineOptions().color(strokeColor).width(strokeWidth).addAll(points)
+ map, "$id-stroke-main", PolylineOptions().color(strokeColor).width(strokeWidth).addAll(
+ (points + points.firstOrNull()).filterNotNull()
+ )
  )
- ) + holes.mapIndexed { idx, it ->
+ ) + holes.mapIndexed { idx, holePoints ->
  LitePolylineImpl(
- map, "$id-stroke-hole-$idx", PolylineOptions().color(strokeColor).width(strokeWidth).addAll(it)
+ map, "$id-stroke-hole-$idx", PolylineOptions().color(strokeColor).width(strokeWidth).addAll(
+ (holePoints + holePoints.firstOrNull()).filterNotNull()
+ )
  )
  }).toMutableList()