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

GeoJSON - refactor geometry generator to preserve geometry type in output (ref https://github.com/mapnik/python-mapnik/issues/139)

Browse source
This commit is contained in:
artemp 2017-03-21 16:48:41 +00:00
parent b4b5e33b05
commit 38b4b65911
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,39 +50,54 @@ geometry_generator_grammar<OutputIterator, Geometry>::geometry_generator_grammar
| |
geometry_collection geometry_collection
| |
lit("null") lit("null") // geometry_empty
; ;
point = lit("{\"type\":\"Point\",\"coordinates\":") << point_coord << lit("}") point = lit("{\"type\":\"Point\",\"coordinates\":") << point_coord << lit("}")
; ;
linestring = lit("{\"type\":\"LineString\",\"coordinates\":[") << linestring_coord << lit("]}")
linestring = lit("{\"type\":\"LineString\",\"coordinates\":") << linestring_coord << lit("}")
; ;
polygon = lit("{\"type\":\"Polygon\",\"coordinates\":[") << polygon_coord << lit("]}")
polygon = lit("{\"type\":\"Polygon\",\"coordinates\":") << polygon_coord << lit("}")
; ;
multi_point = lit("{\"type\":\"MultiPoint\",\"coordinates\":[") << multi_point_coord << lit("]}") multi_point = lit("{\"type\":\"MultiPoint\",\"coordinates\":[") << multi_point_coord << lit("]}")
; ;
multi_linestring = lit("{\"type\":\"MultiLineString\",\"coordinates\":[") << multi_linestring_coord << lit("]}") multi_linestring = lit("{\"type\":\"MultiLineString\",\"coordinates\":[") << multi_linestring_coord << lit("]}")
; ;
multi_polygon = lit("{\"type\":\"MultiPolygon\",\"coordinates\":[") << multi_polygon_coord << lit("]}") multi_polygon = lit("{\"type\":\"MultiPolygon\",\"coordinates\":[") << multi_polygon_coord << lit("]}")
; ;
geometry_collection = lit("{\"type\":\"GeometryCollection\",\"geometries\":[") << geometries << lit("]}") geometry_collection = lit("{\"type\":\"GeometryCollection\",\"geometries\":[") << geometries << lit("]}")
; ;
point_coord = lit('[') << coordinate << lit(',') << coordinate << lit(']') point_coord = lit('[') << coordinate << lit(',') << coordinate << lit(']')
; ;
linestring_coord = point_coord % lit(',')
linestring_coord = lit('[') << -(point_coord % lit(',')) << lit(']')
; ;
polygon_coord = lit('[') << exterior_ring_coord << lit(']') << interior_ring_coord
polygon_coord = lit('[') << exterior_ring_coord << interior_ring_coord << lit(']')
; ;
exterior_ring_coord = linestring_coord.alias() exterior_ring_coord = linestring_coord.alias()
; ;
interior_ring_coord = *(lit(",[") << exterior_ring_coord << lit(']'))
interior_ring_coord = *(lit(",") << exterior_ring_coord)
; ;
multi_point_coord = linestring_coord.alias() multi_point_coord = linestring_coord.alias()
; ;
multi_linestring_coord = (lit('[') << linestring_coord << lit(']')) % lit(',')
multi_linestring_coord = lit('[') << linestring_coord % lit(',') << lit(']')
; ;
multi_polygon_coord = (lit('[') << polygon_coord << lit(']')) % lit(',')
multi_polygon_coord = lit('[') << polygon_coord % lit(',') << lit("]")
; ;
geometries = geometry % lit(',') geometries = geometry % lit(',')
; ;
} }