0a8858f2da
MGLShape subclasses can now return NSDictionaries that represent the shapes' GeoJSON geometries. MGLFeature classes can now return NSDictionaries that represent the features as GeoJSON features. This makes it trivial to serialize iOS and macOS shapes and features into GeoJSON. MGLFeature instances can also return a representation of themselves as an mbgl::Feature. This capability is used in a refactoring of the implementations of MGLGeoJSONSource to more efficiently transform MGLFeatures into mbgl::Features so they can be fed directly into mbgl::GeoJSONSource without having to round trip through NSJSONSerialization. The MGLFeature identifier is converted into the mbgl::identifier type based on the type of the identifier. The MGLFeature attributes are recursively converted into an mbgl::PropertyMap and each value is converted into one of the types that the PropertyMap's Value variant supports.
104 lines
3.0 KiB
Plaintext
104 lines
3.0 KiB
Plaintext
#import "MGLPolyline.h"
|
|
|
|
#import "MGLMultiPoint_Private.h"
|
|
#import "MGLGeometry_Private.h"
|
|
|
|
#import "MGLPolyline+MGLAdditions.h"
|
|
|
|
@implementation MGLPolyline
|
|
|
|
@dynamic overlayBounds;
|
|
|
|
+ (instancetype)polylineWithCoordinates:(CLLocationCoordinate2D *)coords
|
|
count:(NSUInteger)count
|
|
{
|
|
return [[self alloc] initWithCoordinates:coords count:count];
|
|
}
|
|
|
|
- (mbgl::LineString<double>)lineString {
|
|
NSUInteger count = self.pointCount;
|
|
CLLocationCoordinate2D *coordinates = self.coordinates;
|
|
|
|
mbgl::LineString<double> geometry;
|
|
geometry.reserve(self.pointCount);
|
|
for (NSUInteger i = 0; i < count; i++) {
|
|
geometry.push_back(mbgl::Point<double>(coordinates[i].longitude, coordinates[i].latitude));
|
|
}
|
|
|
|
return geometry;
|
|
}
|
|
|
|
- (mbgl::Annotation)annotationObjectWithDelegate:(id <MGLMultiPointDelegate>)delegate {
|
|
mbgl::LineAnnotation annotation { [self lineString] };
|
|
annotation.opacity = { static_cast<float>([delegate alphaForShapeAnnotation:self]) };
|
|
annotation.color = { [delegate strokeColorForShapeAnnotation:self] };
|
|
annotation.width = { static_cast<float>([delegate lineWidthForPolylineAnnotation:self]) };
|
|
|
|
return annotation;
|
|
}
|
|
|
|
- (mbgl::Feature)featureObject {
|
|
return mbgl::Feature {[self lineString]};
|
|
}
|
|
|
|
- (NSDictionary *)geoJSONDictionary {
|
|
return @{@"type": @"LineString",
|
|
@"coordinates": self.mgl_coordinates};
|
|
}
|
|
|
|
@end
|
|
|
|
@interface MGLMultiPolyline ()
|
|
|
|
@property (nonatomic, copy, readwrite) NS_ARRAY_OF(MGLPolyline *) *polylines;
|
|
|
|
@end
|
|
|
|
@implementation MGLMultiPolyline {
|
|
MGLCoordinateBounds _overlayBounds;
|
|
}
|
|
|
|
@synthesize overlayBounds = _overlayBounds;
|
|
|
|
+ (instancetype)multiPolylineWithPolylines:(NS_ARRAY_OF(MGLPolyline *) *)polylines {
|
|
return [[self alloc] initWithPolylines:polylines];
|
|
}
|
|
|
|
- (instancetype)initWithPolylines:(NS_ARRAY_OF(MGLPolyline *) *)polylines {
|
|
if (self = [super init]) {
|
|
_polylines = polylines;
|
|
|
|
mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty();
|
|
|
|
for (MGLPolyline *polyline in _polylines) {
|
|
bounds.extend(MGLLatLngBoundsFromCoordinateBounds(polyline.overlayBounds));
|
|
}
|
|
_overlayBounds = MGLCoordinateBoundsFromLatLngBounds(bounds);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (BOOL)intersectsOverlayBounds:(MGLCoordinateBounds)overlayBounds {
|
|
return MGLLatLngBoundsFromCoordinateBounds(_overlayBounds).intersects(MGLLatLngBoundsFromCoordinateBounds(overlayBounds));
|
|
}
|
|
|
|
- (mbgl::Feature)featureObject {
|
|
mbgl::MultiLineString<double> multiLineString;
|
|
multiLineString.reserve(self.polylines.count);
|
|
for (MGLPolyline *polyline in self.polylines) {
|
|
multiLineString.push_back([polyline lineString]);
|
|
}
|
|
return mbgl::Feature {multiLineString};
|
|
}
|
|
|
|
- (NSDictionary *)geoJSONDictionary {
|
|
NSMutableArray *coordinates = [NSMutableArray array];
|
|
for (MGLPolylineFeature *feature in self.polylines) {
|
|
[coordinates addObject: feature.mgl_coordinates];
|
|
}
|
|
return @{@"type": @"MultiLineString",
|
|
@"coordinates": coordinates};
|
|
}
|
|
|
|
@end
|