Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API: gpx import fix

Browse Source
This commit is contained in:
Sam 2018-05-29 15:23:20 +02:00
parent 90c380f35a
commit 276a886a61
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mpwo_api/migrations/versions/b7cfe0c17708_.py
View File

@ -41,8 +41,8 @@ def upgrade():
sa.Column('distance', sa.Numeric(precision=6, scale=3), nullable=True), sa.Column('distance', sa.Numeric(precision=6, scale=3), nullable=True),
sa.Column('min_alt', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('min_alt', sa.Numeric(precision=6, scale=2), nullable=True),
sa.Column('max_alt', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('max_alt', sa.Numeric(precision=6, scale=2), nullable=True),
sa.Column('descent', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('descent', sa.Numeric(precision=7, scale=2), nullable=True),
sa.Column('ascent', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('ascent', sa.Numeric(precision=7, scale=2), nullable=True),
sa.Column('max_speed', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('max_speed', sa.Numeric(precision=6, scale=2), nullable=True),
sa.Column('ave_speed', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('ave_speed', sa.Numeric(precision=6, scale=2), nullable=True),
sa.ForeignKeyConstraint(['sport_id'], ['sports.id'], ), sa.ForeignKeyConstraint(['sport_id'], ['sports.id'], ),

4
mpwo_api/migrations/versions/dd73d23a7a3d_.py
View File

@ -27,8 +27,8 @@ def upgrade():
sa.Column('distance', sa.Numeric(precision=6, scale=3), nullable=True), sa.Column('distance', sa.Numeric(precision=6, scale=3), nullable=True),
sa.Column('min_alt', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('min_alt', sa.Numeric(precision=6, scale=2), nullable=True),
sa.Column('max_alt', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('max_alt', sa.Numeric(precision=6, scale=2), nullable=True),
sa.Column('descent', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('descent', sa.Numeric(precision=7, scale=2), nullable=True),
sa.Column('ascent', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('ascent', sa.Numeric(precision=7, scale=2), nullable=True),
sa.Column('max_speed', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('max_speed', sa.Numeric(precision=6, scale=2), nullable=True),
sa.Column('ave_speed', sa.Numeric(precision=6, scale=2), nullable=True), sa.Column('ave_speed', sa.Numeric(precision=6, scale=2), nullable=True),
sa.ForeignKeyConstraint(['activity_id'], ['activities.id'], ), sa.ForeignKeyConstraint(['activity_id'], ['activities.id'], ),

8
mpwo_api/mpwo_api/activities/models.py
View File

@ -128,8 +128,8 @@ class Activity(db.Model):
distance = db.Column(db.Numeric(6, 3), nullable=True) # kilometers distance = db.Column(db.Numeric(6, 3), nullable=True) # kilometers
min_alt = db.Column(db.Numeric(6, 2), nullable=True) # meters min_alt = db.Column(db.Numeric(6, 2), nullable=True) # meters
max_alt = db.Column(db.Numeric(6, 2), nullable=True) # meters max_alt = db.Column(db.Numeric(6, 2), nullable=True) # meters
descent = db.Column(db.Numeric(6, 2), nullable=True) # meters descent = db.Column(db.Numeric(7, 2), nullable=True) # meters
ascent = db.Column(db.Numeric(6, 2), nullable=True) # meters ascent = db.Column(db.Numeric(7, 2), nullable=True) # meters
max_speed = db.Column(db.Numeric(6, 2), nullable=True) # km/h max_speed = db.Column(db.Numeric(6, 2), nullable=True) # km/h
ave_speed = db.Column(db.Numeric(6, 2), nullable=True) # km/h ave_speed = db.Column(db.Numeric(6, 2), nullable=True) # km/h
bounds = db.Column(postgresql.ARRAY(db.Float), nullable=True) bounds = db.Column(postgresql.ARRAY(db.Float), nullable=True)
@ -263,8 +263,8 @@ class ActivitySegment(db.Model):
distance = db.Column(db.Numeric(6, 3), nullable=True) # kilometers distance = db.Column(db.Numeric(6, 3), nullable=True) # kilometers
min_alt = db.Column(db.Numeric(6, 2), nullable=True) # meters min_alt = db.Column(db.Numeric(6, 2), nullable=True) # meters
max_alt = db.Column(db.Numeric(6, 2), nullable=True) # meters max_alt = db.Column(db.Numeric(6, 2), nullable=True) # meters
descent = db.Column(db.Numeric(6, 2), nullable=True) # meters descent = db.Column(db.Numeric(7, 2), nullable=True) # meters
ascent = db.Column(db.Numeric(6, 2), nullable=True) # meters ascent = db.Column(db.Numeric(7, 2), nullable=True) # meters
max_speed = db.Column(db.Numeric(6, 2), nullable=True) # km/h max_speed = db.Column(db.Numeric(6, 2), nullable=True) # km/h
ave_speed = db.Column(db.Numeric(6, 2), nullable=True) # km/h ave_speed = db.Column(db.Numeric(6, 2), nullable=True) # km/h

8
mpwo_api/mpwo_api/activities/utils.py
View File

@ -124,7 +124,7 @@ def get_gpx_data(parsed_gpx, max_speed, start):
distance = mv.moving_distance + mv.stopped_distance distance = mv.moving_distance + mv.stopped_distance
gpx_data['distance'] = distance / 1000 gpx_data['distance'] = distance / 1000
average_speed = distance / mv.moving_time average_speed = distance / mv.moving_time if mv.moving_time > 0 else 0
gpx_data['average_speed'] = (average_speed / 1000) * 3600 gpx_data['average_speed'] = (average_speed / 1000) * 3600
return gpx_data return gpx_data
@ -207,9 +207,11 @@ def get_chart_data(gpx_file):
if segment.get_speed(point_idx) is not None if segment.get_speed(point_idx) is not None
else 0) else 0)
chart_data.append({ chart_data.append({
'distance': round(distance / 1000, 2), 'distance': (round(distance / 1000, 2)
if distance is not None else 0),
'duration': point.time_difference(first_point), 'duration': point.time_difference(first_point),
'elevation': round(point.elevation, 1), 'elevation': (round(point.elevation, 1)
if point.elevation is not None else 0),
'speed': speed, 'speed': speed,
'time': point.time, 'time': point.time,
}) })