From b184a5443483b676afc1259a95a3f8b1a040d5f2 Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Mon, 23 Mar 2015 21:56:39 -0700 Subject: [PATCH] don't stop/start map in related to style changes anymore since safe --- platform/ios/MGLMapView.mm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 6cc8b7a0f..bb08f9b77 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -192,17 +192,13 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; } else { - if ([@(mbglMap->getStyleJSON().c_str()) length]) mbglMap->stop(); mbglMap->setStyleJSON((std::string)[styleJSON cStringUsingEncoding:[NSString defaultCStringEncoding]]); - mbglMap->start(); } } - (void)setStyleURL:(NSString *)filePathURL { - if ([@(mbglMap->getStyleJSON().c_str()) length]) mbglMap->stop(); mbglMap->setStyleURL(std::string("asset://") + [filePathURL UTF8String]); - mbglMap->start(); } - (BOOL)commonInit @@ -370,6 +366,9 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; _regionChangeDelegateQueue = [NSOperationQueue new]; _regionChangeDelegateQueue.maxConcurrentOperationCount = 1; + // start the main loop + mbglMap->start(); + return YES; }