Use cloudmade tiles for static maps
--- a/aws/awsStartup.sh
+++ b/aws/awsStartup.sh
@@ -5,6 +5,7 @@
#http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12
cp /root/aws.php /tmp/
+mkdir /var/www/lib/staticmaplite/cache
chcon -h system_u:object_r:httpd_sys_content_t /var/www
chcon -R -h root:object_r:httpd_sys_content_t /var/www/*
chcon -R -t httpd_sys_content_rw_t /var/www/lib/staticmaplite/cache
--- a/include/common-geo.inc.php
+++ b/include/common-geo.inc.php
@@ -47,7 +47,7 @@
}
$output = "";
if ($collapsible) $output.= '<div data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';
- $output.= '<center><img src="' . curPageURL() . 'lib/staticmaplite/staticmap.php?center=' . $center . '&zoom=' . $zoom . '&size=' . $width . 'x' . $height . '&maptype=mapnik&markers=' .
+ $output.= '<center><img src="' . curPageURL() . 'lib/staticmaplite/staticmap.php?center=' . $center . '&zoom=' . $zoom . '&size=' . $width . 'x' . $height . '&markers=' .
$markers . '" width=' . $width . ' height=' . $height . '></center>';
if ($collapsible) $output.= '</div>';
return $output;
--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -215,7 +215,7 @@
<div data-role="fieldcontain">
<label for="time"> Time: </label>
<input type="time" name="time" id="time" value="' . (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")) . '"/>
- <a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();'. "$('#time').val(d.getHours() +':'+ d.getMinutes());".'">Current Time?</a>
+ <a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();'. "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length = 1 ? '0'+ d.getMinutes(): d.getMinutes()));".'">Current Time?</a>
</div>
<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -7,7 +7,8 @@
"phperror",
"awsgtfs",
"awsotp",
- "squallotp",
+ //"squallotp",
+ //"vanilleotp",
"other"
);
if (isDebug("awsgtfs")) {
@@ -21,6 +22,9 @@
}
if (isDebug("squallotp")) {
$otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/';
+}
+if (isDebug("vanilleotp")) {
+ $otpAPIurl = 'http://10.0.1.135:8080/opentripplanner-api-webapp/';
}
if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE);
include_once ("common-geo.inc.php");
--- a/labs/tripPlannerTester.kml.php
+++ b/labs/tripPlannerTester.kml.php
@@ -63,8 +63,8 @@
// make sure to sleep(10);
$boundingBoxes = Array(
"belconnen" => Array(
- "startlat" => - 35.1828,
- "startlon" => 149.0295,
+ "startlat" => - 35.1928,
+ "startlon" => 149.006,
"finishlat" => - 35.2630,
"finishlon" => 149.1045,
) ,
@@ -74,24 +74,24 @@
"finishlat" => - 35.2955,
"finishlon" => 149.1559,
) ,
- //"west duffy" => Array(
- // "startlat" => - 35.3252,
- // "startlon" => 149.0240,
- // "finishlat" => - 35.3997,
- // "finishlon" => 149.0676,
- //) ,
- //"central south" => Array(
- // "startlat" => - 35.3042,
- // "startlon" => 149.0762,
- // "finishlat" => - 35.3370,
- // "finishlon" => 149.1806,
- //) ,
- //"south" => Array(
- // "startlat" => - 35.3403,
- // "startlon" => 149.0714,
- // "finishlat" => - 35.4607,
- // "finishlon" => 149.1243,
- //)
+ "west duffy" => Array(
+ "startlat" => - 35.3252,
+ "startlon" => 149.0240,
+ "finishlat" => - 35.3997,
+ "finishlon" => 149.0676,
+ ) ,
+ "central south" => Array(
+ "startlat" => - 35.3042,
+ "startlon" => 149.0762,
+ "finishlat" => - 35.3370,
+ "finishlon" => 149.1806,
+ ) ,
+ "south" => Array(
+ "startlat" => - 35.3403,
+ "startlon" => 149.0714,
+ "finishlat" => - 35.4607,
+ "finishlon" => 149.1243,
+ )
);
$latdeltasize = 0.01;
$londeltasize = 0.01;
@@ -121,8 +121,7 @@
if ($csv) echo "Trip planner temporarily unavailable: " . curl_errno($ch) . " " . curl_error($ch);
}
else {
- $tripplan = json_decode($page);
- if (isset($tripplan->error)) var_dump($tripplan->error);
+ $tripplan = json_decode($page);
$plans = Array();
if (is_array($tripplan->plan->itineraries->itinerary)) {
foreach ($tripplan->plan->itineraries->itinerary as $itineraryNumber => $itinerary) {
@@ -144,6 +143,10 @@
else {
$plan .= processLeg(0, $plans[min(array_keys($plans)) ]->legs->leg);
}
+ if (isset($tripplan->error) && $tripplan->error->id == 404) {
+ $time = 999;
+ $plan = "Trip not possible without excessive walking from nearest bus stop";
+ }
$testRegions[] = Array(
"lat" => $i,
"lon" => $j,
@@ -151,7 +154,7 @@
"latdeltasize" => $latdeltasize,
"londeltasize" => $londeltasize,
"regionname" => $key,
- "plan" => $plan . "<br><a href='". htmlspecialchars($url)."'>original plan</a>"
+ "plan" => $plan . "<br/><a href='". htmlspecialchars($url)."'>original plan</a>"
);
$regionTimes[] = $time;
}
@@ -163,25 +166,25 @@
}
}
if ($kml) {
- $colorSteps = 18;
+ $colorSteps = 9;
//$minTime = min($regionTimes);
//$maxTime = max($regionTimes);
//$rangeTime = $maxTime - $minTime;
//$deltaTime = $rangeTime / $colorSteps;
- $Gradients = Gradient("66FF00", "FF0000", $colorSteps);
+ $Gradients = Gradient(strrev("66FF00"), strrev("FF0000"), $colorSteps); // KML is BGR not RGB so strrev
foreach ($testRegions as $testRegion) {
//$band = (floor(($testRegion[time] - $minTime) / $deltaTime));
- $band = (floor(($testRegion[time] / 10) *2));
+ $band = (floor($testRegion[time] / 10));
if ($band > $colorSteps) $band = $colorSteps;
echo "<Placemark>
<name>" . $testRegion['regionname'] . " time {$testRegion['time']} band $band</name>
<description> {$testRegion['plan']} </description>
<Style>
<PolyStyle>
- <color>c7" . strrev($Gradients[$band]) . "</color>" . // 7f = 50% alpha, c7=78%, also KML is BGR not RGB
+ <color>c7" . $Gradients[$band] . "</color>" . // 7f = 50% alpha, c7=78%
"</PolyStyle>
<LineStyle>
- <color>c7" . strrev($Gradients[$band]) . "</color>" . "</LineStyle>
+ <color>c7" . $Gradients[$band] . "</color>" . "</LineStyle>
</Style>
<Polygon>
<altitudeMode>relativeToGround</altitudeMode>
--- a/lib/staticmaplite/staticmap.php
+++ b/lib/staticmaplite/staticmap.php
@@ -32,11 +32,9 @@
protected $tileSize = 256;
protected $tileSrcUrl = array( 'mapnik' => 'http://tile.openstreetmap.org/{Z}/{X}/{Y}.png',
- 'osmarenderer' => 'http://c.tah.openstreetmap.org/Tiles/tile/{Z}/{X}/{Y}.png',
- 'cycle' => 'http://c.andy.sandbox.cloudmade.com/tiles/cycle/{Z}/{X}/{Y}.png'
- );
-
- protected $tileDefaultSrc = 'mapnik';
+ 'cloudmade' => 'http://b.tile.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/1/256/{Z}/{X}/{Y}.png',);
+
+ protected $tileDefaultSrc = 'cloudmade';
protected $markerBaseDir = 'images/markers';
protected $osmLogo = 'images/osm_logo.png';
@@ -258,8 +256,10 @@
} else {
// no cache, make map, send headers and deliver png
$this->makeMap();
- $this->sendHeader();
- return imagepng($this->image);
+ // $this->sendHeader();
+ // do some extra compression
+ imagetruecolortopalette($this->image, false, 256);
+ return imagepng($this->image, 9, PNG_ALL_FILTERS);
}
}
--- a/routeList.php
+++ b/routeList.php
@@ -36,16 +36,16 @@
$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
$url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
include_header("Routes by Suburb", "routeList");
- trackEvent("Route Lists","Routes By Suburb", $suburb);
+ trackEvent("Route Lists", "Routes By Suburb", $suburb);
}
if ($_REQUEST['nearby']) {
$url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
include_header("Routes Nearby", "routeList", true, true);
- timePlaceSettings(true);
- if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
- include_footer();
- die();
- }
+ timePlaceSettings(true);
+ if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
+ include_footer();
+ die();
+ }
}
$stops = json_decode(getPage($url));
$routes = Array();
@@ -63,7 +63,7 @@
echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[4]) . ")</a></li>\n";
}
}
-else if ($_REQUEST['bynumber']) {
+else if ($_REQUEST['bynumber'] || $_REQUEST['numberSeries']) {
include_header("Routes by Number", "routeList");
navbar();
echo ' <ul data-role="listview" data-inset="true">';
@@ -87,25 +87,20 @@
$routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row;
}
}
- ksort($routeSeries);
- ksort($seriesRange);
- echo '<div class="noscriptnav"> Go to route numbers: ';
- foreach ($seriesRange as $series => $range) {
- if ($range['min'] == $range['max']) echo "<a href=\"#$series\">$series</a> ";
- else echo "<a href=\"#$series\">{$range['min']}-{$range['max']}</a> ";
+ if ($_REQUEST['bynumber']) {
+ ksort($routeSeries);
+ ksort($seriesRange);
+ foreach ($routeSeries as $series => $routes) {
+ echo '<li><a href="' . curPageURL() . 'routeList.php?numberSeries=' . $series . '">';
+ if ($series <= 9) echo $series;
+ else echo "{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}";
+ echo "</a></li>\n";
+ }
}
- echo "</div>
- <script>
- $('.noscriptnav').hide();
- </script>";
- foreach ($routeSeries as $series => $routes) {
- echo '<a name="' . $series . '"></a>';
- if ($series <= 9) echo '<li>' . $series . "<ul>\n";
- else echo "<li>{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}<ul>\n";
- foreach ($routes as $row) {
+ else if ($_REQUEST['numberSeries']) {
+ foreach ($routeSeries[$_REQUEST['numberSeries']] as $row) {
echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
}
- echo "</ul></li>\n";
}
}
else {
@@ -115,24 +110,18 @@
$url = $APIurl . "/json/routes";
$contents = json_decode(getPage($url));
// by destination!
- foreach ($contents as $key => $row) {
+ foreach ($contents as $row) {
$routeDestinations[$row[2]][] = $row;
}
- echo '<div class="noscriptnav"> Go to Destination: ';
- foreach (ksort($routeDestinations) as $destination => $routes) {
- echo "<a href=\"#$destination\">$destination</a> ";
- }
- echo "</div>
- <script>
- $('.noscriptnav').hide();
- </script>";
- foreach ($routeDestinations as $destination => $routes) {
- echo '<a name="' . $destination . '"></a>';
- echo '<li>' . $destination . "... <ul>\n";
- foreach ($routes as $row) {
+ if ($_REQUEST['routeDestination']) {
+ foreach ($routeDestinations[urldecode($_REQUEST['routeDestination'])] as $row) {
echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
}
- echo "</ul></li>\n";
+ }
+ else {
+ foreach ($routeDestinations as $destination => $routes) {
+ echo '<li><a href="' . curPageURL() . 'routeList.php?routeDestination=' . urlencode($destination) . '">' . $destination . "... </a></li>\n";
+ }
}
}
echo "</ul>\n";