Defined a geometry for polyhedron

example/01_point_example.cpp

@@ -115,18 +115,22 @@ int main()
  poly_t polyhedron2 = {{{0,0,0}, {0, 1, 0}, {1, 1, 0}, {1, 0, 0}, {0, 0, 0}}, {{0, 0, 0}, {0, 1, 0}, {0, 1, 1}, {0, 0, 1}, {0, 0, 0}},
  {{0, 0, 0}, {1, 0, 0}, {1, 0, 1}, {0, 0, 1}, {0, 0, 0}}, {{1, 1, 1}, {1, 0, 1}, {0, 0, 1}, {0, 1, 1}, {1, 1, 1}}, {{1, 1, 1}, {1, 0, 1}, {1, 0, 0}, {1, 1, 0}, {1, 1, 1}}, 
  {{1, 1, 1}, {1, 1, 0}, {0, 1, 0}, {0, 1, 1}, {1, 1, 1}} };
+
+ std::cout<<wkt(polyhedron2)<<std::endl;
 
  //append(polyhedron1[0], point_t{1, 0, 0});
  //append(polyhedron1[0], point_t{0, 0, 0});
  //append(polyhedron1[0], point_t{0, 1, 0});
  //append(polyhedron1[0], point_t{1, 1, 0});
  //append(polyhedron1[0], point_t{0, 0, 0});
- read_wkt("POLYHEDRALSURFACE Z(((0 0 0, 0 1 0, 1 1 0, 1 0 0, 0 0 0)), ((0 0 0, 0 1 0, 0 1 1, 0 0 1, 0 0 0)), ((0 0 0, 1 0 0, 1 0 1, 0 0 1, 0 0 0)), ((1 1 1, 1 0 1, 0 0 1, 0 1 1, 1 1 1)), ((1 1 1, 1 0 1, 1 0 0, 1 1 0, 1 1 1)), ((1 1 1, 1 1 0, 0 1 0, 0 1 1, 1 1 1)))", polyhedron1);
+ read_wkt("POLYHEDRALSURFACE(((0 0 0, 0 1 0, 1 1 0, 1 0 0, 0 0 0)),((0 0 0, 0 1 0, 0 1 1, 0 0 1, 0 0 0)),((0 0 0, 1 0 0, 1 0 1, 0 0 1, 0 0 0)),((1 1 1, 1 0 1, 0 0 1, 0 1 1, 1 1 1)),((1 1 1, 1 0 1, 1 0 0, 1 1 0, 1 1 1)),((1 1 1, 1 1 0, 0 1 0, 0 1 1, 1 1 1)))", polyhedron1);
+
+ std::cout<<wkt(polyhedron1)<<std::endl;
 
  typedef model::polygon<point_2d> poly;
  poly polygon1;
  read_wkt("POLYGON((0 0, 0 7, 4 2, 2 0, 0 0))", polygon1); 
-
+ std::cout<<wkt(polygon1)<<std::endl;
  typedef model::linestring<point_2d> lines;
  lines line;
  read_wkt("LINESTRING(0 0, 2 2, 3 1)", line);

include/boost/geometry/geometries/concepts/PolyhedralSurface_concept.hpp

@@ -32,6 +32,28 @@ class PolyhedralSurface
 
 };
 
+//polyhedral surface(constant version)
+template <typename Geometry>
+class ConstPolyhedral
+{
+#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
+
+ typedef typename std::remove_const<Geometry>::type const_polyhedral_type;
+
+ typedef typename ring_type<const_polyhedral_type>::type ring_type;
+
+ BOOST_CONCEPT_ASSERT( (concepts::ConstRing<ring_type>) );
+
+public:
+
+ BOOST_CONCEPT_USAGE(ConstPolyhedral)
+ {
+
+ }
+
+#endif
+};
+
 } // namepspace concepts
 
 } // namespace geometry

include/boost/geometry/geometries/concepts/check.hpp

@@ -126,6 +126,11 @@ struct check<Geometry, polyhedral_surface_tag, false>
  : detail::concept_check::check<concepts::PolyhedralSurface<Geometry> >
 {};
 
+template <typename Geometry>
+struct check<Geometry, polyhedral_surface_tag, true>
+ : detail::concept_check::check<concepts::ConstPolyhedral<Geometry> >
+{};
+
 template <typename Geometry>
 struct check<Geometry, box_tag, true>
  : detail::concept_check::check<concepts::ConstBox<Geometry> >

include/boost/geometry/io/wkt/detail/prefix.hpp

@@ -44,7 +44,7 @@ struct prefix_linestring
 
 struct prefix_polyhedral_surface
 {
- static inline const char* apply() { return "POLYHEDRALSURFACE Z"; }
+ static inline const char* apply() { return "POLYHEDRALSURFACE"; }
 };
 
 struct prefix_multipoint

include/boost/geometry/io/wkt/read.hpp

@@ -465,12 +465,23 @@ struct polyhderal_surface_parser
  PolyhedralSurface& Poly)
  {
  handle_open_parenthesis(it, end, wkt);
- typename ring_type<PolyhedralSurface>::type ring;
  while(it != end && *it != ")"){
+ handle_open_parenthesis(it, end, wkt);
+
+ typename ring_type<PolyhedralSurface>::type ring;
+
  appender::apply(it, end, wkt, ring);
+ traits::push_back
+ <
+ typename std::remove_reference
+ <
+ PolyhedralSurface
+ >::type
+ >::apply(Poly, ring);
+ handle_close_parenthesis(it, end, wkt);
  if(it!=end && *it == ",")
  {
- //skip after ring is parsed
+ //skip "," after ring is parsed
  ++it;
  }
 
@@ -549,6 +560,7 @@ inline bool initialize(tokenizer const& tokens,
  it = tokens.begin();
  end = tokens.end();
 
+ //std::cout<<*it<<" "<<geometry_name<<std::endl;
  if (it == end || ! boost::iequals(*it++, geometry_name))
  {
  BOOST_THROW_EXCEPTION(read_wkt_exception(std::string("Should start with '") + geometry_name + "'", wkt));

include/boost/geometry/io/wkt/write.hpp

@@ -235,6 +235,35 @@ struct wkt_poly
 
 };
 
+template <typename Polyhedral_surface, typename PrefixPolicy>
+struct wkt_polyhedral
+{
+ template <typename Char, typename Traits>
+ static inline void apply(std::basic_ostream<Char, Traits>& os, 
+ Polyhedral_surface const& polyhedral, bool force_closure)
+ {
+ typedef typename std::remove_const<Polyhedral_surface>::type const_polyhedral_type;
+ typedef typename ring_type<const_polyhedral_type>::type ring;
+
+ os << PrefixPolicy::apply();
+
+ os << "(";
+ for( typename boost::range_iterator<Polyhedral_surface const>::type 
+ it = boost::begin(polyhedral); it != boost::end(polyhedral); ++it)
+ {
+ if(it != boost::begin(polyhedral))
+ {
+ os << ",";
+ }
+ os << "(";
+
+ wkt_sequence<ring>::apply(os, *it, force_closure);
+ os << ")";
+ }
+ os << ")";
+ }
+};
+
 template <typename Multi, typename StreamPolicy, typename PrefixPolicy>
 struct wkt_multi
 {
@@ -409,6 +438,15 @@ struct wkt<Polygon, polygon_tag>
  >
 {};
 
+template <typename Polyhedral_surface>
+struct wkt<Polyhedral_surface, polyhedral_surface_tag>
+ : detail::wkt::wkt_polyhedral
+ <
+ Polyhedral_surface,
+ detail::wkt::prefix_polyhedral_surface
+ >
+{};
+
 template <typename Multi>
 struct wkt<Multi, multi_point_tag>
  : detail::wkt::wkt_multi