API & Client: minor fix

This commit is contained in:
Sam 2018-05-28 23:37:53 +02:00
parent 66343c16b8
commit 1ac669e6e6
2 changed files with 64 additions and 50 deletions

View File

@ -202,7 +202,9 @@ def get_chart_data(gpx_file):
) )
distance = 0 if distance is None else distance distance = 0 if distance is None else distance
distance += previous_distance distance += previous_distance
speed = round((segment.get_speed(point_idx) / 1000)*3600, 2) speed = (round((segment.get_speed(point_idx) / 1000)*3600, 2)
if segment.get_speed(point_idx) is not None
else 0)
chart_data.append({ chart_data.append({
'distance': round(distance / 1000, 2), 'distance': round(distance / 1000, 2),
'duration': point.time_difference(first_point), 'duration': point.time_difference(first_point),

View File

@ -43,6 +43,7 @@ class ActivityCharts extends React.Component {
render() { render() {
const { chartData } = this.props const { chartData } = this.props
const { displayDistance } = this.state const { displayDistance } = this.state
const xInterval = chartData ? parseInt(chartData.length / 10, 10) : 0
let xDataKey, xScale let xDataKey, xScale
if (displayDistance) { if (displayDistance) {
xDataKey = 'distance' xDataKey = 'distance'
@ -73,6 +74,8 @@ class ActivityCharts extends React.Component {
duration duration
</label> </label>
</div> </div>
{chartData && chartData.length > 0 ? (
<div>
<div className="row chart"> <div className="row chart">
<ResponsiveContainer height={300}> <ResponsiveContainer height={300}>
<ComposedChart <ComposedChart
@ -84,17 +87,22 @@ class ActivityCharts extends React.Component {
dataKey={xDataKey} dataKey={xDataKey}
label={{ value: xDataKey, offset: 0, position: 'bottom' }} label={{ value: xDataKey, offset: 0, position: 'bottom' }}
scale={xScale} scale={xScale}
interval={xInterval}
tickFormatter={value => displayDistance tickFormatter={value => displayDistance
? value ? value
: format(value, 'HH:mm:ss')} : format(value, 'HH:mm:ss')}
type="number" type="number"
/> />
<YAxis <YAxis
label={{ value: 'speed (km/h)', angle: -90, position: 'left' }} label={{
value: 'speed (km/h)', angle: -90, position: 'left'
}}
yAxisId="left" yAxisId="left"
/> />
<YAxis <YAxis
label={{ value: 'altitude (m)', angle: -90, position: 'right' }} label={{
value: 'altitude (m)', angle: -90, position: 'right'
}}
yAxisId="right" orientation="right" yAxisId="right" orientation="right"
/> />
<Area <Area
@ -123,6 +131,10 @@ class ActivityCharts extends React.Component {
</div> </div>
<div className="chart-info">data from gpx, without any cleaning</div> <div className="chart-info">data from gpx, without any cleaning</div>
</div> </div>
) : (
'No data to display'
)}
</div>
) )
} }
} }