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

GeoJSON - refactor FeatureCollection grammar to restore empty features condition (#3167)

Browse source
This commit is contained in:
artemp 2015-11-18 14:44:39 +00:00
parent 938702dc8b
commit 7d8f7357ed
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/mapnik/json/feature_collection_grammar_impl.hpp
View file

@ -54,24 +54,23 @@ feature_collection_grammar<Iterator,FeatureType, FeatureCallback,ErrorHandler>::
start = feature_collection(_r1, _r2, _r3) start = feature_collection(_r1, _r2, _r3)
; ;
feature_collection = lit('{') >> (type | features(_r1, _r2, _r3) | feature_g.json_.key_value) % lit(',') >> lit('}') feature_collection = lit('{') > (type | features(_r1, _r2, _r3) | feature_g.json_.key_value) % lit(',') > lit('}')
; ;
type = lit("\"type\"") >> lit(':') >> lit("\"FeatureCollection\"") type = lit("\"type\"") > lit(':') > lit("\"FeatureCollection\"")
; ;
features = lit("\"features\"") features = lit("\"features\"")
>> lit(':') > lit(':') > lit('[') >
>> lit('[') ( lit(']') | ((feature(_r1, _r2, _r3) [_r2 +=1] % lit(',')) > lit(']')))
>> -(feature(_r1, _r2, _r3) [_r2 +=1] % lit(','))
>> lit(']')
; ;
feature = eps[_a = phoenix::construct<mapnik::feature_ptr>(new_<mapnik::feature_impl>(_r1, _r2))] feature = eps[_a = phoenix::construct<mapnik::feature_ptr>(new_<mapnik::feature_impl>(_r1, _r2))]
>> feature_g(*_a)[on_feature(_r3,_a)] > feature_g(*_a)[on_feature(_r3,_a)]
; ;
start.name("start"); start.name("start");
feature_collection.name("FeatureCollection");
type.name("type"); type.name("type");
features.name("features"); features.name("features");
feature.name("feature"); feature.name("feature");