From 1badabcf19c633014ad63496dec2fcf4730a0675 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Sun, 25 Aug 2013 23:26:25 +0200 Subject: [PATCH] Fix compile --- .../src/net/osmand/plus/routing/RouteProvider.java | 3 ++- .../src/net/osmand/plus/routing/RoutingHelper.java | 13 ++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java index 29c86908ca..0c2e170079 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java @@ -668,7 +668,8 @@ public class RouteProvider { 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; List routeNodes = srcRoute.getImmutableLocations(); List directionInfo = srcRoute.getDirections(); diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 9f4fb32516..59a82a6e91 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -11,15 +11,10 @@ import net.osmand.binary.RouteDataObject; import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion; import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule; import net.osmand.data.LatLon; -import net.osmand.plus.ApplicationMode; +import net.osmand.plus.*; import net.osmand.plus.GPXUtilities.GPXFile; -import net.osmand.plus.ClientContext; 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.R; -import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo; import net.osmand.plus.routing.RouteProvider.GPXRouteParams; import net.osmand.plus.routing.RouteProvider.RouteService; @@ -44,7 +39,7 @@ public class RoutingHelper { private List listeners = new ArrayList(); - private ClientContext app; + private OsmandApplication app; 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; settings = context.getSettings(); voiceRouter = new VoiceRouter(this, player); @@ -845,7 +840,7 @@ public class RoutingHelper { } public GPXFile generateGPXFileWithRoute(){ - return provider.createOsmandRouterGPX(route); + return provider.createOsmandRouterGPX(route, app); } }