Authored by Justin R. Miller

Merge branch 'develop' of github.com:mapbox/mapbox-ios-sdk into develop

@@ -34,7 +34,9 @@ @@ -34,7 +34,9 @@
34 34
35 - (void)setLayer:(RMMapLayer *)newLayer 35 - (void)setLayer:(RMMapLayer *)newLayer
36 { 36 {
37 - if (newLayer) 37 + if ( ! newLayer)
  38 + [super setLayer:nil];
  39 + else
38 RMLog(@"Setting a custom layer on an %@ is a no-op", [self class]); 40 RMLog(@"Setting a custom layer on an %@ is a no-op", [self class]);
39 } 41 }
40 42
@@ -57,7 +57,9 @@ @@ -57,7 +57,9 @@
57 57
58 - (void)setLayer:(RMMapLayer *)newLayer 58 - (void)setLayer:(RMMapLayer *)newLayer
59 { 59 {
60 - if (newLayer) 60 + if ( ! newLayer)
  61 + [super setLayer:nil];
  62 + else
61 RMLog(@"Setting a custom layer on an %@ is a no-op", [self class]); 63 RMLog(@"Setting a custom layer on an %@ is a no-op", [self class]);
62 } 64 }
63 65
@@ -34,7 +34,9 @@ @@ -34,7 +34,9 @@
34 34
35 - (void)setLayer:(RMMapLayer *)newLayer 35 - (void)setLayer:(RMMapLayer *)newLayer
36 { 36 {
37 - if (newLayer) 37 + if ( ! newLayer)
  38 + [super setLayer:nil];
  39 + else
38 RMLog(@"Setting a custom layer on an %@ is a no-op", [self class]); 40 RMLog(@"Setting a custom layer on an %@ is a no-op", [self class]);
39 } 41 }
40 42