Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/stdlib/haversine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ impl Function for Haversine {
let longitude2 = arguments.required("longitude2");

let measurement_unit = match arguments
.optional_enum("measurement", &measurement_systems(), state)?
.optional_enum("measurement_unit", &measurement_systems(), state)?
.unwrap_or_else(|| value!("kilometers"))
.try_bytes()
.ok()
Expand All @@ -144,7 +144,7 @@ impl Function for Haversine {
&[
Example {
title: "haversine",
source: "haversine(0, 0, 10, 10)",
source: "haversine(0.0, 0.0, 10.0, 10.0)",
result: Ok(indoc!(
r#"{
"distance": 1568.5227233,
Expand All @@ -154,10 +154,10 @@ impl Function for Haversine {
},
Example {
title: "haversine in miles",
source: r#"haversine(0, 0, 10, 10, "miles")"#,
source: r#"haversine(0.0, 0.0, 10.0, 10.0, measurement_unit: "miles")"#,
result: Ok(indoc!(
r#"{
"distance": 974.6348468
"distance": 974.6348468,
"bearing": 44.561
}"#
)),
Expand Down Expand Up @@ -218,7 +218,7 @@ mod tests {
}

basic_miles {
args: func_args![latitude1: value!(0.0), longitude1: value!(0.0), latitude2: value!(10.0), longitude2: value!(10.0), measurement: value!("miles")],
args: func_args![latitude1: value!(0.0), longitude1: value!(0.0), latitude2: value!(10.0), longitude2: value!(10.0), measurement_unit: value!("miles")],
want: Ok(value!({ "distance": 974.634_846_8, "bearing": 44.561 })),
tdef: TypeDef::object(inner_kind()).infallible(),
}
Expand Down
1 change: 1 addition & 0 deletions src/stdlib/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ pub fn all() -> Vec<Box<dyn Function>> {
Box::new(GetEnvVar),
Box::new(GetHostname),
Box::new(GetTimezoneName),
Box::new(Haversine),
Box::new(Hmac),
Box::new(Includes),
Box::new(Integer),
Expand Down
Loading