Skip to content
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

Add test to reproduce geo_bbox error #147

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add test to reproduce geo_bbox error #147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebb231a
Add test to reproduce geo_bbox error
berkes May 5, 2020
6e3e2b9
WIP: quick implementation to circumvent the bbox issue
berkes May 5, 2020
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
45 changes: 26 additions & 19 deletions src/query/geo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,7 @@ impl IndexedShape {

/// Geo Bounding Box Query
#[derive(Debug, Serialize)]
pub struct GeoBoundingBoxQuery(FieldBasedQuery<GeoBoundingBoxQueryInner, NoOuter>);

#[derive(Debug, Default, Serialize)]
pub struct GeoBoundingBoxQueryInner {
geo_box: GeoBox,
#[serde(skip_serializing_if = "ShouldSkip::should_skip")]
coerce: Option<bool>,
#[serde(skip_serializing_if = "ShouldSkip::should_skip")]
ignore_malformed: Option<bool>,
#[serde(skip_serializing_if = "ShouldSkip::should_skip", rename = "type")]
filter_type: Option<Type>,
}
pub struct GeoBoundingBoxQuery(FieldBasedQuery<GeoBox, NoOuter>);

impl Query {
pub fn build_geo_bounding_box<A, B>(field: A, geo_box: B) -> GeoBoundingBoxQuery
Expand All @@ -149,19 +138,16 @@ impl Query {
{
GeoBoundingBoxQuery(FieldBasedQuery::new(
field.into(),
GeoBoundingBoxQueryInner {
geo_box: geo_box.into(),
..Default::default()
},
geo_box.into(),
NoOuter,
))
}
}

impl GeoBoundingBoxQuery {
add_inner_field!(with_coerce, coerce, bool);
add_inner_field!(with_ignore_malformed, ignore_malformed, bool);
add_inner_field!(with_type, filter_type, Type);
//add_inner_field!(with_coerce, coerce, bool);
//add_inner_field!(with_ignore_malformed, ignore_malformed, bool);
//add_inner_field!(with_type, filter_type, Type);

build!(GeoBoundingBox);
}
Expand Down Expand Up @@ -455,6 +441,27 @@ pub mod tests {
client.refresh().with_indexes(&[index_name]).send().unwrap();
}

#[test]
fn test_geobbox_query() {
let index_name = "test_geobbox_query";
let mut client = make_client();

clean_db(&mut client, index_name);
setup_test_data(&mut client, index_name);

let all_results: SearchResult<GeoTestDocument> = client
.search_query()
.with_indexes(&[index_name])
.with_query(
&Query::build_geo_bounding_box("geojson_field", ((1.1, 1.1), (0.9, 0.9)))
.build(),
)
.send()
.unwrap();
// Only p1 should be returned
assert_eq!(1, all_results.hits.total);
}

#[test]
fn test_geoshape_search_point() {
let index_name = "test_geoshape_search_point";
Expand Down