Commit graph

4096 commits

Author SHA1 Message Date
artemp
03f1e49818 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:24:53 +02:00
artemp
34e1096788 GeoJSON generator - implement using geometry<double> karma adapters 2016-09-20 11:01:38 +02:00
artemp
a34cb6c2a3 remove unused rule 2016-09-20 10:55:38 +02:00
artemp
9d05667723 add specialisations for coord_type = std::int64_t 2016-09-20 10:55:00 +02:00
artemp
ba573e558b remove redundant and bogus enum value 2016-09-19 16:55:25 +02:00
artemp
fc481b171d wkt generator - remove boost::phoenix headers 2016-09-19 16:54:54 +02:00
artemp
6e010cbbd0 mapnik::geometry - refactor karma adaper into separate header for re-use 2016-09-19 16:32:40 +02:00
artemp
d67410f82a fix typo 2016-09-19 15:56:15 +02:00
artemp
8ddbd18d20 adapt mapnik::geometry::geometry<double> to work with boost::spirit::karma + simplify and optimise WKT generator 2016-09-19 15:51:21 +02:00
artemp
545b32eaf5 refactor path_expression_grammar 2016-09-15 15:41:31 +02:00
artemp
c03cb2d434 consistently return x3 grammars by const& 2016-09-15 15:40:38 +02:00
artemp
e4e628ecd5 upgrade WKT grammar to boost::spirit::x3 2016-09-13 15:11:05 +02:00
artemp
46fe1d6f4a Merge branch 'master' into develop 2016-09-12 12:59: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
747ca7470c remove duplicate #pragma 2016-09-05 11:39:36 +02:00
artemp
f322d95f3e Merge branch 'master' into develop 2016-09-05 11:38:57 +02:00
Dane Springmeyer
3741a7f348 fix -Wshadow warnings caught by g++-5 2016-09-03 09:58:40 -07:00
Dane Springmeyer
4b06dfe9b4 Avoid warnings when building the g++5 2016-08-31 11:09:27 -07:00
artemp
468aeb23e1 Merge branch 'master' into develop 2016-08-31 14:37:38 +01:00
artemp
f360f50eed JSON - make generic_json a proper spirit grammar and reduce code bloat 2016-08-31 14:36:35 +01:00
artemp
792675225b cleanup 2016-08-26 10:35:35 +01:00
artemp
e03b607b27 remove unused include directives 2016-08-26 10:34:48 +01:00
artemp
75ec9d6063 merge spirit-x3 2016-08-26 10:09:22 +01:00
artemp
4b8dc524e9 Merge branch 'master' into tidy-headers 2016-08-26 09:17:48 +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
d5a8992ce6 Merge branch 'master' into tidy-headers 2016-08-24 11:14:33 +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
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
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