Merge pull request #9 from flitsmeister/feature/fix-spammy-shizzle

Fixed spammy when server doesn't respond
maplibre · Jul 6, 2020 · b48eac3 · b48eac3
2 parents d334f1a + b7bd1e9
commit b48eac3
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 12 deletions.
diff --git a/Examples/Objective-CTests/Info.plist b/Examples/Objective-CTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>34</string>
 </dict>

diff --git a/Examples/SwiftTests/Info.plist b/Examples/SwiftTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>34</string>
 </dict>

diff --git a/MapboxCoreNavigation/Info.plist b/MapboxCoreNavigation/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>34</string>
 	<key>NSPrincipalClass</key>

diff --git a/MapboxCoreNavigation/RouteController.swift b/MapboxCoreNavigation/RouteController.swift
@@ -70,6 +70,8 @@ open class RouteController: NSObject, Router {
 
     var isRerouting = false
     var lastRerouteLocation: CLLocation?
+
+    var isFindingFasterRoute = false
 
     var routeTask: URLSessionDataTask?
     var lastLocationDate: Date?
@@ -425,6 +427,10 @@ extension RouteController: CLLocationManagerDelegate {
     }
 
     func checkForFasterRoute(from location: CLLocation) {
+        guard !isFindingFasterRoute else {
+            return
+        }
+
         guard let currentUpcomingManeuver = routeProgress.currentLegProgress.upComingStep else {
             return
         }
@@ -439,18 +445,25 @@ extension RouteController: CLLocationManagerDelegate {
             return
         }
         let durationRemaining = routeProgress.durationRemaining
+
+        isFindingFasterRoute = true
 
         getDirections(from: location, along: routeProgress) { [weak self] (route, error) in
             guard let strongSelf = self else {
                 return
             }
+
+            // Every request should reset the lastLocationDate, else we spam the server by calling this method every location update.
+            // If the call fails, tough luck buddy! Then wait until the next interval before retrying
+            strongSelf.lastLocationDate = nil
+
+            // Also only do one 'findFasterRoute' call per time
+            strongSelf.isFindingFasterRoute = false
 
             guard let route = route else {
                 return
             }
 
-            strongSelf.lastLocationDate = nil
-
             guard let firstLeg = route.legs.first, let firstStep = firstLeg.steps.first else {
                 return
             }

diff --git a/MapboxCoreNavigationTests/Info.plist b/MapboxCoreNavigationTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Location Usage Description</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>

diff --git a/MapboxNavigation/Info.plist b/MapboxNavigation/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>34</string>
 	<key>NSPrincipalClass</key>

diff --git a/MapboxNavigationTests/Info.plist b/MapboxNavigationTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>Location Usage Description</string>
 	<key>NSLocationWhenInUseUsageDescription</key>

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ Alternatively, to install Mapbox Navigation using [Carthage](https://github.com/
 
 1. Create a [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#github-repositories) with the following dependency:
    ```cartfile
-   github "flitsmeister/flitsmeister-navigation-ios" ~> 1.0.2
+   github "flitsmeister/flitsmeister-navigation-ios" ~> 1.0.3
    ```
 
 1. Run `carthage update --platform iOS` to build just the iOS dependencies.

diff --git a/RouteTest/Info.plist b/RouteTest/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>34</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/custom-navigation.md b/custom-navigation.md
@@ -20,7 +20,7 @@ To install Mapbox Core Navigation using [CocoaPods](https://cocoapods.org/):
 
 1. Specify the following dependency in your Podfile:
    ```ruby
-   pod 'MapboxCoreNavigation', '~> 1.0.2'
+   pod 'MapboxCoreNavigation', '~> 1.0.3'
    ```
 
 1. Run `pod install` and open the resulting Xcode workspace.
@@ -31,7 +31,7 @@ Alternatively, to install Mapbox Core Navigation using [Carthage](https://github
 
 1. Specify the following dependency in your Cartfile:
    ```cartfile
-   github "mapbox/mapbox-navigation-ios" ~> 1.0.2
+   github "mapbox/mapbox-navigation-ios" ~> 1.0.3
    ```
 
 1. Run `carthage update --platform iOS` to build just the iOS dependencies.