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

New format for lat/long added used by Swedish and Finnish map provider kartor.eniro.se|fi.

Browse Source 
svn: r11624
This commit is contained in:
Peter Landgren
2009-01-14 09:00:21 +00:00
parent 71be10c1bc
commit 042379ae5b
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/PlaceUtils.py
View File

@@ -154,7 +154,9 @@ def __convert_using_classic_repr(stringValue, typedeg):
#exchange some characters #exchange some characters
stringValue = stringValue.replace(u'°',r'_') stringValue = stringValue.replace(u'°',r'_')
#allow to input ° as # #allow to input ° as #, UTF-8 code c2b00a
stringValue = stringValue.replace(u'º',r'_')
#allow to input º as #, UTF-8 code c2ba0a
stringValue = stringValue.replace(r'#',r'_') stringValue = stringValue.replace(r'#',r'_')
#allow to input " as '' #allow to input " as ''
stringValue = stringValue.replace(r"''",r'"') stringValue = stringValue.replace(r"''",r'"')
@@ -274,7 +276,8 @@ def conv_lat_lon(latitude, longitude, format="D.D4"):
'D.D8' : degree notation, 8 decimals (precision like ISO-DMS) 'D.D8' : degree notation, 8 decimals (precision like ISO-DMS)
eg +12.01543265 , -124.36473268 eg +12.01543265 , -124.36473268
'DEG' : degree, minutes, seconds notation 'DEG' : degree, minutes, seconds notation
eg 50°52'21.92''N , 124°52'21.92''E eg 50°52'21.92''N , 124°52'21.92''E ° has UTF-8 code c2b00a
or N 50º52'21.92" E 124º52'21.92" º has UTF-8 code c2ba0a
'DEG-:' : degree, minutes, seconds notation with : 'DEG-:' : degree, minutes, seconds notation with :
eg -50:52:21.92 , 124:52:21.92 eg -50:52:21.92 , 124:52:21.92
'ISO-D' : ISO 6709 degree notation i.e. ±DD.DDDD±DDD.DDDD 'ISO-D' : ISO 6709 degree notation i.e. ±DD.DDDD±DDD.DDDD
@@ -300,6 +303,16 @@ def conv_lat_lon(latitude, longitude, format="D.D4"):
longitude = longitude.replace(translate_en_loc['W'],'W') longitude = longitude.replace(translate_en_loc['W'],'W')
longitude = longitude.replace(translate_en_loc['E'],'E') longitude = longitude.replace(translate_en_loc['E'],'E')
# take away leading spaces
latitude = latitude.lstrip()
longitude = longitude.lstrip()
# check if first character is alpha i.e. N or S, put it last
if len(latitude) > 1 and latitude[0].isalpha():
latitude = latitude[1:] + latitude[0]
# check if first character is alpha i.e. E or W, put it last
if len(longitude) > 1 and longitude[0].isalpha():
longitude = longitude[1:] + longitude[0]
# convert to float # convert to float
lat_float = __convert_float_val(latitude, 'lat') lat_float = __convert_float_val(latitude, 'lat')
lon_float = __convert_float_val(longitude, 'lon') lon_float = __convert_float_val(longitude, 'lon')
@@ -618,4 +631,8 @@ if __name__ == '__main__':
test_formats_success(lat,lon) test_formats_success(lat,lon)
lat, lon = ': 0 : 1 : 1', ':1:2' lat, lon = ': 0 : 1 : 1', ':1:2'
test_formats_fail(lat,lon) test_formats_fail(lat,lon)
lat, lon = u'N 50º52\'21.92"', u'E 124º52\'21.92"'
test_formats_success(lat,lon, 'New format with N/E first and another º - character')
lat, lon = u'S 50º52\'21.92"', u'W 124º52\'21.92"'
test_formats_success(lat,lon, 'New format with S/W first and another º - character')