Add support for geopo based nearest stop lookup
--- a/common.inc.php
+++ b/common.inc.php
@@ -9,7 +9,8 @@
$debugOkay = Array(
"session",
"json",
- "phperror"
+ "phperror",
+ "other"
);
if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE);
include_once ("common-geo.inc.php");
@@ -25,13 +26,22 @@
$_SESSION['time'] = filter_var($_REQUEST['time'], FILTER_SANITIZE_STRING);
}
if (isset($_REQUEST['geolocate'])) {
+
$geocoded = false;
if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
- $_SESSION['lat'] = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
- $_SESSION['lon'] = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+ $_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+ $_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
}
else {
- $contents = geocode(filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL) , true);
+ $geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL);
+ echo $_REQUEST['geolocate'];
+ if (startsWith($geolocate, "-")) {
+ $locateparts = explode(",",$geolocate);
+ $_SESSION['lat'] = $locateparts[0];
+ $_SESSION['lon'] =$locateparts[1];
+ } else {
+ $contents = geocode($geolocate, true);
+ print_r($contents);
if (isset($contents[0]->centroid)) {
$geocoded = true;
$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
@@ -40,6 +50,7 @@
else {
$_SESSION['lat'] = "";
$_SESSION['lon'] = "";
+ }
}
}
if ($_SESSION['lat'] != "" && isMetricsOn()) {
--- a/myway_api.json.php
+++ b/myway_api.json.php
@@ -72,6 +72,7 @@
//close connection
curl_close($ch);
}
+
if (!isset($return['error'])) {
include_once ('simple_html_dom.php');
$page = str_get_html($pageHTML);
@@ -97,7 +98,8 @@
foreach ($table->find("tr") as $tr) {
$tableColumnNum = 0;
foreach ($tr->find("td") as $td) {
- $return[$tableName[$tableNum]][$tableRowNum][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
+ if ($tableNum == 1) $return[$tableName[$tableNum]][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
+ else $return[$tableName[$tableNum]][$tableRowNum][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
$tableColumnNum++;
}
$tableRowNum++;
@@ -107,8 +109,8 @@
}
if (sizeof($return) == 0) {
$return['error'][] = "No data extracted from MyWay website - API may be out of date";
-print $pageHTML;
}
+
header('Content-Type: text/javascript; charset=utf8');
// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
header('Access-Control-Max-Age: 3628800');
--- /dev/null
+++ b/mywaybalance.php
@@ -1,1 +1,63 @@
-
+<?php
+include ('common.inc.php');
+include_header("MyWay Balance", "mywayBalance");
+$return = Array();
+function printBalance($cardNumber, $date, $pwrd)
+{
+ global $return;
+ $return = json_decode(getPage(curPageURL() . "/myway_api.json.php?card_number=$cardNumber&DOBday={$date[0]}&DOBmonth={$date[1]}&DOByear={$date[2]}&secret_answer=$pwrd"), true);
+
+ if (isset($return['error'])) {
+ echo "<font color=red>" . var_dump($return['error']) . "</font>";
+ } else {
+ echo "<h2>Balance: " . $return['myway_carddetails']['Card Balance'] . "</h2>";
+ echo '<ul data-role="listview" data-inset="true"><li data-role="list-divider"> Recent Transactions </li>';
+ foreach ($return['myway_transactions'] as $transaction) {
+ echo "<li><b>" . $transaction["Date / Time"] . "</b>";
+ echo "<br><small>" . $transaction["TX Reference No / Type"]. "</small>";
+ echo '<p class="ui-li-aside">'.$transaction["TX Amount"].'</p>';
+ echo "</li>";
+ }
+ echo "</ul>";
+ }
+}
+if (isset($_REQUEST['card_number']) && isset($_REQUEST['date']) && isset($_REQUEST['secret_answer'])) {
+ $cardNumber = $_REQUEST['card_number'];
+ $date = explode("/", $_REQUEST['date']);
+ $pwrd = $_REQUEST['secret_answer'];
+ if ($_REQUEST['remember'] == true) {
+ $_COOKIE['card_number'] = $cardNumber;
+ $_COOKIE['date'] = $date;
+ $_COOKIE['secret_answer'] = $pwrd;
+ }
+ printBalance($cardNumber, $date, $pwrd);
+}
+else if (isset($_COOKIE['card_number']) && isset($_COOKIE['date']) && isset($_COOKIE['secret_answer'])) {
+ $cardNumber = $_COOKIE['card_number'];
+ $date = explode("/", $_COOKIE['date']);
+ $pwrd = $_COOKIE['secret_answer'];
+ printBalance($cardNumber, $date, $pwrd);
+}
+else {
+ $date = (isset($_REQUEST['date']) ? filter_var($_REQUEST['date'], FILTER_SANITIZE_STRING) : date("m/d/Y"));
+ echo '<form action="" method="post">
+ <div data-role="fieldcontain">
+ <label for="card_number">Card number</label>
+ <input type="text" name="card_number" id="card_number" value="' . $card_number . '" />
+ </div>
+ <div data-role="fieldcontain">
+ <label for="date"> Date of birth </label>
+ <input type="text" name="date" id="date" value="' . $date . '" />
+ </div>
+ <div data-role="fieldcontain">
+ <label for="secret_answer"> Secret question answer </label>
+ <input type="text" name="secret_answer" id="secret_answer" value="' . $secret_answer . '" />
+ </div>
+ <div data-role="fieldcontain">
+ <label for="remember"> Remember these details? </label>
+ <input type="checkbox" name="remember" id="remember" checked="yes" />
+ </div>
+ <input type="submit" value="Go!"></form>';
+}
+include_footer();
+?>
--- a/schedule_viewer.py
+++ b/schedule_viewer.py
@@ -349,14 +349,54 @@
points.append((stop.stop_lat, stop.stop_lon))
return points
+#
+# GeoPo Encode in Python
+# @author : Shintaro Inagaki
+# @param location (Dictionary) [lat (Float), lng (Float), scale(Int)]
+# @return geopo (String)
+#
+
def handle_json_GET_neareststops(self, params):
"""Return a list of the nearest 'limit' stops to 'lat', 'lon'"""
schedule = self.server.schedule
lat = float(params.get('lat'))
lon = float(params.get('lon'))
limit = int(params.get('limit'))
- stops = schedule.GetNearestStops(lat=lat, lon=lon, n=limit)
- return [StopToTuple(s) for s in stops]
+ scale = int(params.get('scale',5)) # 5 = neighbourhood ~ 1km, 4= town 5 by 7km
+ stops = []
+
+ # 64characters (number + big and small letter + hyphen + underscore)
+ chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"
+
+ geopo = ""
+
+ # Change a degree measure to a decimal number
+ lat = (lat + 90.0) / 180 * 8 ** 10 # 90.0 is forced FLOAT type when lat is INT
+ lon = (lon + 180.0) / 360 * 8 ** 10 # 180.0 is same
+
+ # Compute a GeoPo code from head and concatenate
+ for i in range(scale):
+ order = int(lat / (8 ** (9 - i)) % 8) + int(lon / (8 ** (9 - i)) % 8) * 8
+ geopo = geopo + chars[order]
+
+
+ for s in schedule.GetStopList():
+ if s.stop_code.find(geopo) != -1:
+ stops.append(s)
+
+ if scale == 5:
+ return [StopToTuple(s) for s in stops]
+ else:
+ dist_stop_list = []
+ for s in stops:
+ # TODO: Use util.ApproximateDistanceBetweenStops?
+ dist = (s.stop_lat - lat)**2 + (s.stop_lon - lon)**2
+ if len(dist_stop_list) < limit:
+ bisect.insort(dist_stop_list, (dist, s))
+ elif dist < dist_stop_list[-1][0]:
+ bisect.insort(dist_stop_list, (dist, s))
+ dist_stop_list.pop() # Remove stop with greatest distance
+ return [StopToTuple(s) for s in dist_stop_list]
def handle_json_GET_boundboxstops(self, params):
"""Return a list of up to 'limit' stops within bounding box with 'n','e'