Use our own parser for geojson

MKGeoJSONDecoder extracts interior polygons from geojson which does not
seem to work properly with map view.

2 files changed, 3 insertions, 31 deletions

diff --git a/ios/MullvadVPN/ConnectViewController.swift b/ios/MullvadVPN/ConnectViewController.swift
index b83ae621e2..8673f8a23b 100644
--- a/ios/MullvadVPN/ConnectViewController.swift
+++ b/ios/MullvadVPN/ConnectViewController.swift
@@ -383,18 +383,6 @@ class ConnectViewController: UIViewController, MKMapViewDelegate, RootContainmen
             return renderer
         }
 
-        if #available(iOS 13, *) {
-            if let multiPolygon = overlay as? MKMultiPolygon {
-                let renderer = MKMultiPolygonRenderer(multiPolygon: multiPolygon)
-                renderer.fillColor = UIColor.primaryColor
-                renderer.strokeColor = UIColor.secondaryColor
-                renderer.lineWidth = 1.0
-                renderer.lineCap = .round
-                renderer.lineJoin = .round
-                return renderer
-            }
-        }
-
         if let tileOverlay = overlay as? MKTileOverlay {
             return CustomOverlayRenderer(overlay: tileOverlay)
         }
diff --git a/ios/MullvadVPN/GeoJSON.swift b/ios/MullvadVPN/GeoJSON.swift
index 4b3f8c7c28..cbc9c9f3b9 100644
--- a/ios/MullvadVPN/GeoJSON.swift
+++ b/ios/MullvadVPN/GeoJSON.swift
@@ -142,24 +142,8 @@ extension GeoJSON {
     }
 
     static func decodeGeoJSON(_ data: Data) throws -> [MKOverlay] {
-        if #available(iOS 13, *) {
-            let decoder = MKGeoJSONDecoder()
-            let geoJSONObjects = try decoder.decode(data)
-
-            return geoJSONObjects.flatMap { (object) -> [MKOverlay] in
-                if let feat = object as? MKGeoJSONFeature {
-                    return feat.geometry.compactMap { (geometry) -> MKOverlay? in
-                        return geometry as? MKOverlay
-                    }
-                } else {
-                    return []
-                }
-            }
-        } else {
-            let jsonDecoder = JSONDecoder()
-            let featureCollection = try jsonDecoder.decode(GeoJSON.FeatureCollection.self, from: data)
-
-            return featureCollection.mkOverlays
-        }
+        return try JSONDecoder()
+            .decode(GeoJSON.FeatureCollection.self, from: data)
+            .mkOverlays
     }
 }