From 98d005792b68d0b299f123c1d31e50c72ba91ba8 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 4 Apr 2017 15:01:39 -0700
Subject: [darwin] Simplify MGLSource initialization and pointer management

Introduce `-[MGLSource initWithPendingSource:]`, allowing the base class to track the owned `_pendingSource` pointer and implement `-addToMapView:` and `-removeFromMapView:` without any casts.
---
 platform/darwin/src/MGLVectorSource.mm | 67 ++++------------------------------
 1 file changed, 8 insertions(+), 59 deletions(-)

(limited to 'platform/darwin/src/MGLVectorSource.mm')

diff --git a/platform/darwin/src/MGLVectorSource.mm b/platform/darwin/src/MGLVectorSource.mm
index 5404f170e9..afce3bad46 100644
--- a/platform/darwin/src/MGLVectorSource.mm
+++ b/platform/darwin/src/MGLVectorSource.mm
@@ -1,88 +1,37 @@
 #import "MGLVectorSource_Private.h"
 
-#import "MGLMapView_Private.h"
 #import "MGLFeature_Private.h"
 #import "MGLSource_Private.h"
 #import "MGLTileSource_Private.h"
 #import "NSPredicate+MGLAdditions.h"
 #import "NSURL+MGLAdditions.h"
 
-#include <mbgl/map/map.hpp>
 #include <mbgl/style/sources/vector_source.hpp>
 
 @interface MGLVectorSource ()
 
-- (instancetype)initWithRawSource:(mbgl::style::VectorSource *)rawSource NS_DESIGNATED_INITIALIZER;
-
-@property (nonatomic) mbgl::style::VectorSource *rawSource;
+@property (nonatomic, readonly) mbgl::style::VectorSource *rawSource;
 
 @end
 
-@implementation MGLVectorSource {
-    std::unique_ptr<mbgl::style::VectorSource> _pendingSource;
-}
+@implementation MGLVectorSource
 
 - (instancetype)initWithIdentifier:(NSString *)identifier configurationURL:(NSURL *)configurationURL {
-    if (self = [super initWithIdentifier:identifier]) {
-        auto source = std::make_unique<mbgl::style::VectorSource>(identifier.UTF8String,
-                                                                  configurationURL.mgl_URLByStandardizingScheme.absoluteString.UTF8String);
-        _pendingSource = std::move(source);
-        self.rawSource = _pendingSource.get();
-    }
-    return self;
+    auto source = std::make_unique<mbgl::style::VectorSource>(identifier.UTF8String,
+                                                              configurationURL.mgl_URLByStandardizingScheme.absoluteString.UTF8String);
+    return self = [super initWithPendingSource:std::move(source)];
 }
 
 - (instancetype)initWithIdentifier:(NSString *)identifier tileURLTemplates:(NS_ARRAY_OF(NSString *) *)tileURLTemplates options:(nullable NS_DICTIONARY_OF(MGLTileSourceOption, id) *)options {
-    if (self = [super initWithIdentifier:identifier]) {
-        mbgl::Tileset tileSet = MGLTileSetFromTileURLTemplates(tileURLTemplates, options);
-
-        auto source = std::make_unique<mbgl::style::VectorSource>(identifier.UTF8String, tileSet);
-        _pendingSource = std::move(source);
-        self.rawSource = _pendingSource.get();
-    }
-    return self;
-}
-
-- (instancetype)initWithRawSource:(mbgl::style::VectorSource *)rawSource {
-    return [super initWithRawSource:rawSource];
-}
-
-- (void)addToMapView:(MGLMapView *)mapView {
-    if (_pendingSource == nullptr) {
-        [NSException raise:@"MGLRedundantSourceException"
-                    format:@"This instance %@ was already added to %@. Adding the same source instance " \
-                            "to the style more than once is invalid.", self, mapView.style];
-    }
-
-    mapView.mbglMap->addSource(std::move(_pendingSource));
-}
-
-- (void)removeFromMapView:(MGLMapView *)mapView {
-    if (self.rawSource != mapView.mbglMap->getSource(self.identifier.UTF8String)) {
-        return;
-    }
-
-    auto removedSource = mapView.mbglMap->removeSource(self.identifier.UTF8String);
-
-    mbgl::style::VectorSource *source = dynamic_cast<mbgl::style::VectorSource *>(removedSource.get());
-    if (!source) {
-        return;
-    }
-
-    removedSource.release();
-
-    _pendingSource = std::unique_ptr<mbgl::style::VectorSource>(source);
-    self.rawSource = _pendingSource.get();
+    mbgl::Tileset tileSet = MGLTileSetFromTileURLTemplates(tileURLTemplates, options);
+    auto source = std::make_unique<mbgl::style::VectorSource>(identifier.UTF8String, tileSet);
+    return self = [super initWithPendingSource:std::move(source)];
 }
 
 - (mbgl::style::VectorSource *)rawSource {
     return (mbgl::style::VectorSource *)super.rawSource;
 }
 
-- (void)setRawSource:(mbgl::style::VectorSource *)rawSource {
-    super.rawSource = rawSource;
-}
-
 - (NSURL *)configurationURL {
     auto url = self.rawSource->getURL();
     return url ? [NSURL URLWithString:@(url->c_str())] : nil;
-- 
cgit v1.2.1