Date picker and bylines for platforms`
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-maxious-canberra-transit-feed/output/
+origin-src
--- /dev/null
+++ b/betweenpoint.add.php
@@ -1,1 +1,50 @@
+<?php
+ /*
+ * GeoPo Encode in PHP
+ * @author : Shintaro Inagaki
+ * @param $location (Array)
+ * @return $geopo (String)
+ */
+ function geopoEncode($lat, $lng)
+ {
+ // 64characters (number + big and small letter + hyphen + underscore)
+ $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
+
+ $geopo = "";
+ $scale = 7;
+
+ // Change a degree measure to a decimal number
+ $lat = ($lat + 90) / 180 * pow(8, 10);
+ $lng = ($lng + 180) / 360 * pow(8, 10);
+ // Compute a GeoPo code from head and concatenate
+ for ($i = 0; $i < $scale; $i++) {
+ $geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
+ }
+ return $geopo;
+ }
+
+ $conn = pg_connect("dbname=bus user=postgres password=snmc");
+ if (!$conn) {
+ echo "An error occured.\n";
+ exit;
+ }
+ if ($_REQUEST['newlatlng']) {
+ $latlng = explode(";", $_REQUEST['newlatlng']);
+ $lat = (float)$latlng[0];
+ $lng = (float)$latlng[1];
+
+ $geoPo = geopoEncode($lat, $lng);
+ $nodelat = (int)($lat * 10000000);
+ $nodelon = (int)($lng * 10000000);
+ echo($nodelat . "," . $nodelon . "=$geoPo<br>");
+ $sql = "INSERT INTO stops (geohash,lat,lng) VALUES ('$geoPo', '$nodelat', '$nodelon')";
+ $result = pg_query($conn, $sql);
+ if (!$result) {
+ echo("Error in SQL query: " . pg_last_error() . "<br>\n");
+ } else {
+ echo "Inserted new point at $geoPo <br>";
+ }
+ }
+ flush();
+?>
--- /dev/null
+++ b/betweenpoint.delete.php
@@ -1,1 +1,33 @@
-
+<?php
+
+ $conn = pg_connect("dbname=bus user=postgres password=snmc");
+ if (!$conn) {
+ echo "An error occured.\n";
+ exit;
+ }
+ if ($_REQUEST['oldgeopo']) {
+
+ $sql = " DELETE from stops WHERE geohash = '{$_REQUEST['oldgeopo']}'";
+ $result = pg_query($conn, $sql);
+ if (!$result) {
+ echo("Error in SQL query: " . pg_last_error() . "<br>\n");
+ } else {
+ echo "Deleted {$_REQUEST['oldgeopo']}<br>";
+ $updatedroutes = 0;
+ $result_outdatedroutes = pg_query($conn, "Select * FROM between_stops where points LIKE '%" . $_REQUEST['oldgeopo'] . ";%'");
+ while ($outdatedroute = pg_fetch_assoc($result_outdatedroutes)) {
+ $newpoints = str_replace($_REQUEST['oldgeopo'].';', '', $outdatedroute['points']);
+ $sql = "UPDATE between_stops set points='$newpoints' where fromlocation = '{$outdatedroute['fromlocation']}' AND tolocation = '{$outdatedroute['tolocation']}' ";
+ $result = pg_query($conn, $sql);
+ if (!$result) {
+ echo("Error in SQL query: " . pg_last_error() . "<br>\n");
+ }
+ echo "updated ".$outdatedroute['fromlocation']."->".$outdatedroute['tolocation']."<br>";
+
+ $updatedroutes++;
+ }
+ echo "updated $updatedroutes routes<br>";
+ }
+ }
+ flush();
+?>
--- a/betweenpoint.load.php
+++ /dev/null
@@ -1,76 +1,1 @@
-<?php
-/*
- * GeoPo Encode in PHP
- * @author : Shintaro Inagaki
- * @param $location (Array)
- * @return $geopo (String)
- */
-function geopoEncode($lat, $lng) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
-
- $geopo = "";
- $scale = 7;
-
- // Change a degree measure to a decimal number
- $lat = ($lat + 90) / 180 * pow(8, 10);
- $lng = ($lng + 180) / 360 * pow(8, 10);
- // Compute a GeoPo code from head and concatenate
- for($i = 0; $i < $scale; $i++) {
- $geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
- }
- return $geopo;
-}
-
-/*
- * GeoPo Decode in PHP
- * @author : Shintaro Inagaki
- * @param $geopo (String)
- * @return $location (Array)
- */
-function geopoDecode($geopo) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
- // Array for geolocation
- $location = array ();
-
- for ($i = 0; $i < strlen($geopo); $i++) {
- // What number of character that equal to a GeoPo code (0-63)
- $order = strpos($chars, substr($geopo, $i, 1));
- // Lat/Lng plus geolocation value of scale
- $location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);
- $location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);
- }
-
- // Change a decimal number to a degree measure, and plus revised value that shift center of area
- $location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;
- $location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;
- $location['scale'] = strlen($geopo);
-
- return $location;
-}
-
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
- echo "An error occured.\n";
- exit;
-}
-$xml = simplexml_load_file("04-locatebetweenpoints.osm");
-
-/* Access the <rating> nodes of the first movie.
- * Output the rating scale, too. */
-foreach ($xml->node as $node) {
- $geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);
- $node['lat'] = (int) ((float)$node['lat']*10000000);
- $node['lon'] = (int) ((float)$node['lon']*10000000);
- echo($node['lat'].",".$node['lon']."=$geoPo<br>");
- $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";
- $result = pg_query($conn, $sql);
- if (!$result) {
- echo("Error in SQL query: " . pg_last_error() ."<br>\n");
- }
-flush();
-
-}
-?>
--- /dev/null
+++ b/betweenpoint.move.php
@@ -1,1 +1,95 @@
-
+<?php
+ /*
+ * GeoPo Encode in PHP
+ * @author : Shintaro Inagaki
+ * @param $location (Array)
+ * @return $geopo (String)
+ */
+ function geopoEncode($lat, $lng)
+ {
+ // 64characters (number + big and small letter + hyphen + underscore)
+ $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
+
+ $geopo = "";
+ $scale = 7;
+
+ // Change a degree measure to a decimal number
+ $lat = ($lat + 90) / 180 * pow(8, 10);
+ $lng = ($lng + 180) / 360 * pow(8, 10);
+ // Compute a GeoPo code from head and concatenate
+ for ($i = 0; $i < $scale; $i++) {
+ $geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
+ }
+ return $geopo;
+ }
+
+ /*
+ * GeoPo Decode in PHP
+ * @author : Shintaro Inagaki
+ * @param $geopo (String)
+ * @return $location (Array)
+ */
+ function geopoDecode($geopo)
+ {
+ // 64characters (number + big and small letter + hyphen + underscore)
+ $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
+ // Array for geolocation
+ $location = array();
+
+ for ($i = 0; $i < strlen($geopo); $i++) {
+ // What number of character that equal to a GeoPo code (0-63)
+ $order = strpos($chars, substr($geopo, $i, 1));
+ // Lat/Lng plus geolocation value of scale
+ $location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);
+ $location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);
+ }
+
+ // Change a decimal number to a degree measure, and plus revised value that shift center of area
+ $location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;
+ $location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;
+ $location['scale'] = strlen($geopo);
+
+ return $location;
+ }
+
+ $conn = pg_connect("dbname=bus user=postgres password=snmc");
+ if (!$conn) {
+ echo "An error occured.\n";
+ exit;
+ }
+ if ($_REQUEST['newlatlng']) {
+ $latlng = explode(";", $_REQUEST['newlatlng']);
+ $lat = (float)$latlng[0];
+ $lng = (float)$latlng[1];
+
+ $geoPo = geopoEncode($lat, $lng);
+ $nodelat = (int)($lat * 10000000);
+ $nodelon = (int)($lng * 10000000);
+ echo($nodelat . "," . $nodelon . "=$geoPo<br>");
+ $sql = "UPDATE stops SET geohash='$geoPo', lat='$nodelat', lng='$nodelon', name=null, suburb=null WHERE geohash = '{$_REQUEST['oldgeopo']}'";
+ $result = pg_query($conn, $sql);
+ if (!$result) {
+ echo("Error in SQL query: " . pg_last_error() . "<br>\n");
+ } else if (pg_affected_rows($result) == 0) {
+ echo ("Error 0 points moved, please refresh page and try again");
+ } else {
+ echo $_REQUEST['oldgeopo'] . " replaced with $geoPo <br>";
+ $updatedroutes = 0;
+ $result_outdatedroutes = pg_query($conn, "Select * FROM between_stops where points LIKE '%" . $_REQUEST['oldgeopo'] . ";%'");
+ while ($outdatedroute = pg_fetch_assoc($result_outdatedroutes)) {
+ $newpoints = str_replace($_REQUEST['oldgeopo'], $geoPo, $outdatedroute['points']);
+ $sql = "UPDATE between_stops set points='$newpoints' where
+ fromlocation = '".pg_escape_string($outdatedroute['fromlocation']).
+ "' AND tolocation = '".pg_escape_string($outdatedroute['tolocation'])."' ";
+ $result = pg_query($conn, $sql);
+ if (!$result) {
+ echo("Error in SQL query: " . pg_last_error() . "<br>\n");
+ }
+ echo "updated ".$outdatedroute['fromlocation']."->".$outdatedroute['tolocation']."<br>";
+ $updatedroutes++;
+ }
+ echo "updated $updatedroutes routes<br>";
+ }
+ }
+ flush();
+?>
--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -7,71 +7,123 @@
function init()
{
- // create the ol map object
- var map = new OpenLayers.Map('map');
+ // create the ol map object
+ var map = new OpenLayers.Map('map');
- var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
+ var osmtiles = new OpenLayers.Layer.OSM("local", "/tiles/${z}/${x}/${y}.png")
// use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
- markers = new OpenLayers.Layer.Markers("Between Stop Markers");
-
-
+ markers = new OpenLayers.Layer.Markers("Between Stop Markers");
+
+ //hanlde mousedown on regions that are not points by reporting latlng
+OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
+ defaultHandlerOptions: {
+ 'single': true,
+ 'double': false,
+ 'pixelTolerance': 0,
+ 'stopSingle': false,
+ 'stopDouble': false
+ },
+
+ initialize: function(options) {
+ this.handlerOptions = OpenLayers.Util.extend(
+ {}, this.defaultHandlerOptions
+ );
+ OpenLayers.Control.prototype.initialize.apply(
+ this, arguments
+ );
+ this.handler = new OpenLayers.Handler.Click(
+ this, {
+ 'click': this.trigger
+ }, this.handlerOptions
+ );
+ },
+
+ trigger: function(e) {
+ var lonlat = map.getLonLatFromViewPortPx(e.xy).transform(
+ new OpenLayers.Projection("EPSG:900913"),
+ new OpenLayers.Projection("EPSG:4326")
+ );
+ $('form input[name="newlatlng"]').val(lonlat.lat + ";" + lonlat.lon );
+ }
+
+ });
+ var click = new OpenLayers.Control.Click();
+ map.addControl(click);
+ click.activate();
<?php
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
- echo "An error occured.\n";
- exit;
-}
-$result_stops = pg_query($conn, "Select * FROM stops");
-
-while ($stop = pg_fetch_assoc($result_stops)) {
-echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat('.($stop['lng']/10000000).",".($stop['lat']/10000000).')
+ $conn = pg_connect("dbname=bus user=postgres password=snmc");
+ if (!$conn) {
+ echo "An error occured.\n";
+ exit;
+ }
+ $result_stops = pg_query($conn, "Select * FROM stops");
+
+ while ($stop = pg_fetch_assoc($result_stops)) {
+ echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat(' . ($stop['lng'] / 10000000) . "," . ($stop['lat'] / 10000000) . ')
.transform(
new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
new OpenLayers.Projection("EPSG:900913") // to Spherical Mercator Projection
));';
-
-echo '
- marker.id="'.$stop['geohash'].'";
+
+ echo '
+ marker.id="' . $stop['geohash'] . '";
markers.addMarker(marker);
marker.events.register("mousedown", marker, function() {
+
document.getElementById("between_points").innerHTML += this.id+";";
+$(\'form input[name="oldgeopo"]\').val(this.id);
});
';
-}
+ }
?>
-var timeicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png",new OpenLayers.Size(32,32));
+var timeicon = new OpenLayers.Icon("icong.png",new OpenLayers.Size(16,16));
var timepoints = new OpenLayers.Layer.GeoRSS("Timing Points", "displaytimepoints.georss.php", { icon: timeicon });
map.addLayers([osmtiles, markers,timepoints]);
map.addControl(new OpenLayers.Control.LayerSwitcher());
- map.zoomToExtent(markers.getDataExtent());
+ map.zoomToExtent(markers.getDataExtent());
}
-
- function submit(){
- $.ajax({
- type: "POST",
- url: "betweenpoint.submit.php",
- data: "reverse=" + document.getElementById("reverse").value +
- "&from=" + document.getElementById("from").value +
- "&to=" + document.getElementById("to").value +
- "&routes=" + document.getElementById("routes").value +
- "&between_points=" + document.getElementById("between_points").value,
- success: function(html){
- $("#response").html(html);
- clearForms();
- }
- });
-
- }
-<!--
+ </script>
+ <script type="text/javascript">
+function submitBetween () {
+ $.post("betweenpoint.submit.php", $("#inputform").serialize(), function(html){
+ $("#response").html(html);
+ clearForms();
+ return false;
+ });
+};
+function submitMove () {
+ $.post("betweenpoint.move.php", $("#moveform").serialize(), function(html){
+ $("#response").html(html);
+ clearForms();
+ return false;
+ });
+};
+function submitDelete () {
+ $.post("betweenpoint.delete.php", $("#moveform").serialize(), function(html){
+ $("#response").html(html);
+ clearForms();
+ return false;
+ });
+};
+function submitAdd () {
+ $.post("betweenpoint.add.php", $("#moveform").serialize(), function(html){
+ $("#response").html(html);
+ clearForms();
+ return false;
+ });
+};
function OnChange(dropdown)
{
var myindex = dropdown.selectedIndex
- var selValue = dropdown.options[myindex].value
-alert(selValue);
+ var selValue = dropdown.options[myindex].value;
+ $("#routes").val(selValue.split(":",2)[0]);
+ fromto = selValue.split(":",2)[1];
+ $("#from").val(fromto.split("->",2)[0]);
+ $("#to").val(fromto.split("->",2)[1]);
+ document.getElementById("between_points").innerHTML = "";
return true;
}
-//-->
// function will clear input elements on each form
function clearForms(){
@@ -96,7 +148,7 @@
break;
case "radio":
case "checkbox":
- document.forms[x].elements[y].checked = "";
+ document.forms[x].elements[y].checked = true;
break;
case "select-one":
document.forms[x].elements[y].options[0].selected = true;
@@ -118,72 +170,85 @@
<select name=selectPair onchange='OnChange(this.form.selectPair);'>
<option>Select a from/to pair...</option>
<?php
-include('spyc/spyc.php');
-//$timetable = Spyc::YAMLLoad('../spyc.yaml');
-$path = "maxious-canberra-transit-feed/output/";
-$dhandle = opendir("maxious-canberra-transit-feed/output/");
-// define an array to hold the files
-$files = array();
-$paths = array();
-
-if ($dhandle) {
- // loop through all of the files
- while (false !== ($fname = readdir($dhandle))) {
- if (($fname != '.') && ($fname != '..')) {
- $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/".$fname);
- for ($i = 0; $i < sizeof($timetable["time_points"]) -1 ; $i++)
- {
- @$paths[$timetable["time_points"][$i]."->".$timetable["time_points"][$i+1]] .= $timetable["short_name"].";";
- }
+ include('spyc/spyc.php');
+ //$timetable = Spyc::YAMLLoad('../spyc.yaml');
+ $path = "maxious-canberra-transit-feed/output/";
+ $dhandle = opendir("maxious-canberra-transit-feed/output/");
+ // define an array to hold the files
+ $files = array();
+ $paths = array();
+
+ if ($dhandle) {
+ // loop through all of the files
+ while (false !== ($fname = readdir($dhandle))) {
+ if (($fname != '.') && ($fname != '..')) {
+ $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/" . $fname);
+ // Strip off individual platforms because it usually doesn't matter for routes
+ $timetable["time_points"] = preg_replace("/\(Platform.*/","",$timetable["time_points"]);
+ for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
+ $key = trim($timetable["time_points"][$i]) . "->" . trim($timetable["time_points"][$i + 1]);
+ if (strstr($paths[$key],";" . $timetable["short_name"] . ";") === false)
+ @$paths[$key] .= $timetable["short_name"] . ";";
+ }
+ }
+ }
+ }
+ ksort($paths);
+
+ $completedPaths = array();
+ $result_betweenstops = pg_query($conn, "Select * FROM between_stops");
+ while ($path = pg_fetch_assoc($result_betweenstops)) {
+ $key = trim($path['fromlocation']) . "->" . trim($path['tolocation']);
+ $completedPaths[$key].= trim($path['routes']);
+
+ }
+
+ $processed = 0;
+ foreach ($paths as $path => $routes) {
+ if (!in_array($path, array_keys($completedPaths))) {
+ echo "<option value=\"$routes:$path\"> $path ($routes) </option>\n";
+ $processed++;
+ } else {
+ $completedRoutes = explode(";", $completedPaths[$path]);
+ $incompleteRoutes = "";
+ foreach (explode(";", $routes) as $route) {
+
+ if (!in_array($route,$completedRoutes) && strstr($incompleteRoutes,';'.$route.';') === false) {
+ $incompleteRoutes .= $route.';';
+ }
+
}
- }
-}
-$completedPaths = Array("Cameron Ave Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cohen St Bus Station",
-"Cohen St Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cameron Ave Bus Station",
-"Lathlain St Bus Station - Platform 1->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 3",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 4",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 6",
-"Lathlain St Bus Station - Platform 5->Cohen St Bus Station - Platform 5",
-"Lathlain St Bus Station - Platform 6->Cohen St Bus Station - Platform 5",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 1",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 3->Lathlain St Bus Station - Platform 1",
-"Cameron Ave Bus Station - Platform 4->Lathlain St Bus Station - Platform 4",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 5",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 6"
-);
-ksort($paths);
-foreach ($paths as $path => $routes)
-{
- if (!in_array($path,$completedPaths)) echo "<option value=\"$routes:$path\">".sizeof(explode(";",$routes))." $path</option>\n";
-}
+ if ($incompleteRoutes != "") {
+ echo "<option value=\"$incompleteRoutes:$path\"> $path ($incompleteRoutes) </option>\n";
+ $processed++;
+ }
+ }
+
+ }
+ echo "</select>$processed";
?>
-</select>
- from <input type="text" id="from"/>
- to <input type="text" id="to"/>
+ from <input type="text" name="from" id="from"/>
+ to <input type="text" name="to" id="to"/>
<br>
- on routes <input type="text" id="routes"/>
-Reverse? <input type="checkbox" name="reverse" id="reverse" value="true"/>
-<input type="button" onclick="javascript:submit()" name="mysubmit" value="Submit!">
+ on routes <input type="text" name="routes" id="routes"/>
+Reverse? <input type="checkbox" name="reverse" id="reverse" checked="true"/>
+<input type="button" onclick="javascript:submitBetween()" value="Submit!">
<input type="button" value="Clear" onclick="javascript:clearForms()" title="Start clearForms() JavaScript function">
<br>
-<textarea id="between_points" rows="1" cols="120"></textarea>
+<textarea name="between_points" id="between_points" rows="1" cols="120"></textarea>
</form>
-<br><div id="response">
- <!-- Our message will be echoed out here -->
- </div>
+ <form id="moveform">
+oldgeopo <input type="text" name="oldgeopo" id="oldgeopo"/>
+newlatlng <input type="text" name="newlatlng" id="newlatlng" size="60"/>
+ <input type="button" onclick="javascript:submitMove()" value="Move!">
+ <input type="button" onclick="javascript:submitAdd()" value="Add!">
+ <input type="button" onclick="javascript:submitDelete()" value="Delete!">
+</form>
+<div id="response">
+ <!-- Our message will be echoed out here -->
+ </div>
</div>
<div id="map" width="100%" height="100%"></div>
</body>
</html>
-
--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -1,76 +1,32 @@
<?php
-/*
- * GeoPo Encode in PHP
- * @author : Shintaro Inagaki
- * @param $location (Array)
- * @return $geopo (String)
- */
-function geopoEncode($lat, $lng) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
-
- $geopo = "";
- $scale = 7;
-
- // Change a degree measure to a decimal number
- $lat = ($lat + 90) / 180 * pow(8, 10);
- $lng = ($lng + 180) / 360 * pow(8, 10);
- // Compute a GeoPo code from head and concatenate
- for($i = 0; $i < $scale; $i++) {
- $geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
- }
- return $geopo;
-}
-
-/*
- * GeoPo Decode in PHP
- * @author : Shintaro Inagaki
- * @param $geopo (String)
- * @return $location (Array)
- */
-function geopoDecode($geopo) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
- // Array for geolocation
- $location = array ();
-
- for ($i = 0; $i < strlen($geopo); $i++) {
- // What number of character that equal to a GeoPo code (0-63)
- $order = strpos($chars, substr($geopo, $i, 1));
- // Lat/Lng plus geolocation value of scale
- $location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);
- $location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);
- }
-
- // Change a decimal number to a degree measure, and plus revised value that shift center of area
- $location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;
- $location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;
- $location['scale'] = strlen($geopo);
-
- return $location;
-}
-
$conn = pg_connect("dbname=bus user=postgres password=snmc");
if (!$conn) {
echo "An error occured.\n";
exit;
}
-$xml = simplexml_load_file("04-locatebetweenpoints.osm");
-
-/* Access the <rating> nodes of the first movie.
- * Output the rating scale, too. */
-foreach ($xml->node as $node) {
- $geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);
- $node['lat'] = (int) ((float)$node['lat']*10000000);
- $node['lon'] = (int) ((float)$node['lon']*10000000);
- echo($node['lat'].",".$node['lon']."=$geoPo<br>");
- $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";
+print_r($_REQUEST);
+$reverse=(isset($_REQUEST["reverse"]) ? $_REQUEST["reverse"] : "off");
+$from=pg_escape_string($_REQUEST["from"]);
+$to=pg_escape_string($_REQUEST["to"]);
+$routes=$_REQUEST["routes"] ;
+$points=$_REQUEST["between_points"];
+ $sql = "INSERT INTO between_stops (fromLocation, toLocation, points, routes) VALUES('$from','$to','$points','$routes')";
$result = pg_query($conn, $sql);
if (!$result) {
echo("Error in SQL query: " . pg_last_error() ."<br>\n");
}
+ if ($reverse === "on") {
+ $ep = explode(";",$points);
+ $epr = array_reverse($ep);
+ $p = implode(";",$epr).";";
+ $pointsString = substr($p,1);
+$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$pointsString','$routes')";
+$result = pg_query($conn, $sql);
+ if (!$result) {
+ echo("Error in SQL query: " . pg_last_error() ."<br>\n");
+ }
+ }
flush();
-}
?>
--- /dev/null
+++ b/busui/about.php
@@ -1,1 +1,24 @@
+<?php
+include('common.inc.php');
+?>
+<p>
+ Busness Time - An ACT bus timetable webapp
+Based on the maxious-canberra-transit-feed
+Uses jQuery Mobile, PHP, Ruby, Python, Google Transit Feed Specification tools, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service
+Feedback encouraged; contact maxious@lambdacomplex.org
+
+Some icons by Joseph Wain / glyphish.com
+
+
+Disclaimer: The content of this website is of a general and informative nature. Please check with printed timetables or those available on http://action.act.gov.au before your trip.
+Whilst every effort has been made to ensure the high quality and accuracy of the Site, the Author makes no warranty,
+express or implied concerning the topicality, correctness, completeness or quality of the information, which is provided
+"as is". The Author expressly disclaims all warranties, including but not limited to warranties of fitness for a particular purpose and warranties of merchantability.
+All offers are not binding and without obligation. The Author expressly reserves the right, in his discretion, to suspend,
+change, modify, add or remove portions of the Site and to restrict or terminate the use and accessibility of the Site
+without prior notice.
+<?
+include_footer();
+?>
+
--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -1,34 +1,109 @@
<?php
date_default_timezone_set('Australia/ACT');
$APIurl = "http://localhost:8765";
+error_reporting(E_ALL ^ E_NOTICE);
+ // you have to open the session to be able to modify or remove it
+ session_start();
+
function isDebug()
{
- return true;
-}
-
+ return $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME'];
+}
+
+function debug($msg) {
+ if (isDebug()) echo "<!-- $msg -->";
+}
function isFastDevice() {
return true;
}
-function include_header($pageTitle) {
+function include_header($pageTitle, $opendiv = true, $geolocate = false) {
+ // this starts the session
+ session_start();
+
// if (isDebug()) // set php error level high
echo '
<!DOCTYPE html>
<html>
<head>
- <title>bus.lambdacomplex.org - '.$pageTitle.'</title>
- <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.css" />
- <script src="http://code.jquery.com/jquery-1.4.3.min.js"></script><script type="text/javascript"
-src="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.mi