artemp
fd36ac5279
Merge branch 'master' into geometry-refactor
2016-11-10 18:01:11 +01:00
artemp
eea427b19f
cleanup include directives
2016-10-19 13:15:59 +02:00
artemp
e74af890fb
Silence -Wundefined-var-template warnings in enumeration.hpp
2016-10-17 16:58:22 +02:00
Jiri Drbalek
b830469d2d
multiply blur radius by scale_factor
2016-10-17 11:59:21 +00:00
Jiri Drbalek
0f3eecbe5e
fix intersecting extents in different projections
2016-09-27 20:36:34 +00:00
artemp
8a8427daed
GeoJSON feature/geometry grammars - split (a | b | ...) % lit(',') rule to avoid creating bogus temp synthesised attribute e.g boost::variant<a,b,..> which causes clang compiler >= 3.9 to segfault. (ref #3507 )
...
NOTE: In general many Boost.Spirit gotchas can be fixed by simplifying rules (better control what gets synthesied under the bonet)
2016-09-22 12:18:34 +02:00
Mickey Rose
870b890042
remove redundant member pData_ from mapnik::image
...
I believe this is better than fixing swap() by also
swapping pData_
2016-09-07 20:03:17 +02:00
artemp
a63a50556a
Merge branch 'master' into geometry-refactor
2016-09-06 10:01:15 +02:00
artemp
747ca7470c
remove duplicate #pragma
2016-09-05 11:39:36 +02:00
artemp
8e0e344b72
Merge branch 'master' into geometry-refactor
2016-09-05 09:41:52 +01:00
Dane Springmeyer
3741a7f348
fix -Wshadow warnings caught by g++-5
2016-09-03 09:58:40 -07:00
artemp
38bff90a99
Merge branch 'master' into geometry-refactor
2016-09-01 16:06:20 +01:00
Dane Springmeyer
4b06dfe9b4
Avoid warnings when building the g++5
2016-08-31 11:09:27 -07:00
artemp
f360f50eed
JSON - make generic_json a proper spirit grammar and reduce code bloat
2016-08-31 14:36:35 +01:00
artemp
842522b287
Merge branch 'master' into geometry-refactor
2016-08-26 09:06:05 +01:00
Jiri Drbalek
8b18c605fd
no need for heap allocation
2016-08-25 08:01:31 +00:00
Jiri Drbalek
6da9de5739
fix closing segment
2016-08-25 08:01:25 +00:00
artemp
56c6a1ea62
Merge branch 'master' into geometry-refactor
2016-08-24 11:14:01 +01:00
artemp
fe007915df
Revert "Revert "mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency""
...
and remove `<boost/fusion/adapted/std_tuple.hpp>`
This reverts commit b6cc48fd40
2016-08-23 15:45:15 +01:00
Dane Springmeyer
f81583554a
Merge branch 'master' of github.com:mapnik/mapnik into geometry-refactor
2016-08-22 16:19:17 -07:00
Dane Springmeyer
b6cc48fd40
Revert "mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency"
...
This reverts commit 6613222b84
2016-08-22 11:40:06 -07:00
artemp
6613222b84
mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency
2016-08-22 12:16:48 +01:00
artemp
1e8f471448
minor formatting
2016-08-16 10:53:57 +01:00
artemp
b9279feee2
fix is_valid logic (ref #3494 )
2016-08-15 12:49:43 +01:00
artemp
0471f3369a
add order_by_name helper method
2016-08-15 12:20:19 +01:00
artemp
31814b32d0
rename empty_featureset => invalid_featureset to avoid ambiguity + add helper is_valid method
2016-08-15 10:41:30 +01:00
artemp
8dca305e7e
json stringifier - add missing quoting in nested json objects (ref #3491 )
2016-08-12 11:04:30 +01:00
Jiri Drbalek
621a5e51ac
style level comp-op and opacity for Cairo renderer
2016-08-03 20:14:56 +00:00
Mickey Rose
f9d5c3a2f8
use proper feature-test macro for inheriting constructors
2016-08-03 00:29:51 +02: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
dc88582b4d
Merge branch 'master' into geometry-refactor
2016-07-19 10:25:33 +01: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
132aa6654f
add empty_featureset (returning feature_ptr()) implementation
2016-07-13 15:07:08 +01:00
artemp
45c5a3768f
extract_bounding_box_grammar - make features optional / ref #3463
2016-07-12 17:44:19 +01:00
artemp
abb4271bea
extract_bounding_box_grammar - make features optional / ref #3463
2016-07-12 17:42:53 +01:00
artemp
e08c3c1a20
using alias() doesn't work: line_string and linear_ring are different types (no-conversion)
2016-07-12 11:13:45 +01:00
artemp
fd41b682be
geometry_generator - fix synthesised attribute types
2016-07-12 11:11:35 +01:00
artemp
74bf270d21
geometry is_simple - handle empty polygons
2016-07-11 11:55:20 +01:00
