Commit Graph

10 Commits

Author SHA1 Message Date
Brad Leege
044d1fc3c2 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into 1033-metrics
Conflicts:
	gyp/platform-ios.gypi
	platform/ios/MGLMapView.mm
	styles
2015-03-23 10:52:27 -05:00
Justin R. Miller
0e2d6c8277 fixes #1053: umbrella Cocoa header 2015-03-22 12:25:10 -07:00
Justin R. Miller
ecb8e2800d Cocoa annotations API 2015-03-22 00:53:36 -07:00
Brad Leege
33f4dfffd2 #1033 - Removing BackgroundStatus analytic 2015-03-20 17:14:25 -05:00
Brad Leege
ec304d37ac #1033 - Integrating MapboxEvents class. 2015-03-20 16:01:52 -05:00
Brad Leege
253643f57d #1033 - Renaming MBLocationManager to MGLMetricsLocationManager to better comply with naming scheme. 2015-03-20 11:37:50 -05:00
Brad Leege
c42e83fcc6 #1033 - Moving MBLocationManager to Core GL from app specific instance. 2015-03-20 11:11:06 -05:00
Minh Nguyễn
3d195b467a Added API for initializing with bundled style
As a best practice for the beta and a workaround for #1014.

Also reversed the argument order of the existing init method. Reads better this way, but you’ll likely have to change your initialization to match the new signatures.
2015-03-19 10:29:04 -07:00
Justin R. Miller
6e41664cb0 fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOS 2015-02-16 09:52:36 -08:00
Justin R. Miller
d4d4cd4415 move iOS code from gl-cocoa to this project 2015-02-09 18:01:40 -08:00