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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-01-08 01:16:04 +01:00
commit c50a5764c3
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
View file

@ -125,7 +125,7 @@ public class AvoidSpecificRoads {
}
});
bld.setPositiveButton(R.string.default_buttons_ok, null);
bld.setPositiveButton(R.string.close, null);
bld.show();
}

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

@ -772,7 +772,7 @@ public class RoutingHelper {
}
public void recalculateRouteDueToSettingsChange() {
//See if this fixes route-recalculation if settings change during ongoing calculation
//This should fix route-recalculation if settings change during ongoing calculation
clearCurrentRoute(finalLocation, intermediatePoints);
recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route,
true, false);

7
OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
View file

@ -85,12 +85,15 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
//if (!routingHelper.isRouteBeingCalculated()) {
// getTargets().setStartPoint(latlon, true, null);
//}
//or like this:
// routingHelper.recalculateRouteDueToSettingsChange();
//-----------------
}
contextMenu.setLocation(latlon, null);
showDialog();
//-Test code only--
//Try force resuming route re-caculation if stopped due to Issue2515
routingHelper.recalculateRouteDueToSettingsChange();
routingHelper.recalculateRouteDueToSettingsChange();
//-----------------
return true;
}
return super.onSingleTap(point, tileBox);