Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4076: Fix sort order when different latitude/longitude formats are used

Browse Source 
svn: r15581
This commit is contained in:
Nick Hall 2010-06-19 17:41:28 +00:00
parent 1915b899b3
commit 49a0830d29
1 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/gui/views/treemodels/placemodel.py
View File

@ -49,6 +49,7 @@ import gtk
import const import const
import ToolTips import ToolTips
import Utils import Utils
from PlaceUtils import conv_lat_lon
from gui.views.treemodels.flatbasemodel import FlatBaseModel from gui.views.treemodels.flatbasemodel import FlatBaseModel
from gui.views.treemodels.treebasemodel import TreeBaseModel from gui.views.treemodels.treebasemodel import TreeBaseModel
@ -124,43 +125,17 @@ class PlaceBaseModel(object):
def column_place_name(self, data): def column_place_name(self, data):
return unicode(data[2]) return unicode(data[2])
def __format_degrees(self, angle, sign_str):
"""
Format a decimal as degrees, minutes and seconds.
If the value is not a decimal leave it unformatted.
"""
try:
angle = float(angle)
except ValueError:
return angle
if angle >= 0:
sign = sign_str[0]
else:
sign = sign_str[1]
seconds = abs(int(angle * 60 * 60))
minutes = seconds / 60
seconds %= 60
degrees = minutes / 60
minutes %= 60
string = unicode(degrees) + u'\u00b0 ' + \
unicode(minutes) + u'\u2032 ' + \
unicode(seconds) + u'\u2033 ' + unicode(sign)
return string
def column_longitude(self, data): def column_longitude(self, data):
return self.__format_degrees(data[3], _('EW')) return conv_lat_lon('0', data[3], format='DEG')[1]
def column_latitude(self, data): def column_latitude(self, data):
return self.__format_degrees(data[4], _('NS')) return conv_lat_lon(data[4], '0', format='DEG')[0]
def sort_longitude(self, data): def sort_longitude(self, data):
return unicode(data[3]) return conv_lat_lon('0', data[3], format='D.D8')[1] if data[3] else u''
def sort_latitude(self, data): def sort_latitude(self, data):
return unicode(data[4]) return conv_lat_lon(data[4], '0', format='D.D8')[0] if data[4] else u''
def column_id(self, data): def column_id(self, data):
return unicode(data[1]) return unicode(data[1])