From: maxious <maxious@lambdacomplex.org>
Date: Wed, 23 Mar 2011 11:37:59 +0000
Subject: Good colorscheme for trip planner tester
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=00375cff4056787b49a4e55d4e1b57b058f77f28
---
Good colorscheme for trip planner tester
---


--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -7,6 +7,7 @@
 	"phperror",
 	"awsgtfs",
 	"awsotp",
+	"squallotp",
 	"other"
 );
 if (isDebug("awsgtfs")) {
@@ -17,6 +18,9 @@
 $otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/';
 if (isDebug("awsotp") || php_uname('n') == "maxious.xen.prgmr.com") {
 	$otpAPIurl = 'http://bus-main.lambdacomplex.org:8080/opentripplanner-api-webapp/';
+}
+if (isDebug("squallotp")) {
+		$otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/';
 }
 if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE);
 include_once ("common-geo.inc.php");

--- /dev/null
+++ b/labs/OpenStreetMap.js
@@ -1,1 +1,165 @@
+/**
+ * Namespace: Util.OSM
+ */
+OpenLayers.Util.OSM = {};
 
+/**
+ * Constant: MISSING_TILE_URL
+ * {String} URL of image to display for missing tiles
+ */
+OpenLayers.Util.OSM.MISSING_TILE_URL = "/404.php";
+
+/**
+ * Property: originalOnImageLoadError
+ * {Function} Original onImageLoadError function.
+ */
+OpenLayers.Util.OSM.originalOnImageLoadError = OpenLayers.Util.onImageLoadError;
+
+/**
+ * Function: onImageLoadError
+ */
+OpenLayers.Util.onImageLoadError = function() {
+    if (this.src.match(/^http:\/\/[abc]\.[a-z]+\.openstreetmap\.org\//)) {
+        this.src = OpenLayers.Util.OSM.MISSING_TILE_URL;
+    } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) {
+        // do nothing - this layer is transparent
+    } else {
+        OpenLayers.Util.OSM.originalOnImageLoadError;
+    }
+};
+
+/**
+ * Class: OpenLayers.Layer.OSM.Mapnik
+ *
+ * Inherits from:
+ *  - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
+    /**
+     * Constructor: OpenLayers.Layer.OSM.Mapnik
+     *
+     * Parameters:
+     * name - {String}
+     * options - {Object} Hashtable of extra options to tag onto the layer
+     */
+    initialize: function(name, options) {
+        var url = [
+            "http://a.tiles.bigtincan.com/${z}/${x}/${y}.png",
+            "http://b.tiles.bigtincan.com/${z}/${x}/${y}.png",
+            "http://c.tiles.bigtincan.com/${z}/${x}/${y}.png"
+        ];
+        options = OpenLayers.Util.extend({ numZoomLevels: 19 }, options);
+        var newArguments = [name, url, options];
+        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.OSM.Mapnik"
+});
+
+OpenLayers.Layer.OSM.NearMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
+    /**
+     * Constructor: OpenLayers.Layer.OSM.Mapnik
+     *
+     * Parameters:
+     * name - {String}
+     * options - {Object} Hashtable of extra options to tag onto the layer
+     */
+    initialize: function(name, options) {
+        var url = [
+	    "http://nearmap:findreality@web0.nearmap.com/maps/hl=en&nml=Vert&x=${x}&y=${y}&z=${z}",
+	    "http://nearmap:findreality@web1.nearmap.com/maps/hl=en&nml=Vert&x=${x}&y=${y}&z=${z}",
+	    "http://nearmap:findreality@web2.nearmap.com/maps/hl=en&nml=Vert&x=${x}&y=${y}&z=${z}",
+	    "http://nearmap:findreality@web3.nearmap.com/maps/hl=en&nml=Vert&x=${x}&y=${y}&z=${z}"
+        ];
+        options = OpenLayers.Util.extend({ numZoomLevels: 22 }, options);
+        var newArguments = [name, url, options];
+        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.OSM.NearMap"
+});
+
+/**
+ * Class: OpenLayers.Layer.OSM.Osmarender
+ *
+ * Inherits from:
+ *  - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, {
+    /**
+     * Constructor: OpenLayers.Layer.OSM.Osmarender
+     *
+     * Parameters:
+     * name - {String}
+     * options - {Object} Hashtable of extra options to tag onto the layer
+     */
+    initialize: function(name, options) {
+        var url = [
+            "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png",
+            "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png",
+            "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png"
+        ];
+        options = OpenLayers.Util.extend({ numZoomLevels: 18 }, options);
+        var newArguments = [name, url, options];
+        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender"
+});
+
+/**
+ * Class: OpenLayers.Layer.OSM.CycleMap
+ *
+ * Inherits from:
+ *  - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
+    /**
+     * Constructor: OpenLayers.Layer.OSM.CycleMap
+     *
+     * Parameters:
+     * name - {String}
+     * options - {Object} Hashtable of extra options to tag onto the layer
+     */
+    initialize: function(name, options) {
+        var url = [
+            "http://a.andy.sandbox.cloudmade.com/tiles/cycle/${z}/${x}/${y}.png",
+            "http://b.andy.sandbox.cloudmade.com/tiles/cycle/${z}/${x}/${y}.png",
+            "http://c.andy.sandbox.cloudmade.com/tiles/cycle/${z}/${x}/${y}.png"
+        ];
+        options = OpenLayers.Util.extend({ numZoomLevels: 19 }, options);
+        var newArguments = [name, url, options];
+        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.OSM.CycleMap"
+});
+
+/**
+ * Class: OpenLayers.Layer.OSM.Maplint
+ *
+ * Inherits from:
+ *  - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.Maplint = OpenLayers.Class(OpenLayers.Layer.OSM, {
+    /**
+     * Constructor: OpenLayers.Layer.OSM.Maplint
+     *
+     * Parameters:
+     * name - {String}
+     * options - {Object} Hashtable of extra options to tag onto the layer
+     */
+    initialize: function(name, options) {
+        var url = [
+            "http://d.tah.openstreetmap.org/Tiles/maplint/${z}/${x}/${y}.png",
+            "http://e.tah.openstreetmap.org/Tiles/maplint/${z}/${x}/${y}.png",
+            "http://f.tah.openstreetmap.org/Tiles/maplint/${z}/${x}/${y}.png"
+        ];
+        options = OpenLayers.Util.extend({ numZoomLevels: 18, isBaseLayer: false, visibility: false }, options);
+        var newArguments = [name, url, options];
+        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.OSM.Maplint"
+});
+

--- a/labs/tripPlannerTester.kml.php
+++ b/labs/tripPlannerTester.kml.php
@@ -1,10 +1,61 @@
 <?php
-
+// http://www.herethere.net/~samson/php/color_gradient/color_gradient_generator.php.txt
+// return the interpolated value between pBegin and pEnd
+function interpolate($pBegin, $pEnd, $pStep, $pMax)
+{
+	if ($pBegin < $pEnd) {
+		return (($pEnd - $pBegin) * ($pStep / $pMax)) + $pBegin;
+	}
+	else {
+		return (($pBegin - $pEnd) * (1 - ($pStep / $pMax))) + $pEnd;
+	}
+}
+function Gradient($HexFrom, $HexTo, $ColorSteps)
+{
+	$theColorBegin = hexdec($HexFrom);
+	$theColorEnd = hexdec($HexTo);
+	$theNumSteps = intval($ColorSteps);
+	$theR0 = ($theColorBegin & 0xff0000) >> 16;
+	$theG0 = ($theColorBegin & 0x00ff00) >> 8;
+	$theB0 = ($theColorBegin & 0x0000ff) >> 0;
+	$theR1 = ($theColorEnd & 0xff0000) >> 16;
+	$theG1 = ($theColorEnd & 0x00ff00) >> 8;
+	$theB1 = ($theColorEnd & 0x0000ff) >> 0;
+	$GradientColors = array();
+	// generate gradient swathe now
+	for ($i = 0; $i <= $theNumSteps; $i++) {
+		$theR = interpolate($theR0, $theR1, $i, $theNumSteps);
+		$theG = interpolate($theG0, $theG1, $i, $theNumSteps);
+		$theB = interpolate($theB0, $theB1, $i, $theNumSteps);
+		$theVal = ((($theR << 8) | $theG) << 8) | $theB;
+		$GradientColors[] = sprintf("%06X", $theVal);
+	}
+	return $GradientColors;
+}
+function processLeg($legNumber, $leg)
+{
+	$legArray = object2array($leg);
+	if ($legArray["@mode"] === "BUS") {
+		return "bus {$legArray['@route']} " . str_replace("To", "towards", $legArray['@headsign']);
+	}
+	else {
+		return "walk";
+		//$walkingstep = "walk ";
+		//if (strpos($step->streetName, "from") !== false && strpos($step->streetName, "way") !== false) {
+		//	$walkingstep.= "footpath";
+		//}
+		//else {
+		//	$walkingstep.= $step->streetName;
+		//}
+		//$walkingstep.= floor($step->distance) . "m";
+		//return $walkingstep;
+	}
+}
 $csv = false;
 $kml = true;
 if ($kml) {
-	header('Content-Type: application/vnd.google-earth.kml+xml');
-echo '<?xml version="1.0" encoding="UTF-8"?>
+	//header('Content-Type: application/vnd.google-earth.kml+xml');
+	echo '<?xml version="1.0" encoding="UTF-8"?>
 <kml xmlns="http://www.opengis.net/kml/2.2"><Document>';
 }
 include ('../include/common.inc.php');
@@ -16,50 +67,48 @@
 		"startlon" => 149.0295,
 		"finishlat" => - 35.2630,
 		"finishlon" => 149.1045,
-	) , 
+	) ,
 	"north gungahlin civic" => Array(
-		"startlat" => - 35.2652,
+		"startlat" => - 35.1828,
 		"startlon" => 149.1045,
-		"finishlat" => -35.2955,
-		"finishlon" => 149.1559, 
+		"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.025;
-$londeltasize = 0.025;
-$from = "Barry Drive";
+$latdeltasize = 0.01;
+$londeltasize = 0.01;
+$from = "Wattle Street";
 $fromPlace = (startsWith($from, "-") ? $from : geocode($from, false));
 $startTime = "9:00 am";
-$startDate = "21/03/2011";
+$startDate = "03/21/2011"; // american dates, OTP does not validate!
 $counter = 0;
 $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 ($csv) echo "<pre>";
 if ($csv) echo "lat,lon,time,latdeltasize, londeltasize, region key name\n";
-
 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=840&wheelchair=false&toPlace=" . $i . "," . $j . "&fromPlace=$fromPlace&intermediatePlaces=";
+			$url = $otpAPIurl . "ws/plan?date=" . urlencode($startDate) . "&time=" . urlencode($startTime) . "&mode=TRANSIT%2CWALK&optimize=QUICK&maxWalkDistance=440&wheelchair=false&toPlace=" . $i . "," . $j . "&fromPlace=$fromPlace";
 			$ch = curl_init($url);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($ch, CURLOPT_HEADER, 0);
@@ -74,102 +123,81 @@
 			else {
 				$tripplan = json_decode($page);
 				if (isset($tripplan->error)) var_dump($tripplan->error);
-				$times = Array();
+				$plans = Array();
 				if (is_array($tripplan->plan->itineraries->itinerary)) {
-					
 					foreach ($tripplan->plan->itineraries->itinerary as $itineraryNumber => $itinerary) {
-						$times[] = floor($itinerary->duration / 60000);
+						$plans[floor($itinerary->duration / 60000) ] = $itinerary;
 					}
-
 				}
 				else {
-					$times[] = floor($tripplan->plan->itineraries->itinerary->duration / 60000);
+					$plans[floor($tripplan->plan->itineraries->itinerary->duration / 60000) ] = $tripplan->plan->itineraries->itinerary;
 				}
-				if ($csv) echo "$i,$j," . min($times) . ",$latdeltasize, $londeltasize,$key\n";
+				if ($csv) echo "$i,$j," . min(array_keys($plans)) . ",$latdeltasize, $londeltasize,$key\n";
+				if ($kml) {
+					$time = min(array_keys($plans));
+					$plan = "";
+					if (is_array($plans[min(array_keys($plans)) ]->legs->leg)) {
+						foreach ($plans[min(array_keys($plans)) ]->legs->leg as $legNumber => $leg) {
+							$plan .= processLeg($legNumber, $leg).",";
+						}
+					}
+					else {
+						$plan .= processLeg(0, $plans[min(array_keys($plans)) ]->legs->leg);
+					}
+					$testRegions[] = Array(
+						"lat" => $i,
+						"lon" => $j,
+						"time" => $time,
+						"latdeltasize" => $latdeltasize,
+						"londeltasize" => $londeltasize,
+						"regionname" => $key,
+						"plan" => $plan . "<br><a href='". htmlspecialchars($url)."'>original plan</a>"
+					);
+					$regionTimes[] = $time;
+				}
 			}
 			flush();
 			ob_flush();
 			curl_close($ch);
-			$testRegions[] = Array ("lat" => $i, "lon" => $j, "time" => min($times), "latdeltasize" => $latdeltasize, "londeltasize" => $londeltasize, "regionname" => $key);
-			$regionTimes[] = min($times);
-			break;
-			}
-		break;
-	}
-}
-
-// http://www.geekpedia.com/code163_Generate-Gradient-Within-Hex-Range-In-PHP.html
-function Gradient($HexFrom, $HexTo, $ColorSteps)
-{
-        $FromRGB['r'] = hexdec(substr($HexFrom, 0, 2));
-        $FromRGB['g'] = hexdec(substr($HexFrom, 2, 2));
-        $FromRGB['b'] = hexdec(substr($HexFrom, 4, 2));
-       
-        $ToRGB['r'] = hexdec(substr($HexTo, 0, 2));
-        $ToRGB['g'] = hexdec(substr($HexTo, 2, 2));
-        $ToRGB['b'] = hexdec(substr($HexTo, 4, 2));
-       
-        $StepRGB['r'] = ($FromRGB['r'] - $ToRGB['r']) / ($ColorSteps - 1);
-        $StepRGB['g'] = ($FromRGB['g'] - $ToRGB['g']) / ($ColorSteps - 1);
-        $StepRGB['b'] = ($FromRGB['b'] - $ToRGB['b']) / ($ColorSteps - 1);
-       
-        $GradientColors = array();
-       
-        for($i = 0; $i <= $ColorSteps; $i++)
-        {
-                $RGB['r'] = floor($FromRGB['r'] - ($StepRGB['r'] * $i));
-                $RGB['g'] = floor($FromRGB['g'] - ($StepRGB['g'] * $i));
-                $RGB['b'] = floor($FromRGB['b'] - ($StepRGB['b'] * $i));
-               
-                $HexRGB['r'] = sprintf('%02x', ($RGB['r']));
-                $HexRGB['g'] = sprintf('%02x', ($RGB['g']));
-                $HexRGB['b'] = sprintf('%02x', ($RGB['b']));
-               
-                $GradientColors[] = implode(NULL, $HexRGB);
-        }
-        return $GradientColors;
-}
-
-if ($kml)  {
-$minTime = min($regionTimes);
-$maxTime = max($regionTimes);
-$rangeTime = $maxTime - $minTime;
-$colorSteps = 32;
-$deltaTime = $rangeTime / $colorSteps;
-
-$Gradients = Gradient("FF5B5B", "FFCA5B", $colorSteps);
-
-foreach ($testRegions as $testRegion) {
-	$band = (floor(($testRegion[time] - $minTime) / $deltaTime));
-			echo "<Placemark>
-  <name>".$testRegion['regionname']." time {$testRegion[time]} band $band</name>
+		}
+	}
+}
+if ($kml) {
+	$colorSteps = 18;
+	//$minTime = min($regionTimes);
+	//$maxTime = max($regionTimes);
+	//$rangeTime = $maxTime - $minTime;
+	//$deltaTime = $rangeTime / $colorSteps;
+	$Gradients = Gradient("66FF00", "FF0000", $colorSteps);
+	foreach ($testRegions as $testRegion) {
+		//$band = (floor(($testRegion[time] - $minTime) / $deltaTime));
+		$band = (floor(($testRegion[time] / 10) *2));
+		if ($band > $colorSteps) $band = $colorSteps;
+		echo "<Placemark>
+  <name>" . $testRegion['regionname'] . " time {$testRegion['time']} band $band</name>
+  <description> {$testRegion['plan']} </description>
     <Style>
         <PolyStyle>
-            <color>7f".$Gradients[$band]."</color>". // 7f = 50% alpha
-        "</PolyStyle>
+            <color>c7" . strrev($Gradients[$band]) . "</color>" . // 7f = 50% alpha, c7=78%, also KML is BGR not RGB
+		"</PolyStyle>
+        <LineStyle>
+            <color>c7" . strrev($Gradients[$band]) . "</color>" . "</LineStyle>
     </Style>
    <Polygon>
-         <extrude>1</extrude>
-      <altitudeMode>relativeToGround</altitudeMode>
+<altitudeMode>relativeToGround</altitudeMode>
     <outerBoundaryIs>
       <LinearRing>
         <coordinates>
-          ". ($testRegion['lon'] - ($testRegion['londeltasize']/2)) . "," . ($testRegion['lat'] - ($testRegion['latdeltasize']/2)).",0\n".
-	  ($testRegion['lon'] - ($testRegion['londeltasize']/2)) . "," . ($testRegion['lat'] + ($testRegion['latdeltasize']/2)).",0\n".
-	  ($testRegion['lon'] + ($testRegion['londeltasize']/2)) . "," . ($testRegion['lat'] + ($testRegion['latdeltasize']/2)).",0\n".
-	  ($testRegion['lon'] + ($testRegion['londeltasize']/2)) . "," . ($testRegion['lat'] - ($testRegion['latdeltasize']/2)).",0\n".
-          ($testRegion['lon'] - ($testRegion['londeltasize']/2)) . "," . ($testRegion['lat'] - ($testRegion['latdeltasize']/2)).",0\n".
-	  "
+          " . ($testRegion['lon'] - ($testRegion['londeltasize'] / 2)) . "," . ($testRegion['lat'] - ($testRegion['latdeltasize'] / 2)) . ",500\n" . ($testRegion['lon'] - ($testRegion['londeltasize'] / 2)) . "," . ($testRegion['lat'] + ($testRegion['latdeltasize'] / 2)) . ",500\n" . ($testRegion['lon'] + ($testRegion['londeltasize'] / 2)) . "," . ($testRegion['lat'] + ($testRegion['latdeltasize'] / 2)) . ",500\n" . ($testRegion['lon'] + ($testRegion['londeltasize'] / 2)) . "," . ($testRegion['lat'] - ($testRegion['latdeltasize'] / 2)) . ",500\n" . ($testRegion['lon'] - ($testRegion['londeltasize'] / 2)) . "," . ($testRegion['lat'] - ($testRegion['latdeltasize'] / 2)) . ",500\n" . "
 	  
         </coordinates>
       </LinearRing>
     </outerBoundaryIs>
   </Polygon>
 </Placemark>";
-}
-echo "\n</Document></kml>\n";
+	}
+	echo "\n</Document></kml>\n";
 }
 if ($csv) echo "</pre>";
-
 ?>
 

--- a/labs/tripPlannerTester.php
+++ b/labs/tripPlannerTester.php
@@ -33,7 +33,7 @@
 	map.addLayers([osmtiles,tripplantest,nearmap]);
 
     var lonLat = new OpenLayers.LonLat(149.11, -35.28).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
-    map.setCenter(lonLat, 13);
+    map.setCenter(lonLat, 11);
     map.addControl( new OpenLayers.Control.LayerSwitcher({'ascending':false}));
     map.addControl(new OpenLayers.Control.MousePosition(
     {