diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml index 1b89694..206953d 100644 --- a/phoneClients/android/.idea/workspace.xml +++ b/phoneClients/android/.idea/workspace.xml @@ -40,7 +40,9 @@ - @@ -1029,7 +1018,6 @@ - @@ -1233,6 +1221,7 @@ + @@ -1470,13 +1459,12 @@ - + - @@ -1484,23 +1472,24 @@ - - + - - + + + + @@ -1508,15 +1497,15 @@ - - - + + + - + @@ -1529,8 +1518,8 @@ - + @@ -1902,14 +1891,6 @@ - - - - - - - - @@ -1934,11 +1915,17 @@ - + - - - + + + + + + + + + diff --git a/phoneClients/android/build/intermediates/model_data.bin b/phoneClients/android/build/intermediates/model_data.bin index 6bb624d..46663a7 100644 --- a/phoneClients/android/build/intermediates/model_data.bin +++ b/phoneClients/android/build/intermediates/model_data.bin Binary files differ diff --git a/phoneClients/ios/GpsTracker/WSViewController.m b/phoneClients/ios/GpsTracker/WSViewController.m index 6fdde5d..b79dd96 100644 --- a/phoneClients/ios/GpsTracker/WSViewController.m +++ b/phoneClients/ios/GpsTracker/WSViewController.m @@ -117,7 +117,7 @@ NSTimeInterval secondsSinceLastWebsiteUpdate = fabs([lastWebsiteUpdateTime timeIntervalSinceNow]); if (firstTimeGettingPosition || (secondsSinceLastWebsiteUpdate > timeIntervalInSeconds)) { // currently one minute - if (location.horizontalAccuracy < 100.0 && location.coordinate.latitude != 0 && location.coordinate.longitude != 0) { + if (location.horizontalAccuracy < 500.0 && location.coordinate.latitude != 0 && location.coordinate.longitude != 0) { if (increasedAccuracy) { [self reduceTrackingAccuracy]; diff --git a/servers/php/mysql/gpstracker-09-14-14.sql b/servers/php/mysql/gpstracker-09-14-14.sql index 54667be..376710c 100644 --- a/servers/php/mysql/gpstracker-09-14-14.sql +++ b/servers/php/mysql/gpstracker-09-14-14.sql @@ -91,11 +91,13 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `prcGetAllRoutesForMap`() BEGIN - SELECT DISTINCT(sessionId), MAX(gpsTime) gpsTime, - CONCAT('{ "latitude":"', CAST(latitude AS CHAR),'", "longitude":"', CAST(longitude AS CHAR), '", "speed":"', CAST(speed AS CHAR), '", "direction":"', CAST(direction AS CHAR), '", "distance":"', CAST(distance AS CHAR), '", "locationMethod":"', locationMethod, '", "gpsTime":"', DATE_FORMAT(gpsTime, '%b %e %Y %h:%i%p'), '", "userName":"', userName, '", "phoneNumber":"', phoneNumber, '", "sessionID":"', CAST(sessionID AS CHAR), '", "accuracy":"', CAST(accuracy AS CHAR), '", "extraInfo":"', extraInfo, '" }') json - FROM gpslocations - WHERE sessionID != '0' && CHAR_LENGTH(sessionID) != 0 && gpstime != '0000-00-00 00:00:00' - GROUP BY sessionID; +SELECT sessionId, gpsTime, CONCAT('{ "latitude":"', CAST(latitude AS CHAR),'", "longitude":"', CAST(longitude AS CHAR), '", "speed":"', CAST(speed AS CHAR), '", "direction":"', CAST(direction AS CHAR), '", "distance":"', CAST(distance AS CHAR), '", "locationMethod":"', locationMethod, '", "gpsTime":"', DATE_FORMAT(gpsTime, '%b %e %Y %h:%i%p'), '", "userName":"', userName, '", "phoneNumber":"', phoneNumber, '", "sessionID":"', CAST(sessionID AS CHAR), '", "accuracy":"', CAST(accuracy AS CHAR), '", "extraInfo":"', extraInfo, '" }') json +FROM (SELECT MAX(GPSLocationID) ID + FROM gpslocations + WHERE sessionID != '0' && CHAR_LENGTH(sessionID) != 0 && gpstime != '0000-00-00 00:00:00' + GROUP BY sessionID) AS MaxID +JOIN gpslocations ON gpslocations.GPSLocationID = MaxID.ID +ORDER BY gpsTime; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ;