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

Revert "allow "null" values when genrating Feature GeoJSON"

Browse source 
This reverts commit 8ce58ea29c.
This commit is contained in:
artemp 2016-07-15 12:22:03 +01:00
parent 54d51e2728
commit 6f8f286b8d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/mapnik/json/feature_generator_grammar.hpp
View file

@ -40,26 +40,26 @@ struct is_container<mapnik::feature_impl const> : mpl::false_ {} ;
template <>
struct container_iterator<mapnik::feature_impl const>
{
using type = mapnik::feature_kv_iterator;
using type = mapnik::feature_kv_iterator2;
};
template <>
struct begin_container<mapnik::feature_impl const>
{
static mapnik::feature_kv_iterator
static mapnik::feature_kv_iterator2
call (mapnik::feature_impl const& f)
{
return f.begin();
return mapnik::feature_kv_iterator2(mapnik::value_not_null(),f.begin(),f.end());
}
};
template <>
struct end_container<mapnik::feature_impl const>
{
static mapnik::feature_kv_iterator
static mapnik::feature_kv_iterator2
call (mapnik::feature_impl const& f)
{
return f.end();
return mapnik::feature_kv_iterator2(mapnik::value_not_null(),f.end(),f.end());
}
};