sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11613 commits 112 branches 95 tags 181 MiB
Commit graph

3949 commits

Author SHA1 Message Date
Dane Springmeyer
85aae33925 avoid warnings in expression_grammar_x3_config.hpp 2016-01-19 13:00:42 -08:00
Dane Springmeyer
4432e93250 Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3 2016-01-19 12:25:36 -08:00
artemp
f41d515572 fix operator<< 2016-01-19 11:38:52 +00:00
artemp
c615708a2a restore local variant_io.hpp with specialisation for bool (https://github.com/mapnik/node-mapnik/issues/582) 2016-01-15 09:26:42 +00:00
Artem Pavlenko
7997f3725e Merge pull request #3235 from mapnik/raster_mem_ds 
Raster Type Memory Datasource
 2016-01-14 16:19:43 +00:00
artemp
3333f3e1fa inherit mapnik::util::variant from mapbox::variant and add mapbox::variant as submodule 2016-01-14 15:02:41 +00:00
Blake Thompson
044c21db13 Made it possible to change the type of a memory datasource by inspecting the features that are added to the memory datasource 2016-01-14 08:36:12 -06:00
artemp
7e5337b486 Merge branch 'master' into spirit-x3 2016-01-12 15:13:17 +00:00
artemp
0a5f006bb9 SVG : add support for stroke-dashoffset 2016-01-11 10:56:04 +00:00
artemp
d3fc7f8fed Merge branch 'master' into svg-dash-array 2016-01-08 16:08:11 +00:00
artemp
9494bc15d4 SVG path parser - correct handling optional separator (,) between multiple command parts (#3225) 
http://www.w3.org/TR/SVG/paths.html#PathElement
 2016-01-08 12:00:51 +00:00
artemp
a8bf7c72f9 Merge branch 'master' into svg-dash-array 2016-01-08 10:46:17 +00:00
artemp
c8932b3df3 svg2png : use SVG dimensions as a fallback when bounding box has zero width or height (e.g horizontal or vertical line) 2016-01-08 10:20:50 +00:00
artemp
b1c22ba853 SVG :initial support for "stroke-dasharray" 2016-01-07 15:54:34 +00:00
Artem Pavlenko
513cfa7c80 Merge pull request #3219 from mapnik/address-sanitizer-happy 
keep address-sanitizer happy ref (https://github.com/mapbox/mapnik-ve…
 2016-01-07 14:23:54 +00:00
artemp
ca83ca167d svg - move stroke-dasharray setup into dash-array parser method 2016-01-07 11:20:22 +00:00
artemp
e296e554a8 sync with 3ac6e46d01 2016-01-06 12:24:24 +00:00
artemp
50905c3f9a c++ style pedantic 2016-01-06 12:23:59 +00:00
artemp
7b2da35c01 fix typo doh 2016-01-05 19:52:36 +00:00
artemp
5cd3645cd1 keep address-sanitizer happy ref (https://github.com/mapbox/mapnik-vector-tile/pull/171) 2016-01-05 16:58:37 +00:00
artemp
11c6896520 Merge branch 'master' into spirit-x3 2016-01-05 10:25:23 +00:00
artemp
ee0395df7a add basic read/write header support (quad_tree + spatial_index) ref (#3216) 2016-01-05 10:20:21 +00:00
artemp
4b22e1075e Merge branch 'master' into spirit-x3 2015-12-17 12:07:25 +00:00
artemp
e0c756ee8d geometry_envelope - add missing linear_ring 2015-12-17 12:07:05 +00:00
artemp
1b1df8abce geometry_envelope - add missing linear_ring 2015-12-17 12:06:10 +00:00
Dane Springmeyer
bd21e452d1 fix minor header glitches to allow headers to compile standalone 2015-12-16 14:22:36 -08:00
Dane Springmeyer
a0719870ab remove out of date/unused header 2015-12-16 14:22:09 -08:00
Dane Springmeyer
ce98a5c811 fix header glitches uncovered by time-header script - refs #3208 2015-12-16 13:17:19 -08:00
artemp
fb94665fe3 fix reference in comment to point to CSS3 spec 2015-12-15 15:18:39 +00:00
artemp
209af16763 rename SVG2 back to CSS as it's a better fit 2015-12-15 15:16:18 +00:00
Dane Springmeyer
6e5a67c1fb Fix -Wshadow errors from boost - refs #3204 2015-12-14 13:40:23 -08:00
artemp
599b021175 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:46:39 +00:00
artemp
6684019e86 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:38:22 +00:00
artemp
b05e09700b add HSL(A) colors 2015-12-11 13:14:37 +00:00
artemp
b3d7552774 cleanup 2015-12-11 11:27:10 +00:00
artemp
90d5306f09 svg2 colors parser - add RGB(A) percentage syntax 2015-12-11 11:16:38 +00:00
artemp
e4a60d7c90 disable skipper for "hex" colours 2015-12-10 16:05:45 +00:00
artemp
b99cf8a2ca make member variables public to allow using BOOST_FUSION_ADAPT_STRUCT 2015-12-10 16:04:44 +00:00
artemp
09250ede96 add spirit x3 grammar for SVG2 colors (aka CSS colors) 2015-12-10 15:23:49 +00:00
artemp
b6cea7c658 use std::size_t to be complaint with STL containers + explicit types 2015-12-10 15:23:16 +00:00
artemp
f3b6955533 transform expressions - split grammar into *.hpp *_def.hpp and *.cpp 2015-12-09 11:53:57 +00:00
artemp
b7a54e5166 expression_grammar x3 - refactor quoted strings 2015-12-08 18:30:16 +00:00
artemp
da2335328b expression_grammar X3 - add support for single and double quoted arguments in regex functions 2015-12-07 12:19:30 +00:00
artemp
64f5de14b1 expression_grammar X3 - allow backtracking on '<' operator so we can parse '<>' correctly 2015-12-07 11:06:57 +00:00
Dane Springmeyer
9a109bbf7d Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3 2015-12-04 14:07:51 -05:00
Dane Springmeyer
50d1e2fbb3 handle more gcc 4.9 -Wshadow warnings 2015-12-04 14:07:42 -05:00
Dane Springmeyer
010714174e fix -Wshadow warnings 2015-12-04 12:01:39 -05:00
artemp
164d225f07 expression_node - remove unused operator's 2015-12-04 16:19:37 +00:00
artemp
9eee695425 remove unused boost::spirit::qi grammars 2015-12-04 16:03:44 +00:00
artemp
2acaa7f9f4 transform_expression - port parsing grammar to x3 2015-12-04 15:55:01 +00:00
artemp
8bf0cff8cb split expression_grammar_x3 into *.hpp *_def.hpp *_config.hpp and *.cpp for improved integration 2015-12-04 15:36:56 +00:00
artemp
3fc00049f6 expression_grammar_x3 - use lexeme 2015-12-04 13:52:31 +00:00
artemp
8200e1ffc7 transform_expression - add default ctors 2015-12-04 13:52:31 +00:00
artemp
dca41aea12 expression_grammar_x3 : fix attr and global attribute rule (enable skipping) + rule IDs 2015-12-04 13:52:31 +00:00
Dane Springmeyer
1ce9f76fa3 start fixing gcc 4.9 -Wshadow warnings 2015-12-04 13:52:31 +00:00
Dane Springmeyer
a58ef62fc2 start fixing gcc 4.9 -Wshadow warnings 2015-12-02 15:54:58 -05:00
Dane Springmeyer
1cbfbbcc1a iwyu 2015-12-02 12:48:05 -05:00
Dane Springmeyer
a55ff6b33e fix includes 2015-12-02 11:56:42 -05:00
artemp
51920be9a7 move #ifdef/#endif to include include directive and avoid redundant <memory> 2015-12-02 14:30:59 +00:00
artemp
e7e25bb122 expression_grammar_x3 - remove duplicate logical not (optimise) 2015-12-02 13:02:52 +00:00
artemp
492e39d9ad expression_node - add move semantics 2015-12-02 12:58:49 +00:00
artemp
95c9d89afe expression_grammar_x3 - better names 2015-12-02 11:29:01 +00:00
artemp
dfe41c4930 expression_grammar_x3 - add more expectation points 2015-12-02 11:26:43 +00:00
Dane Springmeyer
6d4abf908d fix -Wshadow warnings 2015-12-01 12:43:24 -05:00
artemp
009ad3b5e7 add negate + hex + fix remaining issues 2015-12-01 16:44:28 +00:00
artemp
fc50e6b19a add geometry_type attribute 2015-12-01 15:31:33 +00:00
artemp
07ed49c1a0 add single/double quoted strings + global attributes + unquoted string (default) 2015-12-01 13:57:39 +00:00
artemp
d2bb56a71f port expression grammar to boost::spirit::x3 [skip ci] 
(work-in-progress)
 2015-12-01 12:43:16 +00:00
Jiri Drbalek
100e3c4995 centroid: enable algorithm on multi-geometries with empty sub-geometries 2015-11-24 15:41:34 +00:00
Dane Springmeyer
9a29b5005d fix #3178 2015-11-19 20:57:05 -08:00
Dane Springmeyer
c6d6153964 fix multiple -Wunused-parameter warnings [skip ci] 2015-11-19 17:14:58 -08:00
artemp
da617f92eb add scale_image_agg' and reproject_and_scale_raster` overloads for backward caps 2015-11-19 12:26:16 +00:00
artemp
7d8f7357ed GeoJSON - refactor FeatureCollection grammar to restore empty features condition (#3167) 2015-11-18 14:44:39 +00:00
artemp
6d599dff0a Merge branch 'fix-gray-scaling-2' of https://github.com/mapycz/mapnik into mapycz-fix-gray-scaling-2 2015-11-17 15:03:37 +00:00
Artem Pavlenko
4e922f6a64 Merge pull request #3164 from mapycz/postgis-empty-geoms 
check input data of centroid algorithm
 2015-11-11 10:21:39 +00:00
Jiri Drbalek
924aa62662 raster scaling: fixes nodata handling, acurracy when working with small floats and clipping floats by [0; 255] 2015-11-10 20:37:45 +00:00
Jiri Drbalek
071eeeb660 centroid algorithm: check for empty geometries 2015-11-10 13:49:12 +00:00
artemp
dd31b95bbb better namings (post 9c7149aad5 itr_end implies Iterator concept which is not the case) ref #3166 2015-11-10 10:42:39 +00:00
Dane Springmeyer
9c7149aad5 fix variable shadowing in simplify_converter - refs #3166 2015-11-09 12:25:10 -08:00
artemp
5370dac598 Merge branch 'issue-3050' of https://github.com/wmde/mapnik into wmde-issue-3050 2015-11-09 13:56:06 +00:00
Dane Springmeyer
3db15cb823 avoid warning on unknown pragmas with gcc and older clang 2015-11-07 18:09:38 -08:00
Dane Springmeyer
7608040906 centralize warning suppression 2015-11-07 17:53:09 -08:00
Johannes Kroll
d4eee42db4 comment harfbuzz shaper changes 2015-11-06 12:04:20 +01:00
Dane Springmeyer
90886e7992 now working on Mapnik v3.0.9 [skip ci] 2015-11-05 11:26:31 -08:00
artemp
32331e9b3e GeoJSON parsing - add more expectation points + refactor code 2015-11-05 15:30:25 +00:00
artemp
85ec771573 move 'null' geometry to the top level 2015-11-05 15:30:25 +00:00
Dane Springmeyer
da624b9ef4 update test-data to pull in 9f471a25e3 -refs #3160 2015-11-04 13:57:14 -08:00
Artem Pavlenko
c3c7513c7f Merge pull request #3160 from mapycz/FIX-offseting 
Fix offsetting
 2015-11-04 15:29:55 +00:00
Johannes Kroll
be98fb733d fix khmer problem 2015-11-04 10:33:13 +01:00
artemp
c752cf2d1c variant - update to 91ba0301a6 2015-11-03 15:32:52 +00:00
artemp
6aca4b17f8 extract_bounding_box - fail on nested "FeatureCollection" elements 2015-11-03 13:33:06 +00:00
artemp
47c93eaf15 more formatting 2015-11-03 13:33:06 +00:00
artemp
6f71ad56d4 format 2015-11-03 10:46:26 +00:00
artemp
2893ee4551 mapnik::value - add missing specialisations for mapnik::value_bool in comparison operators + update unit tests 2015-11-03 10:11:29 +00:00
Dane Springmeyer
dad4f64813 include mapnik/config to avoid BOOST_MPL_LIMIT_VECTOR_SIZE macro mismatch warnings 2015-11-02 09:09:14 -08:00
artemp
439fcd0426 correct clog message + formatting 2015-11-02 14:27:57 +00:00
artemp
58c7e5baa3 json - use unified error_handler accross grammars 2015-11-02 13:10:40 +00:00
artemp
25ed5d1e00 json error_handler : optional MAPNIK_LOG_ERROR + don't throw + return qi::fail 2015-11-02 12:46:18 +00:00
Roman Galacz
80fa21cc6f Fix offsetting 2015-11-02 12:32:06 +01:00
Johannes Kroll
9088ae49e1 Merge remote-tracking branch 'origin-mapnik/master' into issue-3050 2015-11-02 10:16:45 +01:00