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

Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch

Browse source
This commit is contained in:
PavelRatushny 2017-08-18 18:21:28 +03:00
commit 1fe9f99617
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -112,6 +112,8 @@ public class MeasurementToolFragment extends Fragment {
private ImageView undoBtn;
private ImageView redoBtn;
private ImageView mainIcon;
private SnapToRoadTask currentSnapToRoadTask;
private ProgressBar snapToRoadProgressBar;
private boolean wasCollapseButtonVisible;
private boolean pointsListOpened;
@ -767,12 +769,19 @@ public class MeasurementToolFragment extends Fragment {
});
snapToRoadBtn.setVisibility(View.VISIBLE);
ProgressBar snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
snapToRoadProgressBar.setMinimumHeight(0);
if (snapToRoadProgressBar == null) {
snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
snapToRoadProgressBar.setMinimumHeight(0);
}
snapToRoadProgressBar.setVisibility(View.VISIBLE);
snapToRoadProgressBar.setProgress(0);
if (measurementPoints.size() > 1) {
new SnapToRoadTask(mapActivity, snapToRoadProgressBar).execute();
if (currentSnapToRoadTask != null && !currentSnapToRoadTask.isCancelled()) {
currentSnapToRoadTask.cancel(true);
}
currentSnapToRoadTask = new SnapToRoadTask(mapActivity);
currentSnapToRoadTask.execute();
}
mapActivity.refreshMap();
@ -791,6 +800,9 @@ public class MeasurementToolFragment extends Fragment {
mainView.findViewById(R.id.snap_to_road_progress_bar).setVisibility(View.GONE);
mapActivity.refreshMap();
}
if (currentSnapToRoadTask != null && !currentSnapToRoadTask.isCancelled()) {
currentSnapToRoadTask.cancel(true);
}
}
private void displayRoutePoints() {
@ -1538,13 +1550,10 @@ public class MeasurementToolFragment extends Fragment {
private class SnapToRoadTask extends AsyncTask<Void, Void, RouteCalculationResult> {
private MapActivity mapActivity;
private ProgressBar progressBar;
private boolean calculated;
SnapToRoadTask(MapActivity mapActivity, ProgressBar progressBar) {
SnapToRoadTask(MapActivity mapActivity) {
this.mapActivity = mapActivity;
this.progressBar = progressBar;
progressBar.setProgress(0);
}
@Override
@ -1593,9 +1602,9 @@ public class MeasurementToolFragment extends Fragment {
float all = progress.totalEstimatedDistance * 1.25f;
if (all > 0) {
int t = (int) Math.min(p * p / (all * all) * 100f, 99);
progressBar.setProgress(t);
snapToRoadProgressBar.setProgress(t);
}
if (!calculated) {
if (!calculated && !isCancelled()) {
updateProgress(progress);
}
}