Better trip planning form, autozooming for static map display based on inserted markers
--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -19,10 +19,15 @@
<html>
<head>
<title>bus.lambdacomplex.org - '.$pageTitle.'</title>
- <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.css" />
+ <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.css" />
+ <style type="text/css">
+ .ui-navbar {
+ padding-bottom: 18px;
+ width: 100%;
+ }
+</style>
<script src="http://code.jquery.com/jquery-1.4.3.min.js"></script><script type="text/javascript"
src="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.js"></script>
- <script type="text/javascript" src="docs/docs.js"></script>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-startup-image" href="startup.png" />
@@ -34,7 +39,6 @@
<div data-role="header">
<h1>'.$pageTitle.'</h1>
- <a href="index.php" data-icon="back" class="ui-btn-right">Home</a>
</div><!-- /header -->
<div data-role="content"> ';
}
@@ -87,31 +91,71 @@
return $f;
}
-function staticmap($mapPoints)
+function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb")
{
$width = 300;
$height = 300;
-$zoom = 0;
+$metersperpixel[9]=305.492*$width;
+$metersperpixel[10]=152.746*$width;
+$metersperpixel[11]=76.373*$width;
+$metersperpixel[12]=38.187*$width;
+$metersperpixel[13]=19.093*$width;
+$metersperpixel[14]=9.547*$width;
+$metersperpixel[15]=4.773*$width;
+$metersperpixel[16]=2.387*$width;
+// $metersperpixel[17]=1.193*$width;
$center = "";
$markers = "";
-
- if (sizeof($mapPoints) < 1) return "";
+$minlat = 999;
+$minlon = 999;
+$maxlat = 0;
+$maxlon = 0;
+
+ if (sizeof($mapPoints) < 1) return "map error";
if (sizeof($mapPoints) === 1) {
- $zoom = 14;
- $markers .= $mapPoint[0].",".$mapPoint[1].",ol-marker";
+ if ($zoom == 0) $zoom = 14;
+ $markers .= "{$mapPoints[0][0]},{$mapPoints[0][1]},$markerimage";
$center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
} else {
foreach ($mapPoints as $index => $mapPoint) {
- $markers .= $mapPoint[0].",".$mapPoint[1].",lightblue".($index+1);
+ $markers .= $mapPoint[0].",".$mapPoint[1].",".$markerImage.($index+1);
if ($index+1 != sizeof($mapPoints)) $markers .= "|";
+ if ($mapPoint[0] < $minlat) $minlat = $mapPoint[0];
+ if ($mapPoint[0] > $maxlat) $maxlat = $mapPoint[0];
+ if ($mapPoint[1] < $minlon) $minlon = $mapPoint[1];
+ if ($mapPoint[1] > $maxlon) $maxlon = $mapPoint[1];
$totalLat += $mapPoint[0];
$totalLon += $mapPoint[1];
}
- $zoom = 11;
+ if ($zoom == 0) {
+ $mapwidthinmeters = distance($minlat,$minlon,$minlat,$maxlon);
+ foreach (array_reverse($metersperpixel,true) as $zoomLevel => $maxdistance)
+ {
+ if ($zoom == 0 && $mapwidthinmeters < ($maxdistance + 50)) $zoom = $zoomLevel;
+ }
+ }
$center = $totalLat/sizeof($mapPoints).",".$totalLon/sizeof($mapPoints);
}
return '<img src="staticmaplite/staticmap.php?center='.$center.'&zoom='.$zoom.'&size='.$width.'x'.$height.'&maptype=mapnik&markers='.$markers.'" width='.$width.' height='.$height.'>';
+}
+
+function distance($lat1, $lng1, $lat2, $lng2)
+{
+ $pi80 = M_PI / 180;
+ $lat1 *= $pi80;
+ $lng1 *= $pi80;
+ $lat2 *= $pi80;
+ $lng2 *= $pi80;
+
+ $r = 6372.797; // mean radius of Earth in km
+ $dlat = $lat2 - $lat1;
+ $dlng = $lng2 - $lng1;
+ $a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2);
+ $c = 2 * atan2(sqrt($a), sqrt(1 - $a));
+ $km = $r * $c;
+
+ return $km * 1000;
}
function decodePolylineToArray($encoded)
@@ -202,7 +246,8 @@
$url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?query=".$query."&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true";
$contents = json_decode(getPage($url));
if ($giveOptions) return $contents->features;
- else return $contents->features[0]->centroid->coordinates[0].",".$contents->features[0]->centroid->coordinates[1];
+ elseif (isset($contents->features[0]->centroid)) return $contents->features[0]->centroid->coordinates[0].",".$contents->features[0]->centroid->coordinates[1];
+ else return "";
}
function reverseGeocode($lat,$lng) {
@@ -210,6 +255,16 @@
$contents = json_decode(getPage($url));
return $contents->features[0]->properties->name;
}
+
+function startsWith($haystack,$needle,$case=true) {
+ if($case){return (strcmp(substr($haystack, 0, strlen($needle)),$needle)===0);}
+ return (strcasecmp(substr($haystack, 0, strlen($needle)),$needle)===0);
+}
+
+function endsWith($haystack,$needle,$case=true) {
+ if($case){return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0);}
+ return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0);
+}
?>
--- /dev/null
+++ b/busui/staticmaplite/.gitignore
@@ -1,1 +1,3 @@
+cache/tiles
+cache/map
--- /dev/null
+++ b/busui/staticmaplite/images/markers/GPlotter - Make Google Maps Easily.URL
@@ -1,1 +1,3 @@
+[InternetShortcut]
+URL=http://gplotter.offwhite.net/
--- /dev/null
+++ b/busui/staticmaplite/images/markers/Google Maps Icons, Free!.URL
@@ -1,1 +1,3 @@
+[InternetShortcut]
+URL=http://brennan.offwhite.net/blog/2005/07/23/new-google-maps-icons-free/
Binary files /dev/null and b/busui/staticmaplite/images/markers/Thumbs.db differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb1.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb10.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb11.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb12.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb13.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb14.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb15.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb16.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb17.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb18.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb19.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb2.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb20.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb21.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb22.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb23.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb24.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb25.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb3.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb4.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb5.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb6.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb7.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb8.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb9.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong1.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong10.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong11.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong12.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong13.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong14.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong15.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong16.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong17.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong18.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong19.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong2.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong20.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong21.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong22.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong23.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong24.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong25.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong3.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong4.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong5.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong6.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong7.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong8.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong9.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr1.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr10.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr11.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr12.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr13.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr14.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr15.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr16.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr17.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr18.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr19.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr2.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr20.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr21.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr22.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr23.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr24.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr25.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr3.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr4.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr5.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr6.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr7.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr8.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconr9.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icons.psd differ
Binary files a/busui/staticmaplite/images/markers/lightblue1.png and b/busui/staticmaplite/images/markers/lightblue1.png differ