Commit Graph

7032 Commits

Author SHA1 Message Date
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
Thiago Marcos P. Santos
379d7830d9 Add tests for handling corrupted data
The MockFileSource will insert garbage on the reply and report as
a request done successfully. The network stack cannot detect this
kind of errors but the consumer should report it like we do for
network problems.
2015-05-28 09:43:56 +03:00
Thiago Marcos P. Santos
f8cc50683a Notify tile parsing errors
The tile parsing is done in a worker thread and if it fails,
we set the tile state to "obsolete" and set an error message.

When the completion callback is fired, we check for the error
message and if it is set, we emit the error signal.

The trick here is the signal cannot be emitted directly from
the worker thread because that would violate data ownership rules.
2015-05-28 09:33:08 +03:00
Thiago Marcos P. Santos
48875d8d6c Notify glyph parsing errors
Emit a signal when the glyphs are not parsed correctly.
2015-05-28 09:33:08 +03:00
Thiago Marcos P. Santos
4819379020 Notify sprite parsing errors
Emit a signal when the JSON or the sprite image was not
parsed correctly.
2015-05-28 09:33:08 +03:00
Mike Morris
e4536789eb Merge pull request #128 from mapbox/mapbox-protocol
drop SetAccessToken from NodeMap
2015-05-27 19:09:38 -04:00
Mike Morris
cb47f902e1 #include <memory> in node_file_source.hpp 2015-05-27 18:40:53 -04:00
Mike Morris
44490f620c drop SetAccessToken from NodeMap
Handle this is JavaScript where necessary.
2015-05-27 18:24:43 -04:00
Mike Morris
2e73682de0 std::make_unique 2015-05-27 16:54:09 -04:00
Minh Nguyễn
9dd8d26729 Merge pull request #1653 from mapbox/1ec5-init-unfail
Make init methods unfailable
2015-05-27 13:15:03 -07:00
Minh Nguyễn
86dd0e99bc Defailablize init methods
If an OpenGL context couldn’t be created, there’s just no point to soldiering on. Things are going to fall apart pretty quickly anyways. Assert and be done with it.
2015-05-27 12:51:30 -07:00
Minh Nguyễn
ceef4d3841 Merge pull request #1652 from mapbox/1ec5-init-nil
Return nil upon failure to initialize
2015-05-27 12:48:08 -07:00
Minh Nguyễn
a2986b2019 Return nil upon failure to initialize 2015-05-27 12:36:52 -07:00
Justin R. Miller
2ce4ae3047 [publish ios-v0.3.2] 2015-05-26 21:23:16 -07:00
Justin R. Miller
8248fca38b bump podspec to 0.3.2 2015-05-26 21:22:40 -07:00
Brad Leege
d0864d719b #1641 - Changing version to a static constant instead of a property 2015-05-26 14:24:02 -07:00
Brad Leege
ad0a2af6b5 #1641 - Adding version and instance to Turnstile event and keeping them DRY for general events processing 2015-05-26 13:50:01 -07:00