lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exif: Do not display city if more than 100 km away

Browse source 
Display GPS coordiantes instead
This commit is contained in:
Sophie Herold 2022-12-19 19:23:22 +01:00
parent cc52f7a542
commit ec45132a97
1 changed files with 48 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/image_metadata/gps.rs
View file

@ -1,3 +1,5 @@
use crate::i18n::*;
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
pub struct GPSLocation { pub struct GPSLocation {
pub latitude: GPSCoord, pub latitude: GPSCoord,
@ -53,10 +55,24 @@ impl GPSCoord {
} }
fn position_exif(position: &[exif::Rational]) -> Option<(f64, Option<f64>, Option<f64>)> { fn position_exif(position: &[exif::Rational]) -> Option<(f64, Option<f64>, Option<f64>)> {
let (deg, mut min, mut sec) = (position.get(0)?, position.get(1), position.get(2));
if let (Some(min_), Some(sec_)) = (min, sec) {
if min_.denom > 1 && sec_.num == 0 {
sec = None;
}
}
if let Some(min_) = min {
if deg.denom > 1 && min_.num == 0 {
min = None;
}
}
Some(( Some((
position.get(0).map(exif::Rational::to_f64)?, deg.to_f64(),
position.get(1).map(exif::Rational::to_f64), min.map(exif::Rational::to_f64),
position.get(2).map(exif::Rational::to_f64), sec.map(exif::Rational::to_f64),
)) ))
} }
} }
@ -93,10 +109,21 @@ impl GPSLocation {
pub fn display(&self) -> String { pub fn display(&self) -> String {
if let Some(world) = libgweather::Location::world() { if let Some(world) = libgweather::Location::world() {
let location = world.find_nearest_city(self.latitude.to_f64(), self.longitude.to_f64()); let location = world.find_nearest_city(self.latitude.to_f64(), self.longitude.to_f64());
if let (Some(city), Some(country)) = (location.city_name(), location.country_name()) { let location_exact = libgweather::Location::new_detached(
"",
None,
self.latitude.to_f64(),
self.longitude.to_f64(),
);
// do not use city if more than 100 km away
if location.distance(&location_exact) < 100. {
if let (Some(city), Some(country)) = (location.city_name(), location.country_name())
{
return format!("{city}, {country}"); return format!("{city}, {country}");
} }
} }
}
// fallback // fallback
self.latitude_display() + "\n" + &self.longitude_display() self.latitude_display() + "\n" + &self.longitude_display()
@ -104,16 +131,28 @@ impl GPSLocation {
pub fn latitude_display(&self) -> String { pub fn latitude_display(&self) -> String {
let coord = self.latitude; let coord = self.latitude;
let reference = if coord.sing { "N" } else { "S" }; let reference = if coord.sing {
// Translators: short for "north" in GPS coordiante
i18n("N")
} else {
// Translators: short for "south" in GPS coordiante
i18n("S")
};
coord.display(reference) coord.display(&reference)
} }
pub fn longitude_display(&self) -> String { pub fn longitude_display(&self) -> String {
let coord = self.longitude; let coord = self.longitude;
let reference = if coord.sing { "E" } else { "W" }; let reference = if coord.sing {
// Translators: short for "east" in GPS coordiante
i18n("E")
} else {
// Translators: short for "west" in GPS coordiante
i18n("W")
};
coord.display(reference) coord.display(&reference)
} }
pub fn geo_uri(&self) -> String { pub fn geo_uri(&self) -> String {