Merge pull request #521 from afischerdev/app-update

App update
abrensch · Mar 31, 2023 · 7b89db7 · 7b89db7
2 parents ab27804 + 4d3edd0
commit 7b89db7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     environment: BRouter
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'zulu'
@@ -34,10 +34,10 @@ jobs:
         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_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
     - name: Upload ZIP
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ZIP
         path: brouter-server/build/distributions/brouter-*.zip
diff --git a/brouter-routing-app/src/main/aidl/btools/routingapp/IBRouterService.aidl b/brouter-routing-app/src/main/aidl/btools/routingapp/IBRouterService.aidl
@@ -23,7 +23,7 @@ interface IBRouterService {
     //                      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)
     //  "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 |)
     //  "polygons"        = lon,lat,lon,lat,...,weight|... (unlimited list of lon,lat and weight (optional), lists separated by |)
     //  "profile"         = profile file name without .brf

diff --git a/brouter-server/src/main/java/btools/server/request/ServerHandler.java b/brouter-server/src/main/java/btools/server/request/ServerHandler.java
@@ -20,13 +20,19 @@
  * Parameters:
  * <p>
  * 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
  * alternativeidx = [0|1|2|3] (optional, default 0)
  * format = [kml|gpx|geojson] (optional, default gpx)
  * trackname = name used for filename and format specific trackname (optional, default brouter)
  * exportWaypoints = 1 to export them (optional, default is no export)
  * 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>
  * Example URLs:
  * {@code http://localhost:17777/brouter?lonlats=8.799297,49.565883|8.811764,49.563606&nogos=&profile=trekking&alternativeidx=0&format=gpx}