Added wkt read feature to polyhedral surfaces

boostorg · Feb 1, 2021 · 80442cb · 80442cb
1 parent b347d87
commit 80442cb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 30 deletions.
diff --git a/include/boost/geometry/algorithms/clear.hpp b/include/boost/geometry/algorithms/clear.hpp
@@ -123,6 +123,11 @@ struct clear<Geometry, ring_tag>
  : detail::clear::collection_clear<Geometry>
 {};
 
+// Clear for Polyhedral surface
+template <typename Geometry>
+struct clear<Geometry, polyhedral_surface_tag>
+ : detail::clear::no_action<Geometry>
+{};
 
 // Polygon can (indirectly) use std for clear
 template <typename Polygon>

diff --git a/include/boost/geometry/geometries/PolyhedralSurface.hpp b/include/boost/geometry/geometries/PolyhedralSurface.hpp
@@ -102,28 +102,7 @@ struct Poly_ring_type
  >::ring_type& type;
 };
 
-/*template 
-<
- typename Ring,
- template<typename, typename> class Container,
- template<typename> class Allocator
->
-struct ring_type
-<
- model::PolyhedralSurface
- < 
- Ring,
- Container, Allocator
- >
->
-{
- typedef typename model::PolyhedralSurface
- <
- Ring,
- Container, Allocator
- >::ring_type& type;
 
-};*/
 
 
 } // namespace traits

diff --git a/include/boost/geometry/geometries/concepts/PolyhedralSurface_concept.hpp b/include/boost/geometry/geometries/concepts/PolyhedralSurface_concept.hpp
@@ -27,9 +27,6 @@ class PolyhedralSurface
  BOOST_CONCEPT_USAGE(PolyhedralSurface)
  {
 
- Geometry* polyhedralSurface = 0;
- ring_type* ring = 0;
-
  }
 #endif
 

diff --git a/include/boost/geometry/io/wkt/read.hpp b/include/boost/geometry/io/wkt/read.hpp
@@ -462,13 +462,18 @@ struct polyhderal_surface_parser
  static inline void apply(tokenizer::iterator& it,
  tokenizer::iterator const& end,
  std::string const& wkt,
- PolyhedralSurface& ring)
+ PolyhedralSurface& Poly)
  {
  handle_open_parenthesis(it, end, wkt);
- int i = 0;
+ typename ring_type<PolyhedralSurface>::type ring;
  while(it != end && *it != ")"){
- //appender::apply(it, end, wkt, ring);
- i++;
+ appender::apply(it, end, wkt, ring);
+ if(it!=end && *it == ",")
+ {
+ //skip after ring is parsed
+ ++it;
+ }
+
  }
  handle_close_parenthesis(it, end, wkt);
  }
@@ -584,7 +589,7 @@ struct geometry_parser
 {
  static inline void apply(std::string const& wkt, Geometry& geometry)
  {
- //geometry::clear(geometry);
+ geometry::clear(geometry);
 
  tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
  tokenizer::iterator it, end;
@@ -933,7 +938,7 @@ struct read_wkt<segment_tag, Segment>
 template <typename Geometry>
 inline void read_wkt(std::string const& wkt, Geometry& geometry)
 {
- //geometry::concepts::check<Geometry>();
+ geometry::concepts::check<Geometry>();
  dispatch::read_wkt<typename tag<Geometry>::type, Geometry>::apply(wkt, geometry);
 }