Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] experimental Spirit X3 hacks #3976

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] experimental Spirit X3 hacks #3976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efdbdd8
topojson: add tests with empty Multi-geometries
lightmare Aug 10, 2018
2baacfe
topojson: some vector typedefs for conciseness
lightmare Aug 10, 2018
bb05f00
experimental spirit utils to define grammars differently
lightmare Aug 10, 2018
e4d7735
topojson: experimental grammar rewrite
lightmare Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions include/mapnik/json/topojson_grammar_x3.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,21 @@

// mapnik
#include <mapnik/json/topology.hpp>
#include <mapnik/util/spirit_rule.hpp>

#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop
namespace mapnik { namespace topojson { namespace grammar {

namespace mapnik { namespace json { namespace grammar {
MAPNIK_SPIRIT_EXTERN_RULE(start_rule, topojson::topology);

namespace x3 = boost::spirit::x3;
}}} // namespace mapnik::topojson::grammar

using topojson_grammar_type = x3::rule<class topojson_rule_tag, topojson::topology>;

BOOST_SPIRIT_DECLARE(topojson_grammar_type);
namespace mapnik { namespace json {

inline auto topojson_grammar()
{
return topojson::grammar::start_rule;
}

grammar::topojson_grammar_type const& topojson_grammar();

}}
}} // namespace mapnik::json

#endif //MAPNIK_TOPOJSON_GRAMMAR_X3_HPP
236 changes: 117 additions & 119 deletions include/mapnik/json/topojson_grammar_x3_def.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ BOOST_FUSION_ADAPT_STRUCT(

BOOST_FUSION_ADAPT_STRUCT(
mapnik::topojson::arc,
(std::list<mapnik::topojson::coordinate>, coordinates)
(mapnik::topojson::position_array, coordinates)
)

BOOST_FUSION_ADAPT_STRUCT(
Expand All @@ -61,9 +61,8 @@ BOOST_FUSION_ADAPT_STRUCT(
(double, maxy)
)

namespace mapnik { namespace json { namespace grammar {
namespace mapnik { namespace topojson { namespace grammar {

using index_type = topojson::index_type;
struct create_point
{
using result_type = mapnik::topojson::point;
Expand All @@ -88,10 +87,10 @@ struct create_multi_point
result_type operator()(T0 & coords, T1 & props) const
{
mapnik::topojson::multi_point mpt;
if (coords.template is<std::vector<mapnik::topojson::coordinate>>())
if (coords.template is<topojson::position_array>())
{
auto const& points = coords.template get<std::vector<mapnik::topojson::coordinate>>();
mpt. points = points;
auto const& points = coords.template get<topojson::position_array>();
mpt.points = points;
mpt.props = props;
}
return mpt;
Expand All @@ -105,10 +104,10 @@ struct create_line_string
result_type operator()(T0 & arcs, T1 & props) const
{
mapnik::topojson::linestring line;
if (arcs.template is<std::vector<index_type>>())
if (arcs.template is<topojson::index_array>())
{
auto const& arcs_ = arcs.template get<std::vector<index_type>>();
line.rings = arcs_;
auto const& arcs_ = arcs.template get<topojson::index_array>();
line.arcs = arcs_;
line.props = props;
}
return line;
Expand All @@ -122,9 +121,9 @@ struct create_multi_line_string
result_type operator()(T0 & arcs, T1 & props) const
{
mapnik::topojson::multi_linestring mline;
if (arcs.template is<std::vector<std::vector<index_type>>>())
if (arcs.template is<topojson::index_array2>())
{
auto const& arcs_ = arcs.template get<std::vector<std::vector<index_type>>>();
auto const& arcs_ = arcs.template get<topojson::index_array2>();
mline.lines = arcs_;
mline.props = props;
}
Expand All @@ -139,9 +138,9 @@ struct create_polygon
result_type operator()(T0 & arcs, T1 & props) const
{
mapnik::topojson::polygon poly;
if (arcs.template is<std::vector<std::vector<index_type>>>())
if (arcs.template is<topojson::index_array2>())
{
auto const& arcs_ = arcs.template get<std::vector<std::vector<index_type>>>();
auto const& arcs_ = arcs.template get<topojson::index_array2>();
poly.rings = arcs_;
poly.props = props;
}
Expand All @@ -156,9 +155,9 @@ struct create_multi_polygon
result_type operator()(T0 & arcs, T1 & props) const
{
mapnik::topojson::multi_polygon mpoly;
if (arcs.template is<std::vector<std::vector<std::vector<index_type>>>>())
if (arcs.template is<topojson::index_array3>())
{
auto const& arcs_ = arcs.template get<std::vector<std::vector<std::vector<index_type>>>>();
auto const& arcs_ = arcs.template get<topojson::index_array3>();
mpoly.polygons = arcs_;
mpoly.props = props;
}
Expand Down Expand Up @@ -285,14 +284,18 @@ auto const& json_string = json::unicode_string_grammar();
auto const& json_value = json::generic_json_grammar();
}

using coordinates_type = util::variant<topojson::coordinate,std::vector<topojson::coordinate>>;
using arcs_type = util::variant<std::vector<index_type>,
std::vector<std::vector<index_type>>,
std::vector<std::vector<std::vector<index_type>>>>;
using coordinates_type = util::variant<topojson::coordinate,
topojson::position_array>;

using arcs_type = util::variant<topojson::empty,
topojson::index_array,
topojson::index_array2,
topojson::index_array3>;

struct topojson_geometry_type_ : x3::symbols<int>
{
topojson_geometry_type_()
: x3::symbols<int>(std::string("Geometry type"))
{
add
("\"Point\"",1)
Expand All @@ -303,47 +306,10 @@ struct topojson_geometry_type_ : x3::symbols<int>
("\"MultiPolygon\"",6)
;
}
} topojson_geometry_type;

// start rule
topojson_grammar_type const topology MAPNIK_INIT_PRIORITY(104) ("Topology");
// rules
x3::rule<class transform_tag, mapnik::topojson::transform> const transform = "Transform";
x3::rule<class bbox_tag, mapnik::topojson::bounding_box> const bbox = "Bounding Box";
x3::rule<class objects_tag, std::vector<mapnik::topojson::geometry>> const objects= "Objects";
x3::rule<class property_tag, mapnik::topojson::property> const property = "Property";
x3::rule<class properties_tag, mapnik::topojson::properties> const properties = "Properties";
x3::rule<class geometry_tag, mapnik::topojson::geometry> const geometry = "Geometry";
x3::rule<class geometry_collection_tag, std::vector<mapnik::topojson::geometry>> const geometry_collection = "Geometry Collection";
x3::rule<class geometry_tuple_tag,
std::tuple<int,
coordinates_type,
arcs_type,
mapnik::topojson::properties>> const geometry_tuple = "Geometry Tuple";
x3::rule<class coordinate_tag, mapnik::topojson::coordinate> const coordinate = "Coordinate";
x3::rule<class coordinates_tag, coordinates_type> const coordinates = "Coordinates";
x3::rule<class arc_tag, mapnik::topojson::arc> const arc = "Arc";
x3::rule<class arcs_tag, std::vector<mapnik::topojson::arc>> const arcs = "Arcs";
x3::rule<class ring_type, std::vector<index_type>> const ring = "Ring";
x3::rule<class rings_type, std::vector<std::vector<index_type>>> const rings = "Rings";
x3::rule<class rings_array_type, arcs_type> const rings_array = "Rings Array";

// defs
auto const topology_def = lit('{') >
-(((lit("\"type\"") > lit(':') > lit("\"Topology\""))
|
bbox[assign_bbox]
|
transform[assign_transform]
|
objects[assign_objects]
|
arcs[assign_arcs]) % lit(','))
> lit('}')
;


auto const transform_def = lit("\"transform\"") > lit(':') > lit('{')
} const topojson_geometry_type = {};

MAPNIK_SPIRIT_LOCAL_RULE(transform, topojson::transform)
= lit("\"transform\"") > ':' > '{'
> lit("\"scale\"") > lit(':')
> lit('[')
> double_ > lit(',')
Expand All @@ -353,91 +319,123 @@ auto const transform_def = lit("\"transform\"") > lit(':') > lit('{')
> lit('}')
;

auto const bbox_def = lit("\"bbox\"") > lit(':')
MAPNIK_SPIRIT_LOCAL_RULE(bbox, topojson::bounding_box)
= lit("\"bbox\"") > ':'
> lit('[') > double_ > lit(',') > double_
> lit(',') > double_ > lit(',') > double_
> lit(']')
;

MAPNIK_SPIRIT_LOCAL_RULE(position, topojson::coordinate)
= '['
> double_ > ',' > double_
> *(',' > omit[double_])
> ']'
;

// A topology must have an “objects” member whose value is an object.
// This object may have any number of members, whose value must be a geometry object.
auto const objects_def = lit("\"objects\"") > lit(':')
> lit('{')
> -((omit[json_string] > ':' > ( geometry_collection[push_collection]
| geometry[push_geometry]
)) % ',')
> lit('}')
// A MultiPoint can have no points.
MAPNIK_SPIRIT_LOCAL_RULE(positions, topojson::position_array)
= '[' >> -(position % ',') >> ']'
;

// A MultiLineString or MultiPolygon can have no components.
MAPNIK_SPIRIT_LOCAL_RULE(empty_array, topojson::empty)
= lit('[') >> ']'
;

MAPNIK_SPIRIT_LOCAL_RULE(line_indices, topojson::index_array)
= '[' >> (int_ % ',') >> ']'
;

MAPNIK_SPIRIT_LOCAL_RULE(poly_indices, topojson::index_array2)
= '[' >> (line_indices % ',') >> ']'
;

MAPNIK_SPIRIT_LOCAL_RULE(mpoly_indices, topojson::index_array3)
= '[' >> (poly_indices % ',') >> ']'
;

MAPNIK_SPIRIT_LOCAL_RULE(rings_array, arcs_type)
= empty_array
| line_indices
| poly_indices
| mpoly_indices
;

MAPNIK_SPIRIT_LOCAL_RULE(property, topojson::property)
= json_string[assign_prop_name] > ':' > json_value[assign_prop_value]
;

MAPNIK_SPIRIT_LOCAL_RULE(properties, topojson::properties)
= '{' > -(property % ',') > '}'
;

auto const geometry_tuple_def =
MAPNIK_SPIRIT_LOCAL_RULE(geometry_tuple,
std::tuple<int,
coordinates_type,
arcs_type,
topojson::properties>)
=
((lit("\"type\"") > lit(':') > topojson_geometry_type[assign_geometry_type])
|
(lit("\"coordinates\"") > lit(':') > coordinates[assign_coordinates])
(lit("\"coordinates\"") > ':' > ( positions[assign_coordinates]
| position[assign_coordinates]
))
|
(lit("\"arcs\"") > lit(':') > rings_array[assign_rings])
|
properties[assign_properties]
(lit("\"properties\"") > ':' > properties[assign_properties])
|
(omit[json_string] > lit(':') > omit[json_value])) % lit(',')
;

auto const geometry_def = lit("{") > geometry_tuple[create_geometry] > lit("}");

auto const geometry_collection_def = (lit('{') >> lit("\"type\"") >> lit(':') >> lit("\"GeometryCollection\"") >> -omit[lit(',') >> bbox])
> lit(',') > lit("\"geometries\"") > lit(':')
> lit('[')
> -(geometry[push_geometry] % lit(','))
> lit(']')
> lit('}')
MAPNIK_SPIRIT_LOCAL_RULE(geometry, topojson::geometry)
= '{' > geometry_tuple[create_geometry] > '}'
;


auto const ring_def = lit('[') >> (int_ % lit(',')) >> lit(']')
;
auto const rings_def = lit('[') >> (ring % lit(',')) >> lit(']')
MAPNIK_SPIRIT_LOCAL_RULE(geometry_collection, std::vector<topojson::geometry>)
= '{'
// FIXME "type" need not be the first key, but if we allow it later,
// we'll have to check (after the closing '}') that the object
// had "type" : "GeometryCollection", and fail otherwise
>> (lit("\"type\"") >> ':' >> "\"GeometryCollection\"")
>> *(',' > ( (lit("\"geometries\"") > ':'
> '[' > -(geometry[push_geometry] % ',') > ']')
| (omit[json_string] > ':' > omit[json_value])
))
>> '}'
;
auto const rings_array_def = (lit('[') >> (rings % lit(',')) >> lit(']'))
|
rings
|
ring

// A topology must have an "objects" member whose value is an object.
// This object may have any number of members, whose value must be a geometry object.
MAPNIK_SPIRIT_LOCAL_RULE(objects, std::vector<topojson::geometry>)
= lit("\"objects\"") > ':'
> '{'
> -((omit[json_string] > ':' > ( geometry_collection[push_collection]
| geometry[push_geometry]
)) % ',')
> '}'
;

auto const property_def = json_string[assign_prop_name] > lit(':') > json_value[assign_prop_value]
// Each arc must be an array of two or more positions.
MAPNIK_SPIRIT_LOCAL_RULE(arc, topojson::arc)
= '[' >> (position % ',') >> ']'
;

auto const properties_def = lit("\"properties\"")
> lit(':')
> lit('{') > (property % lit(',')) > lit('}')
MAPNIK_SPIRIT_LOCAL_RULE(arcs, std::vector<topojson::arc>)
= lit("\"arcs\"") > ':' > '[' > -(arc % ',') > ']'
;

auto const arcs_def = lit("\"arcs\"") >> lit(':') >> lit('[') >> -( arc % lit(',')) >> lit(']') ;

auto const arc_def = lit('[') >> -(coordinate % lit(',')) >> lit(']') ;

auto const coordinate_def = lit('[') >> double_ >> lit(',') >> double_ >> omit[*(lit(',') >> double_)] >> lit(']');

auto const coordinates_def = (lit('[') >> coordinate % lit(',') >> lit(']')) | coordinate;

BOOST_SPIRIT_DEFINE(
topology,
transform,
bbox,
objects,
geometry_tuple,
geometry,
geometry_collection,
ring,
rings,
rings_array,
property,
properties,
arcs,
arc,
coordinate,
coordinates
);
MAPNIK_SPIRIT_EXTERN_RULE_DEF(start_rule)
= '{'
> -(( (lit("\"type\"") > ':' > "\"Topology\"")
| bbox[assign_bbox]
| transform[assign_transform]
| objects[assign_objects]
| arcs[assign_arcs]
) % ',')
> '}'
;

}}}

Expand Down
4 changes: 2 additions & 2 deletions include/mapnik/json/topojson_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ struct bounding_box_visitor
bool first = true;
if (num_arcs_ > 0)
{
for (auto index : line.rings)
for (auto index : line.arcs)
{
index_type arc_index = index < 0 ? std::abs(index) - 1 : index;
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
Expand Down Expand Up @@ -327,7 +327,7 @@ struct feature_generator
{
mapnik::geometry::line_string<double> line_string;

for (auto index : line.rings)
for (auto index : line.arcs)
{
index_type arc_index = index < 0 ? std::abs(index) - 1 : index;
if (arc_index >= 0 && arc_index < static_cast<int>(num_arcs_))
Expand Down
Loading