--- a/labs/tripPlannerTester.kml.php +++ b/labs/tripPlannerTester.kml.php @@ -49,7 +49,7 @@ "latdeltasize" => $latdeltasize, "londeltasize" => $londeltasize, "regionname" => $md['key'], - "plan" => $plan . "<br/><a href='" . htmlspecialchars($url) . "'>original plan</a>" + "plan" => $plan . '<br/><a href="' . htmlspecialchars($md['url']) . '">original plan</a>' ); $regionTimes[] = $time; } @@ -98,6 +98,7 @@ } $csv = false; $kml = true; +$gearthcolors = false; if ($kml) { header('Content-Type: application/vnd.google-earth.kml+xml'); echo '<?xml version="1.0" encoding="UTF-8"?> @@ -136,8 +137,8 @@ "finishlon" => 149.1243, ) ); -$latdeltasize = 0.01; -$londeltasize = 0.01; +$latdeltasize = 0.005; +$londeltasize = 0.005; $from = "Wattle Street"; $fromPlace = (startsWith($from, "-") ? $from : geocode($from, false)); $startTime = "9:00 am"; @@ -146,19 +147,21 @@ $regionTimes = Array(); $testRegions = Array(); $useragent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.1) Gecko/20061204 Firefox/2.0.0.1"; +if ($kml) echo "<name> $from at $startTime on $startDate </name>"; if ($csv) echo "<pre>"; if ($csv) echo "lat,lon,time,latdeltasize, londeltasize, region key name\n"; $rc = new RollingCurl("processResult_cb"); -$rc->window_size = 3; +$rc->window_size = 2; foreach ($boundingBoxes as $key => $boundingBox) { for ($i = $boundingBox['startlat']; $i >= $boundingBox['finishlat']; $i-= $latdeltasize) { for ($j = $boundingBox['startlon']; $j <= $boundingBox['finishlon']; $j+= $londeltasize) { $url = $otpAPIurl . "ws/plan?date=" . urlencode($startDate) . "&time=" . urlencode($startTime) . "&mode=TRANSIT%2CWALK&optimize=QUICK&maxWalkDistance=440&wheelchair=false&toPlace=" . $i . "," . $j . "&fromPlace=$fromPlace"; + //debug($url); $request = new RollingCurlRequest($url); $request->headers = Array( "Accept: application/json" ); - $request->metadata = Array( "i" => $i, "j" => $j, "key" => $key); + $request->metadata = Array( "i" => $i, "j" => $j, "key" => $key, "url" => $url); $rc->add($request); } } @@ -177,7 +180,7 @@ if ($band > $colorSteps) $band = $colorSteps; echo "<Placemark> <name>" . $testRegion['regionname'] . " time {$testRegion['time']} band $band</name> - <description> {$testRegion['plan']} </description> + <description> <![CDATA[ {$testRegion['plan']} ]]> </description> <Style> <PolyStyle> <color>c7" . $Gradients[$band] . "</color>" . // 7f = 50% alpha, c7=78%