Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix build

Browse source
This commit is contained in:
crimean 2019-02-06 19:44:23 +03:00
parent ed81bc438c
commit a354ce2fa0
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoDialogFragment.java
View file

@ -39,12 +39,10 @@ import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.Entry; import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData; import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.formatter.IAxisValueFormatter; import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet; import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
import com.github.mikephil.charting.listener.ChartTouchListener; import com.github.mikephil.charting.listener.ChartTouchListener;
import com.github.mikephil.charting.listener.OnChartGestureListener; import com.github.mikephil.charting.listener.OnChartGestureListener;
import com.github.mikephil.charting.utils.ViewPortHandler;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.Location; import net.osmand.Location;
@ -99,6 +97,7 @@ public class ShowRouteInfoDialogFragment extends DialogFragment {
private ListView listView; private ListView listView;
private RouteInfoAdapter adapter; private RouteInfoAdapter adapter;
private GPXFile gpx; private GPXFile gpx;
private OrderedLineDataSet slopeDataSet;
private OrderedLineDataSet elevationDataSet; private OrderedLineDataSet elevationDataSet;
private GpxDisplayItem gpxItem; private GpxDisplayItem gpxItem;
@ -207,17 +206,19 @@ public class ShowRouteInfoDialogFragment extends DialogFragment {
listView.addHeaderView(headerView); listView.addHeaderView(headerView);
} }
List<Incline> inclines = createInclinesAndAdd100MetersWith0Incline(slopeDataSet.getValues()); if (slopeDataSet != null) {
List<Incline> inclines = createInclinesAndAdd100MetersWith0Incline(slopeDataSet.getValues());
RouteStatistics routeStatistics = RouteStatistics.newRouteStatistic(helper.getRoute().getOriginalRoute()); RouteStatistics routeStatistics = RouteStatistics.newRouteStatistic(helper.getRoute().getOriginalRoute());
buildChartAndAttachLegend(app, view, inflater, R.id.route_class_stat_chart, buildChartAndAttachLegend(app, view, inflater, R.id.route_class_stat_chart,
R.id.route_class_stat_items, routeStatistics.getRouteClassStatistic()); R.id.route_class_stat_items, routeStatistics.getRouteClassStatistic());
buildChartAndAttachLegend(app, view, inflater, R.id.route_surface_stat_chart, buildChartAndAttachLegend(app, view, inflater, R.id.route_surface_stat_chart,
R.id.route_surface_stat_items, routeStatistics.getRouteSurfaceStatistic()); R.id.route_surface_stat_items, routeStatistics.getRouteSurfaceStatistic());
buildChartAndAttachLegend(app, view, inflater, R.id.route_smoothness_stat_chart, buildChartAndAttachLegend(app, view, inflater, R.id.route_smoothness_stat_chart,
R.id.route_smoothness_stat_items, routeStatistics.getRouteSmoothnessStatistic()); R.id.route_smoothness_stat_items, routeStatistics.getRouteSmoothnessStatistic());
buildChartAndAttachLegend(app, view, inflater, R.id.route_steepness_stat_chart, buildChartAndAttachLegend(app, view, inflater, R.id.route_steepness_stat_chart,
R.id.route_steepness_stat_items, routeStatistics.getRouteSteepnessStatistic(inclines)); R.id.route_steepness_stat_items, routeStatistics.getRouteSteepnessStatistic(inclines));
}
return view; return view;
} }
@ -341,7 +342,6 @@ public class ShowRouteInfoDialogFragment extends DialogFragment {
}); });
GPXTrackAnalysis analysis = gpx.getAnalysis(0); GPXTrackAnalysis analysis = gpx.getAnalysis(0);
OrderedLineDataSet slopeDataSet;
if (analysis.hasElevationData) { if (analysis.hasElevationData) {
List<ILineDataSet> dataSets = new ArrayList<>(); List<ILineDataSet> dataSets = new ArrayList<>();
elevationDataSet = GpxUiHelper.createGPXElevationDataSet(app, mChart, analysis, elevationDataSet = GpxUiHelper.createGPXElevationDataSet(app, mChart, analysis,