Commit graph

12318 commits

Author SHA1 Message Date
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
artemp
22a6652160 use spirit::x3 based parser for disk-indexed GeoJSON access 2016-11-17 16:45:11 +01:00
artemp
493b662f16 add create_feature helper method (geojson_value -> mapnik::feature_impl) 2016-11-17 16:44:09 +01:00
artemp
21a121df18 avoid name clashing 2016-11-17 13:13:07 +01:00
artemp
ca96d3e137 fix duplicate feature to geojson code 2016-11-17 10:33:05 +01:00
artemp
190023a085 remove unused include (#include <mapnik/json/value_converters.hpp>) 2016-11-17 10:31:55 +01:00
artemp
fec5715a69 update to use boost::bimap 2016-11-16 16:05:40 +01:00
artemp
4588c23274 use boost:bimap to store key/name mapping for inverse searching caps 2016-11-16 16:04:54 +01:00
artemp
69b79b303f make create_geometry a method 2016-11-16 16:03:25 +01:00
artemp
c2d7ecbef7 move keys_map initilizer with well-known-names into separate inline method 2016-11-15 17:23:27 +01:00
artemp
1b74544b08 start well-known-names enum from 1 + pre-initialise keys_map with well-known-names 2016-11-15 11:18:44 +01:00
artemp
d6bedd235c parse well-known-names as un-quoted strings 2016-11-15 11:16:58 +01:00
artemp
1e238be7ee move wkn_to_string to json_grammar_config.hpp 2016-11-15 10:15:10 +01:00
artemp
c860f9e465 add well_known_names to string mappings 2016-11-15 10:14:10 +01:00
artemp
ae30675e98 move json well_known_names 2016-11-15 10:13:36 +01:00
artemp
5ef77d07b9 update deps/mapbox/variant to the lastest HEAD 2016-11-15 09:32:27 +01:00
Dane Springmeyer
8adc190117 new publish vars 2016-11-14 15:47:20 -08:00
Dane Springmeyer
3283f50639 Merge branch 'master' of github.com:mapnik/mapnik into develop-master 2016-11-14 15:32:39 -08:00
Dane Springmeyer
5a6d16d4fe default scale_factor for filter_visitor (unbreaks node-mapnik compile) 2016-11-14 15:31:18 -08:00
Dane Springmeyer
4449f81e03 restore to_wkt on geometry<std::int64_t> 2016-11-14 15:23:29 -08:00
Dane Springmeyer
657dd7d73a suppress boost warnings 2016-11-14 15:04:07 -08:00
artemp
6b4638a955 add -x3 option to mapnik-index to test new json parser 2016-11-14 15:57:34 +01:00
artemp
0e9f06d221 more comprehensive validation implementation 2016-11-14 12:58:13 +01:00
artemp
92d35d1e40 fix json_value name clashing + add skeleton feature validation method 2016-11-14 12:18:36 +01:00
artemp
2b6f23890b remove redundant mapnik::util::recursive_wrapper 2016-11-14 12:13:26 +01:00
artemp
252a0366e9 consistent usage of iterator type + cleanups 2016-11-11 15:24:11 +01:00
artemp
99ce79fd36 allow short style syntax for long options e.g "-x3", "-validate-features" etc. 2016-11-11 10:48:03 +01:00
artemp
19f1af3861 mapnik-index - add optional 'fast' spirit::x3 GeoJSON parsing. Activated by "--x3" program option. 2016-11-11 10:40:52 +01:00
artemp
6fb3dbd63f remove BIGINT redifinition 2016-11-10 17:28:16 +01:00
artemp
e46a52c3f0 GeoJSON - spirit::x3 based parsing building blocks 2016-11-10 17:26:24 +01:00
artemp
f014555913 Merge branch 'master' into develop-master 2016-11-09 11:02:41 +01:00
artemp
2757ec8973 update variant submodule 2016-11-09 10:47:40 +01:00
artemp
7a880737e7 Merge branch 'master' into develop-master 2016-11-09 10:35:30 +01:00
Artem Pavlenko
bc9cb5d90c Remove Circle badge it appears to be broken 2016-11-09 10:20:00 +01:00
artemp
88b16e0ca8 pass context by const ref + extract _attr(ctx) once and re-use 2016-10-20 17:16:03 +02:00
artemp
eea427b19f cleanup include directives 2016-10-19 13:15:59 +02:00
artemp
7622aa25be cleanup include directives 2016-10-19 13:15:15 +02:00
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