Blame gphotoframe-2.0a2-parseexif-geom-zerovalue.patch
|
Mamoru Tasaka |
b7782b9 |
--- ./gphotoframe-2.0-a2/lib/plugins/base/parseexif.py.zero 2012-02-15 16:05:52.000000000 +0900
|
|
Mamoru Tasaka |
b7782b9 |
+++ ./gphotoframe-2.0-a2/lib/plugins/base/parseexif.py 2012-08-13 16:21:32.000000000 +0900
|
|
Mamoru Tasaka |
b7782b9 |
@@ -61,6 +61,14 @@
|
|
Mamoru Tasaka |
b7782b9 |
|
|
Mamoru Tasaka |
b7782b9 |
return orientation
|
|
Mamoru Tasaka |
b7782b9 |
|
|
Mamoru Tasaka |
b7782b9 |
+ def realvalue_geo(self, fracs):
|
|
Mamoru Tasaka |
b7782b9 |
+ result = 0.
|
|
Mamoru Tasaka |
b7782b9 |
+ factor = 1.
|
|
Mamoru Tasaka |
b7782b9 |
+ for frac in fracs:
|
|
Mamoru Tasaka |
b7782b9 |
+ result += frac.num and frac.num / factor / frac.den or 0.
|
|
Mamoru Tasaka |
b7782b9 |
+ factor *= 60.
|
|
Mamoru Tasaka |
b7782b9 |
+ return result
|
|
Mamoru Tasaka |
b7782b9 |
+
|
|
Mamoru Tasaka |
b7782b9 |
def get_geo(self):
|
|
Mamoru Tasaka |
b7782b9 |
lat_array = self.tags.get('GPS GPSLatitude')
|
|
Mamoru Tasaka |
b7782b9 |
lon_array = self.tags.get('GPS GPSLongitude')
|
|
Mamoru Tasaka |
b7782b9 |
@@ -70,8 +78,10 @@
|
|
Mamoru Tasaka |
b7782b9 |
lon = lon_array.values
|
|
Mamoru Tasaka |
b7782b9 |
lat = lat_array.values
|
|
Mamoru Tasaka |
b7782b9 |
|
|
Mamoru Tasaka |
b7782b9 |
- x = lon[0].num + lon[1].num/60 + lon[2].num/3600/lon[2].den
|
|
Mamoru Tasaka |
b7782b9 |
- y = lat[0].num + lat[1].num/60 + lat[2].num/3600/lat[2].den
|
|
Mamoru Tasaka |
b7782b9 |
+ #x = lon[0].num + lon[1].num/60. + lon[2].num/3600./lon[2].den
|
|
Mamoru Tasaka |
b7782b9 |
+ #y = lat[0].num + lat[1].num/60. + lat[2].num/3600./lat[2].den
|
|
Mamoru Tasaka |
b7782b9 |
+ x = self.realvalue_geo(lon)
|
|
Mamoru Tasaka |
b7782b9 |
+ y = self.realvalue_geo(lat)
|
|
Mamoru Tasaka |
b7782b9 |
|
|
Mamoru Tasaka |
b7782b9 |
lon_ref = -1 if str(self.tags.get('GPS GPSLongitudeRef')) == 'W' else 1
|
|
Mamoru Tasaka |
b7782b9 |
lat_ref = -1 if str(self.tags.get('GPS GPSLatitudeRef')) == 'S' else 1
|