diff options
author | Jesse Bounds <jesse@rebounds.net> | 2016-10-20 17:14:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-20 17:14:19 -0700 |
commit | 1216050f9c5c472f1c8edcc32447004a40680ec7 (patch) | |
tree | 77f937aaeaa6e34f8b2fa84e5f7c721e8f3d541f /platform/darwin/src/MGLPolygon.h | |
parent | baf82fc4d4882480e6dd16ea9821be29d390bf00 (diff) | |
download | qtlocation-mapboxgl-1216050f9c5c472f1c8edcc32447004a40680ec7.tar.gz |
Add MGLPointCollection for GeoJSON multipoints (#6742)
* [ios, macos] Introduce MGLPointCollection
This makes MGLMultiPoint abstract again so that it is only a place
for shared functionality of polygons and polylines. The multipoint
feature replaces the point collection feature and can be
used to initialize a MGLGeoJSONSource. The previously added
swift_names for polyline and polygon are removed, for now.
This also updates the iOS and macOS annotation adding logic so that
unwanted shapes really are avoided. Previously the combined OR
conditions meant that an annotation had to logically be NOT a kind
of all three types so the check always let the annotation slip through.
This also expands the guard to deflect the new MGLPointCollection.
Diffstat (limited to 'platform/darwin/src/MGLPolygon.h')
-rw-r--r-- | platform/darwin/src/MGLPolygon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLPolygon.h b/platform/darwin/src/MGLPolygon.h index 6d53356ba4..3d5b36abb6 100644 --- a/platform/darwin/src/MGLPolygon.h +++ b/platform/darwin/src/MGLPolygon.h @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @param count The number of items in the `coords` array. @return A new polygon object. */ -+ (instancetype)polygonWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count NS_SWIFT_NAME(polygon(coordinates:count:)); ++ (instancetype)polygonWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count; /** Creates and returns an `MGLPolygon` object from the specified set of |