+ echo '

Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...

--- a/include/common.inc.php +++ b/include/common.inc.php @@ -30,10 +30,11 @@ include_once ("common-geo.inc.php"); include_once ("common-net.inc.php"); include_once ("common-transit.inc.php"); +include_once ("common-db.inc.php"); + +include_once ("common-request.inc.php"); include_once ("common-session.inc.php"); -include_once ("common-db.inc.php"); include_once ("common-template.inc.php"); -include_once ("common-request.inc.php"); function isDebugServer() { @@ -162,7 +163,7 @@ $key => $val )); } - if ($sort_ascending) $array = array_reverse($temp_array); + if ($sort_ascending && isset($temp_array)) $array = array_reverse($temp_array); else $array = $temp_array; } function r_implode( $glue, $pieces ) --- a/include/db/route-dao.inc.php +++ b/include/db/route-dao.inc.php @@ -13,6 +13,7 @@ } return $query->fetch(PDO::FETCH_ASSOC); } + function getRoutes() { global $conn; @@ -200,7 +201,7 @@ $query = $conn->prepare($query); $query->bindParam(":service_period", $service_period); $query->bindParam(":distance", $distance); - $query->bindParam(":limit", $limit); + if ($limit != "") $query->bindParam(":limit", $limit); $query->execute(); if (!$query) { databaseError($conn->errorInfo()); --- a/include/db/trip-dao.inc.php +++ b/include/db/trip-dao.inc.php @@ -16,40 +16,25 @@ } return $query->fetch(PDO::FETCH_ASSOC); } -function getTripShape() -{ - /* def handle_json_GET_tripstopTimes(self, params): - schedule = self.server.schedule - try: - trip = schedule.GetTrip(params.get('trip')) - except KeyError: - # if a non-existent trip is searched for, the return nothing - return - time_stops = trip.GetTimeInterpolatedStops() - stops = [] - times = [] - for arr,ts,is_timingpoint in time_stops: - stops.append(StopToTuple(ts.stop)) - times.append(arr) - return [stops, times] - - def handle_json_GET_tripshape(self, params): - schedule = self.server.schedule - try: - trip = schedule.GetTrip(params.get('trip')) - except KeyError: - # if a non-existent trip is searched for, the return nothing - return - points = [] - if trip.shape_id: - shape = schedule.GetShape(trip.shape_id) - for (lat, lon, dist) in shape.points: - points.append((lat, lon)) - else: - time_stops = trip.GetTimeStops() - for arr,dep,stop in time_stops: - points.append((stop.stop_lat, stop.stop_lon)) - return points*/ +function getTripShape($tripID) +{ + global $conn; + $query = "SELECT ST_AsKML(ST_MakeLine(geometry(a.position))) as the_route +FROM (SELECT position, + stop_sequence, trips.trip_id +FROM stop_times +join trips on trips.trip_id = stop_times.trip_id +join stops on stops.stop_id = stop_times.stop_id +WHERE trips.trip_id = :tripID ORDER BY stop_sequence) as a group by a.trip_id"; + debug($query, "database"); + $query = $conn->prepare($query); + $query->bindParam(":tripID", $tripID); + $query->execute(); + if (!$query) { + databaseError($conn->errorInfo()); + return Array(); + } + return $query->fetchColumn(0); } function getTimeInterpolatedTrip($tripID, $range = "") { --- a/index.php +++ b/index.php @@ -28,5 +28,4 @@ echo ' Busness R&D'; include_footer(true) ?> - --- a/labs/index.php +++ b/labs/index.php @@ -10,6 +10,8 @@

Analysis of route timing points

Bus Stop Density Map

Analysis of bus stop coverage

Bus Stop Browser Map

Bus stop location/route browser

More coming soon!

--- a/labs/myway_api.json.php +++ b/labs/myway_api.json.php @@ -23,7 +23,7 @@ "DOBday" => "day", "DOByear" => "year", "secret_answer" => "pwrd", - "button" => "button" + "button" => "Submit" ); foreach (Array( "card_number", @@ -64,6 +64,7 @@ curl_setopt($ch, CURLOPT_POST, count($fields)); curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_REFERER, "https://www.action.act.gov.au/ARTS/getbalance.asp"); curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_TIMEOUT, 30); //execute post @@ -75,6 +76,7 @@ if (!isset($return['error'])) { include_once ('lib/simple_html_dom.php'); + //print_r($pageHTML); $page = str_get_html($pageHTML); $pageAlerts = $page->find(".smartCardAlert"); if (sizeof($pageAlerts) > 0) { @@ -94,12 +96,14 @@ $tableColumns[$tableColumnNum] = cleanString($th->plaintext); $tableColumnNum++; } + //print_r($tableColumns); $tableRowNum = 0; foreach ($table->find("tr") as $tr) { $tableColumnNum = 0; foreach ($tr->find("td") as $td) { if ($tableNum == 1) $return[$tableName[$tableNum]][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext); else $return[$tableName[$tableNum]][$tableRowNum][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext); + //print_r($return); $tableColumnNum++; } $tableRowNum++; --- a/labs/mywaybalance.php +++ b/labs/mywaybalance.php @@ -29,8 +29,10 @@ echo '

Recent Transactions
" . $transaction["Date / Time"] . ""; - echo "
" . $transaction["TX Reference No / Type"] . ""; + echo "
"; + if ($transaction["Deduction Type"] == "DEFAULT") echo ''; + echo"" . $transaction["Date / Time"] . ""; + echo "
" .$transaction["Route"] ." at " . $transaction["Stop Name"]. "
". $transaction["TX Reference No / Type"] . ""; echo '
' . $transaction["TX Amount"] . '
'; echo "

".curPageURL()."$file0.3

".curPageURL()."stop.php?stopid=".htmlspecialchars ($stop[0]).""; +foreach (getStops() as $stop) { + echo " ".curPageURL()."stop.php?stopid=".htmlspecialchars ($stop["stop_id"]).""; echo "" . $last_updated . ""; echo "monthly"; echo "0.9"; echo "\n"; } -$url = $APIurl . "/json/routes"; -$routes = json_decode(getPage($url)); -foreach ($routes as $route) { - echo " ".curPageURL()."trip.php?routeid=".htmlspecialchars ($route[0]).""; +foreach (getRoutes() as $route) { + echo " ".curPageURL()."trip.php?routeid=".htmlspecialchars ($route["route_id"]).""; echo "" . $last_updated . ""; echo "monthly"; echo "0.9"; echo "\n"; } + + // geosite map + foreach (getRoutes() as $route) { + echo " ".curPageURL()."geo/route.kml.php?routeid=".htmlspecialchars ($route["route_id"]).""; + echo "" . $last_updated . ""; + echo " + kml + "; + echo "\n"; + } + echo ''; ?> --- a/stop.php +++ b/stop.php @@ -60,6 +60,7 @@ } } include_header($stop['stop_name'], "stop"); +echo ''; timePlaceSettings(); echo $stopLinks; if (sizeof($stops) > 0) { @@ -75,6 +76,7 @@ ) )) ; } +echo ''; echo '

'; if (sizeof($allStopsTrips) > 0) { sktimesort($allStopsTrips,"arrival_time", true); @@ -107,6 +109,7 @@ } } echo ''; +echo ''; include_footer(); ?> --- a/trip.php +++ b/trip.php @@ -16,7 +16,7 @@ include_header("Stops on " . $trip['route_short_name'] . ' ' . $trip['route_long_name'], "trip"); trackEvent("Route/Trip View","View Route", $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid); - +echo ''; echo '

Via:

' . viaPointNames($tripid) . ''; echo '

Other Trips:

'; foreach (getRouteTrips($routeid) as $othertrip) { @@ -27,6 +27,7 @@ foreach (getRoutesByNumber($trip['route_short_name']) as $row) { if ($row['route_id'] != $routeid) echo '' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ') '; } +echo ''; flush(); @ob_flush(); echo '

'; echo '

' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime']; - echo '

'; + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; + echo '
' . distance($tripStopTime['stop_lat'],$tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; } + echo '

'; echo bracketsMeanNewLine($tripStopTime["stop_name"]); echo '

'; - echo '

' . $tripStopTime['arrival_time'] . '

'; + echo '

' . $tripStopTime['arrival_time']; if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; + echo '
' . distance($tripStopTime['stop_lat'],$tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; } + echo '

'; echo bracketsMeanNewLine($tripStopTime['stop_name']); echo '

'; + +echo ''; include_footer(); ?>