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

template json::(multi_)geometry_grammar on Geometry and GeometryContainer respectfully

Browse source
This commit is contained in:
artemp 2014-10-08 11:01:28 +01:00
parent 7f219b4f8b
commit 37f6aadcbb
5 changed files with 40 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bindings/python/mapnik_generator_grammars.cpp
View file

@ -29,8 +29,8 @@
using sink_type = std::back_insert_iterator<std::string>; using sink_type = std::back_insert_iterator<std::string>;
template struct mapnik::json::feature_generator_grammar<sink_type>; template struct mapnik::json::feature_generator_grammar<sink_type>;
template struct mapnik::json::geometry_generator_grammar<sink_type>; template struct mapnik::json::geometry_generator_grammar<sink_type, mapnik::geometry_type>;
template struct mapnik::json::multi_geometry_generator_grammar<sink_type>; template struct mapnik::json::multi_geometry_generator_grammar<sink_type, mapnik::geometry_container>;
template struct mapnik::svg::svg_path_generator<sink_type, mapnik::geometry_type>; template struct mapnik::svg::svg_path_generator<sink_type, mapnik::geometry_type>;
template struct mapnik::wkt::wkt_generator<sink_type, mapnik::geometry_type>; template struct mapnik::wkt::wkt_generator<sink_type, mapnik::geometry_type>;
template struct mapnik::wkt::wkt_multi_generator<sink_type, mapnik::geometry_container>; template struct mapnik::wkt::wkt_multi_generator<sink_type, mapnik::geometry_container>;

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

@ -156,7 +156,7 @@ struct feature_generator_grammar:
feature_generator_grammar(); feature_generator_grammar();
karma::rule<OutputIterator, mapnik::feature_impl const&()> feature; karma::rule<OutputIterator, mapnik::feature_impl const&()> feature;
multi_geometry_generator_grammar<OutputIterator> geometry; multi_geometry_generator_grammar<OutputIterator, mapnik::geometry_container> geometry;
escaped_string<OutputIterator> escaped_string_; escaped_string<OutputIterator> escaped_string_;
karma::rule<OutputIterator, mapnik::feature_impl const&()> properties; karma::rule<OutputIterator, mapnik::feature_impl const&()> properties;
karma::rule<OutputIterator, pair_type()> pair; karma::rule<OutputIterator, pair_type()> pair;

49
include/mapnik/json/geometry_generator_grammar.hpp
View file

@ -45,30 +45,34 @@ namespace karma = boost::spirit::karma;
namespace detail { namespace detail {
template <typename Geometry>
struct get_type struct get_type
{ {
using result_type = int; using result_type = int;
result_type operator() (geometry_type const& geom) const result_type operator() (Geometry const& geom) const
{ {
return static_cast<int>(geom.type()); return static_cast<int>(geom.type());
} }
}; };
template <typename Geometry>
struct get_first struct get_first
{ {
using result_type = geometry_type::value_type const; using result_type = typename Geometry::value_type const;
result_type operator() (geometry_type const& geom) const result_type operator() (Geometry const& geom) const
{ {
geometry_type::value_type coord; typename Geometry::value_type coord;
std::get<0>(coord) = geom.vertex(0,&std::get<1>(coord),&std::get<2>(coord)); geom.rewind(0);
std::get<0>(coord) = geom.vertex(&std::get<1>(coord),&std::get<2>(coord));
return coord; return coord;
} }
}; };
template <typename GeometryContainer>
struct multi_geometry_type struct multi_geometry_type
{ {
using result_type = std::tuple<unsigned,bool> ; using result_type = std::tuple<unsigned,bool> ;
result_type operator() (geometry_container const& cont) const result_type operator() (GeometryContainer const& cont) const
{ {
unsigned type = 0u; unsigned type = 0u;
bool collection = false; bool collection = false;
@ -86,10 +90,11 @@ struct multi_geometry_type
} }
}; };
template <typename GeometryContainer>
struct not_empty struct not_empty
{ {
using result_type = bool; using result_type = bool;
result_type operator() (geometry_container const& cont) const result_type operator() (GeometryContainer const& cont) const
{ {
for (auto const& geom : cont) for (auto const& geom : cont)
{ {
@ -130,10 +135,12 @@ struct json_coordinate_policy : karma::real_policies<T>
} }
template <typename OutputIterator> template <typename OutputIterator, typename Geometry>
struct geometry_generator_grammar : struct geometry_generator_grammar :
karma::grammar<OutputIterator, geometry_type const& ()> karma::grammar<OutputIterator, Geometry const& ()>
{ {
using geometry_type = Geometry;
using coord_type = typename std::remove_pointer<typename geometry_type::value_type>::type;
geometry_generator_grammar(); geometry_generator_grammar();
karma::rule<OutputIterator, geometry_type const& ()> coordinates; karma::rule<OutputIterator, geometry_type const& ()> coordinates;
karma::rule<OutputIterator, geometry_type const& ()> point; karma::rule<OutputIterator, geometry_type const& ()> point;
@ -141,19 +148,20 @@ struct geometry_generator_grammar :
karma::rule<OutputIterator, geometry_type const& ()> polygon; karma::rule<OutputIterator, geometry_type const& ()> polygon;
karma::rule<OutputIterator, geometry_type const& ()> coords; karma::rule<OutputIterator, geometry_type const& ()> coords;
karma::rule<OutputIterator, karma::locals<unsigned>, geometry_type const& ()> coords2; karma::rule<OutputIterator, karma::locals<unsigned>, geometry_type const& ()> coords2;
karma::rule<OutputIterator, geometry_type::value_type ()> point_coord; karma::rule<OutputIterator, coord_type()> point_coord;
karma::rule<OutputIterator, geometry_type::value_type (unsigned& )> polygon_coord; karma::rule<OutputIterator, coord_type(unsigned& )> polygon_coord;
boost::phoenix::function<detail::get_type > _type; boost::phoenix::function<detail::get_type<geometry_type> > _type;
boost::phoenix::function<detail::get_first> _first; boost::phoenix::function<detail::get_first<geometry_type> > _first;
karma::real_generator<double, detail::json_coordinate_policy<double> > coord_type; karma::real_generator<double, detail::json_coordinate_policy<double> > coordinate;
}; };
template <typename OutputIterator> template <typename OutputIterator, typename GeometryContainer>
struct multi_geometry_generator_grammar : struct multi_geometry_generator_grammar :
karma::grammar<OutputIterator, karma::locals<std::tuple<unsigned,bool> >, karma::grammar<OutputIterator, karma::locals<std::tuple<unsigned,bool> >,
geometry_container const& ()> GeometryContainer const& ()>
{ {
using geometry_type = typename std::remove_pointer<typename GeometryContainer::value_type>::type;
multi_geometry_generator_grammar(); multi_geometry_generator_grammar();
karma::rule<OutputIterator, karma::locals<std::tuple<unsigned,bool> >, karma::rule<OutputIterator, karma::locals<std::tuple<unsigned,bool> >,
geometry_container const&()> start; geometry_container const&()> start;
@ -164,10 +172,11 @@ struct multi_geometry_generator_grammar :
karma::rule<OutputIterator, karma::locals<unsigned>, karma::rule<OutputIterator, karma::locals<unsigned>,
geometry_type const&()> geometry2; geometry_type const&()> geometry2;
karma::rule<OutputIterator, geometry_container const&()> coordinates; karma::rule<OutputIterator, geometry_container const&()> coordinates;
geometry_generator_grammar<OutputIterator> path; geometry_generator_grammar<OutputIterator, geometry_type> path;
boost::phoenix::function<detail::multi_geometry_type> multi_type_; // phoenix functions
boost::phoenix::function<detail::get_type > type_; boost::phoenix::function<detail::multi_geometry_type<GeometryContainer> > multi_type_;
boost::phoenix::function<detail::not_empty> not_empty_; boost::phoenix::function<detail::get_type<geometry_type> > type_;
boost::phoenix::function<detail::not_empty<GeometryContainer> > not_empty_;
karma::symbols<unsigned, char const*> geometry_types; karma::symbols<unsigned, char const*> geometry_types;
}; };

12
include/mapnik/json/geometry_generator_grammar_impl.hpp
View file

@ -34,8 +34,8 @@ namespace mapnik { namespace json {
namespace karma = boost::spirit::karma; namespace karma = boost::spirit::karma;
template <typename OutputIterator> template <typename OutputIterator, typename Geometry>
geometry_generator_grammar<OutputIterator>::geometry_generator_grammar() geometry_generator_grammar<OutputIterator, Geometry>::geometry_generator_grammar()
: geometry_generator_grammar::base_type(coordinates) : geometry_generator_grammar::base_type(coordinates)
{ {
boost::spirit::karma::uint_type uint_; boost::spirit::karma::uint_type uint_;
@ -69,7 +69,7 @@ geometry_generator_grammar<OutputIterator>::geometry_generator_grammar()
point_coord = &uint_ point_coord = &uint_
<< lit('[') << lit('[')
<< coord_type << lit(',') << coord_type << coordinate << lit(',') << coordinate
<< lit(']') << lit(']')
; ;
@ -78,7 +78,7 @@ geometry_generator_grammar<OutputIterator>::geometry_generator_grammar()
.else_[_1 = '[' ]] .else_[_1 = '[' ]]
| |
&uint_(mapnik::SEG_LINETO) &uint_(mapnik::SEG_LINETO)
<< lit(',')) << lit('[') << coord_type << lit(',') << coord_type << lit(']') << lit(',')) << lit('[') << coordinate << lit(',') << coordinate << lit(']')
; ;
coords2 %= *polygon_coord(_a) coords2 %= *polygon_coord(_a)
@ -88,8 +88,8 @@ geometry_generator_grammar<OutputIterator>::geometry_generator_grammar()
; ;
} }
template <typename OutputIterator> template <typename OutputIterator, typename GeometryContainer>
multi_geometry_generator_grammar<OutputIterator>::multi_geometry_generator_grammar() multi_geometry_generator_grammar<OutputIterator, GeometryContainer>::multi_geometry_generator_grammar()
: multi_geometry_generator_grammar::base_type(start) : multi_geometry_generator_grammar::base_type(start)
{ {
boost::spirit::karma::uint_type uint_; boost::spirit::karma::uint_type uint_;

4
include/mapnik/util/geometry_to_geojson.hpp
View file

@ -32,7 +32,7 @@ namespace mapnik { namespace util {
inline bool to_geojson(std::string & json, mapnik::geometry_type const& geom) inline bool to_geojson(std::string & json, mapnik::geometry_type const& geom)
{ {
using sink_type = std::back_insert_iterator<std::string>; using sink_type = std::back_insert_iterator<std::string>;
static const mapnik::json::geometry_generator_grammar<sink_type> grammar; static const mapnik::json::geometry_generator_grammar<sink_type, mapnik::geometry_type> grammar;
sink_type sink(json); sink_type sink(json);
return boost::spirit::karma::generate(sink, grammar, geom); return boost::spirit::karma::generate(sink, grammar, geom);
} }
@ -40,7 +40,7 @@ inline bool to_geojson(std::string & json, mapnik::geometry_type const& geom)
inline bool to_geojson(std::string & json, mapnik::geometry_container const& geom) inline bool to_geojson(std::string & json, mapnik::geometry_container const& geom)
{ {
using sink_type = std::back_insert_iterator<std::string>; using sink_type = std::back_insert_iterator<std::string>;
static const mapnik::json::multi_geometry_generator_grammar<sink_type> grammar; static const mapnik::json::multi_geometry_generator_grammar<sink_type, mapnik::geometry_container> grammar;
sink_type sink(json); sink_type sink(json);
return boost::spirit::karma::generate(sink, grammar, geom); return boost::spirit::karma::generate(sink, grammar, geom);
} }