Symmetrizing read/write wkt

doc/imports.qbk

@@ -153,6 +153,8 @@
 [import src/examples/io/svg.cpp]
 [import src/examples/io/wkt.cpp]
 [import src/examples/io/read_wkt.cpp]
+[import src/examples/io/to_wkt.cpp]
+[import src/examples/io/from_wkt.cpp]
 
 [import src/examples/strategies/buffer_join_round.cpp]
 [import src/examples/strategies/buffer_join_miter.cpp]

doc/quickref.xml

@@ -715,6 +715,8 @@
     <simplelist type="vert" columns="1">
      <member><link linkend="geometry.reference.io.wkt.read_wkt">read_wkt</link></member>
      <member><link linkend="geometry.reference.io.wkt.wkt">wkt</link></member>
+     <member><link linkend="geometry.reference.io.wkt.to_wkt">to_wkt</link></member>
+     <member><link linkend="geometry.reference.io.wkt.from_wkt">from_wkt</link></member>
     </simplelist>
    </entry>
    <entry valign="top">

doc/reference/io/from_wkt.qbk

@@ -0,0 +1,23 @@
+[/============================================================================
+  Boost.Geometry (aka GGL, Generic Geometry Library)
+
+  Copyright (c) 2020 Baidyanath Kundu, Haldia, India.
+
+  Use, modification and distribution is subject to the Boost Software License,
+  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+  http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================/]
+
+[heading Conformance]
+Other libraries refer to this functionality as [*ST_GeomFromText] or [*STGeomFromText].
+That is not done here because Boost.Geometry support more text formats. The name GeomFromText
+is reserved for future usage, which will then have an indication of the used text format.
+
+
+[heading Example]
+[from_wkt]
+
+[heading See also]
+* [link geometry.reference.io.wkt.wkt WKT streaming manipulator]
+* [link geometry.reference.io.wkt.read_wkt Read WKT]
+* [link geometry.reference.io.wkt.to_wkt To WKT]

doc/reference/io/read_wkt.qbk

@@ -19,4 +19,6 @@ is reserved for future usage, which will then have an indication of the used tex
 [read_wkt]
 
 [heading See also]
+* [link geometry.reference.io.wkt.from_wkt From WKT]
+* [link geometry.reference.io.wkt.to_wkt To WKT]
 * [link geometry.reference.io.wkt.wkt WKT streaming manipulator]

doc/reference/io/to_wkt.qbk

@@ -0,0 +1,25 @@
+[/============================================================================
+  Boost.Geometry (aka GGL, Generic Geometry Library)
+
+  Copyright (c) 2009-2014 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2020 Baidyanath Kundu, Haldia, India.
+
+  Use, modification and distribution is subject to the Boost Software License,
+  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+  http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================/]
+
+[def __this_function__ to_wkt]
+
+[heading_conformance_ogc __this_function__..AsText]
+[note __this_function__ is not named "AsText" or "as_text" because Boost.Geometry 
+also supports other textformats (svg, dsv)]
+
+[heading Example]
+[to_wkt]
+[to_wkt_output]
+
+[heading See also]
+* [link geometry.reference.io.wkt.read_wkt Read WKT]
+* [link geometry.reference.io.wkt.from_wkt From WKT]
+* [link geometry.reference.io.wkt.wkt WKT streaming manipulator]

doc/reference/io/wkt.qbk

@@ -20,3 +20,5 @@ also supports other textformats (svg, dsv)]
 
 [heading See also]
 * [link geometry.reference.io.wkt.read_wkt Read WKT]
+* [link geometry.reference.io.wkt.from_wkt From WKT]
+* [link geometry.reference.io.wkt.from_wkt To WKT]

doc/src/examples/io/Jamfile

@@ -17,3 +17,5 @@ project boost-geometry-doc-example-io
 exe svg : svg.cpp ;
 exe wkt : wkt.cpp ;
 exe read_wkt : read_wkt.cpp ;
+exe to_wkt : to_wkt.cpp ;
+exe from_wkt : from_wkt.cpp ;

doc/src/examples/io/from_wkt.cpp

@@ -0,0 +1,36 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// QuickBook Example
+
+// Copyright (c) 2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2020 Baidyanath Kundu, Haldia, India.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//[from_wkt
+//` Shows the usage of from_wkt
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+int main()
+{
+    using point_type = boost::geometry::model::d2::point_xy<double>;
+    using box_type = boost::geometry::model::box<point_type>;
+    using segment_type = boost::geometry::model::segment<point_type>;
+    using polygon_type = boost::geometry::model::polygon<point_type>;
+    using linestring_type = boost::geometry::model::linestring<point_type>;
+
+    auto const a = boost::geometry::from_wkt<point_type>("POINT(1 2)");
+    auto const d = boost::geometry::from_wkt<box_type>("BOX(0 0,3 3)");
+    auto const e = boost::geometry::from_wkt<segment_type>("SEGMENT(1 0,3 4)");
+    auto const c = boost::geometry::from_wkt<polygon_type>("POLYGON((0 0,0 7,4 2,2 0,0 0))");
+    auto const b = boost::geometry::from_wkt<linestring_type>("LINESTRING(0 0,2 2,3 1)");
+
+    return 0;
+}
+
+//]

doc/src/examples/io/to_wkt.cpp

@@ -0,0 +1,64 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// QuickBook Example
+
+// Copyright (c) 2020 Baidyanath Kundu, Haldia, India.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//[to_wkt
+//` Shows the usage of to_wkt
+
+#include <iostream>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+int main()
+{
+    namespace geom = boost::geometry;
+    typedef geom::model::d2::point_xy<double> point_type;
+
+    point_type point = geom::make<point_type>(3, 2);
+    geom::model::polygon<point_type> polygon;
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(0, 0));
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(0, 4));
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(4, 4));
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(4, 0));
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(0, 0));
+
+    std::cout << boost::geometry::to_wkt(point) << std::endl;
+    std::cout << boost::geometry::to_wkt(polygon) << std::endl;
+
+    point_type point_frac = geom::make<point_type>(3.141592654, 27.18281828);
+    geom::model::polygon<point_type> polygon_frac;
+    geom::append(geom::exterior_ring(polygon_frac), geom::make<point_type>(0.00000, 0.00000));
+    geom::append(geom::exterior_ring(polygon_frac), geom::make<point_type>(0.00000, 4.00001));
+    geom::append(geom::exterior_ring(polygon_frac), geom::make<point_type>(4.00001, 4.00001));
+    geom::append(geom::exterior_ring(polygon_frac), geom::make<point_type>(4.00001, 0.00000));
+    geom::append(geom::exterior_ring(polygon_frac), geom::make<point_type>(0.00000, 0.00000));
+
+    std::cout << boost::geometry::to_wkt(point_frac, 3) << std::endl;
+    std::cout << boost::geometry::to_wkt(polygon_frac, 3) << std::endl;
+
+    return 0;
+}
+
+//]
+
+
+//[to_wkt_output
+/*`
+Output:
+[pre
+POINT(3 2)
+POLYGON((0 0,0 4,4 4,4 0,0 0))
+POINT(3.14 27.2)
+POLYGON((0 0,0 4,4 4,4 0,0 0))
+]
+
+
+*/
+//]

doc/src/examples/io/wkt.cpp

@@ -42,7 +42,9 @@ int main()
 /*`
 Output:
 [pre
-POINT(3 6)
+POINT(3 2)
+POLYGON((0 0,0 4,4 4,4 0,0 0))
+POINT(3.14 27.2)
 POLYGON((0 0,0 4,4 4,4 0,0 0))
 ]
 

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

@@ -4,6 +4,7 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2020 Baidyanath Kundu, Haldia, India
 
 // This file was modified by Oracle on 2014-2020.
 // Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
@@ -907,6 +908,23 @@ inline void read_wkt(std::string const& wkt, Geometry& geometry)
     dispatch::read_wkt<typename tag<Geometry>::type, Geometry>::apply(wkt, geometry);
 }
 
+/*!
+\brief Parses OGC Well-Known Text (\ref WKT) into a geometry (any geometry) and returns it
+\ingroup wkt
+\tparam Geometry \tparam_geometry
+\param wkt string containing \ref WKT
+\ingroup wkt
+\qbk{[include reference/io/from_wkt.qbk]}
+*/
+template <typename Geometry>
+inline Geometry from_wkt(std::string const& wkt)
+{
+    Geometry geometry;
+    geometry::concepts::check<Geometry>();
+    dispatch::read_wkt<typename tag<Geometry>::type, Geometry>::apply(wkt, geometry);
+    return geometry;
+}
+
 }} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_IO_WKT_READ_HPP

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

@@ -4,6 +4,7 @@
 // Copyright (c) 2008-2017 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2017 Mateusz Loskot, London, UK.
 // Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2020 Baidyanath Kundu, Haldia, India.
 
 // This file was modified by Oracle on 2015-2020.
 // Modifications copyright (c) 2015-2020, Oracle and/or its affiliates.
@@ -554,6 +555,31 @@ inline wkt_manipulator<Geometry> wkt(Geometry const& geometry)
     return wkt_manipulator<Geometry>(geometry);
 }
 
+/*!
+\brief WKT-string formulating function
+\tparam Geometry \tparam_geometry
+\param geometry \param_geometry
+\param significant_digits Specifies the no of significant digits to use in the output wkt
+\ingroup wkt
+\qbk{[include reference/io/to_wkt.qbk]}
+*/
+template <typename Geometry>
+inline std::string to_wkt(Geometry const& geometry)
+{
+    std::stringstream ss;
+    ss << boost::geometry::wkt(geometry);
+    return ss.str();
+}
+
+template <typename Geometry>
+inline std::string to_wkt(Geometry const& geometry, int significant_digits)
+{
+    std::stringstream ss;
+    ss.precision(significant_digits);
+    ss << boost::geometry::wkt(geometry);
+    return ss.str();
+}
+
 #if defined(_MSC_VER)
 #pragma warning(pop)  
 #endif