Commit Graph

2256 Commits

Author SHA1 Message Date
Konstantin Käfer
fbec72cd47 allow formatted messages 2014-07-11 16:25:20 -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
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
Mike Morris
356c9ce7e4 move sprite class to map directory 2014-07-10 16:30:48 -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
a8e71bcb7b change line width and add line-width test 2014-07-10 14:54:43 -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
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
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
Justin R. Miller
e66ed8fea4 Merge branch 'master' into access_token
Conflicts:
	.gitignore
2014-07-09 15:12:15 -07:00
Konstantin Käfer
d0d68d08f4 fix automated headless testing on travis 2014-07-09 12:37:59 -07:00
Konstantin Käfer
df65ecaa34 fix compile errors 2014-07-08 14:53:17 -07:00
Konstantin Käfer
af6091db5a update headless testing to be configurable 2014-07-08 14:38:49 -07:00
John Firebaugh
815f8be96e Use API v4 and access tokens 2014-07-08 13:16:38 -07:00
Konstantin Käfer
49b0f098c2 add test fixture and image comparison 2014-07-07 20:31:42 -07:00
Konstantin Käfer
59967fd709 make headless rendering work again by setting the correct fbo 2014-07-07 12:39:03 -07:00
Konstantin Käfer
853c9a5876 add ca bundle to linux build 2014-07-07 10:18:32 -07:00
Konstantin Käfer
56c55ec149 fix applied classes symbols 2014-07-07 09:59:23 -07:00
Konstantin Käfer
c81780a9ca Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native
Conflicts:
	src/style/style.cpp
2014-07-07 09:30:00 -07:00
Justin R. Miller
e5d9a20c7c native-side map change notifications 2014-07-03 19:02:46 -07:00
Justin R. Miller
dcc075cb75 Merge branch 'master' of github.com:mapbox/llmr-native 2014-07-03 14:59:29 -07:00
Justin R. Miller
3554a3736a re-add setAppliedClasses() to style 2014-07-03 14:59:06 -07:00
John Firebaugh
c52b2ba7a8 Support for text-transform
This is 1-1 locale-unaware text transform using std::ctype.
If we want a transform that cares for things like ß -> SS,
we need to switch to boost::locale.
2014-07-03 14:06:28 -07:00
Konstantin Käfer
3e54c59656 add applied classes api 2014-07-03 19:39:45 +02:00
Konstantin Käfer
59226af665 correctly detect duplicate layers 2014-07-03 12:30:42 +02:00
Konstantin Käfer
4dc30cbbb0 remove variant options; they're all functions anyway 2014-07-03 10:42:12 +02:00
Konstantin Käfer
2fb634269f tuple is explicit in gcc's stl 2014-07-03 01:41:38 -07:00
Konstantin Käfer
4856728022 parse function stops according to spec 2014-07-02 17:32:29 +02:00
Konstantin Käfer
93aad43be9 show layer name that is failing 2014-07-02 17:32:21 +02:00
Konstantin Käfer
6363594230 don't provide a generic template 2014-07-02 17:32:10 +02:00
Konstantin Käfer
ac57125bd5 fix background painting 2014-07-02 17:31:55 +02:00
Konstantin Käfer
415214d759 correctly parse array properties like *-translate 2014-07-02 17:31:24 +02:00
Konstantin Käfer
634bb17536 make rasterization work again 2014-07-02 16:19:01 +02:00
Konstantin Käfer
cc9dab4024 parse rasterize values as well 2014-07-02 15:57:52 +02:00
Konstantin Käfer
af87fb6c26 load glyphset url from stylesheet 2014-07-02 12:10:09 +02:00
Konstantin Käfer
e93803ac80 read sprite image from style 2014-07-02 11:38:36 +02:00
Konstantin Käfer
5d92e7c610 switch to unordered_map for sprites 2014-07-02 11:36:36 +02:00
Konstantin Käfer
32874718c1 make sure to return a value, even if this should never happen 2014-07-01 05:20:59 -07:00
Konstantin Käfer
006bc98ffc ignore boost warnings for lexical_cast 2014-07-01 05:20:22 -07:00
Konstantin Käfer
409a6ec6f4 rename timestamp name to avoid conflicts 2014-07-01 05:20:03 -07:00
Konstantin Käfer
ce44d8255d ignore boost warnings with gcc as well 2014-07-01 05:15:26 -07:00
Konstantin Käfer
475f0481b3 removing empty AppliedClassProperties objects 2014-07-01 12:50:08 +02:00