v10 default styles by 1ec5 · Pull Request #6301 · mapbox/mapbox-gl-native

1ec5 · 2016-09-09T17:20:48Z

Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL.

Added the Traffic Day v2 and Traffic Night v2 styles, which are now documented as part of the styles API in Mapbox API Documentation.

This PR also partially reverses the decision in #4702 to require iOS and macOS developers to specify a style version number when calling one of MGLStyle’s style URL factory methods. The versioned methods are still there, but the unversioned methods are no longer deprecated. This change makes the iOS and macOS SDKs consistent with the Android and Qt SDKs, which never followed suit and kept their unversioned constants.

~~Hold until the v10 styles are live.~~

/cc @tobrun @friedbunny @tmpsantos @amyleew

mention-bot · 2016-09-09T17:20:50Z

@1ec5, thanks for your PR! By analyzing this pull request, we identified @bleege, @tmpsantos and @jfirebaugh to be potential reviewers.

tmpsantos · 2016-09-12T23:36:59Z

@1ec5 thanks!

Just food for thought, not exactly related to this PR, but if a style change also upgrades the tile source, we need to think about a way of not rendering tiles on the offline database useless.

1ec5 · 2016-09-13T01:33:42Z

Can you elaborate? Is the concern that the user would have to redownload a region's tiles if the v10 Streets style uses a newer version of the Streets source (say, v8) than the v9 Streets style? Styles are somewhat tightly coupled to the sources they reference, so I'm not sure how we'd address that issue without adding custom tile migration logic for individual sources.

tmpsantos · 2016-09-13T01:52:18Z

Styles are somewhat tightly coupled to the sources they reference

Makes sense. Yeah, in this case, if you wanna keep the offline database, better not upgrade the style. Thanks!

amyleew · 2016-10-03T17:17:16Z

@1ec5 - v9 updates and limited v10 styles are now ready to roll in. Please note changelog for specifics.

zugaldia · 2016-10-03T17:30:55Z

@1ec5 Thanks for updating the Android versions as well, is there any tail work required on Android once this PR gets merged?

1ec5 · 2016-10-06T17:24:39Z

v10 has been released for Streets, Outdoors, and Satellite Streets. Apparently the styles are versioned separately, so Light, Dark, and Satellite are still stuck on v9. This PR will need to be reworked to reflect that fact:

Remove mbgl::util::default_styles::currentVersion and figure out what to do about code that uses it
Tweak MGLStyleDefaultVersion’s documentation to say it’s the version of the default style, not “the default version of the suite of default styles”
Hard-code version numbers in tests, making it much more likely that versions will get out of sync in the future

1ec5 · 2017-01-24T21:27:33Z

Not critical for v3.4.1, and no Mapbox-wide timetable for releasing the v10 styles. Moving off the v3.4.1 milestone.

tmpsantos · 2017-04-19T13:28:02Z

+const DefaultStyle outdoors         = { "mapbox://styles/mapbox/outdoors-v10",          "Outdoors" };
+const DefaultStyle light            = { "mapbox://styles/mapbox/light-v10",             "Light" };
+const DefaultStyle dark             = { "mapbox://styles/mapbox/dark-v10",              "Dark" };
+const DefaultStyle satellite        = { "mapbox://styles/mapbox/satellite-v10",         "Satellite" };


We don't have a v10 for light, dark and satellite.

I originally authored this PR before any of the v10 styles went public, so it wasn’t clear to me. #6301 (comment) tracks other things that need to happen before this PR can land.

kkaefer · 2017-04-26T15:57:18Z

We could log a warning to the console that provides the current style version or the full style URL when one of the style URL factory methods is called.

Can we log that to the console for Debug builds only? I think disabling runtime styling for certain URLs could also lead to very weird behavior and increases the complexity.

1ec5 · 2017-04-26T19:21:14Z

Can we log that to the console for Debug builds only? I think disabling runtime styling for certain URLs could also lead to very weird behavior and increases the complexity.

Yes, a log message would certainly be doable. If our goal is to alert about programmer error, though, maybe it should be present in release builds as well, but once per session, like the warning about using floats in predicates.

As far as disabling runtime styling for unversioned URLs, I think this is something that MGLMapView would be able to handle: -[MGLMapView setStyleURL:] would detect the x-darwin-versioned parameter and potentially strip it, and -[MGLMapView style] would remain nil even after -[MGLMapViewDelegate mapView:styleDidFinishLoading:] is called. But you’re right that a log message would be friendlier. Disabling the runtime styling API would be rather draconian, only remotely desirable if we find that everyone is using unversioned style URLs with the runtime styling API.

tobrun

🤖 👍

kkaefer · 2017-05-09T12:36:21Z

 ### Other changes

 * Xcode 8.0 or higher is now recommended for using this SDK. ([#8775](https://github.com/mapbox/mapbox-gl-native/pull/8775))
+<<<<<<< HEAD


Merge conflict

Whoops, I missed that one – good catch! Fixed in 1d0e203.

Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL.

MGLStyleDefaultVersion is just for Streets now. Deleted style version documentation tests because not all styles are on the same version.

Undeprecated the unversioned style URL factory methods in MGLStyle for consistency with the Android and Qt SDKs. Added warnings about using them with the runtime styling API. Refactored mbgl::util::default_styles to track different versions for different styles.

The Styles API section of the Mapbox API Documentation site now lists Traffic Day v2 and Traffic Night v2, so this change adds those styles to all the places where styles are listed. Also switched iosapp and macosapp to unversioned style factory methods since MGLStyleDefaultVersion is no longer applicable for all styles.

fixed

1ec5 · 2017-05-12T01:56:57Z

We could append a query parameter like ?x-darwin-versioned=false to the returned URL; MGLMapView could track the usage of such URLs and disable or booby-trap the runtime styling API.

Tracking as possible tail work in #8971.

1ec5 · 2017-05-12T02:03:38Z

Cherry-picking into the release-ios-v3.6.0-android-v5.1.0 branch in #8972.

1ec5 added iOS Mapbox Maps SDK for iOS macOS Mapbox Maps SDK for macOS Android Mapbox Maps SDK for Android Core The cross-platform C++ core, aka mbgl Qt Mapbox Maps SDK for Qt, aka Qt Location Mapbox GL labels Sep 9, 2016

1ec5 added this to the ios-v3.4.0 milestone Sep 9, 2016

1ec5 self-assigned this Sep 9, 2016

1ec5 added the ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold label Sep 9, 2016

1ec5 mentioned this pull request Oct 17, 2016

Update examples to use style v10 mapbox/mapbox-android-demo#157

Closed

1ec5 force-pushed the 1ec5-default-styles-v10 branch from 9f29c99 to 2df753a Compare October 17, 2016 11:14

1ec5 added the needs discussion label Oct 24, 2016

boundsj modified the milestones: ios-3.4.1, ios-v3.4.0 Oct 30, 2016

1ec5 mentioned this pull request Jan 9, 2017

Add -fvisibility=hidden to iOS #7604

Merged

1ec5 modified the milestones: ios-future, ios-v3.4.1 Jan 24, 2017

1ec5 mentioned this pull request Feb 23, 2017

Navigation UI mapbox/mapbox-navigation-ios#43

Merged

5 tasks

1ec5 force-pushed the 1ec5-default-styles-v10 branch from 2df753a to f7df5f7 Compare March 4, 2017 22:33

1ec5 modified the milestones: ios-v3.6.0, ios-future Mar 14, 2017

1ec5 removed the needs discussion label Mar 14, 2017

tmpsantos reviewed Apr 19, 2017

View reviewed changes

1ec5 requested a review from tobrun April 26, 2017 01:04

1ec5 requested a review from langsmith May 1, 2017 19:16

langsmith mentioned this pull request May 1, 2017

Adjusting Android styles from v9 to v10 #8851

Closed

1ec5 force-pushed the 1ec5-default-styles-v10 branch from 98890a1 to abde819 Compare May 1, 2017 22:19

tobrun approved these changes May 2, 2017

View reviewed changes

langsmith approved these changes May 2, 2017

View reviewed changes

1ec5 force-pushed the 1ec5-default-styles-v10 branch from abde819 to 6213fb2 Compare May 8, 2017 22:29

1ec5 added GLFW and removed Qt Mapbox Maps SDK for Qt, aka Qt Location Mapbox GL ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels May 9, 2017

kkaefer previously requested changes May 9, 2017

View reviewed changes

1ec5 added 4 commits May 9, 2017 15:57

[core, android, ios, macos, qt] v10 default styles

1d0e203

Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL.

[ios, macos] Updated documented default style version

9f008b4

MGLStyleDefaultVersion is just for Streets now. Deleted style version documentation tests because not all styles are on the same version.

1ec5 force-pushed the 1ec5-default-styles-v10 branch from 1b2f5f0 to 4387c75 Compare May 9, 2017 22:57

1ec5 requested review from kkaefer and removed request for kkaefer May 12, 2017 01:43

1ec5 mentioned this pull request May 12, 2017

Warn when using runtime styling with unversioned style methods #8971

Closed

1ec5 merged commit 4d6f545 into master May 12, 2017

1ec5 deleted the 1ec5-default-styles-v10 branch May 12, 2017 01:57

1ec5 mentioned this pull request May 12, 2017

🍒⛏ v10 default styles #8972

Merged

1ec5 mentioned this pull request May 12, 2017

Release Android v5.1.0-beta2 #8975

Closed

10 tasks

1ec5 mentioned this pull request May 23, 2017

Enable View ‣ Traffic Night #9091

Merged

1ec5 mentioned this pull request Dec 12, 2018

Upgrade default styles to v11 #13553

Closed

Conversation

1ec5 commented Sep 9, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mention-bot commented Sep 9, 2016

Uh oh!

tmpsantos commented Sep 12, 2016

Uh oh!

1ec5 commented Sep 13, 2016

Uh oh!

tmpsantos commented Sep 13, 2016

Uh oh!

amyleew commented Oct 3, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zugaldia commented Oct 3, 2016

Uh oh!

1ec5 commented Oct 6, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

1ec5 commented Jan 24, 2017

Uh oh!

tmpsantos Apr 19, 2017

Choose a reason for hiding this comment

Uh oh!

1ec5 Apr 19, 2017

Choose a reason for hiding this comment

Uh oh!

kkaefer commented Apr 26, 2017

Uh oh!

1ec5 commented Apr 26, 2017

Uh oh!

tobrun left a comment

Choose a reason for hiding this comment

Uh oh!

kkaefer May 9, 2017

Choose a reason for hiding this comment

Uh oh!

1ec5 May 9, 2017

Choose a reason for hiding this comment

Uh oh!

1ec5 commented May 12, 2017

Uh oh!

1ec5 commented May 12, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

1ec5 commented Sep 9, 2016 •

edited

Loading

amyleew commented Oct 3, 2016 •

edited

Loading

1ec5 commented Oct 6, 2016 •

edited

Loading