Commit Graph

256 Commits

Author SHA1 Message Date
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
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -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
Mike Morris
97486f3e0d Merge branch 'stylesource' into fuzz-pipe
Conflicts:
	src/map/source.cpp
	src/style/style_layer.cpp
2014-07-10 17:24:50 -07:00
Konstantin Käfer
c272ba7a47 convert stylesheet to use the correct stop values
[skip ci]
2014-07-10 16:05:16 -07:00
Konstantin Käfer
a8e71bcb7b change line width and add line-width test 2014-07-10 14:54:43 -07:00
Mike Morris
ee7b51c942 Merge branch 'master' into fuzz-pipe 2014-07-09 19:28:52 -07:00
Mike Morris
529277b0a2 fix invalid json 2014-07-09 19:28:35 -07:00
Mike Morris
203177403f Merge branch 'master' into fuzz-pipe 2014-07-09 18:51:14 -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
Mike Morris
5cea29b3bc Merge branch 'master' into fuzz-pipe 2014-07-09 18:26:03 -07:00
Mike Morris
824994a5b2 copy node_modules 2014-07-09 17:24:55 -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
Mike Morris
9eb6b69cd4 only load and mkdirp once 2014-07-09 15:23:42 -07:00
Mike Morris
b1bc1e1fc9 update bin/package.json 2014-07-09 14:54:34 -07:00
Mike Morris
e8dcb8af00 generate fuzzed color stylesheet, copy to product_dir 2014-07-09 14:22:10 -07:00
Mike Morris
ba4375dc51 Merge branch 'master' into fuzz-pipe 2014-07-09 13:15:14 -07:00
Mike Morris
172466301b fix gypfile 2014-07-09 13:03:56 -07:00
Konstantin Käfer
d0d68d08f4 fix automated headless testing on travis 2014-07-09 12:37:59 -07:00
Mike Morris
db9cba928b clean up pipes 2014-07-09 12:34:29 -07:00
Mike Morris
ab36059fda try breaking up build-style pipeline into pipeable files 2014-07-08 18:28:00 -07:00
Mike Morris
6f112849be first attempt at testing malformed style parsing 2014-07-07 17:25:15 -07:00
Konstantin Käfer
1b2c48027e remove duplicate layers 2014-07-03 12:30:25 +02:00
Konstantin Käfer
6e18711992 add back v3 outdoors style 2014-07-03 12:06: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
a6f7696feb add interpolation 2014-06-30 17:41:25 +02:00
Konstantin Käfer
18d898fae7 refactor functions 2014-06-30 16:52:39 +02:00
Konstantin Käfer
ba4294ae0c saving current state 2014-06-23 18:05:25 +02:00
Konstantin Käfer
c6fc235cf7 convert to json 2014-06-16 17:12:46 +02:00
Konstantin Käfer
580527a16c use token replacement for icon property as well
fixes #300
2014-06-04 10:58:11 +02:00
Nicki Dlugash
71cf4efa5a finished separating scalerank 4 POIs by localrank 2014-06-02 18:49:14 -04:00
Nicki Dlugash
025f49133f Merge branch 'expressions' into expressions-pois 2014-06-02 18:02:16 -04:00
Nicki Dlugash
370c2e1d45 separating scalerank 4 pois by localrank 2014-06-02 17:38:44 -04:00
Konstantin Käfer
bd4da29a30 Merge branch 'master' into expressions 2014-06-02 23:10:50 +02:00
Ansis Brammanis
3f6075711f draw motorway casing below roads 2014-06-02 13:12:32 -04:00
Eden Halperin
2973d0b2b9 fix admin boundary buckets 2014-06-02 11:14:10 +02:00
Konstantin Käfer
606ad56220 implement nested expression parsing 2014-06-02 11:14:09 +02:00
Eden Halperin
e1bc732576 update hillshade stops 2014-06-01 09:23:28 -07:00
Konstantin Käfer
67bbcd5334 allow setting prerender state with a function too 2014-06-01 18:12:44 +02:00
Konstantin Käfer
1be972eb15 Allow property functions for prerender properties, but tie them to the tile's zoom level instead of the map zoom level
fixes #253
2014-06-01 17:43:12 +02:00
Justin R. Miller
a81a336638 programmatic styling API 2014-05-31 11:32:42 -07:00
Nicki Dlugash
1d8c40870f maxWidth for country, place, and water labels 2014-05-30 18:54:43 -04:00
Nicki Dlugash
600acd89ac changed all labels to name_en 2014-05-30 17:52:07 -04:00
Nicki Dlugash
49dac9bfba added new style properties to largest marine labels 2014-05-30 17:46:42 -04:00
Nicki Dlugash
62c7eab83d tweaked hillshade opacities 2014-05-30 17:04:59 -04:00
Nicki Dlugash
7257bbe8ad reduce to three font stacks and updates to compensate 2014-05-30 16:23:33 -04:00
Nicki Dlugash
4f6e2fcd2a contour labels and waterway label style updates 2014-05-30 16:19:04 -04:00