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

Merge pull request #521 from afischerdev/app-update

Browse source 
App update
This commit is contained in:
afischerdev 2023-03-31 15:17:38 +02:00 committed by GitHub
commit 7b89db71a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/gradle.yml vendored
View file

@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
environment: BRouter environment: BRouter
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up JDK 11 - name: Set up JDK 11
uses: actions/setup-java@v2 uses: actions/setup-java@v3
with: with:
java-version: '11' java-version: '11'
distribution: 'zulu' distribution: 'zulu'
@ -34,10 +34,10 @@ jobs:
ORG_GRADLE_PROJECT_RELEASE_STORE_FILE: ${{ secrets.BROUTER_KEYSTORE_FILE }} ORG_GRADLE_PROJECT_RELEASE_STORE_FILE: ${{ secrets.BROUTER_KEYSTORE_FILE }}
ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS: ${{ secrets.BROUTER_KEY_ALIAS }} ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS: ${{ secrets.BROUTER_KEY_ALIAS }}
ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD: ${{ secrets.BROUTER_KEY_PASSWORD }} ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD: ${{ secrets.BROUTER_KEY_PASSWORD }}
ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }} ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }}
run: ./gradlew build run: ./gradlew build
- name: Upload ZIP - name: Upload ZIP
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: ZIP name: ZIP
path: brouter-server/build/distributions/brouter-*.zip path: brouter-server/build/distributions/brouter-*.zip

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

@ -23,7 +23,7 @@ interface IBRouterService {
// variantes: lon,lat,d|... (from this point to the next do a direct line) // variantes: lon,lat,d|... (from this point to the next do a direct line)
// lon,lat,name|... (route point has a name and should not be ignored) // lon,lat,name|... (route point has a name and should not be ignored)
// "straight" = idx1,idx2,.. (optional, minimum one value, index of a direct routing point in the waypoint list) // "straight" = idx1,idx2,.. (optional, minimum one value, index of a direct routing point in the waypoint list)
// "nogos" = lon,lat,radius|... (optional, radius in meters) // "nogos" = lon,lat,radius,weight|... (optional, list of lon, lat, radius in meters, weight (optional))
// "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

8
brouter-server/src/main/java/btools/server/request/ServerHandler.java
View file

@ -20,13 +20,19 @@ import btools.server.ServiceContext;
* Parameters: * Parameters:
* <p> * <p>
* 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,weight|... (optional, list of lon, lat, radius in meters, weight (optional) 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 |)
* 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)
* format = [kml|gpx|geojson] (optional, default gpx) * format = [kml|gpx|geojson] (optional, default gpx)
* trackname = name used for filename and format specific trackname (optional, default brouter) * trackname = name used for filename and format specific trackname (optional, default brouter)
* 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)
* timode = turnInstructionMode [0=none, 1=auto-choose, 2=locus-style, 3=osmand-style, 4=comment-style, 5=gpsies-style, 6=orux-style, 7=locus-old-style] default 0
* heading = angle (optional to give a route a start direction)
* profile:xxx = parameter in profile (optional)
* straight = idx1,idx2,.. (optional, minimum one value, index of a direct routing point in the waypoint list)
* <p> * <p>
* Example URLs: * Example URLs:
* {@code http://localhost:17777/brouter?lonlats=8.799297,49.565883|8.811764,49.563606&nogos=&profile=trekking&alternativeidx=0&format=gpx} * {@code http://localhost:17777/brouter?lonlats=8.799297,49.565883|8.811764,49.563606&nogos=&profile=trekking&alternativeidx=0&format=gpx}