diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-08-13 10:07:11 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-08-20 11:59:07 -0700 |
| commit | 8d7d770bbc63788b85cbfcb3ab09ad824c79645a (patch) | |
| tree | da2c93d0bead05a85060a35044ff5c19f4a37c8f | |
| parent | 98534631e068477930a32ca25459dca4f3bb6170 (diff) | |
| download | qtlocation-mapboxgl-8d7d770bbc63788b85cbfcb3ab09ad824c79645a.tar.gz | |
Update styles
| -rw-r--r-- | ios/benchmark/MBXBenchViewController.mm | 2 | ||||
| -rw-r--r-- | ios/benchmark/fo/MBXBenchViewController.mm | 2 | ||||
| -rw-r--r-- | platform/default/default_styles.cpp | 10 | ||||
| -rwxr-xr-x | scripts/ios/package.sh | 2 | ||||
| m--------- | styles | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/ios/benchmark/MBXBenchViewController.mm b/ios/benchmark/MBXBenchViewController.mm index 86b4ec9cbe..0305ab853b 100644 --- a/ios/benchmark/MBXBenchViewController.mm +++ b/ios/benchmark/MBXBenchViewController.mm @@ -32,7 +32,7 @@ { [super viewDidLoad]; - NSURL* url = [[NSURL alloc] initWithString:@"asset://styles/mapbox-streets-v7.json"]; + NSURL* url = [[NSURL alloc] initWithString:@"asset://styles/streets-v8.json"]; self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds styleURL:url]; self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; self.mapView.delegate = self; diff --git a/ios/benchmark/fo/MBXBenchViewController.mm b/ios/benchmark/fo/MBXBenchViewController.mm index f1079d9e08..b4eb4ec3fa 100644 --- a/ios/benchmark/fo/MBXBenchViewController.mm +++ b/ios/benchmark/fo/MBXBenchViewController.mm @@ -21,7 +21,7 @@ { [super viewDidLoad]; - NSURL* url = [[NSURL alloc] initWithString:@"asset://styles/mapbox-streets-v7.json"]; + NSURL* url = [[NSURL alloc] initWithString:@"asset://styles/streets-v8.json"]; self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds accessToken:nil styleURL:url]; self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; self.mapView.delegate = self; diff --git a/platform/default/default_styles.cpp b/platform/default/default_styles.cpp index e25d96e4c9..9ee5414974 100644 --- a/platform/default/default_styles.cpp +++ b/platform/default/default_styles.cpp @@ -4,11 +4,11 @@ namespace mbgl { namespace util { const std::vector<std::pair<std::string, std::string>> defaultStyles = { - { "asset://styles/mapbox-streets-v7.json", "Mapbox Streets" }, - { "asset://styles/emerald-v7.json", "Emerald" }, - { "asset://styles/light-v7.json", "Light" }, - { "asset://styles/dark-v7.json", "Dark" }, - { "asset://styles/satellite-v7.json", "Satellite" } + { "asset://styles/streets-v8.json", "Mapbox Streets" }, + { "asset://styles/emerald-v8.json", "Emerald" }, + { "asset://styles/light-v8.json", "Light" }, + { "asset://styles/dark-v8.json", "Dark" }, + { "asset://styles/satellite-v8.json", "Satellite" } }; } // end namespace util diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index 449cf5c258..65bf98cfee 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -102,7 +102,7 @@ cp -pv LICENSE.md "${OUTPUT}/static" mkdir -p "${OUTPUT}/static/${NAME}.bundle" cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle" mkdir -p "${OUTPUT}/static/${NAME}.bundle/styles" -cp -pv styles/styles/{dark,emerald,light,mapbox-streets,satellite}-v7.json "${OUTPUT}/static/${NAME}.bundle/styles" +cp -pv styles/styles/{dark,emerald,light,streets,satellite}-v8.json "${OUTPUT}/static/${NAME}.bundle/styles" step "Creating API Docs..." if [ -z `which appledoc` ]; then diff --git a/styles b/styles -Subproject 44bdcec816407ba16765a556135915652e5e5b2 +Subproject bdac555dcbd7d58338a14139144035960510196 |