Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions WunderLINQ/InAppSettings.bundle/Integrations.plist
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<string>17</string>
<string>18</string>
<string>19</string>
<string>20</string>
</array>
<key>Titles</key>
<array>
Expand All @@ -58,6 +59,7 @@
<string>nav_app_myrouteapp</string>
<string>nav_app_calimoto</string>
<string>nav_app_kurviger</string>
<string>nav_app_tourstart</string>
</array>
</dict>
<dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
"pref_roadbook_app" = "Roadbook App";
"roadbook_app_rabbitrally" = "Rabbit Rally";
"pref_actioncam_title" = "Action Camera";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@
"nav_app_myrouteapp" = "MyRoute-app";
"nav_app_calimoto" = "Calimoto";
"nav_app_kurviger" = "Kurviger";
"nav_app_tourstart" = "Tourstart";
1 change: 1 addition & 0 deletions WunderLINQ/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<string>geo</string>
<string>mra-mobile</string>
<string>calimoto</string>
<string>tourstart.org</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
Expand Down
10 changes: 8 additions & 2 deletions WunderLINQ/Logger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class Logger {
// Use Calendar to compare the two dates
let calendar = Calendar.current
// Compare just the date components, ignoring time
if calendar.isDate(convertedDate, inSameDayAs: today) {
if calendar.isDate(convertedDate, inSameDayAs: today)
{
var formattedEntry = ""
let fileName = "WunderLINQ-TripLog-" + loggingStatus! + ".csv"
// Get the documents folder url
Expand Down Expand Up @@ -318,7 +319,12 @@ class Logger {
}
} else {
os_log("Logger: New Day")
let fileName = "WunderLINQ-TripLog-" + loggingStatus! + ".csv"
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd-HH-mm-ss"
let dateString = dateFormatter.string(from: Date())
UserDefaults.standard.set(dateString, forKey: "loggingStatus")

let fileName = "WunderLINQ-TripLog-" + dateString + ".csv"
// Get the documents folder url
let documentDirectory = try! FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
// Destination url for the log file to be saved
Expand Down
30 changes: 30 additions & 0 deletions WunderLINQ/NavAppHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ enum NavigationAppPreference: Int, CaseIterable {

case kurviger

case tourstart

var isAvailable: Bool {
UIApplication.shared.canOpenURL(URL(string: self.urlScheme)!)
}
Expand Down Expand Up @@ -129,6 +131,9 @@ enum NavigationAppPreference: Int, CaseIterable {

case .kurviger:
return "https://kurviger.de/en"

case .tourstart:
return "tourstart.org://"

}
}
Expand Down Expand Up @@ -208,6 +213,9 @@ enum NavigationAppPreference: Int, CaseIterable {

case .kurviger:
back_link = ""

case .tourstart:
back_link = "?back_url=wunderlinq://"
}

let url = URL(string: "\(urlScheme)\(back_link)")!
Expand Down Expand Up @@ -415,6 +423,15 @@ extension NavAppHelper {
UIApplication.shared.open(mapsURL, options: [:], completionHandler: nil)
}
}
case .tourstart:
//Tourstart
supported = true
let urlString = "\(navApp.urlScheme)route?geo=\(destLatitude),\(destLongitude)&back_url=wunderlinq://"
if let uRL = URL(string: urlString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!) {
if (UIApplication.shared.canOpenURL(uRL)) {
UIApplication.shared.open(uRL, options: [:], completionHandler: nil)
}
}
}

return supported
Expand Down Expand Up @@ -535,6 +552,10 @@ extension NavAppHelper {
//Kurviger
// Not Supported
supported = false
case .tourstart:
//Tourstart
// Not Supported
supported = false
}
return supported
}
Expand Down Expand Up @@ -717,6 +738,15 @@ extension NavAppHelper {
UIApplication.shared.open(mapsURL, options: [:], completionHandler: nil)
}
}
case .tourstart:
//Tourstart
supported = true
let urlString = "\(navApp.urlScheme)view?geo=\(destLatitude),\(destLongitude)&back_url=wunderlinq://"
if let uRL = URL(string: urlString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!) {
if (UIApplication.shared.canOpenURL(uRL)) {
UIApplication.shared.open(uRL, options: [:], completionHandler: nil)
}
}
}
return supported
}
Expand Down
Loading