Commit Graph

354 Commits

Author SHA1 Message Date
Konstantin Käfer
225b5e01cb don't automatically move back to main thread 2014-08-11 07:41:52 -07:00
Konstantin Käfer
4657e6e023 use a file source object to abstract loading of resources 2014-08-08 18:25:45 +02:00
Konstantin Käfer
a045d9c9d4 use filesource object for loading all http stuff 2014-08-08 15:08:41 +02:00
John Firebaugh
70a31baf5c Eliminate warnings 2014-08-07 13:02:40 -07:00
Konstantin Käfer
9dc48b773f fix crash bug for styles that have no glyph url specified 2014-08-06 18:33:21 +02:00
Konstantin Käfer
915e89bee8 Merge branch 'master' into symbols
Conflicts:
	src/renderer/painter_text.cpp
2014-08-06 15:32:48 +02:00
Konstantin Käfer
b402d03837 don't require the background layer to be named "background" 2014-08-05 11:58:16 +02:00
Konstantin Käfer
17617a54bd make sure to check the promise 2014-08-05 11:56:28 +02:00
Konstantin Käfer
cdd7991505 correctly calculate placement depth 2014-08-05 11:44:50 +02:00
Konstantin Käfer
36181b0922 update symbol placement to be more like js 2014-08-04 18:24:22 +02:00
John Firebaugh
9861f40f76 Remove rounding 2014-08-01 10:21:43 -07:00
John Firebaugh
d8490853b9 Remove unused 2014-07-31 17:54:33 -07:00
Konstantin Käfer
d01b996acd better warning messages 2014-07-31 18:55:48 +02:00
Konstantin Käfer
75c079adb1 move sprite to a use future loading 2014-07-31 18:14:26 +02:00
Konstantin Käfer
fa3a41136c merge text and icon buckets/styles
(we're not yet placing together!)
2014-07-29 18:27:59 +02:00
Konstantin Käfer
2be561ed4a reduce maxPlacementScale
implements 871883d569
2014-07-23 17:28:10 +02:00
Konstantin Käfer
04bab1af76 more include what you use 2014-07-23 13:18:03 +02:00
Konstantin Käfer
d175d146fb include what you use 2014-07-23 12:53:21 +02:00
Konstantin Käfer
d47f11574e do not explicitly render matte; we already cleared the background with glClear 2014-07-22 17:18:38 +02:00
John Firebaugh
fb151b3fbe Fix sprite->pos data race 2014-07-21 13:43:59 -07:00
John Firebaugh
86336ed838 Flip name and units and sign of rotation API
Angle -> Bearing
Radians -> Degrees
Clockwise -> Counterclockwise
2014-07-21 11:30:51 -07:00
Konstantin Käfer
bcf82bdd01 respect layer min/maxzoom, not source min/maxzoom 2014-07-17 16:20:49 -07:00
Konstantin Käfer
ab045087da skip rendering layer when min/max-zoom condition isn't met 2014-07-17 16:04:17 -07:00
Konstantin Käfer
1e20959a00 support fractional min/max-zoom values 2014-07-17 16:03:30 -07:00
Konstantin Käfer
9ed0ca5983 pass SourceInfo object to TileData so that we can not skip buckets that appear later than the source maxzoom 2014-07-17 15:52:39 -07:00
Konstantin Käfer
3141b8b1f7 refactor source information into SourceInfo object 2014-07-17 15:37:18 -07:00
Konstantin Käfer
d3aeed6cf2 skip bucket creation if it's out of range 2014-07-17 15:23:39 -07:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
4d1d2c5d5d separate comparisons and expressions 2014-07-16 18:26:35 -07:00
Konstantin Käfer
a1d7da71c6 add more comparison tests 2014-07-16 18:26:35 -07:00
Justin R. Miller
a902446e7f refs #342 & #346: per-map change callbacks 2014-07-16 18:18:04 -07:00
Justin R. Miller
3adad61b82 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-07-15 18:48:10 -07:00
Justin R. Miller
1f06f518b2 allow for delayed map notifications during animations 2014-07-15 18:48:01 -07:00
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