Commit Graph

5798 Commits

Author SHA1 Message Date
Minh Nguyễn
ec987ca434 Assert that snapshot view obscures GL view when it exists
Just in case the host app mucks around with `MGLView`’s internal view hierarchy.
2015-04-15 10:18:15 -07:00
Brad Leege
109a693f00 Merge pull request #1274 from mapbox/1271-alloc-init
Changing "new" to "alloc init"
2015-04-15 10:16:08 -05:00
Mike Morris
5972a7d16e make environment.hpp header public 2015-04-15 17:14:36 +02:00
Brad Leege
074687e732 #1271 - Changing "new" to "alloc init" 2015-04-15 09:39:00 -05:00
Minh Nguyễn
e19b6afb26 Leave GLKView in place, obscured by snapshot
Generate the snapshot using `-[UIView snapshotViewAfterScreenUpdates:]` and place it _over_ the `GLKView`. UIKit appears to be able to detect that the `GLKView` is completely obscured and avoids `-_display`ing it.
2015-04-14 22:23:13 -07:00
Brad Leege
88b8d452b9 Merge pull request #1269 from mapbox/1268-horizontal-accuracy
Adding horizontalAccuracy to location event
2015-04-14 18:30:52 -05:00
Brad Leege
21685caa2a #1268 - Adding horizontalAccuracy to location event 2015-04-14 18:03:59 -05:00
Mike Morris
9f13392de0 Merge pull request #1260 from mapbox/defaults-gypi
define MACOSX_DEPLOYMENT_TARGET in common.gypi
2015-04-14 16:21:41 +02:00
Mike Morris
2fd22b8742 define MACOSX_DEPLOYMENT_TARGET in common.gypi
Needed in target_defaults to prevent node-gyp from overriding this everywhere with '10.5' from https://github.com/joyent/node/blob/master/common.gypi
2015-04-13 19:33:16 +02:00
Konstantin Käfer
1066504008 separate SQLiteCache::Impl header from implementation file 2015-04-13 18:38:39 +02:00
Konstantin Käfer
352ff64e06 rename SQLiteCache::Thread to SQLiteCache::Impl 2015-04-13 18:32:59 +02:00
Konstantin Käfer
452d12e6e6 make implementation files private headers 2015-04-13 18:28:18 +02:00
Konstantin Käfer
16849a341b hide Thread<> and separate the Implementation object 2015-04-13 17:57:45 +02:00
Konstantin Käfer
278e6bd556 use std::tuple<> to forward parameters into the Thread<> object
works around GCC bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47226
2015-04-13 12:58:47 +02:00
Mike Morris
89e226e10f cherry pick fix for #110 2015-04-13 11:44:41 +02:00
John Firebaugh
3efbb69e0c Ensure that ~TileData happens on map thread
Fixes #1251
2015-04-10 17:28:39 -07:00
Justin R. Miller
146a9f9fd3 [publish ios-v0.2.12] 2015-04-10 16:41:54 -07:00
Justin R. Miller
e572bf8988 bump podspec to 0.2.12 2015-04-10 16:39:34 -07:00
Justin R. Miller
32e5196373 change default style to Streets 2015-04-10 16:38:49 -07:00
Justin R. Miller
18ef67b002 Revert "Override file name for Mapbox Streets style JSON"
Mapbox Streets has stock naming again; reverting. Easier
to ensure we name properly than build in logic.

This reverts commit 0b35a88708.
2015-04-10 16:34:42 -07:00
Justin R. Miller
53af2bda3f bump CocoaPods 2015-04-10 16:09:48 -07:00
Justin R. Miller
42dd2bdc5b [publish ios-v0.2.11] 2015-04-10 15:33:49 -07:00
Justin R. Miller
a233a39c0b bump styles pin 2015-04-10 15:32:27 -07:00
Minh Nguyễn
c5b0478e9a Detach GLKView while app is in background
Throw a static snapshot up for the app switcher. Hope you didn’t plan on moving markers around while the app is in the background.

Fixes #1050, #1186, #1203, #1243.
2015-04-10 14:29:18 -07:00
Konstantin Käfer
0f79a89502 don't shadow variable names 2015-04-10 23:19:35 +02:00
Brad Leege
2a468156a9 Merge pull request #1253 from mapbox/1252-created
Created Cleanup
2015-04-10 16:15:27 -05:00
Brad Leege
22a35c23be #1252 - Merging 2 "created" attribute value setting attempts into 1 2015-04-10 15:53:07 -05:00
Konstantin Käfer
00e9cd9e9d OS X needs -framework Foundation for CURL tests 2015-04-10 22:39:53 +02:00
Konstantin Käfer
4c7132337f convert DefaultFileSource to use util::Thread<> 2015-04-10 22:37:27 +02:00
Konstantin Käfer
bd531b9e08 guarantee that Object stays around
Adds more documentation, and guarantees that the Object in the managed thread stays around until the Thread<> destructor is called. This might happen if .start() returns before .stop() is called, e.g. when a run loop in Object() terminates prematurely.
2015-04-10 15:52:02 +02:00
Konstantin Käfer
bba3d9838a add Thread<T> and RunLoop
Thread<T> is a generic thread management object that starts a thread, creates an object T in that thread and calls its .start() function. When the Thread<T> object is destructed (which must happen in the thread that created it), it'll call the object's .stop() function, and wait for thread termination. The .stop() function must somehow get the thread to terminate. Note that object T's constructor/destructor/start()/stop() must be protected/private, and Thread<T> must be declared as a friend class. All public functions may be called from any thread and are exposed through operator->().

RunLoop encapsulates a libuv runloop and has a facility of dispatching function objects to the thread. It can be used either as a worker thread class by itself, or it can be derived from. This commit converts SQLiteCache to derive from RunLoop and removes the custom code used previously for managing the cache thread.
2015-04-10 15:36:32 +02:00
Justin R. Miller
8eafe36932 [publish ios-v0.2.10] 2015-04-09 23:45:52 -07:00
Justin R. Miller
159ffddefd show Dark style in demo app 2015-04-09 23:45:04 -07:00
Justin R. Miller
ba8679b4ac [publish ios-v0.2.10] 2015-04-09 23:08:30 -07:00
Justin R. Miller
1c7c78deda bump podspec version 2015-04-09 23:07:19 -07:00
Justin R. Miller
087d5e7a64 [publish ios-v0.2.10] 2015-04-09 23:05:45 -07:00
Brad Leege
88ec0f1607 Merge pull request #1249 from mapbox/1247-altitude
Altitude Metric
2015-04-09 18:49:53 -05:00
Brad Leege
19e4bc7541 #1247 - Adding Altitude and Vertical Accuracy attributes to location events 2015-04-09 18:08:15 -05:00
Peter Liu
8f987ae4cd Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native 2015-04-09 16:00:08 -07:00
Peter Liu
051c9c0b12 updated emerald style 2015-04-09 15:59:54 -07:00
John Firebaugh
566c6718d7 Merge pull request #1244 from mapbox/uv
Replace uv_messenger with AsyncQueue; rewrite remaining uv_* in C++
2015-04-09 15:59:38 -07:00
John Firebaugh
6708959d12 Remove some uv.hpp includes 2015-04-09 15:30:58 -07:00
John Firebaugh
0c087603e6 Replace uv_messenger with AsyncQueue; rewrite remaining uv_* in C++ 2015-04-09 15:30:58 -07:00
Konstantin Käfer
a22c2dd0a1 Merge pull request #1237 from mapbox/1237-text-font-function
404 errors when style uses functions for text-font
2015-04-09 22:50:32 +02:00
Konstantin Käfer
ec94e03a8e set the correct v7 default font
- also skip layers with empty font names
2015-04-09 22:29:05 +02:00
Justin R. Miller
6efce53e29 Merge pull request #975 from mapbox/974-current-sdk
build with current iOS SDK
2015-04-09 12:44:42 -07:00
Ansis Brammanis
7ac01660d7 port line icon angle fix
-js: 37a498a7aa2c37d6b94611b614b4efe134e6dd59
2015-04-09 12:17:43 -07:00
Ansis Brammanis
9b0376e58e fix angle of icons along lines
fixes https://github.com/mapbox/mapbox-gl-native/issues/1242
2015-04-09 12:05:16 -07:00
John Firebaugh
0b779eaa8b Remove unnecessary use of weak_ptr
The request callback runs in the same thread as ~TileData, and is not run
if the request is cancelled. So either ~TileData runs first and cancels
the request, or the callback runs first, before TileData is destructed.
Therefore the weak pointer and lock() check is unnecessary; `this` can
be used instead.
2015-04-09 11:10:51 -07:00
John Firebaugh
691756d7dd Move ClipID to clip_id.hpp/cpp 2015-04-09 10:58:11 -07:00