Support a union of polygons in the insidePolygon query parameter

WARNING: Breaking change (for this parameter only).

Author: Clément Le Provost

Source/Query.swift

@@ -676,35 +676,40 @@ open class Query : AbstractQuery {
         }
     }
 
-    /// Search entries inside a given area defined by a set of points (defined by a minimum of 3 points).
-    /// You can pass several time the insidePolygon parameter to your query, the behavior will be a OR between all those polygons.
-    @objc public var insidePolygon: [LatLng]? {
-        // FIXME: Union cannot work with this implementation, as at most one occurrence per parameter is supported.
+    /// Search entries inside a given area defined by a union of polygons.
+    /// Each polygon must be defined by a minimum of 3 points.
+    @objc public var insidePolygon: [[LatLng]]? {
         get {
-            if let fields = self["insidePolygon"]?.components(separatedBy: ",") {
-                if fields.count % 2 == 0 && fields.count / 2 >= 3 {
-                    var result = [LatLng]()
-                    for i in 0..<(fields.count / 2) {
-                        if let lat = Double(fields[2 * i + 0]), let lng = Double(fields[2 * i + 1]) {
-                            result.append(LatLng(lat: lat, lng: lng))
-                        }
+            if let data = self["insidePolygon"]?.data(using: .utf8, allowLossyConversion: false),
+               let srcPolygons = (try? JSONSerialization.jsonObject(with: data, options: [])) as? [[Double]] {
+                var dstPolygons = [[LatLng]]()
+                for srcPolygon in srcPolygons {
+                    var dstPolygon = [LatLng]()
+                    if srcPolygon.count % 2 != 0 { continue }
+                    for i in 0 ..< srcPolygon.count / 2 {
+                        let point = LatLng(lat: srcPolygon[2 * i], lng: srcPolygon[2 * i + 1])
+                        dstPolygon.append(point)
                     }
-                    return result
+                    dstPolygons.append(dstPolygon)
                 }
+                return dstPolygons
             }
             return nil
         }
         set {
-            if newValue == nil {
-                self["insidePolygon"] = nil
-            } else {
-                assert(newValue!.count >= 3)
-                var components = [String]()
-                for point in newValue! {
-                    components.append(String(point.lat))
-                    components.append(String(point.lng))
+            if let srcPolygons = newValue {
+                var dstPolygons = [[Double]]()
+                for srcPolygon in srcPolygons {
+                    var dstPolygon = [Double]()
+                    for point in srcPolygon {
+                        dstPolygon.append(point.lat)
+                        dstPolygon.append(point.lng)
+                    }
+                    dstPolygons.append(dstPolygon)
                 }
-                self["insidePolygon"] = components.joined(separator: ",")
+                self["insidePolygon"] = AbstractQuery.buildJSONArray(dstPolygons)
+            } else {
+                self["insidePolygon"] = nil
             }
         }
     }

Tests/ObjectiveCBridging.m

@@ -117,7 +117,9 @@ - (void)testQuery {
     query.aroundPrecision = [NSNumber numberWithInt:66];
     query.minimumAroundRadius = [NSNumber numberWithInt:666];
     query.insideBoundingBox = @[ [[GeoRect alloc] initWithP1:[[LatLng alloc] initWithLat:123.45 lng:67.89] p2:[[LatLng alloc] initWithLat:129.99 lng:69.99]] ];
-    query.insidePolygon = @[ [[LatLng alloc] initWithLat:123.45 lng:67.89], [[LatLng alloc] initWithLat:129.99 lng:69.99], [[LatLng alloc] initWithLat:0.0 lng:0.0] ];
+    query.insidePolygon = @[
+        @[ [[LatLng alloc] initWithLat:123.45 lng:67.89], [[LatLng alloc] initWithLat:129.99 lng:69.99], [[LatLng alloc] initWithLat:0.0 lng:0.0] ]
+    ];
 }
 
 - (void)testClient {

Tests/QueryTests.swift

@@ -523,12 +523,15 @@ class QueryTests: XCTestCase {
     func test_insidePolygon() {
         let query1 = Query()
         XCTAssertNil(query1.insidePolygon)
-        let box = [LatLng(lat: 11.111111, lng: 22.222222), LatLng(lat: 33.333333, lng: 44.444444), LatLng(lat: -55.555555, lng: -66.666666)]
-        query1.insidePolygon = box
-        XCTAssertEqual(query1.insidePolygon!, box)
-        XCTAssertEqual(query1["insidePolygon"], "11.111111,22.222222,33.333333,44.444444,-55.555555,-66.666666")
-        let query2 = Query.parse(query1.build())
-        XCTAssertEqual(query2.insidePolygon!, box)
+        let POLYGONS: [[LatLng]] = [
+            [LatLng(lat: 11.111111, lng: 22.222222), LatLng(lat: 33.333333, lng: 44.444444), LatLng(lat: -55.555555, lng: -66.666667)],
+            [LatLng(lat: -77.777777, lng: -88.888887), LatLng(lat: 11.111111, lng: 22.222222), LatLng(lat: 0, lng: 0)]
+        ]
+        query1.insidePolygon = POLYGONS
+        XCTAssertEqual(query1.insidePolygon! as NSObject, POLYGONS as NSObject)
+        XCTAssertEqual(query1["insidePolygon"], "[[11.111111,22.222222,33.333333,44.444444,-55.555555,-66.666667],[-77.777777,-88.888887,11.111111,22.222222,0,0]]")
+        let query2 = Query.parse(query1.build())
+        XCTAssertEqual(query2.insidePolygon! as NSObject, POLYGONS as NSObject)
     }
 
     func test_tagFilters() {