boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-09 15:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: pass umbrella strategies in rtree spatial predicates

Browse Source
This commit is contained in:
Adam Wulkiewicz 2025-01-16 21:43:20 +01:00
parent 47d398a091
commit cce708e4ba
1 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
include/boost/geometry/index/detail/predicates.hpp
View File

@ -174,9 +174,9 @@ template <>
struct spatial_predicate_call<predicates::contains_tag>
{
template <typename G1, typename G2, typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const&)
static inline bool apply(G1 const& g1, G2 const& g2, S const& s)
{
return geometry::within(g2, g1);
return geometry::within(g2, g1, s);
}
};
@ -184,9 +184,9 @@ template <>
struct spatial_predicate_call<predicates::covered_by_tag>
{
template <typename G1, typename G2, typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const&)
static inline bool apply(G1 const& g1, G2 const& g2, S const& s)
{
return geometry::covered_by(g1, g2);
return geometry::covered_by(g1, g2, s);
}
};
@ -194,9 +194,9 @@ template <>
struct spatial_predicate_call<predicates::covers_tag>
{
template <typename G1, typename G2, typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const&)
static inline bool apply(G1 const& g1, G2 const& g2, S const& s)
{
return geometry::covered_by(g2, g1);
return geometry::covered_by(g2, g1, s);
}
};
@ -204,41 +204,9 @@ template <>
struct spatial_predicate_call<predicates::disjoint_tag>
{
template <typename G1, typename G2, typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const&)
{
return geometry::disjoint(g1, g2);
}
};
// TEMP: used to implement CS-specific intersects predicate for certain
// combinations of geometries until umbrella strategies are implemented
template
<
typename G1, typename G2,
typename Tag1 = tag_t<G1>,
typename Tag2 = tag_t<G2>
>
struct spatial_predicate_intersects
{
template <typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const&)
{
return geometry::intersects(g1, g2);
}
};
// TEMP: used in within and relate
template <typename G1, typename G2>
struct spatial_predicate_intersects<G1, G2, box_tag, point_tag>
{
static inline bool apply(G1 const& g1, G2 const& g2, default_strategy const&)
{
return geometry::intersects(g1, g2);
}
template <typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const& s)
{
return geometry::intersects(g1, g2, s);
return geometry::disjoint(g1, g2, s);
}
};
@ -248,7 +216,7 @@ struct spatial_predicate_call<predicates::intersects_tag>
template <typename G1, typename G2, typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const& s)
{
return spatial_predicate_intersects<G1, G2>::apply(g1, g2, s);
return geometry::intersects(g1, g2, s);
}
};
@ -256,9 +224,9 @@ template <>
struct spatial_predicate_call<predicates::overlaps_tag>
{
template <typename G1, typename G2, typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const&)
static inline bool apply(G1 const& g1, G2 const& g2, S const& s)
{
return geometry::overlaps(g1, g2);
return geometry::overlaps(g1, g2, s);
}
};
@ -266,9 +234,9 @@ template <>
struct spatial_predicate_call<predicates::touches_tag>
{
template <typename G1, typename G2, typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const&)
static inline bool apply(G1 const& g1, G2 const& g2, S const& s)
{
return geometry::touches(g1, g2);
return geometry::touches(g1, g2, s);
}
};
@ -276,9 +244,9 @@ template <>
struct spatial_predicate_call<predicates::within_tag>
{
template <typename G1, typename G2, typename S>
static inline bool apply(G1 const& g1, G2 const& g2, S const&)
static inline bool apply(G1 const& g1, G2 const& g2, S const& s)
{
return geometry::within(g1, g2);
return geometry::within(g1, g2, s);
}
};