Skip to content

Fix inner/outer ring accessor boost::geometry adaptor types/functions #2319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lonvia merged 1 commit into from
Apr 22, 2025
Merged

Fix inner/outer ring accessor boost::geometry adaptor types/functions #2319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/geom-boost-adaptor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,30 @@ struct ring_mutable_type<::geom::polygon_t>
template <>
struct interior_const_type<::geom::polygon_t>
{
using type = std::vector<::geom::ring_t> const;
using type = std::vector<::geom::ring_t> const &;
};
template <>
struct interior_mutable_type<::geom::polygon_t>
{
using type = std::vector<::geom::ring_t>;
using type = std::vector<::geom::ring_t> &;
};

template <>
struct exterior_ring<::geom::polygon_t>
{
// NOLINTNEXTLINE(google-runtime-references)
static auto &get(::geom::polygon_t &p) { return p.outer(); }
static auto &get(::geom::polygon_t const &p) { return p.outer(); }
static auto const &get(::geom::polygon_t const &p) { return p.outer(); }
};

template <>
struct interior_rings<::geom::polygon_t>
{
// NOLINTNEXTLINE(google-runtime-references)
static auto get(::geom::polygon_t &p) { return p.inners(); }
static auto get(::geom::polygon_t const &p) { return p.inners(); }
static auto &get(::geom::polygon_t &p) { return p.inners(); }
static auto const &get(::geom::polygon_t const &p) { return p.inners(); }
};

} // namespace boost::geometry::traits

#endif // OSM2PGSQL_GEOM_BOOST_ADAPTOR_HPP