Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-22 16:06:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(location): make location on the kml object not optional

Browse Source
This commit is contained in:
dignifiedquire
2019-08-26 21:49:47 +02:00
parent 4ec214b3fc
commit 3f8abd2218
2 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/location.rs
View File

@@ -39,7 +39,7 @@ impl Location {
#[derive(Debug, Clone, Default)]
pub struct Kml {
pub addr: Option<String>,
pub locations: Option<Vec<Location>>,
pub locations: Vec<Location>,
tag: KmlTag,
pub curr: Location,
}
@@ -72,7 +72,7 @@ impl Kml {
reader.trim_text(true);
let mut kml = Kml::new();
kml.locations = Some(Vec::with_capacity(100));
kml.locations = Vec::with_capacity(100);
let mut buf = Vec::new();
@@ -142,9 +142,8 @@ impl Kml {
&& 0. != self.curr.latitude
&& 0. != self.curr.longitude
{
if let Some(ref mut locations) = self.locations {
locations.push(std::mem::replace(&mut self.curr, Location::new()));
}
self.locations
.push(std::mem::replace(&mut self.curr, Location::new()));
}
self.tag = KmlTag::UNDEFINED;
};
@@ -675,7 +674,7 @@ mod tests {
assert!(kml.addr.is_some());
assert_eq!(kml.addr.as_ref().unwrap(), "user@example.org",);
let locations_ref = &kml.locations.as_ref().unwrap();
let locations_ref = &kml.locations;
assert_eq!(locations_ref.len(), 2);
assert!(locations_ref[0].latitude > 53.6f64);