Skip to content

Commit bb54bc3

Browse files
mattbarker016mattbarker016
committed
Fixed destination name backend call, added origin name
1 parent 217374d commit bb54bc3

3 files changed

Lines changed: 137 additions & 6 deletions

File tree

‎Siri/en.lproj/Intents.intentdefinition‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>INEnums</key>
6+
<array/>
7+
<key>INIntentDefinitionModelVersion</key>
8+
<string>1.0</string>
9+
<key>INIntentDefinitionSystemVersion</key>
10+
<string>17G65</string>
11+
<key>INIntentDefinitionToolsBuildVersion</key>
12+
<string>10B61</string>
13+
<key>INIntentDefinitionToolsVersion</key>
14+
<string>10.1</string>
15+
<key>INIntents</key>
16+
<array>
17+
<dict>
18+
<key>INIntentCategory</key>
19+
<string>request</string>
20+
<key>INIntentDescriptionID</key>
21+
<string>wweA1z</string>
22+
<key>INIntentLastParameterTag</key>
23+
<integer>9</integer>
24+
<key>INIntentName</key>
25+
<string>GetRoutes</string>
26+
<key>INIntentParameterCombinations</key>
27+
<dict>
28+
<key>searchTo,latitude,longitude</key>
29+
<dict>
30+
<key>INIntentParameterCombinationIsPrimary</key>
31+
<false/>
32+
<key>INIntentParameterCombinationSubtitle</key>
33+
<string></string>
34+
<key>INIntentParameterCombinationSubtitleID</key>
35+
<string>KKOS3V</string>
36+
<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
37+
<false/>
38+
<key>INIntentParameterCombinationTitle</key>
39+
<string>Find bus to ${searchTo}</string>
40+
<key>INIntentParameterCombinationTitleID</key>
41+
<string>DexuVZ</string>
42+
</dict>
43+
</dict>
44+
<key>INIntentParameters</key>
45+
<array>
46+
<dict>
47+
<key>INIntentParameterDisplayPriority</key>
48+
<integer>1</integer>
49+
<key>INIntentParameterName</key>
50+
<string>searchTo</string>
51+
<key>INIntentParameterSupportsMultipleValues</key>
52+
<false/>
53+
<key>INIntentParameterTag</key>
54+
<integer>2</integer>
55+
<key>INIntentParameterType</key>
56+
<string>String</string>
57+
</dict>
58+
<dict>
59+
<key>INIntentParameterDisplayPriority</key>
60+
<integer>2</integer>
61+
<key>INIntentParameterName</key>
62+
<string>latitude</string>
63+
<key>INIntentParameterSupportsMultipleValues</key>
64+
<false/>
65+
<key>INIntentParameterTag</key>
66+
<integer>7</integer>
67+
<key>INIntentParameterType</key>
68+
<string>String</string>
69+
</dict>
70+
<dict>
71+
<key>INIntentParameterDisplayPriority</key>
72+
<integer>3</integer>
73+
<key>INIntentParameterName</key>
74+
<string>longitude</string>
75+
<key>INIntentParameterSupportsMultipleValues</key>
76+
<false/>
77+
<key>INIntentParameterTag</key>
78+
<integer>8</integer>
79+
<key>INIntentParameterType</key>
80+
<string>String</string>
81+
</dict>
82+
</array>
83+
<key>INIntentResponse</key>
84+
<dict>
85+
<key>INIntentResponseCodes</key>
86+
<array>
87+
<dict>
88+
<key>INIntentResponseCodeFormatString</key>
89+
<string>Failed to find routes</string>
90+
<key>INIntentResponseCodeFormatStringID</key>
91+
<string>JvOfFg</string>
92+
<key>INIntentResponseCodeName</key>
93+
<string>failure</string>
94+
<key>INIntentResponseCodeSuccess</key>
95+
<false/>
96+
</dict>
97+
<dict>
98+
<key>INIntentResponseCodeFormatString</key>
99+
<string></string>
100+
<key>INIntentResponseCodeFormatStringID</key>
101+
<string>yRbqhi</string>
102+
<key>INIntentResponseCodeName</key>
103+
<string>success</string>
104+
<key>INIntentResponseCodeSuccess</key>
105+
<true/>
106+
</dict>
107+
</array>
108+
<key>INIntentResponseLastParameterTag</key>
109+
<integer>7</integer>
110+
<key>INIntentResponseParameters</key>
111+
<array/>
112+
</dict>
113+
<key>INIntentRestrictions</key>
114+
<integer>0</integer>
115+
<key>INIntentTitle</key>
116+
<string>Get Routes </string>
117+
<key>INIntentTitleID</key>
118+
<string>6mhV59</string>
119+
<key>INIntentType</key>
120+
<string>Custom</string>
121+
<key>INIntentUserConfirmationRequired</key>
122+
<false/>
123+
<key>INIntentVerb</key>
124+
<string>Request</string>
125+
</dict>
126+
</array>
127+
</dict>
128+
</plist>

‎TCAT/Controllers/RouteOptionsViewController.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,9 @@ class RouteOptionsViewController: UIViewController, DestinationDelegate, SearchB
369369
return
370370
}
371371

372-
Network.getRoutes(startCoord: startCoord, endCoord: endCoord, endPlaceName: searchFrom.name, time: time, type: self.searchTimeType) { request in
373-
let requestUrl = Network.getRequestUrl(startCoord: startCoord, endCoord: endCoord, destinationName: searchTo.name, time: time, type: self.searchTimeType)
372+
Network.getRoutes(startCoord: startCoord, endCoord: endCoord, startPlaceName: searchFrom.name, endPlaceName: searchTo.name,
373+
time: time, type: self.searchTimeType) { request in
374+
let requestUrl = Network.getRequestUrl(startCoord: startCoord, endCoord: endCoord, originName: searchFrom.name, destinationName: searchTo.name, time: time, type: self.searchTimeType)
374375
self.processRequest(request: request, requestUrl: requestUrl, endPlace: searchTo)
375376
}
376377

‎TCAT/Utilities/Network.swift‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class Network {
9393

9494
}
9595

96-
class func getRoutes(startCoord: CLLocationCoordinate2D, endCoord: CLLocationCoordinate2D, endPlaceName: String, time: Date, type: SearchType,
96+
class func getRoutes(startCoord: CLLocationCoordinate2D, endCoord: CLLocationCoordinate2D, startPlaceName: String, endPlaceName: String, time: Date, type: SearchType,
9797
callback: @escaping (_ request: APIRequest<JSON, Error>) -> Void) {
9898

9999
let request: APIRequest<JSON, Error> = tron.swiftyJSON.request("route")
@@ -103,7 +103,8 @@ class Network {
103103
"end" : "\(endCoord.latitude),\(endCoord.longitude)",
104104
"start" : "\(startCoord.latitude),\(startCoord.longitude)",
105105
"time" : time.timeIntervalSince1970,
106-
"destinationName" : endPlaceName
106+
"destinationName" : endPlaceName,
107+
"originName" : startPlaceName
107108
]
108109

109110
// Add unique identifier to request
@@ -114,14 +115,15 @@ class Network {
114115
callback(request)
115116
}
116117

117-
class func getRequestUrl(startCoord: CLLocationCoordinate2D, endCoord: CLLocationCoordinate2D, destinationName: String, time: Date, type: SearchType) -> String {
118+
class func getRequestUrl(startCoord: CLLocationCoordinate2D, endCoord: CLLocationCoordinate2D,
119+
originName: String, destinationName: String, time: Date, type: SearchType) -> String {
118120
let path = "route"
119121
let arriveBy = (type == .arriveBy)
120122
let end = "\(endCoord.latitude),\(endCoord.longitude)"
121123
let start = "\(startCoord.latitude),\(startCoord.longitude)"
122124
let time = time.timeIntervalSince1970
123125

124-
return "\(address)\(path)?arriveBy=\(arriveBy)&end=\(end)&start=\(start)&time=\(time)&destinationName=\(destinationName)"
126+
return "\(address)\(path)?arriveBy=\(arriveBy)&end=\(end)&start=\(start)&time=\(time)&destinationName=\(destinationName)&originName=\(originName)"
125127
}
126128

127129

0 commit comments

Comments
 (0)