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

implement support for "GeometryCollection" type

Browse source
This commit is contained in:
artemp 2016-11-28 17:05:46 +01:00
parent 0ea1c7cce2
commit b05d0caba1
1 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
include/mapnik/json/feature_grammar_x3_def.hpp
View file

@ -177,14 +177,40 @@ auto const assign_geometry_type = [] (auto const& ctx)
std::get<0>(_val(ctx)) = _attr(ctx); std::get<0>(_val(ctx)) = _attr(ctx);
}; };
auto const create_collection = [] (auto const& ctx)
{
mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
feature.set_geometry(mapnik::geometry::geometry_collection<double>());
};
auto const assign_geometry = [] (auto const& ctx) auto const assign_geometry = [] (auto const& ctx)
{ {
mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx); mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
// first check if we're not dealing with GeometryCollection
if (feature.get_geometry().is<mapnik::geometry::geometry_empty>())
{
mapnik::geometry::geometry<double> geom;
auto const type = std::get<0>(_attr(ctx));
auto const& coordinates = std::get<1>(_attr(ctx));
mapnik::json::create_geometry(geom, type, coordinates);
feature.set_geometry(std::move(geom));
}
};
auto const push_geometry = [] (auto const& ctx)
{
mapnik::geometry::geometry<double> geom; mapnik::geometry::geometry<double> geom;
auto const type = std::get<0>(_attr(ctx)); auto const type = std::get<0>(_attr(ctx));
auto const& coordinates = std::get<1>(_attr(ctx)); auto const& coordinates = std::get<1>(_attr(ctx));
mapnik::json::create_geometry(geom, type, coordinates); mapnik::json::create_geometry(geom, type, coordinates);
feature.set_geometry(std::move(geom)); mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
geometry::geometry<double> & collection = feature.get_geometry();
if (collection.is<mapnik::geometry::geometry_collection<double>>())
{
auto & col = collection.get<mapnik::geometry::geometry_collection<double>>();
col.push_back(std::move(geom));
}
}; };
auto const assign_positions = [] (auto const& ctx) auto const assign_positions = [] (auto const& ctx)
@ -213,7 +239,7 @@ x3::rule<struct geometry_tag, std::tuple<mapnik::geometry::geometry_types, mapni
x3::rule<struct property_tag, std::tuple<std::string, json_value>> const property = "Property"; x3::rule<struct property_tag, std::tuple<std::string, json_value>> const property = "Property";
x3::rule<struct properties_tag> const properties = "Properties"; x3::rule<struct properties_tag> const properties = "Properties";
x3::rule<struct feature_part_rule_tag> const feature_part = "Feature part"; x3::rule<struct feature_part_rule_tag> const feature_part = "Feature part";
x3::rule<struct geometry_collection> const geometry_collection = "GeometryCollection";
auto const feature_type_def = lit("\"type\"") > lit(':') > lit("\"Feature\""); auto const feature_type_def = lit("\"type\"") > lit(':') > lit("\"Feature\"");
@ -221,10 +247,18 @@ auto const geometry_type_def = lit("\"type\"") > lit(':') > geometry_type_symbol
auto const coordinates_def = lit("\"coordinates\"") > lit(':') > positions_rule; auto const coordinates_def = lit("\"coordinates\"") > lit(':') > positions_rule;
auto const geometry_collection_def = lit("\"geometries\"")[create_collection] > lit(':')
> lit('[')
> ((lit('{') > geometry_tuple[push_geometry] > lit('}')) % lit(','))
> lit(']');
auto const geometry_tuple_def = (geometry_type[assign_geometry_type] auto const geometry_tuple_def = (geometry_type[assign_geometry_type]
| |
coordinates[assign_positions] coordinates[assign_positions]
| |
geometry_collection
|
(omit[geojson_string] > lit(':') > omit[value])) % lit(','); (omit[geojson_string] > lit(':') > omit[value])) % lit(',');
@ -258,7 +292,8 @@ BOOST_SPIRIT_DEFINE(
properties, properties,
feature_part, feature_part,
feature_rule, feature_rule,
geometry_rule geometry_rule,
geometry_collection
); );
#pragma GCC diagnostic pop #pragma GCC diagnostic pop