From 9dd2bc607e468dca09b546e4d519ab3ca39c60de Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Sat, 31 May 2014 12:49:09 -0700
Subject: mapbox-gl-cocoa renaming

---
 .gitmodules              |  6 +++---
 README.md                |  2 +-
 ios/MBXViewController.mm |  6 +++---
 ios/MVKMapKit            |  1 -
 ios/llmr-app.gyp         | 10 +++++-----
 ios/mapbox-gl-cocoa      |  1 +
 6 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 160000 ios/MVKMapKit
 create mode 160000 ios/mapbox-gl-cocoa

diff --git a/.gitmodules b/.gitmodules
index 37a988d2ba..e2d05b3e9b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "ios/MVKMapKit"]
-	path = ios/MVKMapKit
-	url = git@github.com:mapbox/MVKMapKit.git
+[submodule "ios/mapbox-gl-cocoa"]
+	path = ios/mapbox-gl-cocoa
+	url = git@github.com:mapbox/mapbox-gl-cocoa.git
diff --git a/README.md b/README.md
index bffa8167e3..f987bac132 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ To create projects, you can run:
 
 ## iOS
 
-iOS makes use of a Cocoa-specific API currently housed in [MVKMapKit](https://github.com/mapbox/MVKMapKit), 
+iOS makes use of a Cocoa-specific API called [mapbox-gl-cocoa](https://github.com/mapbox/mapbox-gl-cocoa), 
 which is included as a submodule and provides a `UIView` interface to the map view and some bundle resources. 
 
 First, pull down the submodule(s): 
diff --git a/ios/MBXViewController.mm b/ios/MBXViewController.mm
index 213fdceeb1..f74857a083 100644
--- a/ios/MBXViewController.mm
+++ b/ios/MBXViewController.mm
@@ -1,6 +1,6 @@
 #import "MBXViewController.h"
 
-#import "MVKMapView.h"
+#import "MGLMapView.h"
 
 #import "../common/settings_nsuserdefaults.hpp"
 
@@ -8,7 +8,7 @@
 
 @interface MBXViewController () <CLLocationManagerDelegate>
 
-@property (nonatomic) MVKMapView *mapView;
+@property (nonatomic) MGLMapView *mapView;
 @property (nonatomic) BOOL debug;
 @property (nonatomic) UIView *palette;
 @property (nonatomic) CLLocationManager *locationManager;
@@ -38,7 +38,7 @@ llmr::Settings_NSUserDefaults *settings = nullptr;
 {
     [super viewDidLoad];
 
-    self.mapView = [[MVKMapView alloc] initWithFrame:self.view.bounds];
+    self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
     self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [self.view addSubview:self.mapView];
 
diff --git a/ios/MVKMapKit b/ios/MVKMapKit
deleted file mode 160000
index 113cec55d0..0000000000
--- a/ios/MVKMapKit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 113cec55d080fc407d0c3d37f4aa36323749c1ec
diff --git a/ios/llmr-app.gyp b/ios/llmr-app.gyp
index 89acc2d749..7dd52f563e 100644
--- a/ios/llmr-app.gyp
+++ b/ios/llmr-app.gyp
@@ -14,10 +14,10 @@
             "./MBXAppDelegate.m",
             "./MBXViewController.h",
             "./MBXViewController.mm",
-            '<!@(find MVKMapKit/MVKMapKit -type f -name "MVKMapView.*")',
-            '<!@(find MVKMapKit/MVKMapKit -type f -name "MVKStyleFunctionValue.*")',
-            '<!@(find MVKMapKit/MVKMapKit -type f -name "MVKTypes.*")',
-            '<!@(find MVKMapKit/MVKMapKit -type f -name "*+MVKAdditions.*")',
+            '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa -type f -name "MGLMapView.*")',
+            '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa -type f -name "MGLStyleFunctionValue.*")',
+            '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa -type f -name "MGLTypes.*")',
+            '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa -type f -name "*+MGLAdditions.*")',
             "../common/settings_nsuserdefaults.hpp",
             "../common/settings_nsuserdefaults.mm",
             "../common/foundation_request.h",
@@ -27,7 +27,7 @@
         'mac_bundle': 1,
         'mac_bundle_resources': [
           '<!@(find img -type f)',
-          '<!@(find MVKMapKit/MVKMapKit/Resources -type f)',
+          '<!@(find mapbox-gl-cocoa/mapbox-gl-cocoa/Resources -type f)',
           '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js'
         ],
         'link_settings': {
diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa
new file mode 160000
index 0000000000..3c8057fa31
--- /dev/null
+++ b/ios/mapbox-gl-cocoa
@@ -0,0 +1 @@
+Subproject commit 3c8057fa3125edc8e5d8eb78057b166be83501bb
-- 
cgit v1.2.1