Commit Graph

5798 Commits

Author SHA1 Message Date
Thiago Marcos P. Santos
b09df7acb5 Cleanup the MapContext before the util::Thread destructor
The util::Thread will call the stop() method of the MapContext's RunLoop
which will wait for the pending tasks tied to it to complete.

If we have a request that is timeout'ing, this could mean a really long
wait. Instead, we now send a cleanup message that will reset all the
attributes first (canceling the pending requests) so the the MapContext
gets destructed quickly.
2015-06-04 14:44:34 +03:00
Thiago Marcos P. Santos
29b8b44b77 Fix race condition on error notification
We start loading the resources at the moment we set the style, but we
set the callback for error notification at renderStill(), which happen
afterwards.

If some error occurs in this short window, it was never being notified.
Now we save the last error and we check after we set the callback.
2015-06-04 14:44:34 +03:00
Justin R. Miller
9b36b48268 [publish ios-v0.3.3] 2015-06-03 20:51:19 -07:00
Justin R. Miller
8fdb389574 bump podspec to 0.3.3 2015-06-03 20:50:49 -07:00
Ansis Brammanis
9c03b396c0 Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	src/mbgl/renderer/painter_fill.cpp
2015-06-03 19:20:41 -04:00
Ansis Brammanis
2bd7e45502 fix collision box clipping
and name parameters when it's not clear from their type
2015-06-03 19:17:49 -04:00
Brad Leege
295dc73c1a Adding iOS Testing Header To Draw Attention 2015-06-03 11:57:49 -05:00
Justin R. Miller
ce457dafb8 fix typo 2015-06-03 09:37:43 -07:00
Justin R. Miller
7ac767226f point to better appledoc install method 2015-06-03 09:36:38 -07:00
Ansis Brammanis
1f5fb1db4a fix hangs caused by redoPlacement
After parsing a tile, it redoes placement for that tile if the angle has
changed since it started parsing. These redo calls were accidentally
done from the worker thread. Assigning the new work to `workRequest`
caused it to cancel itself.

Fix the problem by calling redoPlacement from the map thread.
2015-06-02 17:06:24 -04:00
Thiago Marcos P. Santos
d7465061f8 Do not call update() asynchronously on the test case
We need to call it before checking if the tiles are loaded
to give the Source a chance to request for more tiles if
it is needed.
2015-06-02 20:43:29 +03:00
Thiago Marcos P. Santos
5c4c6648d1 Rebase the resource loading tests
Update the ResourceLoader tests to reflect the changes
after we merged ResourceLoader with Style.
2015-06-02 20:43:00 +03:00
Thiago Marcos P. Santos
68989e671c Remove references to ResourceLoader
ResourceLoader got merged with Style.
2015-06-02 20:23:03 +03:00
Ansis Brammanis
3dfa317cf9 fix android compile errors
- explicitly mark override
- re-add fix from 74604af that was lost in a merge
2015-06-02 11:33:03 -04:00
Ansis Brammanis
4e74867ba9 use source zoom level for tile loading errors 2015-06-02 11:33:03 -04:00
Ansis Brammanis
956ad85d26 update test suite 2015-06-02 11:33:03 -04:00
Ansis Brammanis
93fc67ba55 re-add sprite atlas pollution fix
It got missed in a merge.
03d5e2da80
2015-06-02 11:33:03 -04:00
Ansis Brammanis
2ae2cade4a fix assertion. only include glyphs with metrics
fixes bug caught by this assertion:
de3fd89b2c/src/mbgl/text/font_stack.cpp (L124)
2015-06-02 11:33:03 -04:00
Ansis Brammanis
36212ea3c6 sort overlapping symbols in the y direction
fixes #333
fixes #988

-js: 6514de77be2ff3df4267785f42f5e53c63233cac
2015-06-02 11:33:03 -04:00
Justin R. Miller
88b3cfe37d .zip != .tgz 2015-06-01 18:57:25 -07:00
Justin R. Miller
847b1f03af appledoc download is a redirect 2015-06-01 18:57:03 -07:00
Justin R. Miller
81c24e9d1e wget -> curl since wget itself is a brew install 2015-06-01 18:54:58 -07:00
Brad Leege
0d83740272 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2015-06-01 15:49:40 -05:00
John Firebaugh
925cc91ef2 Remove unused; fix naming style 2015-06-01 13:22:02 -07:00
John Firebaugh
ec06bb7e3c Merge ResourceLoader into Style and move atlas ownership 2015-06-01 13:22:02 -07:00
Brad Leege
70acae7941 #1659 - Converting true to YES, false to NO to match Objective C standards 2015-06-01 15:06:32 -05:00
Brad Leege
ebe1e2158c #1659 - Converting usingTestServer to atomic property 2015-06-01 15:05:01 -05:00
John Firebaugh
d2f7105649 Require appledoc v2.2-963 exactly 2015-05-29 11:02:29 -07:00
John Firebaugh
78ea889202 Latest homebrew appledoc should be good 2015-05-29 10:18:31 -07:00
John Firebaugh
c1d42aa557 Opt-in to Travis Xcode 6.3 beta
http://blog.travis-ci.com/2015-05-26-xcode-63-beta-general-availability/
2015-05-29 10:18:31 -07:00
Minh Nguyễn
10fdc7be9c Fixed ios-bench build
`accessToken` parameter was removed in #1553.
2015-05-29 09:15:48 -07:00
Ansis Brammanis
520eddb794 use floats when resampling lines to match -js
This fixes many small render test and collision differences.
2015-05-29 11:51:10 -04:00
Leith Bade
65aaf73956 Update mason to use soft float on Android ARM 2015-05-29 20:47:51 +10:00
Brad Leege
09688ee46b Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2015-05-28 18:01:27 -07:00
Jason Wray
10990475b9 Adapt metrics tests to constant flush timer
Disables three tests:

- testTimerFiresFlush: passes but takes 60 seconds (full MGLFlushInterval)
- testFlushPostsEvents: fails
- testPostEventsNetworkRequest: fails
2015-05-28 17:08:18 -07:00
Ansis Brammanis
ff6a5ce5bc Merge remote-tracking branch 'origin/master' into new-labelling
Conflicts:
	src/mbgl/map/source.cpp
	src/mbgl/map/source.hpp
	src/mbgl/map/tile_data.cpp
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/vector_tile_data.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/text/glyph.hpp
	src/mbgl/text/glyph_store.cpp
	src/mbgl/text/placement.cpp
	test/suite
2015-05-28 20:01:15 -04:00
Ansis Brammanis
fd19eb7905 fix shaped icon box sizes 2015-05-28 19:17:07 -04:00
Ansis Brammanis
4cd95a97c6 fix clipping lines for labeling 2015-05-28 19:17:07 -04:00
Ansis Brammanis
1e044a175c Reparse tiles when zoom level > source maxzoom
so that layout property functions are applied correctly
and so that label placement is redone

js:
https://github.com/mapbox/mapbox-gl-js/pull/1005
and
440bc02505
2015-05-28 19:17:07 -04:00
Ansis Brammanis
8962442b1b make collision debug boxes toggleable 2015-05-28 19:17:07 -04:00
Brad Leege
d44450ac7b #1659 - Adding tile stream certificate and ssl pin check for test server. 2015-05-28 15:51:50 -07:00
Mike Morris
efb583186f Merge pull request #127 from mapbox/collect-garbage
Collect garbage
2015-05-28 14:30:33 -04:00
John Firebaugh
6c166b564e Remove boost install instructions; now installed via mason 2015-05-28 11:23:36 -07:00
Mike Morris
1a3e7bfefe added link with clang-3.5+ linux install 2015-05-28 11:20:48 -07:00
AJ Ashton
6eb6e2d1a8 Linux build instruction updates
[skip ci]
2015-05-28 11:20:48 -07:00
Mike Morris
691ccff978 fix unhandled gzip test
Refs https://github.com/mapbox/mapbox-gl-native/pull/1632
2015-05-28 13:35:00 -04:00
Mike Morris
ed648f9eff skip failed request test 2015-05-28 13:35:00 -04:00
Mike Morris
9214584efb drop extraneous NodeFileSource v8::Persistent
Remove from NodeRequest to stop preventing garbage collection.
2015-05-28 13:35:00 -04:00
Mike Morris
fe3d6bbbd5 expose map.release() method 2015-05-28 13:35:00 -04:00
Thiago Marcos P. Santos
a96a251de9 Merge pull request #1632 from mapbox/1632-handle_currupt_data
Corrupt data not handled properly
2015-05-28 10:15:51 +03:00