artemp
|
9dd00b28dc
|
Merge remote-tracking branch 'origin/master' into geometry-refactor
|
2016-06-27 08:51:55 +01:00 |
|
artemp
|
3536ad0902
|
even more tidy - remove left over stderr
|
2016-06-22 17:35:09 +01:00 |
|
artemp
|
2e8c0d36c2
|
implement custom char_array_bufrer and remove boost::iostreams dependency
|
2016-06-22 17:21:25 +01:00 |
|
artemp
|
67d2a0e141
|
Merge branch 'master' into geometry-refactor
|
2016-06-20 15:01:29 +01:00 |
|
artemp
|
beb34f9c5e
|
topojson_grammar - rename properties to properties_ to avoid compilation error (gcc) ref #3446
|
2016-06-03 14:45:49 +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 |
|
Artem Pavlenko
|
aec5949d5a
|
Merge pull request #3416 from mapycz/scale-factor-improvements
Scale factor improvements
|
2016-05-18 15:05:04 +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
|
c66fd480b5
|
simplify rules
|
2016-05-17 13:05:53 +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
|
4e6aeaedfc
|
handle empty arrays and objects ref #3426
|
2016-05-13 11:50:43 +02:00 |
|
artemp
|
38ec14c739
|
topojson - use json.value directly
|
2016-05-12 18:52:05 +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
|
75189905d6
|
upgrade to latest variant.hpp
|
2016-05-09 11:42:46 +02:00 |
|
artemp
|
97b8a11a72
|
fix includes + use typedefs for json types
|
2016-05-06 10:57:35 +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 |
|
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
|
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 |
|
Jiri Drbalek
|
cfc6b37d71
|
fix passing scale factor to evaluate_transform()
|
2016-05-03 12:09:39 +00:00 |
|
artemp
|
80176a6c83
|
fix `geometry_type' call
|
2016-04-29 18:09:32 +02:00 |
|
artemp
|
c4fcee7b66
|
add geometry dir
|
2016-04-29 17:08:17 +02:00 |
|
artemp
|
3184034414
|
refactor geometry core and algorithms templates + add missing typedefs + prepare for geometry update
|
2016-04-29 14:24:57 +02:00 |
|
artemp
|
de927a1571
|
Merge branch 'master' into geometry-refactor
|
2016-04-29 10:47:43 +02:00 |
|
artemp
|
31e8cfc659
|
improve hash calc ref #3406
|
2016-04-26 15:29:27 +02:00 |
|
artemp
|
4b3b62a40c
|
minor formatting
|
2016-04-25 20:43:40 +02:00 |
|
artemp
|
650e8eea8a
|
bump up version to 3.0.12 in preparation to release
|
2016-04-25 20:43:40 +02:00 |
|
artemp
|
988aa3ea43
|
add guard to get_object_severity ref #3322
|
2016-04-25 11:49:10 +02:00 |
|
artemp
|
ed87cd2883
|
c++ - make bbox standalone method
|
2016-04-22 12:54:57 +02:00 |
|
artemp
|
a89c3fc007
|
c++ - make bbox standalone method
|
2016-04-22 12:51:20 +02:00 |
|
artemp
|
4e57f7b115
|
Merge branch 'master' into geometry-refactor
|
2016-04-20 16:45:08 +02:00 |
|
artemp
|
6105463602
|
split box2d<T> implementation into *.hpp, *._impl.hpp and *.cpp ref #3405
|
2016-04-20 10:51:33 +02:00 |
|
Dane Springmeyer
|
b0894bfda3
|
fix debug assert compile
|
2016-04-18 08:06:30 -07:00 |
|
artemp
|
633a2c1e07
|
Merge branch 'master' into geometry-refactor
|
2016-04-18 16:15:04 +02:00 |
|
artemp
|
66160e9754
|
mapnik::util::is_clockwise - translate coordinates relative to the origin (0,0) to avoid numeric precision issues while using double precision.
(ref #3402)
|
2016-04-18 16:08:30 +02:00 |
|