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

default to transparent not pink if color expression fails

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-27 09:23:27 -07:00
parent 180bc17fc6
commit aa85a4ff1e
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/symbolizer.hpp
View file

@ -289,7 +289,7 @@ struct evaluate_expression_wrapper<mapnik::color>
mapnik::color operator() (T1 const& expr, T2 const& feature, T3 const& vars) const mapnik::color operator() (T1 const& expr, T2 const& feature, T3 const& vars) const
{ {
mapnik::value_type val = util::apply_visitor(mapnik::evaluate<T2,mapnik::value_type,T3>(feature,vars), expr); mapnik::value_type val = util::apply_visitor(mapnik::evaluate<T2,mapnik::value_type,T3>(feature,vars), expr);
if (val.is_null()) return mapnik::color(255,192,203); // pink if (val.is_null()) return mapnik::color(0,0,0,0); // transparent
return mapnik::color(val.to_string()); return mapnik::color(val.to_string());
} }
}; };
@ -400,14 +400,10 @@ struct extract_raw_value : public util::static_visitor<T1>
} }
}; };
//
using property_meta_type = std::tuple<const char*, std::function<std::string(enumeration_wrapper)>, property_types>; using property_meta_type = std::tuple<const char*, std::function<std::string(enumeration_wrapper)>, property_types>;
MAPNIK_DECL property_meta_type const& get_meta(mapnik::keys key); MAPNIK_DECL property_meta_type const& get_meta(mapnik::keys key);
MAPNIK_DECL mapnik::keys get_key(std::string const& name); MAPNIK_DECL mapnik::keys get_key(std::string const& name);
//
template <typename T> template <typename T>
void put(symbolizer_base & sym, keys key, T const& val) void put(symbolizer_base & sym, keys key, T const& val)
{ {