Refactor stopsList page
Refactor stopsList page

file:a/include/common-db.php (deleted)
 
<?php <?php
date_default_timezone_set('Australia/ACT'); date_default_timezone_set('Australia/ACT');
$APIurl = "http://localhost:8765";  
$debugOkay = Array( $debugOkay = Array(
"session", "session",
"json", "json",
"phperror", "phperror",
//"awsgtfs",  
"awsotp", "awsotp",
//"squallotp", //"squallotp",
//"vanilleotp", //"vanilleotp",
  "database",
"other" "other"
); );
if (isDebug("awsgtfs")) {  
$APIurl = "http://bus-main.lambdacomplex.org:8765";  
}  
$cloudmadeAPIkey = "daa03470bb8740298d4b10e3f03d63e6"; $cloudmadeAPIkey = "daa03470bb8740298d4b10e3f03d63e6";
$googleMapsAPIkey = "ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q"; $googleMapsAPIkey = "ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q";
$otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/'; $otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/';
if (isDebug("awsotp") || php_uname('n') == "maxious.xen.prgmr.com") { if (isDebug("awsotp") || php_uname('n') == "maxious.xen.prgmr.com") {
$otpAPIurl = 'http://bus-main.lambdacomplex.org:8080/opentripplanner-api-webapp/'; $otpAPIurl = 'http://bus-main.lambdacomplex.org:8080/opentripplanner-api-webapp/';
} }
if (isDebug("squallotp")) { if (isDebug("squallotp")) {
$otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/'; $otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/';
} }
if (isDebug("vanilleotp")) { if (isDebug("vanilleotp")) {
$otpAPIurl = 'http://10.0.1.135:8080/opentripplanner-api-webapp/'; $otpAPIurl = 'http://10.0.1.135:8080/opentripplanner-api-webapp/';
} }
if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE); if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE);
   
include_once ("common-geo.inc.php"); include_once ("common-geo.inc.php");
include_once ("common-net.inc.php"); include_once ("common-net.inc.php");
include_once ("common-transit.inc.php"); include_once ("common-transit.inc.php");
   
include_once ("common-session.inc.php"); include_once ("common-session.inc.php");
  include_once ("common-db.inc.php");
include_once ("common-template.inc.php"); include_once ("common-template.inc.php");
   
function isDebugServer() function isDebugServer()
{ {
return $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME']; return $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME'];
} }
function isAnalyticsOn() function isAnalyticsOn()
{ {
return !isDebugServer(); return !isDebugServer();
} }
function isDebug($debugReason = "other") function isDebug($debugReason = "other")
{ {
global $debugOkay; global $debugOkay;
return in_array($debugReason, $debugOkay, false) && isDebugServer(); return in_array($debugReason, $debugOkay, false) && isDebugServer();
} }
function debug($msg, $debugReason = "other") function debug($msg, $debugReason = "other")
{ {
if (isDebug($debugReason)) echo "\n<!-- " . date(DATE_RFC822) . "\n $msg -->\n"; if (isDebug($debugReason)) echo "\n<!-- " . date(DATE_RFC822) . "\n $msg -->\n";
} }
function isJQueryMobileDevice() function isJQueryMobileDevice()
{ {
// http://forum.jquery.com/topic/what-is-the-best-way-to-detect-all-useragents-which-can-handle-jquery-mobile#14737000002087897 // http://forum.jquery.com/topic/what-is-the-best-way-to-detect-all-useragents-which-can-handle-jquery-mobile#14737000002087897
$user_agent = $_SERVER['HTTP_USER_AGENT']; $user_agent = $_SERVER['HTTP_USER_AGENT'];
return preg_match('/iphone/i', $user_agent) || preg_match('/android/i', $user_agent) || preg_match('/webos/i', $user_agent) || preg_match('/ios/i', $user_agent) || preg_match('/bada/i', $user_agent) || preg_match('/maemo/i', $user_agent) || preg_match('/meego/i', $user_agent) || preg_match('/fennec/i', $user_agent) || (preg_match('/symbian/i', $user_agent) && preg_match('/s60/i', $user_agent) && $browser['majorver'] >= 5) || (preg_match('/symbian/i', $user_agent) && preg_match('/platform/i', $user_agent) && $browser['majorver'] >= 3) || (preg_match('/blackberry/i', $user_agent) && $browser['majorver'] >= 5) || (preg_match('/opera mobile/i', $user_agent) && $browser['majorver'] >= 10) || (preg_match('/opera mini/i', $user_agent) && $browser['majorver'] >= 5); return preg_match('/iphone/i', $user_agent) || preg_match('/android/i', $user_agent) || preg_match('/webos/i', $user_agent) || preg_match('/ios/i', $user_agent) || preg_match('/bada/i', $user_agent) || preg_match('/maemo/i', $user_agent) || preg_match('/meego/i', $user_agent) || preg_match('/fennec/i', $user_agent) || (preg_match('/symbian/i', $user_agent) && preg_match('/s60/i', $user_agent) && $browser['majorver'] >= 5) || (preg_match('/symbian/i', $user_agent) && preg_match('/platform/i', $user_agent) && $browser['majorver'] >= 3) || (preg_match('/blackberry/i', $user_agent) && $browser['majorver'] >= 5) || (preg_match('/opera mobile/i', $user_agent) && $browser['majorver'] >= 10) || (preg_match('/opera mini/i', $user_agent) && $browser['majorver'] >= 5);
} }
function isFastDevice() function isFastDevice()
{ {
$ua = $_SERVER['HTTP_USER_AGENT']; $ua = $_SERVER['HTTP_USER_AGENT'];
$fastDevices = Array( $fastDevices = Array(
"Mozilla/5.0 (X11;", "Mozilla/5.0 (X11;",
"Mozilla/5.0 (Windows;", "Mozilla/5.0 (Windows;",
"Mozilla/5.0 (iP", "Mozilla/5.0 (iP",
"Mozilla/5.0 (Linux; U; Android", "Mozilla/5.0 (Linux; U; Android",
"Mozilla/4.0 (compatible; MSIE" "Mozilla/4.0 (compatible; MSIE"
); );
$slowDevices = Array( $slowDevices = Array(
"J2ME", "J2ME",
"MIDP", "MIDP",
"Opera/", "Opera/",
"Mozilla/2.0 (compatible;", "Mozilla/2.0 (compatible;",
"Mozilla/3.0 (compatible;" "Mozilla/3.0 (compatible;"
); );
return true; return true;
} }
function array_flatten($a, $f = array()) function array_flatten($a, $f = array())
{ {
if (!$a || !is_array($a)) return ''; if (!$a || !is_array($a)) return '';
foreach ($a as $k => $v) { foreach ($a as $k => $v) {
if (is_array($v)) $f = array_flatten($v, $f); if (is_array($v)) $f = array_flatten($v, $f);
else $f[$k] = $v; else $f[$k] = $v;
} }
return $f; return $f;
} }
function remove_spaces($string) function remove_spaces($string)
{ {
return str_replace(' ', '', $string); return str_replace(' ', '', $string);
} }
function object2array($object) function object2array($object)
{ {
if (is_object($object)) { if (is_object($object)) {
foreach ($object as $key => $value) { foreach ($object as $key => $value) {
$array[$key] = $value; $array[$key] = $value;
} }
} }
else { else {
$array = $object; $array = $object;
} }
return $array; return $array;
} }
function startsWith($haystack, $needle, $case = true) function startsWith($haystack, $needle, $case = true)
{ {
if ($case) { if ($case) {
return (strcmp(substr($haystack, 0, strlen($needle)) , $needle) === 0); return (strcmp(substr($haystack, 0, strlen($needle)) , $needle) === 0);
} }
return (strcasecmp(substr($haystack, 0, strlen($needle)) , $needle) === 0); return (strcasecmp(substr($haystack, 0, strlen($needle)) , $needle) === 0);
} }
   
function endsWith($haystack, $needle, $case = true) function endsWith($haystack, $needle, $case = true)
{ {
if ($case) { if ($case) {
return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)) , $needle) === 0); return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)) , $needle) === 0);
} }
return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)) , $needle) === 0); return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)) , $needle) === 0);
} }
function bracketsMeanNewLine($input) function bracketsMeanNewLine($input)
{ {
return str_replace(")", "</small>", str_replace("(", "<br><small>", $input)); return str_replace(")", "</small>", str_replace("(", "<br><small>", $input));
} }
function sksort(&$array, $subkey = "id", $sort_ascending = false) function sksort(&$array, $subkey = "id", $sort_ascending = false)
{ {
if (count($array)) $temp_array[key($array) ] = array_shift($array); if (count($array)) $temp_array[key($array) ] = array_shift($array);
foreach ($array as $key => $val) { foreach ($array as $key => $val) {
$offset = 0; $offset = 0;
$found = false; $found = false;
foreach ($temp_array as $tmp_key => $tmp_val) { foreach ($temp_array as $tmp_key => $tmp_val) {
if (!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey])) { if (!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey])) {
$temp_array = array_merge((array)array_slice($temp_array, 0, $offset) , array( $temp_array = array_merge((array)array_slice($temp_array, 0, $offset) , array(
$key => $val $key => $val
) , array_slice($temp_array, $offset)); ) , array_slice($temp_array, $offset));
$found = true; $found = true;
} }
$offset++; $offset++;
} }
if (!$found) $temp_array = array_merge($temp_array, array( if (!$found) $temp_array = array_merge($temp_array, array(
$key => $val $key => $val
)); ));
} }
if ($sort_ascending) $array = array_reverse($temp_array); if ($sort_ascending) $array = array_reverse($temp_array);
else $array = $temp_array; else $array = $temp_array;
} }
?> ?>
   
<?php <?php
/* def StopZoneToTuple(stop): /* def StopZoneToTuple(stop):
"""Return tuple as expected by javascript function addStopMarkerFromList""" """Return tuple as expected by javascript function addStopMarkerFromList"""
return (stop.stop_id, stop.stop_name, float(stop.stop_lat), return (stop.stop_id, stop.stop_name, float(stop.stop_lat),
float(stop.stop_lon), stop.location_type, stop.stop_code, stop.zone_id) float(stop.stop_lon), stop.location_type, stop.stop_code, stop.zone_id)
*/ */
  function getStop($stopID)
function getStop($stopID) { {
  global $conn;
  $query = "Select * from stops where stop_id = '$stopID' LIMIT 1";
  debug($query,"database");
  $result = pg_query($conn, $query);
  if (!$result) {
  databaseError(pg_result_error($result));
  return Array();
  }
  return pg_fetch_all($result);
} }
  function getStops($timingPointsOnly = false, $firstLetter = "")
function getStops($timingPointsOnly = false) { {
  global $conn;
  $conditions = Array();
  if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'";
  if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = '$firstLetter'";
  $query = "Select * from stops";
  if (sizeof($conditions) > 0) {
  if (sizeof($conditions) > 1) {
  $query .= " Where ".implode(" AND ",$conditions)." ";
  }
  else {
  $query .= " Where ".$conditions[0]." ";
  }
  }
  $query .= "order by stop_name;";
  debug($query,"database");
  $result = pg_query($conn, $query);
  if (!$result) {
  databaseError(pg_result_error($result));
  return Array();
  }
  return pg_fetch_all($result);
} }
  function getNearbyStops($lat, $lng, $limit, $distance = 1000)
function stopsNear($lat,$lng,$limit) { {
  if ($lat == null || $lng == null) return Array();
/* global $conn;
-- Show a distance query and note, London is outside the 1000km tolerance $query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance
SELECT name FROM global_points WHERE ST_DWithin(location, ST_GeographyFromText('SRID=4326;POINT(-110 29)'), 1000000, FALSE); from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), $distance, FALSE)
// All the geography functions have the option of using a sphere calculation, by setting a final boolean parameter to 'FALSE'. This will somewhat speed up calculations, particularly for cases where the geometries are very simple. order by distance;";
*/ debug($query,"database");
  $result = pg_query($conn, $query);
  if (!$result) {
  databaseError(pg_result_error($result));
  return Array();
  }
  return pg_fetch_all($result);
} }
  function getStopsBySuburb($suburb)
function stopsBySuburb($suburb) { {
  global $conn;
  $query = "Select * from stops where zone_id LIKE '%$suburb;%' order by stop_name;";
  debug($query,"database");
  $result = pg_query($conn, $query);
  if (!$result) {
  databaseError(pg_result_error($result));
  return Array();
  }
  return pg_fetch_all($result);
} }
  function stopRoutes($stopID, $service_period)
function stopRoutes($stopID,$service_period) {
/* /*
def handle_json_GET_stoproutes(self, params): def handle_json_GET_stoproutes(self, params):
"""Given a stop_id return all routes to visit the stop.""" """Given a stop_id return all routes to visit the stop."""
schedule = self.server.schedule schedule = self.server.schedule
stop = schedule.GetStop(params.get('stop', None)) stop = schedule.GetStop(params.get('stop', None))
service_period = params.get('service_period', None) service_period = params.get('service_period', None)
trips = stop.GetTrips(schedule) trips = stop.GetTrips(schedule)
result = {} result = {}
for trip in trips: for trip in trips:
route = schedule.GetRoute(trip.route_id) route = schedule.GetRoute(trip.route_id)
if service_period == None or trip.service_id == service_period: if service_period == None or trip.service_id == service_period:
if not route.route_short_name+route.route_long_name+trip.service_id in result: if not route.route_short_name+route.route_long_name+trip.service_id in result:
result[route.route_short_name+route.route_long_name+trip.service_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id, trip.service_id) result[route.route_short_name+route.route_long_name+trip.service_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id, trip.service_id)
return result return result
*/ */
   
function stopTrips($stopID) {  
/*  
def handle_json_GET_stopalltrips(self, params):  
"""Given a stop_id return all trips to visit the stop (without times)."""  
schedule = self.server.schedule  
stop = schedule.GetStop(params.get('stop', None))  
service_period = params.get('service_period', None)  
trips = stop.GetTrips(schedule)  
result = []  
for trip in trips:  
if service_period == None or trip.service_id == service_period:  
result.append((trip.trip_id, trip.service_id))  
return result  
*/  
} }
function stopTripsWithTimes($stopID, $time, $service_period) { function stopTrips($stopID)
/* {
def handle_json_GET_stoptrips(self, params): /*
"""Given a stop_id and time in seconds since midnight return the next def handle_json_GET_stopalltrips(self, params):
trips to visit the stop.""" """Given a stop_id return all trips to visit the stop (without times)."""
schedule = self.server.schedule schedule = self.server.schedule
stop = schedule.GetStop(params.get('stop', None)) stop = schedule.GetStop(params.get('stop', None))
requested_time = int(params.get('time', 0)) service_period = params.get('service_period', None)
limit = int(params.get('limit', 15)) trips = stop.GetTrips(schedule)
service_period = params.get('service_period', None) result = []
time_range = int(params.get('time_range', 24*60*60)) for trip in trips:
  if service_period == None or trip.service_id == service_period:
filtered_time_trips = [] result.append((trip.trip_id, trip.service_id))
for trip, index in stop._GetTripIndex(schedule): return result
tripstarttime = trip.GetStartTime() */
if tripstarttime > requested_time and tripstarttime < (requested_time + time_range): }
time, stoptime, tp = trip.GetTimeInterpolatedStops()[index] function stopTripsWithTimes($stopID, $time, $service_period)
if time > requested_time and time < (requested_time + time_range): {
bisect.insort(filtered_time_trips, (time, (trip, index), tp)) /*
result = [] def handle_json_GET_stoptrips(self, params):
for time, (trip, index), tp in filtered_time_trips: """Given a stop_id and time in seconds since midnight return the next
if len(result) > limit: trips to visit the stop."""
break schedule = self.server.schedule
route = schedule.GetRoute(trip.route_id) stop = schedule.GetStop(params.get('stop', None))
trip_name = '' requested_time = int(params.get('time', 0))
if route.route_short_name: limit = int(params.get('limit', 15))
trip_name += route.route_short_name service_period = params.get('service_period', None)
if route.route_long_name: time_range = int(params.get('time_range', 24*60*60))
if len(trip_name):  
trip_name += " - " filtered_time_trips = []
trip_name += route.route_long_name for trip, index in stop._GetTripIndex(schedule):
if service_period == None or trip.service_id == service_period: tripstarttime = trip.GetStartTime()
result.append((time, (trip.trip_id, trip_name, trip.service_id), tp)) if tripstarttime > requested_time and tripstarttime < (requested_time + time_range):
return result time, stoptime, tp = trip.GetTimeInterpolatedStops()[index]
*/ if time > requested_time and time < (requested_time + time_range):
  bisect.insort(filtered_time_trips, (time, (trip, index), tp))
  result = []
  for time, (trip, index), tp in filtered_time_trips:
  if len(result) > limit:
  break
  route = schedule.GetRoute(trip.route_id)
  trip_name = ''
  if route.route_short_name:
  trip_name += route.route_short_name
  if route.route_long_name:
  if len(trip_name):
  trip_name += " - "
  trip_name += route.route_long_name
  if service_period == None or trip.service_id == service_period:
  result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
  return result
  */
} }
?> ?>
<
<?php <?php
include ('include/common.inc.php'); include ('include/common.inc.php');
  $stops = Array();
function filterByFirstLetter($var) function filterByFirstLetter($var)
{ {
return $var[1][0] == $_REQUEST['firstLetter']; return $var[1][0] == $_REQUEST['firstLetter'];
} }
function navbar() function navbar()
{ {
echo ' echo '
<div data-role="navbar"> <div data-role="navbar">
<ul> <ul>
<li><a href="stopList.php">Timing Points</a></li> <li><a href="stopList.php">Timing Points</a></li>
<li><a href="stopList.php?suburbs=yes">By Suburb</a></li> <li><a href="stopList.php?suburbs=yes">By Suburb</a></li>
<li><a href="stopList.php?nearby=yes">Nearby Stops</a></li> <li><a href="stopList.php?nearby=yes">Nearby Stops</a></li>
<li><a href="stopList.php?allstops=yes">All Stops</a></li> <li><a href="stopList.php?allstops=yes">All Stops</a></li>
</ul> </ul>
</div> </div>
'; ';
} }
// By suburb // By suburb
if (isset($_REQUEST['suburbs'])) { if (isset($_REQUEST['suburbs'])) {
include_header("Stops by Suburb", "stopList"); include_header("Stops by Suburb", "stopList");