diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-08-18 18:00:58 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-11-28 15:45:37 -0800 |
commit | 850b70ff91e582916829c5248afcafa195070a43 (patch) | |
tree | 3362e95001983e3029e006dbd99579a5bf68e97d /platform/darwin/src/MGLSymbolStyleLayer.mm | |
parent | f71dd14bb74be22fb27646b8732843d92cf72c62 (diff) | |
download | qtlocation-mapboxgl-850b70ff91e582916829c5248afcafa195070a43.tar.gz |
[core, ios, macos] Added layers and sources properties to MGLStyle
Added new layers and sources properties to MGLStyle that contain all the style’s layers and sources, respectively. These properties are KVC-compliant with all the mutable to-many methods. Layers are ordered from topmost to bottommost, for consistency with Cocoa APIs where front/first means top and back/last means bottom.
Also added storage for mbgl::style::Source in MGLSource proper for wrapping AnnotationSource. Until the style finishes loading, its name property is set to nil.
Fixes #6003.
Diffstat (limited to 'platform/darwin/src/MGLSymbolStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm index 9ba1bd7bc2..0acc36d2dc 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.mm +++ b/platform/darwin/src/MGLSymbolStyleLayer.mm @@ -137,6 +137,9 @@ namespace mbgl { - (void)removeFromMapView:(MGLMapView *)mapView { auto removedLayer = mapView.mbglMap->removeLayer(self.identifier.UTF8String); + if (!removedLayer) { + return; + } _pendingLayer = std::move(reinterpret_cast<std::unique_ptr<mbgl::style::SymbolLayer> &>(removedLayer)); _rawLayer = _pendingLayer.get(); } |