|
@@ -20,7 +20,7 @@ def do_convert(s, fmt):
|
|
|
return float(s)
|
|
|
throw("what is this format?")
|
|
|
|
|
|
-def data_from_row(d, yaw_col):
|
|
|
+def data_from_row(d):
|
|
|
d1 = {}
|
|
|
for field in field_fmt:
|
|
|
name = field_fmt[field].name
|
|
@@ -35,17 +35,13 @@ def data_from_row(d, yaw_col):
|
|
|
if st == '':
|
|
|
raise KeyError
|
|
|
d1[field] = do_convert(st, fmt)
|
|
|
- if yaw_col is None:
|
|
|
- d1['yaw'] = 0
|
|
|
- else:
|
|
|
- d1['yaw'] = d[yaw_col]
|
|
|
if d1['lat'] == 0:
|
|
|
d1['lat'] = None
|
|
|
if d1['lon'] == 0:
|
|
|
d1['lon'] = None
|
|
|
return LocationData(**d1)
|
|
|
|
|
|
-def parse_data_from_csv(f, yaw_col = None):
|
|
|
+def parse_data_from_csv(f):
|
|
|
if type(f) == str:
|
|
|
with open(f) as fd:
|
|
|
return parse_data_from_csv(fd)
|
|
@@ -54,7 +50,7 @@ def parse_data_from_csv(f, yaw_col = None):
|
|
|
ret = []
|
|
|
for row in rd:
|
|
|
try:
|
|
|
- ret.append(data_from_row(row, yaw_col))
|
|
|
+ ret.append(data_from_row(row))
|
|
|
except KeyError:
|
|
|
print("suspicous line:", row)
|
|
|
return ret
|