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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-01-12 02:18:35 +01:00
commit 9b9b67fce1
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -709,6 +709,7 @@ public class RoutingHelper {
private final RouteCalculationParams params; private final RouteCalculationParams params;
private boolean paramsChanged; private boolean paramsChanged;
private Thread prevRunningJob;
public RouteRecalculationThread(String name, RouteCalculationParams params, boolean paramsChanged) { public RouteRecalculationThread(String name, RouteCalculationParams params, boolean paramsChanged) {
super(name); super(name);
@ -730,10 +731,23 @@ public class RoutingHelper {
@Override @Override
public void run() { public void run() {
if(prevRunningJob != null) {
while(prevRunningJob.isAlive()){
try {
Thread.sleep(50);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
synchronized (RoutingHelper.this) {
currentRunningJob = this;
}
RouteCalculationResult res = provider.calculateRouteImpl(params); RouteCalculationResult res = provider.calculateRouteImpl(params);
if (params.calculationProgress.isCancelled) { if (params.calculationProgress.isCancelled) {
currentRunningJob = null; synchronized (RoutingHelper.this) {
currentRunningJob = null;
}
return; return;
} }
final boolean onlineSourceWithoutInternet = !res.isCalculated() && params.type.isOnline() && !settings.isInternetConnectionAvailable(); final boolean onlineSourceWithoutInternet = !res.isCalculated() && params.type.isOnline() && !settings.isInternetConnectionAvailable();
@ -773,6 +787,10 @@ public class RoutingHelper {
} }
lastTimeEvaluatedRoute = System.currentTimeMillis(); lastTimeEvaluatedRoute = System.currentTimeMillis();
} }
public void setWaitPrevJob(Thread prevRunningJob) {
this.prevRunningJob = prevRunningJob;
}
} }
public void recalculateRouteDueToSettingsChange() { public void recalculateRouteDueToSettingsChange() {
@ -791,9 +809,9 @@ public class RoutingHelper {
if (start == null || end == null) { if (start == null || end == null) {
return; return;
} }
if (currentRunningJob == null) { if (currentRunningJob == null || force) {
// do not evaluate very often // do not evaluate very often
if (force || System.currentTimeMillis() - lastTimeEvaluatedRoute > evalWaitInterval) { if (System.currentTimeMillis() - lastTimeEvaluatedRoute > evalWaitInterval || force) {
RouteCalculationParams params = new RouteCalculationParams(); RouteCalculationParams params = new RouteCalculationParams();
params.start = start; params.start = start;
params.end = end; params.end = end;
@ -811,7 +829,12 @@ public class RoutingHelper {
updateProgress(params.calculationProgress); updateProgress(params.calculationProgress);
} }
synchronized (this) { synchronized (this) {
currentRunningJob = new RouteRecalculationThread("Calculating route", params, paramsChanged); //$NON-NLS-1$ final Thread prevRunningJob = currentRunningJob;
RouteRecalculationThread newThread = new RouteRecalculationThread("Calculating route", params, paramsChanged); //$NON-NLS-1$
currentRunningJob = newThread ;
if(prevRunningJob != null) {
newThread.setWaitPrevJob(prevRunningJob);
}
currentRunningJob.start(); currentRunningJob.start();
} }
} }