Konstantin Käfer
37bb2ff048
don't force Testing build on linux
...
[skip ci]
2014-07-14 15:31:39 -07:00
Konstantin Käfer
af9293a65b
fix includes
2014-07-14 15:09:05 -07:00
Konstantin Käfer
d91aa9c7e2
don't initialize sources multiple times
2014-07-14 15:01:45 -07:00
Konstantin Käfer
8b775573c1
move std::erase_if => util::erase_if
2014-07-14 15:01:45 -07:00
Justin R. Miller
ab472ed8bb
simplify OS X access token use
2014-07-14 12:16:46 -07:00
Justin R. Miller
7c03f89079
fix up access token docs for Xcode
2014-07-14 11:41:29 -07:00
Mike Morris
6c71d70197
Merge pull request #362 from mapbox/stylesource
...
Break out StyleSource struct
2014-07-11 17:17:08 -07:00
Mike Morris
9031278344
Merge branch 'master' into stylesource
2014-07-11 16:53:18 -07:00
Mike Morris
5bc77d4243
add forward-declared Source shared_ptr to style_bucket
2014-07-11 16:49:39 -07:00
Konstantin Käfer
30298be270
add cstdarg headers
2014-07-11 16:42:09 -07:00
Konstantin Käfer
54fe8aab36
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
2014-07-11 16:34:18 -07:00
Konstantin Käfer
2fc62f941a
add missing include header
2014-07-11 16:30:13 -07:00
Konstantin Käfer
fbec72cd47
allow formatted messages
2014-07-11 16:25:20 -07:00
Konstantin Käfer
2dc9133006
fix linux app build
2014-07-11 15:18:01 -07:00
Mike Morris
86c5367bae
Merge branch 'master' into stylesource
2014-07-11 14:52:39 -07:00
Konstantin Käfer
7ffe4a7858
add nslog and stderr log backends
2014-07-11 14:34:17 -07:00
Konstantin Käfer
f3c55eba9d
add logging facility and check logs in tests
2014-07-11 13:55:18 -07:00
Mike Morris
f89de635ad
Merge branch 'master' into stylesource
2014-07-10 17:21:20 -07:00
Konstantin Käfer
8fc4d61025
allow setting classes in the test case
2014-07-10 17:19:53 -07:00
Mike Morris
7cde26247d
Merge branch 'master' into stylesource
2014-07-10 17:15:04 -07:00
Mike Morris
4590adc115
break out StyleSource from Source, move getActiveSources and
...
updateSources into Map::Map, move getAccessToken from Style to Map
Conflicts:
include/llmr/style/style.hpp
src/map/source.cpp
src/style/style_layer.cpp
src/style/style_parser.cpp
2014-07-10 17:12:02 -07:00
Konstantin Käfer
0719ca73be
remove duplicate setAppliedClasses function
2014-07-10 17:10:34 -07:00
Konstantin Käfer
ac11adf48c
Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native
2014-07-10 17:02:10 -07:00
Konstantin Käfer
6a202fc197
allow processing multiple renders per test
2014-07-10 16:59:48 -07:00
Justin R. Miller
170d57cbe4
bump Cocoa for access tokens
2014-07-10 18:39:58 -05:00
Mike Morris
356c9ce7e4
move sprite class to map directory
2014-07-10 16:30:48 -07:00
Konstantin Käfer
c272ba7a47
convert stylesheet to use the correct stop values
...
[skip ci]
2014-07-10 16:05:16 -07:00
Konstantin Käfer
9846cb75f4
remove *-enabled
...
refs mapbox/mapbox-gl-style-spec#94
2014-07-10 15:51:35 -07:00
Konstantin Käfer
f519625ed2
allow specifying a base parameter for exponential functions
...
refs mapbox/mapbox-gl-style-spec#4
2014-07-10 15:26:35 -07:00
Konstantin Käfer
fd0b1aeffe
report fixture request errors
2014-07-10 15:13:52 -07:00
Konstantin Käfer
0cf3858edb
cleanup
2014-07-10 15:13:46 -07:00
Konstantin Käfer
a8e71bcb7b
change line width and add line-width test
2014-07-10 14:54:43 -07:00
Konstantin Käfer
a8963fcbe4
Merge pull request #351 from mapbox/access_token
...
Use API tokens and v4 vector tile endpoint
2014-07-10 11:36:58 -07:00
Konstantin Käfer
cdf8e95d66
update docs
...
[skip ci]
2014-07-10 11:34:16 -07:00
Konstantin Käfer
72a5a6ee13
read access token from environment
2014-07-10 11:28:39 -07:00
Konstantin Käfer
0d7b3462e9
read access token from environment
2014-07-10 11:27:03 -07:00
Konstantin Käfer
795496053b
Merge branch 'master' into access_token
...
Conflicts:
src/map/source.cpp
2014-07-10 10:46:35 -07:00
Mike Morris
529277b0a2
fix invalid json
2014-07-09 19:28:35 -07:00
Konstantin Käfer
374b1a1c65
fix other style as well
2014-07-09 19:03:26 -07:00
Konstantin Käfer
376105cd87
prettify output
2014-07-09 19:03:17 -07:00
Konstantin Käfer
18924e5e30
update fixtures
2014-07-09 18:53:53 -07:00
Konstantin Käfer
d9bebe84a5
move render type to layer top level
...
refs https://github.com/mapbox/mapbox-gl-style-spec/issues/80
2014-07-09 18:43:28 -07:00
Justin R. Miller
9c0aa55c93
flesh out access token README docs
2014-07-09 18:19:00 -07:00
Justin R. Miller
cfbd9f2469
move Linux & OS X to per-map access tokens
2014-07-09 18:08:53 -07:00
Justin R. Miller
e946ef99d0
cleanup
2014-07-09 18:06:47 -07:00
Justin R. Miller
57b8256c3e
bump Cocoa
2014-07-09 17:55:21 -07:00
Justin R. Miller
98a415416a
move to per-map access token
2014-07-09 17:18:36 -07:00
Konstantin Käfer
cd69784edb
switch to GeoJSON-style geometry type names
...
refs https://github.com/mapbox/mapbox-gl-style-spec/pull/69
2014-07-09 16:54:27 -07:00
Konstantin Käfer
22c8afced5
replace {{token}} with {token}, and %d/%d/%d with {z}/{x}/{y}
...
refs https://github.com/mapbox/mapbox-gl-style-spec/pull/87
2014-07-09 16:27:23 -07:00
Konstantin Käfer
f2ee02d3ca
allow specifying a maximum allowed difference in the info json
2014-07-09 15:17:51 -07:00