snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 00:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

use meters in the filters

Browse Source
This commit is contained in:
Tamo
2021-09-07 12:11:03 +02:00
parent 4f69b190bc
commit e5ef0cad9a
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
milli/src/lib.rs
View File

@ -142,6 +142,14 @@ where
Some((head, tail))
}
/// Return the distance between two points in meters
fn distance_between_two_points(a: &[f64; 2], b: &[f64; 2]) -> f64 {
let a = haversine::Location { latitude: a[0], longitude: a[1] };
let b = haversine::Location { latitude: b[0], longitude: b[1] };
haversine::distance(a, b, haversine::Units::Kilometers) * 1000.
}
#[cfg(test)]
mod tests {
use serde_json::json;

13
milli/src/search/facet/filter_condition.rs
View File

@ -504,17 +504,20 @@ impl FilterCondition {
LowerThan(val) => (Included(f64::MIN), Excluded(*val)),
LowerThanOrEqual(val) => (Included(f64::MIN), Included(*val)),
Between(left, right) => (Included(*left), Included(*right)),
GeoLowerThan(point, distance) => {
GeoLowerThan(base_point, distance) => {
let mut result = RoaringBitmap::new();
let rtree = match index.geo_rtree(rtxn)? {
Some(rtree) => rtree,
None => return Ok(result),
};
let iter = rtree
.nearest_neighbor_iter_with_distance_2(point)
.take_while(|(_, dist)| dist <= distance);
iter.for_each(|(point, _)| drop(result.insert(point.data)));
rtree
.nearest_neighbor_iter(base_point)
.take_while(|point| {
dbg!(crate::distance_between_two_points(base_point, point.geom()))
< *distance
})
.for_each(|point| drop(result.insert(point.data)));
return Ok(result);
}