mapbox-gl-cocoa renaming
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -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):
|
||||
|
||||
@@ -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];
|
||||
|
||||
|
||||
Submodule ios/MVKMapKit deleted from 113cec55d0
@@ -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': {
|
||||
|
||||
1
ios/mapbox-gl-cocoa
Submodule
1
ios/mapbox-gl-cocoa
Submodule
Submodule ios/mapbox-gl-cocoa added at 3c8057fa31
Reference in New Issue
Block a user