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

ensure [mapnik::geometry_type] attribute is stored as mapnik::value_integer

Browse source
This commit is contained in:
artemp 2015-03-23 12:16:21 +01:00
parent 36e9525a49
commit 807a940f1e
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/attribute.hpp
View file

@ -53,7 +53,7 @@ struct geometry_type_attribute
template <typename V, typename F>
V value(F const& f) const
{
return new_geometry::geometry_type(f.get_geometry());
return static_cast<mapnik::value_integer>(new_geometry::geometry_type(f.get_geometry()));
}
};

17
include/mapnik/expression_grammar.hpp
View file

@ -109,18 +109,19 @@ struct regex_replace_impl
mapnik::transcoder const& tr_;
};
struct geometry_types : qi::symbols<char, new_geometry::geometry_types>
struct geometry_types : qi::symbols<char, mapnik::value_integer>
{
geometry_types()
{
add
("point",new_geometry::geometry_types::Point)
("linestring", new_geometry::geometry_types::LineString)
("polygon",new_geometry::geometry_types::Polygon)
("multipoint",new_geometry::geometry_types::MultiPoint)
("multilinestring",new_geometry::geometry_types::MultiLineString)
("multipolygon",new_geometry::geometry_types::MultiPolygon)
("geometrycollection",new_geometry::geometry_types::GeometryCollection)
("unknown", static_cast<mapnik::value_integer>(new_geometry::geometry_types::Unknown))
("point", static_cast<mapnik::value_integer>(new_geometry::geometry_types::Point))
("linestring", static_cast<mapnik::value_integer>(new_geometry::geometry_types::LineString))
("polygon",static_cast<mapnik::value_integer>(new_geometry::geometry_types::Polygon))
("multipoint",static_cast<mapnik::value_integer>(new_geometry::geometry_types::MultiPoint))
("multilinestring",static_cast<mapnik::value_integer>(new_geometry::geometry_types::MultiLineString))
("multipolygon",static_cast<mapnik::value_integer>(new_geometry::geometry_types::MultiPolygon))
("geometrycollection",static_cast<mapnik::value_integer>(new_geometry::geometry_types::GeometryCollection))
;
}
};