diff options
| -rw-r--r-- | ios/MullvadVPN/GeoJSON.swift | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/ios/MullvadVPN/GeoJSON.swift b/ios/MullvadVPN/GeoJSON.swift index 3ed306af72..4b3f8c7c28 100644 --- a/ios/MullvadVPN/GeoJSON.swift +++ b/ios/MullvadVPN/GeoJSON.swift @@ -38,7 +38,7 @@ extension GeoJSON { switch geometry { case .polygon(let polygon): - return [polygon.mkPolygon] + return polygon.mkPolygons case .multiPolygon(let multiPolygon): return multiPolygon.mkPolygons @@ -102,18 +102,24 @@ extension GeoJSON { struct Polygon: Decodable { let coordinates: [[[Double]]] - var mkPolygon: MKPolygon { + var mkPolygons: [MKPolygon] { let coords = self.geoCoordinates let exteriorCoordinates = coords.first ?? [] - let interiorPolygons = coords.dropFirst().map { (interiorCoords) -> MKPolygon in - return MKPolygon(coordinates: interiorCoords, count: interiorCoords.count) - } - return MKPolygon( + let exteriorPolygon = MKPolygon( coordinates: exteriorCoordinates, count: exteriorCoordinates.count, - interiorPolygons: interiorPolygons + interiorPolygons: nil ) + + let interiorPolygons = coords.dropFirst().map { interiorCoords -> MKPolygon in + return MKPolygon( + coordinates: interiorCoords, + count: interiorCoords.count + ) + } + + return [exteriorPolygon] + interiorPolygons } private var geoCoordinates: [[CLLocationCoordinate2D]] { @@ -129,8 +135,8 @@ extension GeoJSON { let coordinates: [[[[Double]]]] var mkPolygons: [MKOverlay] { - return coordinates.map { values -> MKPolygon in - return Polygon(coordinates: values).mkPolygon + return coordinates.flatMap { values -> [MKPolygon] in + return Polygon(coordinates: values).mkPolygons } } } |