searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-12-25 14:10:06 +01:00
Code Issues Releases Wiki Activity

add a check on the fid in the geosearch

Browse Source
This commit is contained in:
Tamo 2021-10-22 18:08:18 +02:00
parent 3942b3732f
commit c8d03046bf
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,22 +309,32 @@ impl<'a> Filter<'a> {
} }
FilterCondition::Empty => Ok(RoaringBitmap::new()), FilterCondition::Empty => Ok(RoaringBitmap::new()),
FilterCondition::GeoLowerThan { point, radius } => { FilterCondition::GeoLowerThan { point, radius } => {
let base_point = [parse(&point[0])?, parse(&point[1])?]; let filterable_fields = index.fields_ids_map(rtxn)?;
let radius = parse(&radius)?; if filterable_fields.id("_geo").is_some() {
let rtree = match index.geo_rtree(rtxn)? { let base_point = [parse(&point[0])?, parse(&point[1])?];
Some(rtree) => rtree, // TODO TAMO: ensure lat is between -90 and 90
None => return Ok(RoaringBitmap::new()), // TODO TAMO: ensure lng is between -180 and 180
}; let radius = parse(&radius)?;
let rtree = match index.geo_rtree(rtxn)? {
Some(rtree) => rtree,
None => return Ok(RoaringBitmap::new()),
};
let result = rtree let result = rtree
.nearest_neighbor_iter(&base_point) .nearest_neighbor_iter(&base_point)
.take_while(|point| { .take_while(|point| {
distance_between_two_points(&base_point, point.geom()) < radius distance_between_two_points(&base_point, point.geom()) < radius
}) })
.map(|point| point.data) .map(|point| point.data)
.collect(); .collect();
return Ok(result); Ok(result)
} else {
// TODO TAMO: update the error message
return Err(UserError::InvalidFilter {
input: format!("You tried to use _geo in a filter, you probably wanted to use _geoRadius"),
})?;
}
} }
FilterCondition::GeoGreaterThan { point, radius } => { FilterCondition::GeoGreaterThan { point, radius } => {
let result = Self::evaluate( let result = Self::evaluate(
@ -334,7 +344,7 @@ impl<'a> Filter<'a> {
index, index,
)?; )?;
let geo_faceted_doc_ids = index.geo_faceted_documents_ids(rtxn)?; let geo_faceted_doc_ids = index.geo_faceted_documents_ids(rtxn)?;
return Ok(geo_faceted_doc_ids - result); Ok(geo_faceted_doc_ids - result)
} }
} }
} }