sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extract_bounding_box - fail on nested "FeatureCollection" elements

Browse source
This commit is contained in:
artemp 2015-11-03 13:31:46 +00:00
parent 47c93eaf15
commit 6aca4b17f8
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/mapnik/json/extract_bounding_box_grammar_impl.hpp
View file

@ -65,22 +65,25 @@ extract_bounding_box_grammar<Iterator, ErrorHandler>::extract_bounding_box_gramm
; ;
features = no_skip[iter_pos[_a = _1]] >> -(lit('{') features = no_skip[iter_pos[_a = _1]] >> -(lit('{')
>> *((json.key_value - lit("\"features\"")) >> lit(',')) >> *((json.key_value - lit("\"features\"")) >> lit(','))
>> lit("\"features\"") >> lit("\"features\"")
>> lit(':')) >> lit(':'))
>> lit('[') >> (feature(_r1,_a) % lit(',')) >> lit(']') >> lit('[') >> (feature(_r1,_a) % lit(',')) >> lit(']')
; ;
feature = raw[lit('{')[_a = 1] feature = raw[lit('{')[_a = 1]
>> *(eps(_a > 0) >> (lit('{')[_a += 1] >> *(eps(_a > 0) >> (
| lit("\"FeatureCollection\"") > eps(false) // fail if nested FeatureCollection
lit('}')[_a -=1] |
| lit('{')[_a += 1]
coords[_b = _1] |
| lit('}')[_a -= 1]
json.string_ |
| coords[_b = _1]
char_))][push_box(_r1, _r2, _b, _1)] |
json.string_
|
char_))][push_box(_r1, _r2, _b, _1)]
; ;
coords = lit("\"coordinates\"") coords = lit("\"coordinates\"")

2
utils/mapnik-index/process_geojson_file.cpp
View file

@ -94,7 +94,7 @@ std::pair<bool,box2d<double>> process_geojson_file(T & boxes, std::string const&
} }
catch (std::exception const& ex) catch (std::exception const& ex)
{ {
std::clog << "mapnik-index:" << ex.what() << std::endl; std::clog << "mapnik-index (GeoJSON): " << ex.what() << std::endl;
} }
for (auto const& item : boxes) for (auto const& item : boxes)
{ {