Commit graph

11894 commits

Author SHA1 Message Date
artemp
65a23b436d bump visual test data 2016-05-24 10:15:00 +02:00
artemp
06d487c8d1 update visual data 2016-05-23 17:49:20 +02:00
artemp
de0d384ca9 update test data 2016-05-23 12:30:08 +02:00
Artem Pavlenko
44e1102166 Merge pull request #3434 from mapnik/topojson
Topojson (refactor)
2016-05-23 11:44:14 +02:00
artemp
f3ae60fed4 Merge branch 'master' into topojson 2016-05-23 10:52:19 +02:00
artemp
01967cfaff topojson grammar - re-factor to allow geometry elements to be in any order 2016-05-23 10:51:05 +02:00
Dane Springmeyer
d7b6b5669b upgrade to latest mason and latest boost via mason 2016-05-19 19:37:31 -04:00
Dane Springmeyer
20a9112135 remove boost thread checking since it is no longer a dependency 2016-05-19 19:37:31 -04:00
Jiri Drbalek
fee0ad05ce update changelog 2016-05-18 20:06:31 +00:00
Dane Springmeyer
c8cc2670be update visual test data - refs mapnik/mapnik#3416 / mapnik/test-data-visual#34 2016-05-18 13:40:00 -04:00
Dane Springmeyer
44ea60ad5f fix #3431 2016-05-18 13:38:07 -04:00
Artem Pavlenko
536ea734e8 Merge pull request #3418 from mapycz/visual-tests-cairo-vectors
visual tests: support for Cairo PS, PDF and SVG renderers
2016-05-18 15:05:27 +02:00
Artem Pavlenko
aec5949d5a Merge pull request #3416 from mapycz/scale-factor-improvements
Scale factor improvements
2016-05-18 15:05:04 +02:00
Artem Pavlenko
26aa516ee7 Merge pull request #3429 from mapnik/topojson
Topojson https://github.com/mapnik/mapnik/issues/3427
2016-05-18 14:16:29 +02:00
artemp
7b3f607a01 remove omit directive as it breaks type deduction and insists on boost::optional<boost::variant<int, mapnik::json::coordinates> attribute signature (boost 1.61.0) 2016-05-18 13:13:25 +02:00
artemp
c85c0fd025 prealloc memory with reserve 2016-05-18 11:18:26 +02:00
artemp
c10c271430 dereference once 2016-05-18 10:35:58 +02:00
artemp
7d72cc1930 more cleanups 2016-05-17 13:47:31 +02:00
artemp
de13582004 remove stderr 2016-05-17 13:45:05 +02:00
artemp
c66fd480b5 simplify rules 2016-05-17 13:05:53 +02:00
artemp
8f74de8525 remove stderr 2016-05-17 13:05:37 +02:00
artemp
4ca0c21d73 move phoenix functions into ctor 2016-05-17 13:00:03 +02:00
artemp
25217549f1 fix topojson parsing (work-in-progress) 2016-05-17 12:53:07 +02:00
artemp
6e326f035d minor formatting 2016-05-17 12:44:46 +02:00
artemp
dc84943575 Fixed https://github.com/mapbox/windows-builds/issues/88
(inheriting constructors not working with msvc-14.0 2015)
2016-05-13 15:23:47 +02:00
artemp
9e5b7a9b5e update test data 2016-05-13 12:51:46 +02:00
artemp
3ec25e36fe test geojson.cpp - add empty properties (ref #3426) 2016-05-13 12:48:56 +02:00
artemp
4e6aeaedfc handle empty arrays and objects ref #3426 2016-05-13 11:50:43 +02:00
artemp
4429155759 update test data 2016-05-12 18:54:48 +02:00
artemp
38ec14c739 topojson - use json.value directly 2016-05-12 18:52:05 +02:00
artemp
04ce225728 update variant (again) to 7f7470fee6a42c3c68f1fa359a28cf762df385c3 2016-05-11 12:35:01 +02:00
artemp
5228dad91a update to latest variant 2016-05-11 10:58:08 +02:00
artemp
d19ff576dc geojson test - fix the order in 'object' to match input (escaped.json) 2016-05-10 16:03:04 +02:00
artemp
5e33dc0551 feature_grammar - simplify further, remove redundant rule 2016-05-10 15:53:14 +02:00
artemp
3909fe5b7d JSON - store 'object' properties in std::vector to preserve order 2016-05-10 15:52:02 +02:00
artemp
f0386e0469 issue pre-processor #warning if BOOST_MPL_LIMIT_VECTOR_SIZE is defined before config.hpp is included ref #3425 2016-05-10 15:15:03 +02:00
artemp
07ca572af4 fix mapbox/variant install path 2016-05-10 15:15:03 +02:00
Dane Springmeyer
e68de54883 re-enable osx unit tests now that ccache is working 2016-05-09 14:04:55 -07:00
Dane Springmeyer
83768dc3dd travis by compiler cache needs to use language:cpp 2016-05-09 12:21:54 -07:00
Dane Springmeyer
609e5ba7af attempt to get caching+ccache working on osx - refs https://blog.travis-ci.com/2016-05-03-caches-are-coming-to-everyone 2016-05-09 10:03:50 -07:00
artemp
75189905d6 upgrade to latest variant.hpp 2016-05-09 11:42:46 +02:00
artemp
d97583b53e geojson.cpp - fix and update test 2016-05-06 16:44:18 +02:00
artemp
908203f15e Merge remote-tracking branch 'origin/json-properties' into json-properties 2016-05-06 10:58:44 +02:00
artemp
c4d80de56e update deps 2016-05-06 10:58:19 +02:00
artemp
97b8a11a72 fix includes + use typedefs for json types 2016-05-06 10:57:35 +02:00
Artem Pavlenko
ea7974d580 Merge pull request #3423 from mapnik/geojson-property-tests
Geojson property tests
2016-05-06 10:34:06 +02:00
artemp
7544f57efe Merge branch 'master' into json-properties 2016-05-06 10:27:18 +02:00
artemp
c2bf2be7ba json - simplify generic_json rules: remove redundant rule 2016-05-06 10:24:25 +02:00
artemp
21487f36b9 json - refactor stringifier and attribute_value_visitor into separate *.hpp and share between geojson and topojson grammars 2016-05-06 10:15:44 +02:00
artemp
6bd708af86 fix generic_json usage across grammars 2016-05-06 09:55:54 +02:00