diff --git a/servers/php/displaymap.php b/servers/php/displaymap.php index 888dfb6..d7b3c85 100644 --- a/servers/php/displaymap.php +++ b/servers/php/displaymap.php @@ -105,30 +105,8 @@ -
-

<== now supports different map providers, Google, Bing or OpenStreetMaps. Select a route below the map - and then click on the selector just to the left.

-
 
-

Please note that routes in the dropdown box are a concatenation of phoneNumber (ie. androidUser) and the first five characters of the sessionID. Start times and end times for the routes are in parentheses -
 
- The routes in the dropdown box are sorted in descending order by startTime so your route should be near the top. -
 
- Also note that you must use https now in this string: -
 
- https://www.websmithing.com/gpstracker/updatelocation.php -
 
- If you do not change this now in the client phone app you will probably not see your route here. +

- - diff --git a/servers/php/getgpslocations.php b/servers/php/getgpslocations.php deleted file mode 100644 index c593a2d..0000000 --- a/servers/php/getgpslocations.php +++ /dev/null @@ -1,36 +0,0 @@ -multi_query($query)) { - - do { // build our json array - if ($result = $mysqli->store_result()) { - while ($row = $result->fetch_row()) { - $json .= $row[0]; - $json .= ','; - } - $result->close(); - } - } while ($mysqli->next_result()); - } - else { - die('error: ' . $mysqli->error); - } - - $json = rtrim($json, ","); - $json .= '] }'; - - header('Content-Type: application/json'); - echo $json; - - $mysqli->close(); -?> \ No newline at end of file diff --git a/servers/php/getrouteformap.php b/servers/php/getrouteformap.php new file mode 100644 index 0000000..c593a2d --- /dev/null +++ b/servers/php/getrouteformap.php @@ -0,0 +1,36 @@ +multi_query($query)) { + + do { // build our json array + if ($result = $mysqli->store_result()) { + while ($row = $result->fetch_row()) { + $json .= $row[0]; + $json .= ','; + } + $result->close(); + } + } while ($mysqli->next_result()); + } + else { + die('error: ' . $mysqli->error); + } + + $json = rtrim($json, ","); + $json .= '] }'; + + header('Content-Type: application/json'); + echo $json; + + $mysqli->close(); +?> \ No newline at end of file diff --git a/servers/php/javascript/maps.js b/servers/php/javascript/maps.js index 73a63c3..abf77a6 100644 --- a/servers/php/javascript/maps.js +++ b/servers/php/javascript/maps.js @@ -34,7 +34,7 @@ function getRouteForMap() { if (hasMap()) { showWaitImage('Getting map...'); - var url = 'getgpslocations.php' + routeSelect.options[routeSelect.selectedIndex].value; + var url = 'getrouteformap.php' + routeSelect.options[routeSelect.selectedIndex].value; //console.log("testing route: " + routeSelect.options[routeSelect.selectedIndex].value);