marc
/
igc2kmz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into ubuntu

This commit is contained in:
Marc Poulhiès 2010-03-23 19:40:04 +01:00
parent 68fba23c72 b2f95f212b
commit 565b34326a
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bin/leonardo2kmz.py
View File

@ -39,6 +39,8 @@ DEFAULT_URL = 'http://www.paraglidingforum.com'
DEFAULT_ICON = '/modules/leonardo/templates/basic/tpl/leonardo_logo.gif'
DEFAULT_DIRECTORY = '/var/www/html'
DEFAULT_TABLE_PREFIX = 'leonardo'
DEFAULT_IGC_PATH = 'data/flights/tracks/%YEAR%/%PILOTID%'
DEFAULT_PHOTOS_PATH = 'data/flights/photos/%YEAR%/%PILOTID%'
LEAGUE = (None, 'Online Contest', 'World XC Online Contest')
ROUTE_NAME = (
@ -57,6 +59,12 @@ B_RECORD_RE = re.compile(r'B(\d{2})(\d{2})(\d{2})'
r'(\d{2})(\d{5})([NS])(\d{3})(\d{5})([EW])')
def substitute(s, dict):
for key, value in dict.items():
s = re.sub('%%%s%%' % re.escape(key), value, s)
return s
def make_banner(options):
leonardo_url = options.url + '/modules.php?name=leonardo'
icon_url = options.url + options.icon
@ -126,6 +134,8 @@ def main(argv):
help='set table prefix')
parser.add_option('-x', '--igc-suffix', metavar='STRING',
help='set IGC file suffix')
parser.add_option('-I', '--igc-path', metavar='STRING', help='set IGC path')
parser.add_option('-P', '--photos-path', metavar='STRING', help='set photos path')
parser.set_defaults(output='igc2kmz.kmz')
parser.set_defaults(name=DEFAULT_NAME)
parser.set_defaults(icon=DEFAULT_ICON)
@ -133,6 +143,8 @@ def main(argv):
parser.set_defaults(directory=DEFAULT_DIRECTORY)
parser.set_defaults(tz_offset=0)
parser.set_defaults(table_prefix=DEFAULT_TABLE_PREFIX)
parser.set_defaults(igc_path=DEFAULT_IGC_PATH)
parser.set_defaults(photos_path=DEFAULT_PHOTOS_PATH)
parser.set_defaults(igc_suffix='.saned.full.igc')
options, args = parser.parse_args(argv)
#
@ -161,13 +173,15 @@ def main(argv):
if flight_row is None:
raise KeyError, id
if flight_row.userServerID:
path = '%(userServerID)d_%(userID)d' % flight_row
pilot_id = '%(userServerID)d_%(userID)d' % flight_row
else:
path = flight_row.userID
igc_path_components = (flights_dir, path, 'flights',
flight_row.DATE.year,
flight_row.filename + options.igc_suffix)
igc_path = os.path.join(*map(str, igc_path_components))
pilot_id = flight_row.userID
substituions = {
'PILOTID': str(pilot_id),
'YEAR': str(flight_row.DATE.year),
}
igc_path = os.path.join(substitute(options.igc_path, substituions),
flight_row.filename + options.igc_suffix)
track = IGC(open(igc_path), date=flight_row.DATE).track()
flight = Flight(track)
flight.glider_type = flight_row.glider
@ -220,8 +234,8 @@ def main(argv):
== flight_row.ID)
for photo_row in select.execute().fetchall():
photo_url = options.url + PHOTO_URL % photo_row
photo_path = os.path.join(flights_dir, photo_row.path,
photo_row.name)
photo_path = os.path.join(substitute(options.photo_path, substituions),
flight_row.filename + options.photo_suffix)
photo = Photo(photo_url, path=photo_path)
if photo_row.description:
photo.description = photo_row.description

2
igc2kmz/igc.py
View File

@ -26,7 +26,7 @@ import track
A_RECORD_RE = re.compile(r'A(.*)\Z')
B_RECORD_RE = re.compile(r'B(\d{2})(\d{2})(\d{2})(\d{2})(\d{5})([NS])'
r'(\d{3})(\d{5})([EW])([AV])(\d{5})(\d{5})\d*\Z')
r'(\d{3})(\d{5})([EW])([AV])(\d{5})(\d{5}).*\Z')
C_RECORD_RE = re.compile(r'C(\d{2})(\d{5})([NS])(\d{3})(\d{5})([EW])(.*)\Z')
G_RECORD_RE = re.compile(r'G(.*)\Z')
HFDTE_RECORD_RE = re.compile(r'H(F)(DTE)(\d\d)(\d\d)(\d\d)\Z')