Commit graph

13028 commits

Author SHA1 Message Date
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
artemp
c5e44cc7a6 add missing extract_bounding_boxes_x3.cpp back 2016-11-25 17:16:13 +01:00
artemp
a40d4ee83f Revert "move extract_bounding_boxes_x3 back into mapnik-json.a"
This reverts commit 44fc648cad.
2016-11-25 17:01:01 +01:00
artemp
483f709541 don't include xxx_def.hpp + make rules const 2016-11-25 16:52:56 +01:00
artemp
7decec426d mapnik-index update build script 2016-11-25 16:52:19 +01:00
artemp
7a819d94fa manually add missing parse_rule instantiation (FIXME) <-- must a better way perhaps via adding another macro 2016-11-25 16:51:15 +01:00
artemp
236d42402f instatiate parse_rules via BOOST_SPIRIT_INSTANTIATE 2016-11-25 16:50:15 +01:00
artemp
8a436c8cdc add extract_bounding_boxes_x3 parser configuration 2016-11-25 16:49:42 +01:00
artemp
00b2bf013a add missing generic_json_grammar_x3.cpp 2016-11-25 16:48:56 +01:00
artemp
44fc648cad move extract_bounding_boxes_x3 back into mapnik-json.a 2016-11-25 16:48:34 +01:00
artemp
be4f9ca79b add missing context type definitions + BOOST_SPIRIT_INSTANTIATE_UNUSED macro to instantiate parse_rule with boost::spirit::x3::unused_type attribute 2016-11-25 16:46:10 +01:00
artemp
163a82fd1e add feature_grammar_x3 implementation 2016-11-25 16:45:23 +01:00
artemp
cad029bf7c make hex rules const 2016-11-25 16:44:20 +01:00
talaj
994a327c7f remove superfluous declaration 2016-11-25 13:31:55 +01:00
artemp
23ba18ead2 make rules const 2016-11-25 11:48:16 +01:00
artemp
988966c68e declare in using one macro 2016-11-25 11:47:33 +01:00
artemp
4aa60d669e adapt box2d<float> to boost::geometry 2016-11-23 18:22:11 +01:00
artemp
71c112a0b0 add coord2f type 2016-11-23 18:21:44 +01:00
artemp
a112e88e23 fix compilation - move extract_bounding_boxes into mapnik-index src dir 2016-11-23 17:44:35 +01:00
artemp
ed5ee69c3c refactor GeoJSON bounding box extraction into separate method for re-use and more... 2016-11-23 16:18:38 +01:00
artemp
20d6f84b3b use char const* 2016-11-22 10:43:41 +01:00
artemp
5834de9b1f use parse_feature method in geojson.input 2016-11-21 16:35:27 +01:00
artemp
2a0bc9db6c GeoJSON - refactor feature/geometry parsing 2016-11-21 16:08:15 +01:00
artemp
fe0b0a7f2d update deps/mapbox/variant to the latest HEAD 2016-11-21 12:01:09 +01:00
artemp
3d629bf76d add missing generic_json_grammar_x3 2016-11-21 11:15:21 +01:00
artemp
7d77835080 update deps/mapbox/variant 2016-11-21 10:49:17 +01:00
artemp
e5c08800eb update deps/mapbox/variant 2016-11-21 10:48:10 +01:00
artemp
4e646c1323 handle properties 2016-11-18 15:51:39 +01:00
artemp
aca229c2bb implement custom feature GeoJSON parser for improved performance 2016-11-18 15:17:23 +01:00
artemp
f64db40a8a don't catch exceptions in featureset::next() as expected behaviour is to throw 2016-11-18 09:43:53 +01:00
artemp
ead152499b fix - ensure stringifier called recursively for nested json objects 2016-11-18 09:42:47 +01:00
artemp
e6e468dc9e Merge branch 'master' into develop-master 2016-11-18 09:05:19 +01:00
artemp
d286b75fb5 make keys member var + cache geojson grammar 2016-11-17 17:36:01 +01:00
Artem Pavlenko
a9af4e6b1c Merge pull request #3551 from tomhughes/pgraster
Use 2D box for pgraster bounding box
2016-11-17 17:34:00 +01:00
Tom Hughes
a3106a6a6e Use 2D box for pgraster bounding box
Using a 3D box causes errors with postgis 2.3 when clipping is
enabled as ST_Clip throws an error clipping a raster to a 3D box.
2016-11-17 16:30:18 +00:00