diff --git a/.gitmodules b/.gitmodules index 37a988d2b..e2d05b3e9 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 bffa8167e..f987bac13 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 213fdceeb..f74857a08 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 () -@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 113cec55d..000000000 --- a/ios/MVKMapKit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 113cec55d080fc407d0c3d37f4aa36323749c1ec diff --git a/ios/llmr-app.gyp b/ios/llmr-app.gyp index 89acc2d74..7dd52f563 100644 --- a/ios/llmr-app.gyp +++ b/ios/llmr-app.gyp @@ -14,10 +14,10 @@ "./MBXAppDelegate.m", "./MBXViewController.h", "./MBXViewController.mm", - '