diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | ios/MBXViewController.mm | 6 | ||||
| m--------- | ios/MVKMapKit | 0 | ||||
| -rw-r--r-- | ios/llmr-app.gyp | 10 | ||||
| m--------- | ios/mapbox-gl-cocoa | 0 |
6 files changed, 12 insertions, 12 deletions
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 @@ -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 -Subproject 113cec55d080fc407d0c3d37f4aa36323749c1e 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 +Subproject 3c8057fa3125edc8e5d8eb78057b166be83501b |