diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml
index 78b2b7c..864bf0e 100644
--- a/phoneClients/android/.idea/workspace.xml
+++ b/phoneClients/android/.idea/workspace.xml
@@ -40,7 +40,17 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -93,8 +103,8 @@
-
+
@@ -102,10 +112,10 @@
-
+
-
+
@@ -115,8 +125,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -571,7 +591,7 @@
-
-
+
+
-
-
+
+
-
+
@@ -985,8 +1005,6 @@
-
-
@@ -1189,6 +1207,8 @@
+
+
@@ -1256,6 +1276,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1283,19 +1316,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1439,8 +1459,8 @@
-
-
+
+
@@ -1453,7 +1473,8 @@
-
+
+
@@ -1461,14 +1482,13 @@
-
+
-
@@ -1476,15 +1496,15 @@
-
-
-
+
+
+
-
+
@@ -1497,8 +1517,8 @@
-
+
@@ -1615,14 +1635,14 @@
-
-
-
+
+
+
@@ -1842,9 +1862,6 @@
-
-
-
@@ -1854,6 +1871,9 @@
+
+
+
@@ -1862,21 +1882,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1892,22 +1897,37 @@
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
diff --git a/phoneClients/android/app/build.gradle b/phoneClients/android/app/build.gradle
index a901d36..51ae711 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 10
- versionName "3.3.0"
+ versionCode 11
+ versionName "4.0.0"
}
buildTypes {
release {
diff --git a/phoneClients/android/app/src/main/res/values/strings.xml b/phoneClients/android/app/src/main/res/values/strings.xml
index b4c9ecb..fcf1ac0 100644
--- a/phoneClients/android/app/src/main/res/values/strings.xml
+++ b/phoneClients/android/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
Gps Tracker
- https://www.websmithing.com/gpstracker/updatelocation.php
+ http://192.168.1.8/gpstracker/updatelocation.aspxTracking is OffTracking is OnPlease restart tracking to change the time interval.
diff --git a/phoneClients/android/build/intermediates/model_data.bin b/phoneClients/android/build/intermediates/model_data.bin
index 52a79f5..051aef7 100644
--- a/phoneClients/android/build/intermediates/model_data.bin
+++ b/phoneClients/android/build/intermediates/model_data.bin
Binary files differ
diff --git a/servers/php/README.md b/servers/php/README.md
index 70d5df8..3dda108 100644
--- a/servers/php/README.md
+++ b/servers/php/README.md
@@ -1,98 +1,12 @@
-Gps Tracker v3.2.4
--------------
+The database file is in the sqlserver or mysql directory and this needs to be restored, please read the quick start guide to see how to do that:
-##### Google Map Gps Cell Phone Tracker
+https://www.websmithing.com/2014/01/20/quick-start-guide-for-gpstracker-3/#aspnetserver
+If you want to turn on the adsense advertisement in the map, then change line 8 of google.js to enabled:
-**Just a quick note, Aug 26, 2014**
+var adsense_status = 'enabled';
+and add your adsense channel number and publisher id to line 206 and 207:
-There is a responsive front-end using bootstrap in the bootstrap branch. This will be brought into the master branch as soon as I am done making it. You are free to use it now. I am using it on websmithing.com as my test pages and they are working fine.
-
-The dark theme is displaymap.php and the light theme is displaymap-light.php.
-
-If you want to use that branch, you need to add this stored procedure to your database:
-
-
-DROP PROCEDURE IF EXISTS prcGetAllRoutesForMap;
-DELIMITER //
-CREATE 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'), '", "phoneNumber":"', phoneNumber, '", "sessionID":"', CAST(sessionID AS CHAR), '", "accuracy":"', CAST(accuracy AS CHAR), '", "extraInfo":"', extraInfo, '" }') json
- FROM gpslocations
- WHERE sessionID != '0' && CHAR_LENGTH(sessionID) != 0
- GROUP BY sessionID;
-END//
-DELIMITER ;
-
-*************
-
-This project allows you to track cell phones periodically. For instance every minute or every five minutes. You can watch the cell phone being tracked in real time using google maps and you can store and reload routes easily.
-
-You have the choice of two server stacks. Either using asp.net and sql server or using php and mysql. Both are now in the same download but you only need to use one.
-
-If you need help, please go to:
-
-https://www.websmithing.com/gps-tracker/
-
-Here is a quick start guide to help you set up Gps Tracker:
-
-https://www.websmithing.com/2014/01/20/quick-start-guide-for-gpstracker-3/
-
-*************
-
-#### Changelog
-
-*************
-
-Jun 12, 2014 - v3.2.4
-
-Fixed android intervals not working above one minute and removed adsense ads publisher id.
-
-*************
-
-Jun 6, 2014 - v3.2.3
-
-This version fixes the zoom buttons on the google map which was causing the app to freeze and updates leaflet to version 0.7.3. This version is now free from all known errors.
-
-*************
-
-May 5, 2014 - v3.2.2
-
-This version fixes the total distance traveled in the android app.
-
-*************
-
-May 1, 2014 - v3.2.1
-
-This version changes the UI of the android app from two buttons (Save and Track) to one button (Track).
-
-
-
-
-and the android version is now in Google Play:
-
-
-https://play.google.com/store/apps/details?id=com.websmithing.gpstracker
-
-*************
-
-Apr 20, 2014 - v3.2.0
-
-Some pretty major changes here. The android app now has google play location services running in a background service. Also updates will restart if phone is rebooted. The servers are both now using json and jquery. Xml is gone forever. Both servers now support multiple map types. It's currently set up for google maps, bing maps and OpenStreetMaps.
-
-
-*************
-
-Feb 11, 2014 - v3.1.0
-
-Version 3.1.0 updates the php server code from google maps 2 to 3 and now uses jquery. There was a bug in the delete route stored procedure (the sessionID parameter was to small and was causing the delete to fail silently).
-
-*************
-
-Jan 14, 2014 - v3.0.0
-
-Version 3.0.0 of Gps Tracker is complete. This was a very big change from the last version. It's been updated with ios, android, windowsPhone and java me/j2me phone clients and the servers have all been updated as well. Please let me know how it works, good or bad and create an issue if you find a problem. Thanks and enjoy the software, Nick.
-
-ps. I will be writing tutorials and documentation shortly.
-
+user_adsense.channelNumber = "YOUR_CHANNEL_NUMBER";
+user_adsense.publisherID = "YOUR_PUBLISHER_ID";
+https://github.com/nickfox/GpsTracker/tree/master/servers/dotNet/javascript/leaflet-plugins/google.js
\ No newline at end of file
diff --git a/servers/php/js/maps.js b/servers/php/js/maps.js
index f3f1195..b3882a4 100644
--- a/servers/php/js/maps.js
+++ b/servers/php/js/maps.js
@@ -386,8 +386,8 @@
if (hasMap()) {
// comment out these two lines to get delete working
- // confirm("Disabled here on test website, this works fine.");
- // return false;
+ confirm("Disabled here on test website, this works fine.");
+ return false;
var answer = confirm("This will permanently delete this route\n from the database. Do you want to delete?");
if (answer){
diff --git a/servers/php/updatelocation.php b/servers/php/updatelocation.php
index c513a70..90c26bb 100644
--- a/servers/php/updatelocation.php
+++ b/servers/php/updatelocation.php
@@ -1,23 +1,35 @@
$latitude,
':longitude' => $longitude,
':speed' => $speed,