| 
					
				 | 
			
			
				@@ -22,6 +22,7 @@ class ViewController: UIViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     var locationManager: CLLocationManager? 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     var noOfSentPos: Int = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    var noOfSentToServer: Int = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     var gpsLogData: [NSManagedObject] = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -37,7 +38,7 @@ class ViewController: UIViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         locationManager?.requestAlwaysAuthorization() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         locationManager?.desiredAccuracy = kCLLocationAccuracyNearestTenMeters 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         locationManager?.activityType = CLActivityType.otherNavigation 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        locationManager?.distanceFilter = 100.0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        locationManager?.distanceFilter = 10.0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         locationManager?.allowsBackgroundLocationUpdates = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pauseSwitch.isEnabled = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -56,7 +57,7 @@ class ViewController: UIViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     func setupTimer() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        _ = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { timer in 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        _ = Timer.scheduledTimer(withTimeInterval: 60.0, repeats: true) { [self] timer in 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             print("New Timer fired!") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -73,8 +74,11 @@ class ViewController: UIViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     let ts = self.convertStartDate(StartDate: row.ts!) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     let gpsPosLog = GPS_POS_LOG(latitude:row.latitude,longitude: row.longitud,ts: ts) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     positions.append(gpsPosLog) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    cnxt.delete(row) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    self.noOfSentToServer += 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 sendToHttpServer(gpsPosLog: positions) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                noOfSentGPSToServer.text = String(noOfSentToServer) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } catch let error as NSError { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 print("Could not fetch. \(error), \(error.userInfo)") 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -119,6 +123,9 @@ class ViewController: UIViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             locationManager?.startUpdatingLocation() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             pauseSwitch.isEnabled = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             noOfSentPos = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            noOfSentToServer = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            noOfRxGPSPos.text = String(noOfSentPos) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            noOfSentGPSToServer.text = String(noOfSentToServer) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             setupTimer() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         default: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             print("OFF") 
			 |