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

Fix compile

Browse source
This commit is contained in:
vshcherb 2013-08-25 23:26:25 +02:00
parent 684fdb0e23
commit 1badabcf19
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -668,7 +668,8 @@ public class RouteProvider {
return new RouteCalculationResult(res, null, params.start, params.end, null, null, null, params.ctx, params.leftSide, true); return new RouteCalculationResult(res, null, params.start, params.end, null, null, null, params.ctx, params.leftSide, true);
} }
public GPXFile createOsmandRouterGPX(RouteCalculationResult srcRoute, TargetPointsHelper helper, ClientContext ctx){ public GPXFile createOsmandRouterGPX(RouteCalculationResult srcRoute, OsmandApplication ctx){
TargetPointsHelper helper = ctx.getTargetPointsHelper();
int currentRoute = srcRoute.currentRoute; int currentRoute = srcRoute.currentRoute;
List<Location> routeNodes = srcRoute.getImmutableLocations(); List<Location> routeNodes = srcRoute.getImmutableLocations();
List<RouteDirectionInfo> directionInfo = srcRoute.getDirections(); List<RouteDirectionInfo> directionInfo = srcRoute.getDirections();

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

@ -11,15 +11,10 @@ import net.osmand.binary.RouteDataObject;
import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion; import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule; import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.plus.ApplicationMode; import net.osmand.plus.*;
import net.osmand.plus.GPXUtilities.GPXFile; import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.ClientContext;
import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.MetricsConstants; import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo; import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo;
import net.osmand.plus.routing.RouteProvider.GPXRouteParams; import net.osmand.plus.routing.RouteProvider.GPXRouteParams;
import net.osmand.plus.routing.RouteProvider.RouteService; import net.osmand.plus.routing.RouteProvider.RouteService;
@ -44,7 +39,7 @@ public class RoutingHelper {
private List<IRouteInformationListener> listeners = new ArrayList<IRouteInformationListener>(); private List<IRouteInformationListener> listeners = new ArrayList<IRouteInformationListener>();
private ClientContext app; private OsmandApplication app;
private boolean isFollowingMode = false; private boolean isFollowingMode = false;
@ -83,7 +78,7 @@ public class RoutingHelper {
} }
public RoutingHelper(ClientContext context, CommandPlayer player){ public RoutingHelper(OsmandApplication context, CommandPlayer player){
this.app = context; this.app = context;
settings = context.getSettings(); settings = context.getSettings();
voiceRouter = new VoiceRouter(this, player); voiceRouter = new VoiceRouter(this, player);
@ -845,7 +840,7 @@ public class RoutingHelper {
} }
public GPXFile generateGPXFileWithRoute(){ public GPXFile generateGPXFileWithRoute(){
return provider.createOsmandRouterGPX(route); return provider.createOsmandRouterGPX(route, app);
} }
} }