Commit graph

11522 commits

Author SHA1 Message Date
Dane Springmeyer
2222ca9b95 Merge pull request #3197 from tomhughes/nik2img
Fix name reported by mapnik-render
2015-12-14 13:33:42 -08:00
artemp
d21d49a8ef Merge branch 'master' into spirit-x3 2015-12-14 14:15:08 +00:00
artemp
3139dad5cd don't bother iterating over geometries if shape_type is shape_null in header 2015-12-14 14:11:38 +00:00
artemp
4e7175762e Merge branch 'master' into spirit-x3 2015-12-14 11:48:50 +00:00
artemp
6ca0e34a80 mapnik-index - output failed feature JSON when both --validate-features and --verbose options present. 2015-12-14 11:47:19 +00:00
artemp
5e2f3ce61d geojson/geometry - update unit test 2015-12-14 11:46:39 +00:00
artemp
599b021175 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:46:39 +00:00
artemp
1dff366897 geojson/geometry - update unit test 2015-12-14 11:39:42 +00:00
artemp
6684019e86 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:38:22 +00:00
artemp
c71e7c622d mapnik-index - output failed feature JSON when both --validate-features and --verbose options present. 2015-12-14 11:36:21 +00:00
artemp
f2d10db402 add HSL(A) tests 2015-12-11 13:18:00 +00:00
artemp
b05e09700b add HSL(A) colors 2015-12-11 13:14:37 +00:00
artemp
428641452c add more color unit tests 2015-12-11 11:27:27 +00:00
artemp
b3d7552774 cleanup 2015-12-11 11:27:10 +00:00
artemp
90d5306f09 svg2 colors parser - add RGB(A) percentage syntax 2015-12-11 11:16:38 +00:00
artemp
bcfa73c85d use svg2_color parser 2015-12-10 16:06:58 +00:00
artemp
e4a60d7c90 disable skipper for "hex" colours 2015-12-10 16:05:45 +00:00
artemp
b99cf8a2ca make member variables public to allow using BOOST_FUSION_ADAPT_STRUCT 2015-12-10 16:04:44 +00:00
artemp
09250ede96 add spirit x3 grammar for SVG2 colors (aka CSS colors) 2015-12-10 15:23:49 +00:00
artemp
b6cea7c658 use std::size_t to be complaint with STL containers + explicit types 2015-12-10 15:23:16 +00:00
artemp
f3b6955533 transform expressions - split grammar into *.hpp *_def.hpp and *.cpp 2015-12-09 11:53:57 +00:00
artemp
b7a54e5166 expression_grammar x3 - refactor quoted strings 2015-12-08 18:30:16 +00:00
artemp
3a0cbfd081 Merge branch 'master' into spirit-x3 2015-12-08 16:43:46 +00:00
artemp
e65cb96743 sync expressions tests with spirit-x3 branch 2015-12-08 16:39:32 +00:00
artemp
f85fe07418 Merge branch 'master' into spirit-x3 2015-12-08 16:36:24 +00:00
artemp
327ba670ff expressions unit test - add relational and regex tests 2015-12-08 16:25:59 +00:00
artemp
319651c33a expressions unit test - add logical expr 2015-12-08 14:25:02 +00:00
artemp
10cd9cd0fd unit test - expression parsing/evalution test 2015-12-08 14:25:02 +00:00
artemp
96f7366e9a expressions unit test - add logical expr 2015-12-08 11:58:10 +00:00
artemp
3f61adc170 unit test - expression parsing/evalution test 2015-12-08 11:42:55 +00:00
artemp
da2335328b expression_grammar X3 - add support for single and double quoted arguments in regex functions 2015-12-07 12:19:30 +00:00
artemp
64f5de14b1 expression_grammar X3 - allow backtracking on '<' operator so we can parse '<>' correctly 2015-12-07 11:06:57 +00:00
Tom Hughes
25a9cab9ad Fix name reported by mapnik-render 2015-12-06 15:10:43 +00:00
Dane Springmeyer
9a109bbf7d Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3 2015-12-04 14:07:51 -05:00
Dane Springmeyer
50d1e2fbb3 handle more gcc 4.9 -Wshadow warnings 2015-12-04 14:07:42 -05:00
Dane Springmeyer
04c0bb19a1 Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3 2015-12-04 13:41:24 -05:00
Dane Springmeyer
4eb26bb452 adapt to cpp file renames 2015-12-04 13:17:26 -05:00
Dane Springmeyer
010714174e fix -Wshadow warnings 2015-12-04 12:01:39 -05:00
artemp
164d225f07 expression_node - remove unused operator's 2015-12-04 16:19:37 +00:00
artemp
9eee695425 remove unused boost::spirit::qi grammars 2015-12-04 16:03:44 +00:00
artemp
2acaa7f9f4 transform_expression - port parsing grammar to x3 2015-12-04 15:55:01 +00:00
artemp
8bf0cff8cb split expression_grammar_x3 into *.hpp *_def.hpp *_config.hpp and *.cpp for improved integration 2015-12-04 15:36:56 +00:00
artemp
3fc00049f6 expression_grammar_x3 - use lexeme 2015-12-04 13:52:31 +00:00
artemp
8200e1ffc7 transform_expression - add default ctors 2015-12-04 13:52:31 +00:00
artemp
dca41aea12 expression_grammar_x3 : fix attr and global attribute rule (enable skipping) + rule IDs 2015-12-04 13:52:31 +00:00
Dane Springmeyer
51e2e25f69 suppress -Wshadow warning from ogr 2015-12-04 13:52:31 +00:00
Dane Springmeyer
4be4260d7e start fixing gcc 4.9 -Wshadow warnings 2015-12-04 13:52:31 +00:00
Dane Springmeyer
1ce9f76fa3 start fixing gcc 4.9 -Wshadow warnings 2015-12-04 13:52:31 +00:00
Dane Springmeyer
8e6e74dfa2 suppress -Wshadow warning from ogr 2015-12-03 10:22:02 -05:00
Dane Springmeyer
e424ef1d77 start fixing gcc 4.9 -Wshadow warnings 2015-12-02 15:55:26 -05:00