Commit Graph

7074 Commits

Author SHA1 Message Date
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
Mike Morris
4d4fd3155c update test fixtures 2014-07-17 17:58:29 -04:00
Mike Morris
4b9e299d06 Merge branch 'master' into fuzz-pipe
Conflicts:
	src/style/style_parser.cpp
2014-07-17 17:58:13 -04:00
Konstantin Käfer
c01143a731 parse min-zoom/max-zoom values
refs mapbox/mapbox-gl-style-spec#65
2014-07-17 14:54:22 -07:00
Konstantin Käfer
afe069df2b remove stops from demo stylesheet 2014-07-17 14:33:06 -07:00
Konstantin Käfer
68f595a32b consolidate functions to only use stops
refs mapbox/mapbox-gl-style-spec#96
2014-07-17 14:32:35 -07:00
Mike Morris
50d9e6d845 Merge branch 'master' into fuzz-pipe
Conflicts:
	bin/package.json
2014-07-17 17:12:44 -04:00
Mike Morris
e052d847f9 switch to mapbox-glsl-optimizer for node-pre-gyp 2014-07-17 17:08:52 -04:00
Mike Morris
7fab02d6bd split stylesheet fixtures into separate gyp action 2014-07-17 16:49:30 -04:00
Konstantin Käfer
d44742f115 switch to published npm version 2014-07-17 13:27:33 -07:00
Mike Morris
4cb9972278 Merge branch 'master' into fuzz-pipe
Conflicts:
	bin/package.json
	src/style/style_parser.cpp
	test/fixtures/fixture_log.cpp
	test/test.gyp
2014-07-17 12:44:45 -04:00
Konstantin Käfer
fa4133a094 add missing header 2014-07-16 19:01:35 -07:00
Konstantin Käfer
55dce57896 rename a few things from mbgl => mapboxgl 2014-07-16 19:00:49 -07:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
c1a64dc5fa rename file and fix merge error 2014-07-16 18:30:04 -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
becce08a32 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-07-16 18:18:16 -07:00
Justin R. Miller
a902446e7f refs #342 & #346: per-map change callbacks 2014-07-16 18:18:04 -07:00
Konstantin Käfer
17b1c6fd41 update value semanatics to be closer to js and add filter expression tests 2014-07-16 14:39:19 -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
Konstantin Käfer
7810548409 correctly cast buffer 2014-07-15 17:18:05 -07:00
Konstantin Käfer
066fa64dad make icons work again 2014-07-15 17:17:37 -07:00
Konstantin Käfer
c2efeaf876 do not reallocate the texture data on every update; use glTexSubImage2D instead 2014-07-15 17:01:00 -07:00
Mike Morris
056f9e88d5 noncopyable log 2014-07-15 17:12:37 -04:00
Mike Morris
a2336cf7ad Merge branch 'master' into fuzz-pipe 2014-07-15 17:06:35 -04:00
Konstantin Käfer
5459d80d47 disallow copying to avoid accidental unchecked message output 2014-07-15 13:31:55 -07:00
Mike Morris
9437d0d7cc check log messages from style_parser 2014-07-15 16:16:52 -04:00
Justin R. Miller
cdda9f12b5 flesh out 'will change region' notifications 2014-07-15 12:52:19 -07:00
Mike Morris
fb91537466 print unchecked log messages 2014-07-15 14:01:08 -04:00
Mike Morris
973a2f5550 fix quotes in log output 2014-07-15 14:00:38 -04:00
Mike Morris
c29883bb54 why u no write to FixtureLogBackend? 2014-07-15 11:42:34 -04:00
Mike Morris
d1977dc53f Merge branch 'master' into fuzz-pipe
Conflicts:
	test/test.gyp
2014-07-15 11:16:54 -04:00
Konstantin Käfer
471dafc1d1 change halo-width/blur units
refs mapbox/mapbox-gl-style-spec#66
2014-07-14 18:25:07 -07:00
Konstantin Käfer
9213f8d8e0 fix font halo units 2014-07-14 17:35:47 -07:00
Konstantin Käfer
22ed777a82 make gcc happy 2014-07-14 16:44:40 -07:00
Konstantin Käfer
ba7d8c7731 fix errors 2014-07-14 16:38:34 -07:00
Konstantin Käfer
bdc97d55d2 add enum class to unify parsing/stringification 2014-07-14 16:33:02 -07:00
Mike Morris
b327a2cb34 hook up style_parser to new log backend 2014-07-14 18:46:34 -04:00
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
Mike Morris
97ec376614 C++ exception with description "array value has unexpected number of elements" thrown in the test body. 2014-07-14 16:16:20 -04: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