Move warning from ShapeCollection to ShapeSource

2 files changed, 8 insertions, 12 deletions

diff --git a/platform/darwin/src/MGLShapeCollection.mm b/platform/darwin/src/MGLShapeCollection.mm
index 36c3e15900..5db1ee335c 100644
--- a/platform/darwin/src/MGLShapeCollection.mm
+++ b/platform/darwin/src/MGLShapeCollection.mm
@@ -14,18 +14,6 @@
 - (instancetype)initWithShapes:(NSArray<MGLShape *> *)shapes {
     if (self = [super init]) {
         _shapes = shapes.copy;
-        
-        for (MGLShape* shape in shapes ){
-            if ([shape conformsToProtocol:@protocol(MGLFeature)]) {
-                static dispatch_once_t onceToken;
-                dispatch_once(&onceToken, ^{
-                    NSLog(@"Shape collection will not retain attributes from objects conforming to MGLFeature protocol."
-                          @"Use MGLShapeCollectionFeature instead."
-                          @"This will be logged only once.");
-                });
-            }
-            break;
-        }
     }
     return self;
 }
diff --git a/platform/darwin/src/MGLShapeSource.mm b/platform/darwin/src/MGLShapeSource.mm
index 1425269012..9457d2569a 100644
--- a/platform/darwin/src/MGLShapeSource.mm
+++ b/platform/darwin/src/MGLShapeSource.mm
@@ -105,6 +105,14 @@ mbgl::style::GeoJSONOptions MGLGeoJSONOptionsFromDictionary(NSDictionary<MGLShap
     auto geoJSONOptions = MGLGeoJSONOptionsFromDictionary(options);
     auto source = std::make_unique<mbgl::style::GeoJSONSource>(identifier.UTF8String, geoJSONOptions);
     if (self = [super initWithPendingSource:std::move(source)]) {
+        if ([shape isMemberOfClass:[MGLShapeCollection class]]) {
+            static dispatch_once_t onceToken;
+            dispatch_once(&onceToken, ^{
+                NSLog(@"MGLShapeCollection initialized with MGLFeatures will not retain attributes."
+                        @"Use MGLShapeCollectionFeature to retain attributes instead."
+                        @"This will be logged only once.");
+            });
+        }
         self.shape = shape;
     }
     return self;