[ios] fix #6361: source query nullability & return nil for unfound re…

…sults (#6408) Also removes some dead code in MGLStyle.mm.
mapbox · Sep 21, 2016 · 2bde64f · 2bde64f
1 parent f4ba92a
commit 2bde64f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/platform/darwin/src/MGLStyle.h b/platform/darwin/src/MGLStyle.h
@@ -187,7 +187,7 @@ static const NSInteger MGLStyleDefaultVersion = 9;
  
  @return source An instance of an `MGLSource` subclass.
  */
-- (MGLSource *)sourceWithIdentifier:(NSString *)identifier;
+- (nullable MGLSource *)sourceWithIdentifier:(NSString *)identifier;
 
 /**
  Adds a new layer on top of existing layers.

diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm
@@ -92,19 +92,11 @@ - (NSString *)name {
     return @(self.mapView.mbglMap->getStyleName().c_str());
 }
 
-- (mbgl::style::Layer *)mbglLayerWithIdentifier:(NSString *)identifier
-{
-    return self.mapView.mbglMap->getLayer(identifier.UTF8String);
-}
-
-- (mbgl::style::Source *)mbglSourceWithIdentifier:(NSString *)identifier
-{
-    return self.mapView.mbglMap->getSource(identifier.UTF8String);
-}
-
 - (id <MGLStyleLayer>)layerWithIdentifier:(NSString *)identifier
 {
     auto layer = self.mapView.mbglMap->getLayer(identifier.UTF8String);
+
+    if (!layer) return nil;
 
     Class clazz = [self classFromLayer:layer];
 
@@ -119,6 +111,8 @@ - (NSString *)name {
 - (MGLSource *)sourceWithIdentifier:(NSString *)identifier
 {
     auto s = self.mapView.mbglMap->getSource(identifier.UTF8String);
+
+    if (!s) return nil;
 
     Class clazz = [self classFromSource:s];