Skip to content

Commit

Permalink
vk-NAVIOS-309-traffic-tendency: added traffic tendency to AttributeOp…
Browse files Browse the repository at this point in the history 
…tions and RouteLeg. Corresponding new type added; unit tests and fixtures updated (#795)
  • Loading branch information
@Udumft
Udumft committed Jan 26, 2023
1 parent 975f53f commit 42726ff
Show file tree
Hide file tree
Showing 8 changed files with 304 additions and 10 deletions.
10 changes: 10 additions & 0 deletions MapboxDirections.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
2B28E22327EDB2AA0029E4C1 /* ForeignMemberContainerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B28E22227EDB2A90029E4C1 /* ForeignMemberContainerTests.swift */; };
2B28E22427EDB2AA0029E4C1 /* ForeignMemberContainerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B28E22227EDB2A90029E4C1 /* ForeignMemberContainerTests.swift */; };
2B28E22527EDB2AA0029E4C1 /* ForeignMemberContainerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B28E22227EDB2A90029E4C1 /* ForeignMemberContainerTests.swift */; };
2B36B3E22980202600ED1E47 /* TrafficTendency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B36B3E12980202600ED1E47 /* TrafficTendency.swift */; };
2B36B3E32980202600ED1E47 /* TrafficTendency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B36B3E12980202600ED1E47 /* TrafficTendency.swift */; };
2B36B3E42980202600ED1E47 /* TrafficTendency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B36B3E12980202600ED1E47 /* TrafficTendency.swift */; };
2B36B3E52980202600ED1E47 /* TrafficTendency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B36B3E12980202600ED1E47 /* TrafficTendency.swift */; };
2B39DD40270F034700ED68E4 /* CodingOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B39DD3F270F034700ED68E4 /* CodingOperation.swift */; };
2B4383022549C22700A3E38B /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B4383002549C22700A3E38B /* main.swift */; };
2B46024528EDB1670008A624 /* CustomValueOptionSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B46024428EDB1670008A624 /* CustomValueOptionSet.swift */; };
Expand Down Expand Up @@ -551,6 +555,7 @@
2B0BA057294B544E00402F81 /* MatrixError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatrixError.swift; sourceTree = "<group>"; };
2B0BA068294B546300402F81 /* MatrixTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatrixTests.swift; sourceTree = "<group>"; };
2B28E22227EDB2A90029E4C1 /* ForeignMemberContainerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForeignMemberContainerTests.swift; sourceTree = "<group>"; };
2B36B3E12980202600ED1E47 /* TrafficTendency.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrafficTendency.swift; sourceTree = "<group>"; };
2B39DD3F270F034700ED68E4 /* CodingOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CodingOperation.swift; path = Sources/MapboxDirectionsCLI/CodingOperation.swift; sourceTree = "<group>"; };
2B4383002549C22700A3E38B /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = Sources/MapboxDirectionsCLI/main.swift; sourceTree = "<group>"; };
2B46024428EDB1670008A624 /* CustomValueOptionSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomValueOptionSet.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -945,6 +950,7 @@
DAC05F151CFBFAC400FA0071 /* Waypoint.swift */,
F4CF2C562523B66300A6D0B6 /* TollCollection.swift */,
2B79D3E528E5EB3900B3F127 /* TollPrice.swift */,
2B36B3E12980202600ED1E47 /* TrafficTendency.swift */,
F4F508372524D6F10044F2D0 /* RestStop.swift */,
F4F5084A2524DC280044F2D0 /* AdministrativeRegion.swift */,
F457FA79252B9E29007DAEB1 /* Incident.swift */,
Expand Down Expand Up @@ -1530,6 +1536,7 @@
files = (
2B9F3892272AE23A001DBA12 /* Isochrones.swift in Sources */,
43538E3923ED463100E010D4 /* ResponseDisposition.swift in Sources */,
2B36B3E32980202600ED1E47 /* TrafficTendency.swift in Sources */,
431E93C0234664A200A71B44 /* DrivingSide.swift in Sources */,
C5DAAC9B2019167C001F9261 /* Match.swift in Sources */,
2B5407EE2451B17E006C820B /* RouteRefreshResponse.swift in Sources */,
Expand Down Expand Up @@ -1639,6 +1646,7 @@
files = (
2B9F3893272AE23A001DBA12 /* Isochrones.swift in Sources */,
43538E3A23ED463200E010D4 /* ResponseDisposition.swift in Sources */,
2B36B3E42980202600ED1E47 /* TrafficTendency.swift in Sources */,
431E93C1234664A200A71B44 /* DrivingSide.swift in Sources */,
C5DAAC9C2019167D001F9261 /* Match.swift in Sources */,
2B5407EF2451B17E006C820B /* RouteRefreshResponse.swift in Sources */,
Expand Down Expand Up @@ -1748,6 +1756,7 @@
files = (
2B9F3894272AE23A001DBA12 /* Isochrones.swift in Sources */,
43538E3B23ED463400E010D4 /* ResponseDisposition.swift in Sources */,
2B36B3E52980202600ED1E47 /* TrafficTendency.swift in Sources */,
431E93C2234664A200A71B44 /* DrivingSide.swift in Sources */,
C5DAAC9D2019167E001F9261 /* Match.swift in Sources */,
2B5407F02451B17E006C820B /* RouteRefreshResponse.swift in Sources */,
Expand Down Expand Up @@ -1819,6 +1828,7 @@
files = (
2B9F3891272AE23A001DBA12 /* Isochrones.swift in Sources */,
43538E3823ED463100E010D4 /* ResponseDisposition.swift in Sources */,
2B36B3E22980202600ED1E47 /* TrafficTendency.swift in Sources */,
431E93BF234664A200A71B44 /* DrivingSide.swift in Sources */,
C51538CC1E807FF00093FF3E /* AttributeOptions.swift in Sources */,
2B5407ED2451B17E006C820B /* RouteRefreshResponse.swift in Sources */,
Expand Down
11 changes: 11 additions & 0 deletions Sources/MapboxDirections/AttributeOptions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ public struct AttributeOptions: CustomValueOptionSet, CustomStringConvertible {
*/
public static let numericCongestionLevel = AttributeOptions(rawValue: 1 << 6)

/**
:nodoc:
The tendency value conveys the changing state of traffic congestion (increasing, decreasing, constant etc).
*/
public static let trafficTendency = AttributeOptions(rawValue: 1 << 7)

/**
Creates an AttributeOptions from the given description strings.
*/
Expand All @@ -96,6 +102,8 @@ public struct AttributeOptions: CustomValueOptionSet, CustomStringConvertible {
attributeOptions.update(with: .maximumSpeedLimit)
case "congestion_numeric":
attributeOptions.update(with: .numericCongestionLevel)
case "traffic_tendency":
attributeOptions.update(with: .trafficTendency)
case "":
continue
default:
Expand Down Expand Up @@ -128,6 +136,9 @@ public struct AttributeOptions: CustomValueOptionSet, CustomStringConvertible {
if contains(.numericCongestionLevel) {
descriptions.append("congestion_numeric")
}
if contains(.trafficTendency) {
descriptions.append("traffic_tendency")
}
for (key, value) in customOptionsByRawValue {
if rawValue & key != 0 {
descriptions.append(value)
Expand Down
12 changes: 11 additions & 1 deletion Sources/MapboxDirections/RouteLeg.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,12 @@ open class RouteLeg: Codable, ForeignMemberContainerClass {
*/
open var closures: [Closure]?

/**
:nodoc:
The tendency value conveys the changing state of traffic congestion (increasing, decreasing, constant etc).
*/
open var trafficTendencies: [TrafficTendency]?

/**
The full collection of attributes along the leg.
*/
Expand All @@ -280,7 +286,8 @@ open class RouteLeg: Codable, ForeignMemberContainerClass {
segmentSpeeds: segmentSpeeds,
segmentCongestionLevels: segmentCongestionLevels,
segmentNumericCongestionLevels: segmentNumericCongestionLevels,
segmentMaximumSpeedLimits: segmentMaximumSpeedLimits)
segmentMaximumSpeedLimits: segmentMaximumSpeedLimits,
trafficTendencies: trafficTendencies)
}
set {
segmentDistances = newValue.segmentDistances
Expand All @@ -289,6 +296,7 @@ open class RouteLeg: Codable, ForeignMemberContainerClass {
segmentCongestionLevels = newValue.segmentCongestionLevels
segmentNumericCongestionLevels = newValue.segmentNumericCongestionLevels
segmentMaximumSpeedLimits = newValue.segmentMaximumSpeedLimits
trafficTendencies = newValue.trafficTendencies
}
}

Expand All @@ -301,6 +309,7 @@ open class RouteLeg: Codable, ForeignMemberContainerClass {
segmentCongestionLevels?.replaceIfPossible(subrange: refreshRange, with: newAttributes.segmentCongestionLevels)
segmentNumericCongestionLevels?.replaceIfPossible(subrange: refreshRange, with: newAttributes.segmentNumericCongestionLevels)
segmentMaximumSpeedLimits?.replaceIfPossible(subrange: refreshRange, with: newAttributes.segmentMaximumSpeedLimits)
trafficTendencies?.replaceIfPossible(subrange: refreshRange, with: newAttributes.trafficTendencies)
}

private func adjustShapeIndexRange(_ range: Range<Int>, startLegShapeIndex: Int) -> Range<Int> {
Expand Down Expand Up @@ -424,6 +433,7 @@ extension RouteLeg: Equatable {
lhs.segmentCongestionLevels == rhs.segmentCongestionLevels &&
lhs.segmentNumericCongestionLevels == rhs.segmentNumericCongestionLevels &&
lhs.segmentMaximumSpeedLimits == rhs.segmentMaximumSpeedLimits &&
lhs.trafficTendencies == rhs.trafficTendencies &&
lhs.name == rhs.name &&
lhs.distance == rhs.distance &&
lhs.expectedTravelTime == rhs.expectedTravelTime &&
Expand Down
14 changes: 13 additions & 1 deletion Sources/MapboxDirections/RouteLegAttributes.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ extension RouteLeg {
This property is set if the `RouteOptions.attributeOptions` property contains `AttributeOptions.maximumSpeedLimit`.
*/
public var segmentMaximumSpeedLimits: [Measurement<UnitSpeed>?]?

/**
:nodoc:
The tendency value conveys the changing state of traffic congestion (increasing, decreasing, constant etc).
*/
public var trafficTendencies: [TrafficTendency]?
}
}

Expand All @@ -76,6 +82,7 @@ extension RouteLeg.Attributes: Codable {
case segmentCongestionLevels = "congestion"
case segmentNumericCongestionLevels = "congestion_numeric"
case segmentMaximumSpeedLimits = "maxspeed"
case trafficTendencies = "traffic_tendency"
}

public init(from decoder: Decoder) throws {
Expand All @@ -93,6 +100,8 @@ extension RouteLeg.Attributes: Codable {
segmentMaximumSpeedLimits = nil
}

trafficTendencies = try container.decodeIfPresent([TrafficTendency].self, forKey: .trafficTendencies)

try decodeForeignMembers(notKeyedBy: CodingKeys.self, with: decoder)
}

Expand All @@ -109,6 +118,8 @@ extension RouteLeg.Attributes: Codable {
try container.encode(speedLimitDescriptors, forKey: .segmentMaximumSpeedLimits)
}

try container.encodeIfPresent(trafficTendencies, forKey: .trafficTendencies)

try encodeForeignMembers(notKeyedBy: CodingKeys.self, to: encoder)
}

Expand All @@ -121,6 +132,7 @@ extension RouteLeg.Attributes: Codable {
segmentSpeeds == nil &&
segmentCongestionLevels == nil &&
segmentNumericCongestionLevels == nil &&
segmentMaximumSpeedLimits == nil
segmentMaximumSpeedLimits == nil &&
trafficTendencies == nil
}
}
20 changes: 20 additions & 0 deletions Sources/MapboxDirections/TrafficTendency.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import Foundation

/// :nodoc:
/// The tendency value conveys the changing state of traffic congestion (increasing, decreasing, constant etc).
///
/// New values could be introduced in the future without an API version change.
public enum TrafficTendency: Int, Codable, CaseIterable {
/// Congestion tendency is unknown.
case unknown = 0
/// Congestion tendency is not changing.
case constant = 1
/// Congestion tendency is increasing.
case increasing = 2
/// Congestion tendency is decreasing.
case decreasing = 3
/// Congestion tendency is rapidly increasing.
case rapidlyIncreasing = 4
/// Congestion tendency is rapidly decreasing.
case rapidlyDecreasing = 5
}
114 changes: 111 additions & 3 deletions Tests/MapboxDirectionsTests/Fixtures/RouteRefresh/routeRefreshResponse.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"closures": [
{
"geometry_index_start": 8,
"geometry_index_end": 20,
"geometry_index_end": 20
}
],
"incidents": [
Expand All @@ -22,7 +22,10 @@
"alertc_codes": [
1
],
"lanes_blocked": ["RIGHT", "SIDE"],
"lanes_blocked": [
"RIGHT",
"SIDE"
],
"geometry_index_start": 10,
"geometry_index_end": 15,
"iso_3166_1_alpha3": "DEU",
Expand All @@ -39,6 +42,69 @@
}
],
"annotation": {
"traffic_tendency": [
0,
2,
2,
1,
4,
4,
1,
4,
0,
4,
4,
4,
5,
3,
4,
4,
3,
0,
3,
2,
5,
2,
2,
1,
3,
3,
3,
2,
4,
3,
5,
4,
3,
1,
1,
4,
1,
5,
2,
2,
3,
5,
4,
2,
1,
4,
0,
1,
1,
3,
0,
5,
0,
1,
5,
3,
2,
3,
3,
5,
3
],
"duration": [
34.3,
3.5,
Expand Down Expand Up @@ -391,7 +457,7 @@
"closures": [
{
"geometry_index_start": 6,
"geometry_index_end": 18,
"geometry_index_end": 18
}
],
"incidents": [
Expand All @@ -415,6 +481,48 @@
}
],
"annotation": {
"traffic_tendency": [
4,
3,
1,
3,
3,
4,
5,
3,
5,
0,
2,
5,
0,
1,
1,
4,
0,
1,
5,
4,
3,
0,
0,
1,
1,
3,
4,
5,
5,
5,
4,
3,
3,
5,
5,
1,
0,
2,
0,
1
],
"duration": [
4.9,
4.7,
Expand Down
Loading

0 comments on commit 42726ff

Please sign in to comment.