Commit Graph

961 Commits

Author SHA1 Message Date
Leith Bade
0ac4247f72 Temp disable SSL cert validation 2014-11-08 08:44:39 +11:00
Leith Bade
01ead83b39 Android mapbogl now loads maps!
(had to change JSON loading to http - temp fix)
2014-11-08 08:07:47 +11:00
Leith Bade
6c5331ee73 Add more detail to TileJSON error 2014-11-08 02:29:07 +11:00
Leith Bade
585805a754 Add logging of http requests 2014-11-08 02:15:19 +11:00
Leith Bade
86f8f626f1 Change clear to red to debug tile loading 2014-11-07 01:40:05 +11:00
Leith Bade
da49d0adb7 Workaround for GL extension. Need to come back to this. 2014-11-05 20:17:28 +11:00
Dane Springmeyer
a9ca7fdf11 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-04 21:28:18 -05:00
John Firebaugh
051e1c32ae Support compound text-anchor values 2014-11-04 12:26:27 -08:00
John Firebaugh
0790b574b4 Single text positioning property
https://github.com/mapbox/mapbox-gl-style-spec/issues/197
2014-11-04 12:26:27 -08:00
John Firebaugh
9a3b740fcc Render ⇢ layout, style ⇢ paint
https://github.com/mapbox/mapbox-gl-style-spec/issues/166
2014-11-04 12:26:14 -08:00
John Firebaugh
c151f12997 Implement v6 filters 2014-11-04 12:26:14 -08:00
Lauren Budorick
f25cf70689 Reinstate 16px line width limit 2014-11-04 12:26:14 -08:00
Lauren Budorick
dc834aec91 v6: min-zoom -> minzoom, max-zoom -> maxzoom 2014-11-04 12:26:14 -08:00
Lauren Budorick
37922605f8 Axe the 16-px line width limit 2014-11-04 12:26:14 -08:00
Lauren Budorick
3d18160fe4 More concise 2014-11-04 12:26:14 -08:00
Lauren Budorick
0d6bca0e7e line-offset -> line-gap-width 2014-11-04 12:26:13 -08:00
Konstantin Käfer
75889d8124 replace strftime_l with our custom formatter 2014-11-04 06:44:50 -08:00
artemp
92124d3aa1 make util::utf8_to_utf32::convert() static 2014-11-03 15:44:27 +00:00
Dane Springmeyer
490a4bb17f centralize android ifdefs 2014-11-02 22:55:23 -05:00
Dane Springmeyer
7ea305d021 reinterpret_cast for parseCacheControl to avoid -Wformat warning on all platforms 2014-11-02 19:37:48 -05:00
Dane Springmeyer
68556362b3 avoid -Wformat warning 2014-11-02 11:52:29 -05:00
Dane Springmeyer
d7b0a34bdd mason-based android port 2014-11-01 22:41:40 -04:00
Konstantin Käfer
a50042349c Merge branch 'master' into platform-image 2014-10-31 16:33:45 -04:00
Konstantin Käfer
15cf30652c rename to .hpp to avoid compiling twice 2014-10-30 18:00:52 -04:00
Konstantin Käfer
80366bc615 allow providing a callback to uv_messenger_stop to prevent mismatched new/free 2014-10-30 17:47:34 -04:00
Konstantin Käfer
203acaad9e simplify debug font lookup 2014-10-30 17:36:28 -04:00
Konstantin Käfer
8712beff80 don't use std::map for checking color constants 2014-10-30 16:43:36 -04:00
Konstantin Käfer
e3bc69b7e7 use CoreImage for decoding/encoding images on osx/ios 2014-10-30 12:02:28 -04:00
Konstantin Käfer
7a13db9a86 do not crash for missing images 2014-10-30 11:58:16 -04:00
Konstantin Käfer
414ccaaf93 use unique_ptr for automatic deallocation 2014-10-30 11:54:52 -04:00
Konstantin Käfer
8f1c2b3bce remove regex/boost regex usage 2014-10-30 11:34:14 -04:00
artemp
fd2d8f48cb pass Tile::ID by const ref 2014-10-30 10:43:58 -04:00
Dane Springmeyer
761f753cbd merge with mbgl-config 2014-10-29 21:40:02 -04:00
artemp
665497672e access member variables directly inside class methods 2014-10-29 18:13:25 -04:00
artemp
9ff0d00912 store uv::loop as unique_ptr 2014-10-29 18:12:11 -04:00
artemp
6622a07ad8 simplify - remove before/afterParse and create Parser on stack in worker thread 2014-10-29 14:37:13 -04:00
artemp
2607a755af store spriteAtlas by value + make TileParser noncopyable 2014-10-29 14:09:06 -04:00
artemp
92f99cbc16 remove commented out assert 2014-10-29 13:55:17 -04:00
artemp
3b5b15a4e4 store glyphAtlas by value in Map object, pass by ref
change hasData signiture to expect ```StyleLayer const&```
2014-10-29 13:44:26 -04:00
artemp
3723481319 c++ - use const qualifier 2014-10-29 11:57:39 -04:00
John Firebaugh
7caac537b8 Fix variable shadowing 2014-10-29 10:12:41 -04:00
John Firebaugh
8ae0dcb5a4 Replace uv::rwlock with std::recursive_mutex
Fixes #491
2014-10-29 09:58:56 -04:00
John Firebaugh
da8aa391d0 Render map with a copy of TransformState 2014-10-29 09:58:56 -04:00
John Firebaugh
4f7bc80664 Hold internal reference to Sprite in SpriteAtlas 2014-10-29 09:58:03 -04:00
artemp
14829db508 fix text/icon rendering order (#470) 2014-10-28 15:43:10 -04:00
artemp
0d4f625951 fix 'flip' logic to take into account rotation_alignment and keep_upright (#470) 2014-10-28 14:50:44 -04:00
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
artemp
c3f3b9ddd5 canonical move ctor 2014-10-27 14:18:12 -04:00
artemp
dcf643fb4b add new line at the end 2014-10-27 14:18:12 -04:00
artemp
efeaba832d c++ - don't test if pointer is nullptr before deleting 2014-10-27 14:18:11 -04:00