matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix: Allow second to be missing

Browse source
This commit is contained in:
Matthias Beyer 2018-04-28 23:16:10 +02:00
parent 5870fa0785
commit f493b4b8c3
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bin/core/imag-gps/src/main.rs
View file

@ -94,21 +94,35 @@ fn add(rt: &Runtime) {
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);
let c = { let c = {
let parse = |value: &str| -> Vec<i8> { let parse = |value: &str| -> (i32, i32, i32) {
value.split(".") debug!("Parsing '{}' into degree, minute and second", value);
let ary = value.split(".")
.map(|v| {debug!("Parsing = {}", v); v})
.map(FromStr::from_str) .map(FromStr::from_str)
.map(|elem| { .map(|elem| {
elem.or_else(|_| Err(GE::from(GEK::NumberConversionError))) elem.or_else(|_| Err(GE::from(GEK::NumberConversionError)))
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
}) })
.collect::<Vec<i8>>() .collect::<Vec<i32>>();
let degree = ary.get(0).unwrap_or_else(|| {
error!("Degree missing. This value is required.");
exit(1)
});
let minute = ary.get(1).unwrap_or_else(|| {
error!("Degree missing. This value is required.");
exit(1)
});
let second = ary.get(2).unwrap_or(&0);
(*degree, *minute, *second)
}; };
let long = parse(scmd.value_of("longitude").unwrap()); // unwrap safed by clap let long = parse(scmd.value_of("longitude").unwrap()); // unwrap safed by clap
let lati = parse(scmd.value_of("latitude").unwrap()); // unwrap safed by clap let lati = parse(scmd.value_of("latitude").unwrap()); // unwrap safed by clap
let long = GPSValue::new(long[0], long[1], long[2]); let long = GPSValue::new(long.0, long.1, long.2);
let lati = GPSValue::new(lati[0], lati[1], lati[2]); let lati = GPSValue::new(lati.0, lati.1, lati.2);
Coordinates::new(long, lati) Coordinates::new(long, lati)
}; };