Commit graph

12245 commits

Author SHA1 Message Date
artemp
c5174d2862 port parse_hex to use boost::spirit::x3 2016-12-09 11:49:53 +01:00
artemp
5eaf37404a remove unused using directive 2016-12-09 11:49:08 +01:00
artemp
0d703ee552 cleanup include directives 2016-12-08 18:55:55 +01:00
artemp
1372ca48ef SConstruct - require c++14 2016-12-08 10:43:25 +01:00
artemp
fe7e9a7dc5 use mapbox namespace to fix name resolution 2016-12-06 15:14:28 +01:00
artemp
87c65e888d update variant dep 2016-12-06 14:56:52 +01:00
artemp
a07a8cd6fe use <mapnik/util/variant_io.hpp> which has specialisation for boolean type 2016-12-06 14:56:04 +01:00
artemp
df10fab439 only add valid bounding boxes (make backward compatible) 2016-12-06 12:23:09 +01:00
talaj
218fba4479 Merge pull request #3529 from lightmare/group-pair-layout
fix #3526 GroupSymbolizer PairLayout with 3+ items
2016-12-05 21:35:11 +01:00
Mickey Rose
cb41fc5d48 fix #3526 GroupSymbolizer PairLayout with 3+ items 2016-12-05 16:26:03 +01:00
Jiri Drbalek
6364e07d71 duplicate code elimination 2016-12-05 11:25:33 +01:00
Dane Springmeyer
ec5964d855 Merge pull request #3568 from mapnik/gcc-again
Travis: Add g++ testing, upgrade to clang++ 3.9, downgrade to libstdc++-4.9
2016-12-02 14:11:09 -08:00
Dane Springmeyer
05936826b3 allow visual test failures with g++ https://github.com/mapnik/mapnik/issues/3567 2016-12-02 14:05:16 -08:00
Dane Springmeyer
8262eb5206 avoid -Wshadow and 'unrecognized command line option' with gcc 2016-12-02 13:43:43 -08:00
Dane Springmeyer
9cc8af9173 try g++6 on precise 2016-12-02 13:43:42 -08:00
Dane Springmeyer
e57ac30690 use clang 3.9, g++-6 2016-12-02 13:43:42 -08:00
artemp
5ea5f18a7e cleanups 2016-12-02 12:42:07 +01:00
artemp
6824f4c477 fix more gcc warnings 2016-12-02 11:42:57 +01:00
artemp
069de8e266 fix gcc6 compilation issue 2016-12-02 11:04:11 +01:00
Dane Springmeyer
8b6059eab6 mason packages are currently built with -D_GLIBCXX_USE_CXX11_ABI=0 2016-12-01 09:50:34 -08:00
artemp
2f8da6dfd5 reduce compiler warnings (gcc 6) 2016-12-01 17:17:56 +01:00
artemp
410a2ce7ca from_geojson(json, geometry) - remove temp feature/ parse directly into geometry 2016-11-30 12:21:56 +01:00
artemp
56d5ffb473 remove unused headers 2016-11-30 12:21:38 +01:00
artemp
b01481ded7 refactor feature_grammar_x3 to have a cleaner separation between feature and geometry rules 2016-11-30 11:33:35 +01:00
artemp
2dc57effb8 allow null geometry 2016-11-29 16:26:58 +01:00
Artem Pavlenko
2f5c12f28a Merge pull request #3560 from mapycz/minor-cleanup
remove methods that are not referenced anywhere
2016-11-29 16:02:58 +01:00
Jiri Drbalek
2b852ad1f9 remove methods that are not referenced anywhere 2016-11-29 14:55:06 +00:00
artemp
f7cf220688 fix Makefike - remove utils/mapnik-index/process_geojson_file.o 2016-11-29 15:28:32 +01:00
artemp
9887270b9e Merge branch 'develop-master' 2016-11-29 11:18:31 +01:00
artemp
d88bf9e1ef remove unused old headers 2016-11-29 10:48:48 +01:00
artemp
36eb7f61bd implement from_geojson in terms of parse_(feature|geometry) 2016-11-29 10:48:06 +01:00
artemp
941a025682 remove spirit::qi usage from (Geo)JSON 2016-11-29 10:46:23 +01:00
artemp
0ec510025d mapnik-index - remove -x3 option, use process_geojson_x3 always 2016-11-29 09:20:41 +01:00
artemp
2fcd608ab3 remove spirit spirit::qi usage 2016-11-28 18:42:29 +01:00
artemp
160c1c9471 pass iterator pair by ref,const& ref to match spirit::x3 APIs and be able check for fully consumed input (needed by geojson.input logic) 2016-11-28 18:40:03 +01:00
artemp
f4f39993d0 allow accessing geometry by ref 2016-11-28 18:38:40 +01:00
artemp
cc9f23c470 allow empty "properties" 2016-11-28 18:38:04 +01:00
artemp
b05d0caba1 implement support for "GeometryCollection" type 2016-11-28 17:05:46 +01:00
artemp
0ea1c7cce2 Merge branch 'master' into develop-master 2016-11-28 15:26:13 +01:00
artemp
e6eda7e8b9 use parse_feature() 2016-11-28 10:28:12 +01:00
artemp
ac3e72703d use spirit::x3 based extract_bounding_boxes 2016-11-28 10:16:25 +01:00
artemp
1e2b4c6bc1 instantiate require parse_rule's 2016-11-28 10:15:17 +01:00
artemp
af1b39c689 support both box2d<float> and box2d<double> 2016-11-28 10:14:49 +01:00
artemp
f422da8681 sanitise parse_rule instantiations via BOOST_SPIRIT_INSTANTIATE and OOST_SPIRIT_INSTANTIATE_UNUSED macros 2016-11-27 17:07:04 +01:00
artemp
d4e1cb9ae7 add an extra extract_bounding_boxes_reverse_context_type definition 2016-11-27 17:06:02 +01:00
Artem Pavlenko
765922e42f Merge pull request #3556 from mapnik/minor-cleanup
remove superfluous declaration
2016-11-25 20:39:23 +01:00
artemp
f32b423428 attempting to keep clang on Travis happy 2016-11-25 17:59:44 +01:00
artemp
c04d8bf082 re-enable GeoJSON feature validation 2016-11-25 17:50:33 +01:00
artemp
8158293b16 fix std:: namespace :) 2016-11-25 17:47:41 +01:00
artemp
1a16dfd8c2 fix namespace 2016-11-25 17:19:30 +01:00