From 4074e9cf6ff948991fffa965846b1402590a587e Mon Sep 17 00:00:00 2001 From: Fernando Sanchez Date: Mon, 7 Nov 2022 12:59:11 +0100 Subject: [PATCH 1/4] Improve calculations of time to goal and arrival time --- .../InfoBarNavigationViewController.swift | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/SitumWayfinding/Classes/Positioning/Navigation/InfoBarNavigationViewController.swift b/SitumWayfinding/Classes/Positioning/Navigation/InfoBarNavigationViewController.swift index 31fc054..8509a94 100644 --- a/SitumWayfinding/Classes/Positioning/Navigation/InfoBarNavigationViewController.swift +++ b/SitumWayfinding/Classes/Positioning/Navigation/InfoBarNavigationViewController.swift @@ -48,9 +48,9 @@ class InfoBarNavigationViewController: UIViewController { self.setLoadingState() self.timeRemainingLabel.text = progress.currentIndication.humanReadableMessage() } else { - self.timeRemainingLabel.text = self.formatTime(time: progress.timeToGoal) - self.distanceRemainingLabel.text = self.formatDistance(distance: progress.timeToGoal) - self.estimatedTimeLabel.text = self.calculateEstimatedTime(timeToGoal: progress.timeToGoal) + self.timeRemainingLabel.text = self.formatTime(time: progress.improvedTimeToGoal) + self.distanceRemainingLabel.text = self.formatDistance(distance: progress.distanceToGoal) + self.estimatedTimeLabel.text = self.calculateEstimatedTime(timeToGoal: progress.improvedTimeToGoal) } } @@ -112,3 +112,12 @@ class InfoBarNavigationViewController: UIViewController { return formatter.string(from: goalTime) } } + +//TODO: This has to be deleted when this change is added to the sdk +extension SITNavigationProgress { + var improvedTimeToGoal: Float { + get { + return timeToGoal/1.4 + } + } +} From 9263b102a55044649def4d1cd213f4c1961e70a7 Mon Sep 17 00:00:00 2001 From: Fernando Sanchez Date: Mon, 7 Nov 2022 13:02:06 +0100 Subject: [PATCH 2/4] Added changelog --- CHANGELOG_UNRELEASED.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md index e69de29..40a49b5 100644 --- a/CHANGELOG_UNRELEASED.md +++ b/CHANGELOG_UNRELEASED.md @@ -0,0 +1,3 @@ +## [0.16.1] - 2022-11-07 +### Changed: +- Improvements in the calculation of time to goal and arrival expected time whe the user request a route to a point. \ No newline at end of file From c66ef0206181ac6a8ce615b81c7b56f99551ab43 Mon Sep 17 00:00:00 2001 From: Fernando Sanchez Date: Mon, 7 Nov 2022 13:52:32 +0100 Subject: [PATCH 3/4] Updated changelogs, podspec, framework.properties --- CHANGELOG.md | 4 ++++ CHANGELOG_UNRELEASED.md | 3 --- SitumWayfinding.podspec | 2 +- scripts/framework.properties | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05182f3..c174b00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. All non released changes should be in CHANGELOG_UNRELEASED.md file --------- +## [0.16.1] - 2022-11-07 +### Changed: +- Improvements in the calculation of time to goal and arrival expected time whe the user request a route to a point. + ## [0.16.0] - 2022-11-03 ### Added: - Added onNavigationStarted method to OnNavigationListener to notify when all route calculation are finished and the navigation starts. diff --git a/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md index 40a49b5..e69de29 100644 --- a/CHANGELOG_UNRELEASED.md +++ b/CHANGELOG_UNRELEASED.md @@ -1,3 +0,0 @@ -## [0.16.1] - 2022-11-07 -### Changed: -- Improvements in the calculation of time to goal and arrival expected time whe the user request a route to a point. \ No newline at end of file diff --git a/SitumWayfinding.podspec b/SitumWayfinding.podspec index 3350eda..216c7e6 100644 --- a/SitumWayfinding.podspec +++ b/SitumWayfinding.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'SitumWayfinding' - s.version = '0.16.0' + s.version = '0.16.1' s.summary = 'Indoor Location for iOS.' s.static_framework = true diff --git a/scripts/framework.properties b/scripts/framework.properties index 22a4822..f3d5052 100644 --- a/scripts/framework.properties +++ b/scripts/framework.properties @@ -1 +1 @@ -frameworkVersion=0.16.0 +frameworkVersion=0.16.1 From 0a9e43e4df30a2507b11e4874dd0591f87b9fbc0 Mon Sep 17 00:00:00 2001 From: Fernando Sanchez Date: Mon, 7 Nov 2022 13:54:01 +0100 Subject: [PATCH 4/4] Update podfile.lock of example --- Example/Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index f591e29..ce53c09 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -27,7 +27,7 @@ PODS: - SitumSDK (2.54.2): - Protobuf (~> 3.7) - SSZipArchive (~> 2.4) - - SitumWayfinding (0.16.0): + - SitumWayfinding (0.16.1): - Google-Maps-iOS-Utils (~> 4.1.0) - GoogleMaps (~> 4.2.0) - SitumSDK (~> 2.54.2) @@ -53,7 +53,7 @@ SPEC CHECKSUMS: GoogleMaps: eb03e327edfd70b06de1e6e321653f73712df7ad Protobuf: 02524ec14183fe08fb259741659e79683788158b SitumSDK: 62e0823dfd0aaba52f3fa5aa720e4515b97bd598 - SitumWayfinding: b232c8cd13701c875dbc4ead249c67eef8ef73c6 + SitumWayfinding: f8b4dcb3aefdcf1711cfdded8cf24c4bf1e75236 SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef PODFILE CHECKSUM: 181eb894514efe3e0119ec84dae5349934aaaa20