[ios, macos] refs #7060: properly check removed layers & sources (#7062)

This commit is contained in:
Justin R. Miller
2016-11-15 10:05:35 -08:00
committed by GitHub
parent 31206b4516
commit c78c97f346

View File

@@ -168,6 +168,13 @@ static NSURL *MGLStyleURL_emerald;
- (void)removeLayer:(MGLStyleLayer *)layer
{
if (!layer.layer) {
[NSException raise:NSInvalidArgumentException format:
@"The style layer %@ cannot be removed from the style. "
@"Make sure the style layer was created as a member of a concrete subclass of MGLStyleLayer.",
layer];
}
self.mapView.mbglMap->removeLayer(layer.identifier.UTF8String);
}
@@ -218,6 +225,13 @@ static NSURL *MGLStyleURL_emerald;
- (void)removeSource:(MGLSource *)source
{
if (!source.rawSource) {
[NSException raise:NSInvalidArgumentException format:
@"The source %@ cannot be removed from the style. "
@"Make sure the source was created as a member of a concrete subclass of MGLSource.",
source];
}
self.mapView.mbglMap->removeSource(source.identifier.UTF8String);
// Once a mbgl source is removed from the map, ownership does not return