Commit Graph

226 Commits

Author SHA1 Message Date
Ansis Brammanis
32a1711d8c remove support for composite layers 2014-08-15 15:52:53 +02:00
Ansis Brammanis
6c45972502 allow crosstile labels and add symbol-avoid-edges 2014-08-15 15:18:29 +02:00
Lauren Budorick
adb04662f9 parsing brightness correctly 2014-08-12 18:56:42 -07:00
Konstantin Käfer
22e179aa37 remove trailing whitespace
[skip ci]
2014-08-12 16:30:27 +02:00
Konstantin Käfer
64d5cea94f Merge branch 'master' into rasterize
[skip ci]
2014-08-12 15:15:05 +02:00
Konstantin Käfer
213b6ad4dc Merge branch 'master' into rasterize
[skip ci]
2014-08-12 15:12:31 +02:00
Konstantin Käfer
df47a7be90 explicitly define destructor to avoid destructing with forward declaration 2014-08-12 13:35:04 +02:00
Konstantin Käfer
9b9ad20a90 Merge branch 'master' into style-parser-test
Conflicts:
	mapboxgl.gyp
2014-08-12 13:16:20 +02:00
Konstantin Käfer
6f80264291 remove uv.h dependency from header files 2014-08-12 11:45:30 +02:00
Lauren Budorick
0263a9ffb7 minor access changes etc 2014-08-11 15:42:09 -07:00
Lauren Budorick
41165452bc some cleaning up, raster spin->hue-rotate rename 2014-08-11 12:13:24 -07:00
Lauren Budorick
560cc112e1 rm rasterize_properties, should be close to working...doesn't work 2014-08-11 12:13:22 -07:00
Lauren Budorick
9e1156d660 take 2, still not working 2014-08-11 12:13:22 -07:00
Lauren Budorick
df925fe0e5 nonworking prerendering attempts 2014-08-11 12:12:43 -07:00
Mike Morris
a79afb78d8 Merge branch 'master' into style-parser-test
Conflicts:
	bin/build-style.js
	bin/default.style.json
	mapboxgl.gyp
	src/style/style_parser.cpp
	test/test.gyp
2014-08-11 12:42:49 -04:00
John Firebaugh
70a31baf5c Eliminate warnings 2014-08-07 13:02:40 -07:00
Konstantin Käfer
1f8202b678 default to map alignment when placement type is line 2014-08-05 13:49:59 +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
9f99f0bb60 change max_angle_delta to max_angle 2014-08-04 18:59:17 +02:00
Konstantin Käfer
36181b0922 update symbol placement to be more like js 2014-08-04 18:24:22 +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
270c24a9a8 add symbol* properties/keys 2014-07-29 12:09:22 +02:00
Konstantin Käfer
b5c406416a read default values from property structs
fixes background color
2014-07-22 17:19:07 +02:00
Konstantin Käfer
3141b8b1f7 refactor source information into SourceInfo object 2014-07-17 15:37:18 -07: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
68f595a32b consolidate functions to only use stops
refs mapbox/mapbox-gl-style-spec#96
2014-07-17 14:32:35 -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
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
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
Konstantin Käfer
682eaec87c add icon render test 2014-07-15 18:08:14 -07: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
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
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
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
af6091db5a update headless testing to be configurable 2014-07-08 14:38:49 -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