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 |
|
artemp
|
e528b433d4
|
geojson feature_grammar - parse objects and arrays into json_value before applying "stringifier" #3419 https://github.com/mapnik/node-mapnik/issues/642
|
2016-05-06 09:50:45 +02:00 |
|
artemp
|
7374f82414
|
generic_json - add support for JSON object and array type in json_value + update rules attributes
|
2016-05-06 09:47:40 +02:00 |
|
Dane Springmeyer
|
966a4ae366
|
avoid warnings with boost 1.60 [skip ci]
|
2016-05-05 19:09:05 -07:00 |
|
mapsam
|
086157e26b
|
one step deeper, moar arrays/objects
|
2016-05-05 13:38:28 -07:00 |
|
mapsam
|
0ed6eedfec
|
Merge branch 'master' into geojson-property-tests
|
2016-05-05 09:17:44 -07:00 |
|
mapsam
|
9d9c8db233
|
add geojson unit test for property types/values
|
2016-05-05 09:17:08 -07:00 |
|
artemp
|
db912d9b67
|
disable white skipping in stringify_object/stringify_array (ref #3419)
|
2016-05-05 10:33:36 +02:00 |
|
artemp
|
d9e75f4ddb
|
c++ prettify formatting
|
2016-05-05 10:31:58 +02:00 |
|
artemp
|
52df451ee3
|
geometry_envelope_test - fix linking/duplicate symbols (ref #3415)
|
2016-05-04 10:20:10 +02:00 |
|
artemp
|
e596ffc1c2
|
don't instantiate types that are not used in core library
|
2016-05-03 18:33:06 +02:00 |
|
artemp
|
c0dfc92022
|
geometry_envelope - add tests for double/float/int coord_type (ref #3415)
|
2016-05-03 18:26:46 +02:00 |
|
artemp
|
471d6dfe94
|
remove redundant recursive_wrapper (via @jfirebaugh : f00a7aebf1)
|
2016-05-03 18:13:41 +02:00 |
|
artemp
|
ff821c9239
|
geometry::envelope - deduct value_type of box2d<T> automatically + add missing typedefs
|
2016-05-03 18:02:42 +02:00 |
|
artemp
|
f5d6af4bb8
|
agg - make cover unsigned to avoid left shift of negative values ref #3406
|
2016-04-26 15:30:50 +02:00 |
|