Commit Graph

321 Commits

Author SHA1 Message Date
Konstantin Käfer
682eaec87c add icon render test 2014-07-15 18:08:14 -07:00
Justin R. Miller
cdda9f12b5 flesh out 'will change region' notifications 2014-07-15 12:52:19 -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
Mike Morris
5bc77d4243 add forward-declared Source shared_ptr to style_bucket 2014-07-11 16:49:39 -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
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
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
John Firebaugh
815f8be96e Use API v4 and access tokens 2014-07-08 13:16:38 -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
93aad43be9 show layer name that is failing 2014-07-02 17:32:21 +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
97fc5d9f74 make transitions work properly 2014-07-01 12:21:53 +02:00
Konstantin Käfer
a6f7696feb add interpolation 2014-06-30 17:41:25 +02:00
Konstantin Käfer
93cd4c5c7b move StyleLayerGroup and PropertyTransition to their own files 2014-06-30 11:46:03 +02:00
Konstantin Käfer
48019ae85c make more members of StyleLayer const 2014-06-27 18:39:42 +02:00
Konstantin Käfer
881c0f1412 more docs + remove StyleLayer::Ptr typedef 2014-06-27 18:01:28 +02:00
Konstantin Käfer
d75f0075f3 even more refactoring 2014-06-27 16:42:44 +02:00
Konstantin Käfer
6d9de75732 rename time => timestamp to avoid naming conflicts 2014-06-27 15:52:45 +02:00
Konstantin Käfer
6de9d9769e cleanup 2014-06-26 21:54:57 +02:00
Konstantin Käfer
aff667d742 add filter expressions 2014-06-26 15:04:18 +02:00
Konstantin Käfer
b95d023a98 remove debug statements 2014-06-24 19:01:41 +02:00
Konstantin Käfer
7637b7f8c7 get applied classes 2014-06-24 16:47:11 +02:00
Konstantin Käfer
ff571fabcf fix exit crash due to forced loop stop 2014-06-24 11:39:16 +02:00
Konstantin Käfer
ba4294ae0c saving current state 2014-06-23 18:05:25 +02:00
Konstantin Käfer
71d2b230a1 separate bucket render properties and change naming 2014-06-16 11:49:11 +02:00
Konstantin Käfer
af69b4fe39 unifiy constants in one place, and allow local override 2014-06-04 11:22:03 +02:00
Konstantin Käfer
ef76be64a2 separate out token replacer as a standalone function in preparation for #300 2014-06-04 10:53:08 +02:00
Konstantin Käfer
f59424b00b skip background layer early 2014-06-04 10:09:38 +02:00
Konstantin Käfer
fbd983f104 don't make a copy of the glyph store 2014-06-03 18:11:19 +02:00
Konstantin Käfer
7a4a833f39 Revert "background grid"
This reverts commit 1dd3fdfba3.
2014-06-03 17:29:27 +02:00
Konstantin Käfer
bd4da29a30 Merge branch 'master' into expressions 2014-06-02 23:10:50 +02:00
Justin R. Miller
1dd3fdfba3 background grid 2014-06-02 11:42:00 -07:00
Konstantin Käfer
dd4c8a67ba add explicit true type == "no filter" 2014-06-02 11:14:09 +02:00
Konstantin Käfer
99b6a700ef move both variant options to recursive_wrapper 2014-06-02 11:14:09 +02:00