Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Enable use of direction to app (#464)

Browse source 
* make app equal to server #314
This commit is contained in:
afischerdev 2022-10-19 21:12:38 +02:00 committed by GitHub
parent 51dc7fb1fb
commit 13a41bd9f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
brouter-routing-app/src/main/aidl/btools/routingapp/IBRouterService.aidl
View file

@ -1,38 +1,40 @@
package btools.routingapp; package btools.routingapp;
interface IBRouterService { interface IBRouterService {
//param params--> Map of params: //param params--> Map of params:
// "pathToFileResult"-->String with the path to where the result must be saved, including file name and extension // "pathToFileResult"-->String with the path to where the result must be saved, including file name and extension
// -->if null, the track is passed via the return argument, this should be default when Android Q or later // -->if null, the track is passed via the return argument, this should be default when Android Q or later
// "maxRunningTime"-->String with a number of seconds for the routing timeout, default = 60 // "maxRunningTime"-->String with a number of seconds for the routing timeout, default = 60
// "turnInstructionFormat"-->String selecting the format for turn-instructions values: osmand, locus // "turnInstructionFormat"-->String selecting the format for turn-instructions values: osmand, locus
// "trackFormat"-->[kml|gpx|json] default = gpx // "trackFormat"-->[kml|gpx|json] default = gpx
// "lats"-->double[] array of latitudes; 2 values at least. // "lats"-->double[] array of latitudes; 2 values at least.
// "lons"-->double[] array of longitudes; 2 values at least. // "lons"-->double[] array of longitudes; 2 values at least.
// "nogoLats"-->double[] array of nogo latitudes; may be null. // "nogoLats"-->double[] array of nogo latitudes; may be null.
// "nogoLons"-->double[] array of nogo longitudes; may be null. // "nogoLons"-->double[] array of nogo longitudes; may be null.
// "nogoRadi"-->double[] array of nogo radius in meters; may be null. // "nogoRadi"-->double[] array of nogo radius in meters; may be null.
// "fast"-->[0|1] // "fast"-->[0|1]
// "v"-->[motorcar|bicycle|foot] // "v"-->[motorcar|bicycle|foot]
// "remoteProfile"--> (String), net-content of a profile. If remoteProfile != null, v+fast are ignored // "remoteProfile"--> (String), net-content of a profile. If remoteProfile != null, v+fast are ignored
// //
// "lonlats" = lon,lat|... (unlimited list of lon,lat waypoints separated by |) // "lonlats" = lon,lat|... (unlimited list of lon,lat waypoints separated by |)
// "nogos" = lon,lat,radius|... (optional, radius in meters) // "nogos" = lon,lat,radius|... (optional, radius in meters)
// "polylines" = lon,lat,lon,lat,...,weight|... (unlimited list of lon,lat and weight (optional), lists separated by |) // "polylines" = lon,lat,lon,lat,...,weight|... (unlimited list of lon,lat and weight (optional), lists separated by |)
// "polygons" = lon,lat,lon,lat,...,weight|... (unlimited list of lon,lat and weight (optional), lists separated by |) // "polygons" = lon,lat,lon,lat,...,weight|... (unlimited list of lon,lat and weight (optional), lists separated by |)
// "profile" = profile file name without .brf // "profile" = profile file name without .brf
// "alternativeidx" = [0|1|2|3] (optional, default 0) // "alternativeidx" = [0|1|2|3] (optional, default 0)
// "exportWaypoints" = 1 to export them (optional, default is no export) // "exportWaypoints" = 1 to export them (optional, default is no export)
// "pois" = lon,lat,name|... (optional) // "pois" = lon,lat,name|... (optional)
// "extraParams" = Bundle key=value list for a profile setup (like "profile:") // "extraParams" = Bundle key=value list for a profile setup (like "profile:")
// "timode" = turnInstructionMode [0=none, 1=auto-choose, 2=locus-style, 3=osmand-style, 4=comment-style, 5=gpsies-style, 6=orux-style] default 0 // "timode" = turnInstructionMode [0=none, 1=auto-choose, 2=locus-style, 3=osmand-style, 4=comment-style, 5=gpsies-style, 6=orux-style] default 0
// "heading" = angle (optional to give a route a start direction)
// return null if all ok and no path given, the track if ok and path given, an error message if it was wrong // "direction" = (deprecated) angle
// the resultas string when 'pathToFileResult' is null, this should be default when Android Q or later
// call in a background thread, heavy task! // return null if all ok and no path given, the track if ok and path given, an error message if it was wrong
// the resultas string when 'pathToFileResult' is null, this should be default when Android Q or later
String getTrackFromParams(in Bundle params); // call in a background thread, heavy task!
}
String getTrackFromParams(in Bundle params);
}

5
brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
View file

@ -64,10 +64,13 @@ public class BRouterWorker {
rc.turnInstructionMode = params.getInt("timode"); rc.turnInstructionMode = params.getInt("timode");
} }
if (params.containsKey("direction")) { if (params.containsKey("direction")) {
rc.startDirection = params.getInt("direction"); rc.startDirection = params.getInt("direction");
} }
if (params.containsKey("heading")) {
rc.startDirection = params.getInt("heading");
rc.forceUseStartDirection = true;
}
if (params.containsKey("alternativeidx")) { if (params.containsKey("alternativeidx")) {
rc.alternativeIdx = params.getInt("alternativeidx"); rc.alternativeIdx = params.getInt("alternativeidx");
} }