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

json error handler : use MAPNIK_LOG_ERROR and better message

Browse source
This commit is contained in:
artemp 2014-09-23 13:22:53 +01:00
parent ebe0021679
commit f4694d03ff
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/json/feature_grammar.hpp
View file

@ -97,7 +97,7 @@ struct error_handler
Iterator first, Iterator last, Iterator first, Iterator last,
Iterator err_pos, boost::spirit::info const& what) const Iterator err_pos, boost::spirit::info const& what) const
{ {
MAPNIK_LOG_WARN(error_handler) << what << " expected in input"; MAPNIK_LOG_ERROR(error_handler) << what << " expected but got: " << where_message()(err_pos, last, 16);
} }
}; };

2
include/mapnik/json/feature_grammar_impl.hpp
View file

@ -114,8 +114,10 @@ feature_grammar<Iterator,FeatureType,ErrorHandler>::feature_grammar(mapnik::tran
attribute_value %= json_.number | json_.string_ ; attribute_value %= json_.number | json_.string_ ;
feature.name("Feature"); feature.name("Feature");
feature_type.name("Feature Type");
properties.name("Properties"); properties.name("Properties");
attributes.name("Attributes"); attributes.name("Attributes");
attribute_value.name("Attribute Value");
on_error<fail>(feature, error_handler(_1, _2, _3, _4)); on_error<fail>(feature, error_handler(_1, _2, _3, _4));