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

Merge branch 'master' into geometry-refactor

Browse source
This commit is contained in:
artemp 2016-07-19 10:25:33 +01:00
commit dc88582b4d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps/mapbox/variant vendored

@ -1 +1 @@
Subproject commit b5728ad76e1402c130a9330aa44b6f4b655b13b4
Subproject commit c511b2f34d966c09e02a1b833db33a9a1f9b2196

2
include/mapnik/feature.hpp
View file

@ -154,7 +154,7 @@ public:
inline bool has_key(context_type::key_type const& key) const
{
return (ctx_->mapping_.find(key) != ctx_->mapping_.end());
return (ctx_->mapping_.count(key) == 1);
}
inline value_type const& get(context_type::key_type const& key) const

4
src/value.cpp
View file

@ -673,7 +673,7 @@ struct convert<std::string>
std::string operator()(value_null const&) const
{
return std::string();
return std::string("null");
}
};
@ -708,7 +708,7 @@ struct to_unicode_impl
value_unicode_string operator()(value_null const&) const
{
return value_unicode_string();
return value_unicode_string("null");
}
};