Integrate hybrid style

[1ec5]

Per discussion with @incanus, this issue tracks adding the “hybrid” style to the example apps. See mapbox/mapbox-gl-styles#35, mapbox/mapbox-gl-js#1041.

[incanus]

Idea here is parity with what devs expect of -[MKMapView.mapType].

[1ec5]

Depends on #939.

[1ec5]

To your left, contours+labels. To your right, just labels:

[1ec5]

Here’s what we’re getting out of the style .json: http://a.tiles.mapbox.com/v4/mapbox.mapbox-terrain-v2/{z}/{x}/{y}.vector.pbf?access_token=…. The vector glyph zoom level is always one lower than the raster tile zoom level.

[1ec5]

At the initial viewport, map.getState() is 14.5. The TileDatas are being created with z14 for the contours and labels and z15 for the satellite tiles, based on the return value of Source::getZoom().

[incanus]

@jfirebaugh I believe you said you were going to take a look at this? Want to self-assign, or just take a peek?

[gundersen]

@incanus can we use Mapbox Terrain rather than Mapbox Outdoors in when we launch. Terrain gets us the wins of terrain w/ the wins of Mapbox Streets.

@ajashton what are your thoughts here on the 1 style we should launch in GL w/ the iOS launch?

[jfirebaugh]

The rendering errors (black labels, missing contours) are reproducible on any platform.

9897ae7 fixes contour rendering. fddd27f fixes label rendering but I'm not sure if it's correct. @kkaefer?

[incanus]

Splitting vector terrain out to #964 to keep this ticket purely raster satellite + vector labels (i.e. "hybrid").

[incanus]

This will come in in b2.