Commit graph

12175 commits

Author SHA1 Message Date
artemp
e74af890fb Silence -Wundefined-var-template warnings in enumeration.hpp 2016-10-17 16:58:22 +02:00
artemp
9846632daa Merge branch 'master' into develop-master 2016-10-17 16:56:08 +02:00
artemp
f18737f974 update deps 2016-10-17 16:35:20 +02:00
artemp
7a64fae41f update visual test data 2016-10-17 16:34:40 +02:00
Artem Pavlenko
be2f1a147b Merge pull request #3537 from mapycz/fix-blur-scale-factor
Fix blur with scale_factor
2016-10-17 16:33:04 +02:00
Jiri Drbalek
9248fba0f0 update visual test data 2016-10-17 12:37:53 +00:00
Jiri Drbalek
0221cd36df take scale_factor into account when inflating buffer 2016-10-17 11:59:21 +00:00
Jiri Drbalek
b830469d2d multiply blur radius by scale_factor 2016-10-17 11:59:21 +00:00
artemp
1c0abe5e2f update deps/mapbox/variant 2016-10-17 11:01:07 +02:00
artemp
6790e27712 remove redundant includes directives 2016-10-17 10:49:56 +02:00
artemp
709d8409cc Merge branch 'master' into develop-master 2016-10-17 09:47:00 +02:00
Artem Pavlenko
e3041f07c7 Merge pull request #3535 from sebastic/dependencies-typo
Fix 'depedencies' typo, replace with 'dependencies'.
2016-10-17 09:42:52 +02:00
Bas Couwenberg
01699fe81e Fix 'depedencies' typo, replace with 'dependencies'. 2016-10-15 20:07:52 +02:00
artemp
62012fbf19 re-use literal parser implementation between separator and quote primitives 2016-10-14 14:32:44 +02:00
artemp
1e66580f0d add explicit 'types' branch to "deps/mapbox/variant" 2016-10-14 14:26:10 +02:00
artemp
df12183e10 re-use object file to avoid duplicate compilation 2016-10-14 14:25:34 +02:00
artemp
83cc819c39 upgrade CSV parser to boost::spirit::x3 2016-10-14 14:24:44 +02:00
artemp
01fbbafc26 remove duplicate 'transcoder_tag` 2016-10-14 09:24:52 +02:00
artemp
558fa0cdaa remove unused #include <mapnik/expression_grammar_x3_config.hpp> 2016-10-13 17:00:12 +02:00
artemp
4c7d4a51e6 remove unused <bitset> header 2016-10-13 17:00:12 +02:00
artemp
b27cddc101 Silence -Wundefined-var-template warnings in enumeration.hpp 2016-10-13 17:00:12 +02:00
artemp
75024c067c remove bogus template instantiations 2016-10-13 17:00:12 +02:00
artemp
d99b4eaeb4 remove unused include directive 2016-10-13 17:00:12 +02:00
artemp
4384178e3f update deps/mapbox/variant 2016-10-13 17:00:12 +02:00
artemp
d934630bc5 Fix clang >= 3.9.0 compilation by using mapbox::util::variant as alias (via deps/mapbox/variant => "types" branch) 2016-10-13 17:00:12 +02:00
artemp
ab86171c2b GeoJSON generator - implement using geometry<double> karma adapters 2016-10-13 17:00:12 +02:00
artemp
b770db56c3 remove unused rule 2016-10-13 17:00:12 +02:00
artemp
9de3c80b0d add specialisations for coord_type = std::int64_t 2016-10-13 17:00:12 +02:00
artemp
a63a491ba0 wkt generator - remove boost::phoenix headers 2016-10-13 17:00:12 +02:00
artemp
beee2fd539 mapnik::geometry - refactor karma adaper into separate header for re-use 2016-10-13 17:00:12 +02:00
artemp
9853353353 adapt mapnik::geometry::geometry<double> to work with boost::spirit::karma + simplify and optimise WKT generator 2016-10-13 17:00:12 +02:00
artemp
bdaef2cc91 variant - pin to 'types' branch (requires types typedef) 2016-10-13 17:00:11 +02:00
artemp
67468ef356 refactor path_expression_grammar 2016-10-13 17:00:11 +02:00
artemp
d2f64604a3 consistently return x3 grammars by const& 2016-10-13 17:00:11 +02:00
artemp
1cb966cee2 upgrade WKT grammar to boost::spirit::x3 2016-10-13 17:00:11 +02:00
artemp
3d80a62531 remove unused include directives 2016-10-13 17:00:11 +02:00
artemp
ce0f87fb71 merge spirit-x3 2016-10-13 17:00:11 +02:00
artemp
9a82ffbde7 add geometry and value dirs 2016-10-11 18:01:30 +02:00
artemp
923efd589c geometry_to_path.hpp => geometry/to_path.hpp 2016-10-11 18:01:30 +02:00
artemp
b5c9966e4b refactor value related objects into include/value dir 2016-10-11 18:01:30 +02:00
artemp
8ce7a1c43d 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-10-11 18:01:29 +02:00
Artem Pavlenko
d6a3be87a4 Merge pull request #3511 from mapnik/unbundle-unifont
Unbundle unifont
2016-10-11 17:57:06 +02:00
Artem Pavlenko
605ad3b2a8 Merge pull request #3525 from mapycz/fix-extent-intersect
fix intersecting extents in different projections
2016-10-11 17:56:45 +02:00
Mickey Rose
d18e65dbdf travis: also search unknown submodule commit in branches 2016-10-05 20:03:45 +02:00
Jiri Drbalek
0f3eecbe5e fix intersecting extents in different projections 2016-09-27 20:36:34 +00:00
artemp
a0a5085917 add GeoJSON num_features_to_query unit test (ref #3515) 2016-09-23 11:56:43 +02:00
artemp
dad0ca2071 clamp num_features_to_query to 1...max range (at least one feature will queried) + use std::size_t for feature count (ref #3515) 2016-09-23 11:56:32 +02: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
artemp
094994ef54 update CHANGELOG for mapnik v3.0.12 release [skip ci] 2016-09-08 10:36:21 +02:00
Dane Springmeyer
1d22d860af Merge pull request #3513 from lightmare/fix-image-swap
Fix image swap
2016-09-07 21:03:32 -07:00