Merge pull request #3 from Siddharth-coder13/revert-2-3d-geometries

Revert "Polyhedral read feature"

Author: Siddharth-coder13

example/01_point_example.cpp

@@ -107,29 +107,6 @@ int main()
 
 
     // Some ways of getting point values
-    typedef model::point<double, 3, cs::cartesian> point_t;
-    typedef model::ring<point_t> ring_t;
-    typedef model::PolyhedralSurface<ring_t> poly_t;
-
-    poly_t polyhedron1;
-    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}} };
-
-    //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);
-
-    typedef model::polygon<point_2d> poly;
-    poly polygon1;
-    read_wkt("POLYGON((0 0, 0 7, 4 2, 2 0, 0 0))", polygon1); 
-
-    typedef model::linestring<point_2d> lines;
-    lines line;
-    read_wkt("LINESTRING(0 0, 2 2, 3 1)", line);
 
     // 1: using the "get" function following the concepts behind
     std::cout << get<0>(p2) << "," << get<1>(p2) << std::endl;

include/boost/geometry/algorithms/clear.hpp

@@ -123,11 +123,6 @@ 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>

include/boost/geometry/core/point_type.hpp

@@ -92,16 +92,6 @@ struct point_type<ring_tag, Ring>
     typedef typename boost::range_value<Ring>::type type;
 };
 
-// Specialization for PolyhedralSurface: the point-type is the point-type of its rings
-template <typename PolyhedralSurface>
-struct point_type<polyhedral_surface_tag, PolyhedralSurface>
-{
-    typedef typename point_type
-        <
-            ring_tag,
-            typename ring_type<polyhedral_surface_tag, PolyhedralSurface>::type
-        >::type type;
-};
 
 // Specialization for polygon: the point-type is the point-type of its rings
 template <typename Polygon>

include/boost/geometry/core/ring_type.hpp

@@ -23,6 +23,7 @@
 #include <type_traits>
 
 #include <boost/range/value_type.hpp>
+
 #include <boost/geometry/core/static_assert.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
@@ -60,13 +61,6 @@ struct ring_mutable_type
         Geometry);
 };
 
-template <typename Geometry>
-struct Poly_ring_type
-{
-    BOOST_GEOMETRY_STATIC_ASSERT_FALSE(
-        "Not implemented for this Geometry type.",
-        Geometry);
-};
 
 } // namespace traits
 
@@ -93,11 +87,6 @@ struct ring_return_type<ring_tag, Ring>
     typedef Ring& type;
 };
 
-template <typename PolyhedralSurface>
-struct ring_return_type<polyhedral_surface_tag, PolyhedralSurface>
-{
-    typedef typename traits::Poly_ring_type<PolyhedralSurface>::type type;
-};
 
 template <typename Polygon>
 struct ring_return_type<polygon_tag, Polygon>
@@ -156,15 +145,6 @@ struct ring_type<ring_tag, Ring>
     typedef Ring type;
 };
 
-template <typename PolyhedralSurface>
-struct ring_type<polyhedral_surface_tag, PolyhedralSurface>
-{
-    typedef typename std::remove_reference
-        <
-            typename ring_return_type<polyhedral_surface_tag, PolyhedralSurface>::type
-        >::type type;
-};
-
 
 template <typename Polygon>
 struct ring_type<polygon_tag, Polygon>

include/boost/geometry/core/tags.hpp

@@ -105,9 +105,6 @@ struct box_tag : single_tag, areal_tag {};
 /// Convenience segment (2-points) identifying tag
 struct segment_tag : single_tag, linear_tag {};
 
-/// OGC Polyhedral surface identifying tag
-struct polyhedral_surface_tag : single_tag, volumetric_tag {};
-
 
 /// OGC Multi point identifying tag
 struct multi_point_tag : multi_tag, pointlike_tag  {};

include/boost/geometry/geometries/PolyhedralSurface.hpp

@@ -39,7 +39,7 @@
 #include <boost/geometry/geometries/concepts/polygon_concept.hpp>
 #include <boost/geometry/geometries/concepts/ring_concept.hpp>
 #include <boost/geometry/geometries/concepts/segment_concept.hpp>
-#include <boost/geometry/geometries/concepts/PolyhedralSurface_concept.hpp>
+
 #include <boost/geometry/algorithms/not_implemented.hpp>
 
 namespace boost { namespace geometry
@@ -121,10 +121,6 @@ struct check<Geometry, polygon_tag, false>
     : detail::concept_check::check<concepts::Polygon<Geometry> >
 {};
 
-template <typename Geometry>
-struct check<Geometry, polyhedral_surface_tag, false>
-    : detail::concept_check::check<concepts::PolyhedralSurface<Geometry> >
-{};
 
 template <typename Geometry>
 struct check<Geometry, box_tag, true>

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

@@ -29,6 +29,5 @@
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/segment.hpp>
-#include <boost/geometry/geometries/PolyhedralSurface.hpp>
 
 #endif // BOOST_GEOMETRY_GEOMETRIES_HPP

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

@@ -47,11 +47,6 @@ struct prefix_linestring
     static inline const char* apply() { return "LINESTRING"; }
 };
 
-struct prefix_polyhedral_surface
-{
-	static inline const char* apply() { return "POLYHEDRALSURFACE Z"; }
-};
-
 struct prefix_multipoint
 {
     static inline const char* apply() { return "MULTIPOINT"; }

include/boost/geometry/geometries/geometries.hpp

@@ -453,32 +453,6 @@ struct polygon_parser
     }
 };
 
-template<typename PolyhedralSurface>
-struct polyhderal_surface_parser
-{
-    typedef typename ring_return_type<PolyhedralSurface>::type ring_return_type;
-    typedef container_appender<ring_return_type> appender;
-
-    static inline void apply(tokenizer::iterator& it,
-                             tokenizer::iterator const& end,
-                             std::string const& wkt,
-                             PolyhedralSurface& Poly)
-    {
-        handle_open_parenthesis(it, end, wkt);
-        typename ring_type<PolyhedralSurface>::type ring;
-        while(it != end && *it != ")"){
-            appender::apply(it, end, wkt, ring);
-            if(it!=end && *it == ",")
-            {
-                //skip after ring is parsed
-                ++it;
-            }
-
-        }
-        handle_close_parenthesis(it, end, wkt);
-    }
-};
-
 
 inline bool one_of(tokenizer::iterator const& it,
                    std::string const& value,
@@ -870,15 +844,6 @@ struct read_wkt<polygon_tag, Geometry>
         >
 {};
 
-template <typename Geometry>
-struct read_wkt<polyhedral_surface_tag, Geometry>
-    : detail::wkt::geometry_parser
-        < 
-            Geometry,
-            detail::wkt::polyhderal_surface_parser,
-            detail::wkt::prefix_polyhedral_surface
-        >
-{};
 
 template <typename MultiGeometry>
 struct read_wkt<multi_point_tag, MultiGeometry>