Skip to content

Commit f92671b

Browse files
committed
[wkt] support tabs, newlines and code cleanup
1 parent 6a7224e commit f92671b

File tree

9 files changed

+291
-314
lines changed

9 files changed

+291
-314
lines changed

doc/release_notes.qbk

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[/============================================================================
22
Boost.Geometry (aka GGL, Generic Geometry Library)
33

4-
Copyright (c) 2009-2022 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
4+
Copyright (c) 2009-2023 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
55
Copyright (c) 2009-2017 Bruno Lalande, Paris, France.
66
Copyright (c) 2009-2017 Mateusz Loskot <[email protected]>, London, UK.
77
Copyright (c) 2011-2017 Adam Wulkiewicz, Lodz, Poland.
@@ -19,6 +19,22 @@
1919

2020
[section:release_notes Release Notes]
2121

22+
[/=================]
23+
[heading Boost 1.82]
24+
[/=================]
25+
26+
[*Major improvements]
27+
28+
* [@https://github.com/boostorg/geometry/pull/1045 1045] Support geographic buffer for (multi)linestrings and (multi)polygons
29+
30+
[*Solved issues]
31+
32+
* [@https://github.com/boostorg/geometry/issues/705 705] WKT: allow tabs and new lines
33+
34+
[*Breaking changes]
35+
36+
* The WKT output presentation of an empty polygon is now POLYGON() to make it consistent with other geometries
37+
2238
[/=================]
2339
[heading Boost 1.81]
2440
[/=================]

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Boost.Geometry (aka GGL, Generic Geometry Library)
22

3-
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
3+
// Copyright (c) 2007-2022 Barend Gehrels, Amsterdam, the Netherlands.
44
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
55
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
66

@@ -57,6 +57,20 @@ struct prefix_multipolygon
5757
static inline const char* apply() { return "MULTIPOLYGON"; }
5858
};
5959

60+
struct prefix_segment
61+
{
62+
static inline const char* apply() { return "SEGMENT"; }
63+
};
64+
struct prefix_box
65+
{
66+
static inline const char* apply() { return "BOX"; }
67+
};
68+
struct prefix_geometrycollection
69+
{
70+
static inline const char* apply() { return "GEOMETRYCOLLECTION"; }
71+
};
72+
73+
6074
}} // namespace wkt::impl
6175
#endif
6276

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Boost.Geometry (aka GGL, Generic Geometry Library)
22

3-
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
3+
// Copyright (c) 2007-2022 Barend Gehrels, Amsterdam, the Netherlands.
44
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
55
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
66

@@ -11,46 +11,13 @@
1111
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
1212
// http://www.boost.org/LICENSE_1_0.txt)
1313

14-
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
15-
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
14+
#ifndef BOOST_GEOMETRY_IO_WKT_MULTI_HPP
15+
#define BOOST_GEOMETRY_IO_WKT_MULTI_HPP
1616

1717
#include <boost/geometry/core/tags.hpp>
1818
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
1919

20+
#include <boost/config/pragma_message.hpp>
21+
BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
2022

21-
namespace boost { namespace geometry
22-
{
23-
24-
#ifndef DOXYGEN_NO_DETAIL
25-
namespace detail { namespace wkt
26-
{
27-
28-
struct prefix_null
29-
{
30-
static inline const char* apply() { return ""; }
31-
};
32-
33-
struct prefix_multipoint
34-
{
35-
static inline const char* apply() { return "MULTIPOINT"; }
36-
};
37-
38-
struct prefix_multilinestring
39-
{
40-
static inline const char* apply() { return "MULTILINESTRING"; }
41-
};
42-
43-
struct prefix_multipolygon
44-
{
45-
static inline const char* apply() { return "MULTIPOLYGON"; }
46-
};
47-
48-
49-
50-
}} // namespace wkt::impl
51-
#endif
52-
53-
54-
}} // namespace boost::geometry
55-
56-
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
23+
#endif // BOOST_GEOMETRY_IO_WKT_MULTI_HPP

0 commit comments

Comments
 (0)