Merge pull request #6 from stadiamaps/feat/via-waypoints

Added via_waypoint index extension for mapbox and valhalla flavor

.github/workflows/android.yml

@@ -1,4 +1,4 @@
-name: Kotlin CI with Gradle
+name: Kotlin
 
 on:
   push:

.github/workflows/apple.yml

@@ -1,4 +1,4 @@
-name: Test
+name: Swift
 
 on:
   push:

android/build.gradle.kts

@@ -79,7 +79,7 @@ publishing {
 
             groupId = "com.osrm"
             artifactId = "api"
-            version = "0.0.6"
+            version = "0.0.7"
         }
     }
 }

apple/Sources/OSRM/Models/RouteLeg.swift

@@ -19,14 +19,17 @@ public struct RouteLeg: Codable, Hashable {
     public var summary: String?
     public var steps: [RouteStep]?
     public var annotation: Annotation?
+    /** A valhalla and mapbox extension for via waypoints. */
+    public var viaWaypoints: [String]?
 
-    public init(distance: Double? = nil, duration: Double? = nil, weight: Double? = nil, summary: String? = nil, steps: [RouteStep]? = nil, annotation: Annotation? = nil) {
+    public init(distance: Double? = nil, duration: Double? = nil, weight: Double? = nil, summary: String? = nil, steps: [RouteStep]? = nil, annotation: Annotation? = nil, viaWaypoints: [String]? = nil) {
         self.distance = distance
         self.duration = duration
         self.weight = weight
         self.summary = summary
         self.steps = steps
         self.annotation = annotation
+        self.viaWaypoints = viaWaypoints
     }
 
     public enum CodingKeys: String, CodingKey, CaseIterable {
@@ -36,6 +39,7 @@ public struct RouteLeg: Codable, Hashable {
         case summary
         case steps
         case annotation
+        case viaWaypoints = "via_waypoints"
     }
 
     // Encodable protocol methods
@@ -48,5 +52,6 @@ public struct RouteLeg: Codable, Hashable {
         try container.encodeIfPresent(summary, forKey: .summary)
         try container.encodeIfPresent(steps, forKey: .steps)
         try container.encodeIfPresent(annotation, forKey: .annotation)
+        try container.encodeIfPresent(viaWaypoints, forKey: .viaWaypoints)
     }
 }

apple/Tests/OSRM/__Snapshots__/TestDecodeOSRM/testDecodeRouteResponse.1.json

@@ -138,6 +138,9 @@
             }
           ],
           "summary" : "AK 1",
+          "via_waypoints" : [
+
+          ],
           "weight" : 56.002
         }
       ],

openapi.yaml

@@ -145,6 +145,13 @@ components:
             $ref: '#/components/schemas/RouteStep'
         annotation:
           $ref: '#/components/schemas/Annotation'
+        via_waypoints:
+          type: array
+          nullable: true
+          default: null
+          description: A Mapbox and Valhalla extension which indicates which waypoints are passed through rather than creating a new leg.
+          items:
+            type: string
     RouteStep:
       type: object
       properties: