artemp
850915c151
Merge branch 'master' into tidy-headers [skip ci]
2016-08-08 12:40:09 +01:00
Jiri Drbalek
621a5e51ac
style level comp-op and opacity for Cairo renderer
2016-08-03 20:14:56 +00:00
artemp
dd2344b99c
add geometry and value dirs
2016-08-03 13:49:58 +01:00
artemp
94c2e1d4b5
Merge branch 'master' into tidy-headers
2016-08-03 12:34:53 +01:00
artemp
7aa424bb5d
geometry_to_path.hpp => geometry/to_path.hpp
2016-08-03 12:17:05 +01:00
Mickey Rose
f9d5c3a2f8
use proper feature-test macro for inheriting constructors
2016-08-03 00:29:51 +02:00
artemp
d06af64d0d
refactor value related objects into include/value dir
2016-08-02 15:34:59 +01:00
artemp
5104f5dfea
refactor souce code files with the following rule: the physical filesytem path matches namespace structure
...
e.g `mapnik::geometry::centroid()` -> `$(MAPNIK_SOURCE)/include/mapnik/geometry/centroid.hpp`
2016-08-02 14:43:02 +01:00
Artem Pavlenko
68db7ee224
Merge pull request #3475 from mapycz/logarithm
...
Add support for natural logarithm in expressions (via @talaj)
2016-08-01 15:07:01 +02:00
Jiri Drbalek
c1ab5c8e6c
add support for natural logarithm function in expressions
2016-08-01 12:58:21 +00:00
Dane Springmeyer
148783da25
Revert "inherit ctor's from geometry_base"
...
- Fixes #3473 (windows compile)
- TODO: @artemp get to the bottom of how to inherit from base class
in a way that works with boost::variant and across platforms
This reverts commit bf99177da7
2016-07-29 04:51:18 -07:00
artemp
bf99177da7
inherit ctor's from geometry_base
2016-07-25 15:55:20 +02:00
Dane Springmeyer
bd920daa16
fix decltype forwarding
2016-07-25 14:51:45 +02:00
Dane Springmeyer
f734368a73
limit mpl list size as well as vector size
2016-07-25 14:51:45 +02:00
artemp
2864d90460
more explicit conversions to the target variant type
2016-07-25 13:45:35 +02:00
artemp
7fa35f481e
Support creating paletted images for any number of pixels e.g < 3 (ref #3466 )
2016-07-20 14:01:14 +02:00
artemp
6f8f286b8d
Revert "allow "null" values when genrating Feature GeoJSON"
...
This reverts commit 8ce58ea29c
2016-07-15 12:22:03 +01:00
artemp
54d51e2728
Revert "feature_kv_iterator - change logic in 'increment' to skip key/value's when value doesn't exist"
...
This reverts commit 3397b8f14f
2016-07-15 12:21:41 +01:00
artemp
8ce58ea29c
allow "null" values when genrating Feature GeoJSON
2016-07-14 10:09:34 +01:00
artemp
3397b8f14f
feature_kv_iterator - change logic in 'increment' to skip key/value's when value doesn't exist
2016-07-14 09:46:37 +01:00
artemp
c457d93804
use count(key)
2016-07-14 09:45:55 +01:00
artemp
75781a999c
add empty_featureset (returning feature_ptr()) implementation
2016-07-13 15:17:41 +01:00
artemp
45c5a3768f
extract_bounding_box_grammar - make features optional / ref #3463
2016-07-12 17:44:19 +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
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
