diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml
index d5145d2..7d3a053 100644
--- a/phoneClients/android/.idea/workspace.xml
+++ b/phoneClients/android/.idea/workspace.xml
@@ -41,6 +41,7 @@
+
@@ -108,46 +109,25 @@
-
-
+
+
-
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -597,7 +577,7 @@
-
-
-
-
+
+
+
+
@@ -1011,7 +991,6 @@
-
@@ -1214,8 +1193,9 @@
-
+
+
@@ -1465,8 +1445,8 @@
-
-
+
+
@@ -1479,7 +1459,6 @@
-
@@ -1487,7 +1466,7 @@
-
+
@@ -1495,6 +1474,7 @@
+
@@ -1641,14 +1621,14 @@
+
+
+
-
-
-
@@ -1897,38 +1877,40 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/phoneClients/android/app/build.gradle b/phoneClients/android/app/build.gradle
index cde89c6..215eab7 100644
--- a/phoneClients/android/app/build.gradle
+++ b/phoneClients/android/app/build.gradle
@@ -8,8 +8,8 @@
applicationId "com.websmithing.gpstracker"
minSdkVersion 10
targetSdkVersion 20
- versionCode 12
- versionName "4.0.1"
+ versionCode 13
+ versionName "4.0.2"
}
buildTypes {
release {
diff --git a/phoneClients/android/build/intermediates/model_data.bin b/phoneClients/android/build/intermediates/model_data.bin
index a449a16..f347d9d 100644
--- a/phoneClients/android/build/intermediates/model_data.bin
+++ b/phoneClients/android/build/intermediates/model_data.bin
Binary files differ
diff --git a/servers/dotNet/sqlserver/gpstraacker-11-15-14.bak b/servers/dotNet/sqlserver/gpstraacker-11-15-14.bak
new file mode 100644
index 0000000..d7602da
--- /dev/null
+++ b/servers/dotNet/sqlserver/gpstraacker-11-15-14.bak
Binary files differ
diff --git a/servers/dotNet/sqlserver/gpstracker-10-1-14.bak b/servers/dotNet/sqlserver/gpstracker-10-1-14.bak
deleted file mode 100644
index 2882545..0000000
--- a/servers/dotNet/sqlserver/gpstracker-10-1-14.bak
+++ /dev/null
Binary files differ
diff --git a/servers/php/mysql/gpstracker-09-14-14.sql b/servers/php/mysql/gpstracker-09-14-14.sql
index 9be91e8..b484d46 100644
--- a/servers/php/mysql/gpstracker-09-14-14.sql
+++ b/servers/php/mysql/gpstracker-09-14-14.sql
@@ -91,12 +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(MAX(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
- ORDER BY gpsTime ASC;
+ 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 */ ;