Commit Graph

374 Commits

Author SHA1 Message Date
Justin R. Miller
778925a96a refs #1219: move iOS CocoaPods spec to root of project
This is only temporary, until such time that we release Mapbox GL
on CocoaPods directly, when they will host the Podspec. For now,
it needs to be in the repository root to be usable as a non-main
CocoaPods source.
2015-04-07 13:05:38 -07:00
Justin R. Miller
e4228f7a0f prep CocoaPods for new deploy setup 2015-04-07 11:18:52 -07:00
Minh Nguyễn
e18e4b0de5 Removed redundant initializers and setters
This change removes most of the ways you used to be able to apply a style to the map. Building on #1163, `styleURL` (HTTP(S), mapbox:, asset:) is the canonical way to apply a style, and `mapID` is a convenient shorthand for Mapbox-hosted styles. A relative style URL is interpreted as a path relative to the app’s main bundle. We now construct asset: URLs in lieu of “bundled style names”.
2015-04-03 12:14:51 -07:00
Minh Nguyễn
6a1e7d5707 Fixed race condition after setting access token
`Map` should be able to deal with having no access token or JSON even while it’s running. Most of `Map` accounts for this situation, but `reloadStyle()` incorrectly assumes that one or the other is set. This change corrects the assumption in `reloadStyle()`.

Also expose the access token and style name to clients as ordinary KVO-compliant properties. Actually, they’re not so ordinary because they’re inspectable!

Ref #1070, #1147
2015-04-03 12:07:53 -07:00
Minh Nguyễn
44d360501e Polished privacy settings
Added footer text to explain the purpose of the Mapbox Metrics setting. Added strings from the plist to an existing unused .strings file and converted that .strings file to UTF-8 for diffability.
2015-04-02 12:43:32 -07:00
Minh Nguyễn
501f9701cd Merge pull request #1105 from mapbox/1099-gyp-deps
Enable modules in iOS demo app
2015-03-26 10:35:34 -07:00
Justin R. Miller
f3058dbc9a closes #1082, refs #756: user dot on map in iOS 2015-03-25 17:48:22 -07:00
Minh Nguyễn
de9255f002 Enabled modules in iOS demo app
No longer need to explicitly link system frameworks like UIKit.
2015-03-25 15:07:35 -07:00
Minh Nguyễn
675f138154 Merge pull request #1098 from mapbox/1ec5-pod-telephony
update podspec frameworks
2015-03-25 14:08:41 -07:00
Minh Nguyễn
76a51fd1ea Also QuartzCore for calloutview 2015-03-25 11:47:39 -07:00
Minh Nguyễn
2570462ead Added CoreTelephony to Podspec frameworks
Ref #1036, #1094
2015-03-25 11:31:36 -07:00
Brad Leege
788c95a115 #1095 - Adding Settings.bundle to project generation 2015-03-25 12:34:40 -05:00
Justin R. Miller
10a30daed6 refs #894, fixes #1074: callout views for iOS 2015-03-24 18:43:24 -07:00
Brad Leege
88398b2545 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into 1033-metrics
Conflicts:
	platform/ios/MGLMapView.mm
2015-03-24 15:15:27 -05:00
Brad Leege
708ae14468 #1033 - Reverting to Metrics Enabled Preference in System.app 2015-03-24 11:41:47 -05:00
Brad Leege
308d382bd2 #1033 - Building Mapbox Metrics Disabled UI in Settings.app and functionality in Events tracking infrastructure 2015-03-24 11:33:08 -05:00
Brad Leege
25381187be #1033 - Setting up Opt Out UI in Settings.app. Checking for Opt Out status at event push time. 2015-03-24 10:50:26 -05:00
Brad Leege
5acf518ea6 #1033 - Adding blank Settings.bundle infrastructure and ensuring it's loaded into memory 2015-03-24 10:37:59 -05:00
Justin R. Miller
c5597ad6f1 annotations perf improvements & iOS app testing
squash of #1061
2015-03-23 20:49:02 -07: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
Peter Liu
a1a7ab62e1 add emerald 2015-03-20 18:31:12 -07:00
Minh Nguyễn
8fb1bbca8e Merge pull request #1030 from mapbox/829-pod
CocoaPod podspec for beta 1
2015-03-20 10:02:06 -07:00
Minh Nguyễn
1be8e6327b Prepared podspec for beta 1
This podspec was originally lifted from mapbox/mapbox-ios-sdk, which was structured and built quite differently. We could have the podspec build this repo as is, using scripts/package_ios.sh, but that would require developers to install the same version of Xcode as Travis is using (see #977). So this podspec instead pulls a prebuilt library. Much simpler.

Also package a LICENSE with the archive to satisfy a CocoaPods warning.

Fixes #829.
2015-03-19 14:40:44 -07:00
Justin R. Miller
b4dbba93f8 bump iOS app version 2015-03-19 12:41:59 -07:00
Konstantin Käfer
47ede853c4 fixes black flicker on rotating the device
fixes #838

instead of rendering ad libitum on the map thread, we are now driving rendering from the UI thread on iOS via the map.renderSync() function. There are still white bars during the rotation, but the general content of the view is kept visible.

- upgrades GLFW to 3.1
- removes swapped/needsSwap in favor of a more explicit scheme
- View#invalidate() now replaces View#swap() and is called whenever the View needs to trigger a rerender. GLFW and Android to this right away, while iOS goes back to the main thread and does the Map redrawing as part of the GLKView update
- sets all iOS deployment targets to 7.0
- disables SQLite3 version check, since the library version changed on iOS 8.2
2015-03-12 12:16:38 +01:00
Minh Nguyễn
78900c6eee Alias hybrid to satellite
Looks terrible at the moment, but the API is closer to what developers would expect.

Fixes #935.
2015-03-08 12:14:22 -07:00
Jason Wray
7ef669ba8c Add optimized 3x assets 2015-03-05 19:34:07 -08:00
Justin R. Miller
28228bfae0 ensure correct ordering for bundled styles 2015-03-03 11:46:20 -08:00
Jason Wray
ef8a5cc0df Bump iOS app styles versions to 7 2015-03-02 23:17:26 -08:00
Justin R. Miller
d4d4cd4415 move iOS code from gl-cocoa to this project 2015-02-09 18:01:40 -08:00
Justin R. Miller
3b3f732ea3 proper gl-cocoa pin 2015-02-06 16:44:19 -08:00
Justin R. Miller
213ad376cc pin gl-cocoa to master 2015-02-06 16:35:58 -08:00
Konstantin Käfer
b9bf66e67e rewrite storage layer to be independent of the Map's event loop 2015-02-04 10:46:37 +01:00
Leith Bade
63e4c75275 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into chrono
Conflicts:
	ios/mapbox-gl-cocoa
2015-02-04 10:44:57 +11:00
Leith Bade
89bbd29278 Use std::chrono 2015-02-04 09:39:25 +11:00
John Firebaugh
18d44402d4 Fix OS X build 2015-02-03 14:02:14 -08:00
John Firebaugh
d24b73b1a6 Move class state to map
https://github.com/mapbox/mapbox-gl-js/pull/936
2015-01-14 17:43:44 -08:00
Leith Bade
0771e50460 Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656 2014-12-23 09:29:45 +13:00
Konstantin Käfer
b5e9998b15 change file:// to asset:// to indicate that they aren't arbitrary files
refs #579
2014-12-17 14:59:05 +01:00
John Firebaugh
ff640132de Move setAccessToken to CachingHTTPFileSource 2014-12-04 17:03:23 -08:00
John Firebaugh
16fe8e64c4 Move setReachability to CachingHTTPFileSource 2014-12-04 15:14:40 -08:00
Konstantin Käfer
3b190ddd0d fix build 2014-12-04 20:13:08 +01:00
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00
John Firebaugh
e5f70bddf6 Update mapbox-gl-cocoa 2014-12-04 10:35:50 -08:00
Mike Morris
dac76a0f92 break out FileSource as an abstract class
add CachingHTTPFileSource implementation
2014-12-03 12:25:11 -05:00
Justin R. Miller
913a119b66 bump Cocoa 2014-11-26 14:09:50 -08:00
John Firebaugh
545292b6f9 Fix OS X build 2014-11-20 15:55:16 -08:00
Konstantin Käfer
582d616deb load VAO extension 2014-11-07 18:17:24 +01:00
Konstantin Käfer
7e65c88b46 bump cocoa bindings 2014-11-07 17:25:50 +01:00