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

Hide gpx options for new gpx routing

Browse source
This commit is contained in:
max-klaus 2020-03-20 11:23:30 +03:00
parent 8710881eea
commit d518c29d0f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java
View file

@ -62,8 +62,7 @@ public class RouteExporter {
}
bundle.putBundleList("types", "type", typeList);
GPXFile gpx = new GPXFile("OsmAnd");
gpx.author = OSMAND_ROUTER_V2;
GPXFile gpx = new GPXFile(OSMAND_ROUTER_V2);
Track track = new Track();
track.name = name;
gpx.tracks.add(track);

5
OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
View file

@ -462,10 +462,11 @@ public class RoutingOptionsHelper {
}
public List<LocalRoutingParameter> getGpxRouterParameters(ApplicationMode am) {
RoutingHelper routingHelper = app.getRoutingHelper();
List<LocalRoutingParameter> list = new ArrayList<LocalRoutingParameter>();
RouteProvider.GPXRouteParamsBuilder rparams = app.getRoutingHelper().getCurrentGPXRoute();
RouteProvider.GPXRouteParamsBuilder rparams = routingHelper.getCurrentGPXRoute();
boolean osmandRouter = am.getRouteService() == RouteProvider.RouteService.OSMAND;
if (rparams != null && osmandRouter) {
if (rparams != null && !routingHelper.isCurrentGPXRouteV2() && osmandRouter) {
GPXUtilities.GPXFile fl = rparams.getFile();
if (fl.hasRtePt()) {
list.add(new OtherLocalRoutingParameter(R.string.use_points_as_intermediates,

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

@ -251,7 +251,7 @@ public class RouteProvider {
}
if (OSMAND_ROUTER_V2.equals(file.author)) {
route = parseOsmAndGPXRoute(points, file);
addMissingTurns = reverse;
addMissingTurns = false;
} else if (file.isCloudmadeRouteFile() || OSMAND_ROUTER.equals(file.author)) {
directions = parseOsmAndGPXRoute(points, file, OSMAND_ROUTER.equals(file.author), builder.leftSide, 10);
if (OSMAND_ROUTER.equals(file.author)) {