Skip to content

GitLab

Commit 0042ea97 authored by Kevin Abel's avatar Kevin Abel
Browse files

Merge branch 'four'

parents 5bcb7fd9 ce740b4b
Hide whitespace changes
Inline Side-by-side
www/busproxy.php
View file @ 0042ea97
......@@ -2,7 +2,7 @@
$url = 'http://getonboard.lincoln.ne.gov/packet/json/vehicle?lastVehicleHttpRequestTime=0';
$file = __DIR__ . '/bus.json';
$seconds_to_cache = 1;
$seconds_to_cache = 4;
if (!file_exists($file) || time() - $seconds_to_cache >= filemtime($file)) {
//echo 'retrieved fresh';
......@@ -60,4 +60,4 @@ if (!file_exists($file) || time() - $seconds_to_cache >= filemtime($file)) {
$out = file_get_contents($file);
}
echo $out;
\ No newline at end of file
echo $out;
www/js/map.js
View file @ 0042ea97
......@@ -89,6 +89,17 @@
}
},
angleToCardinal = function(angle) {
var cardinals = ['n', 'ne', 'e', 'se', 's', 'sw', 'w', 'nw'], i;
i = Math.round(angle / (360 / cardinals.length)) % cardinals.length;
if (i < 0) {
i += cardinals.length;
}
return cardinals[i];
},
initialize = function(markerTypes) {
var
mapOptions = {
......@@ -301,7 +312,7 @@
busLoop = function() {
busTimeout = true;
$.ajax({
url: UNL_TOUR_URL + 'busproxy.php',
url: UNL_TOUR_URL + 'bus.json',
dataType: 'json',
success: function(data) {
$.each(data.VehicleArray, function(key, value) {
......@@ -319,14 +330,20 @@
return;
}
var icon = {
url: UNL_TOUR_URL + 'images/markers/google/bus-' + angleToCardinal(value.vehicle.CVLocation.angle) + '.png',
anchor: new google.maps.Point(16, 16)
};
if (markers['buses'][value.vehicle.id]) {
markers['buses'][value.vehicle.id].setPosition(new google.maps.LatLng(value.vehicle.CVLocation.latitude/100000, value.vehicle.CVLocation.longitude/100000));
markers['buses'][value.vehicle.id].setIcon(icon);
} else {
markers['buses'][value.vehicle.id] = new google.maps.Marker({
position : new google.maps.LatLng(value.vehicle.CVLocation.latitude/100000, value.vehicle.CVLocation.longitude/100000),
map : UNLTourMap.map,
title : 'Route ' + value.vehicle.routeID,
icon : UNL_TOUR_URL + 'images/markers/google/busstop.png',
icon : icon,
clickable: false,
});
}
......@@ -334,7 +351,7 @@
},
complete: function() {
if (busTimeout) {
busTimeout = setTimeout(busLoop, 500);
busTimeout = setTimeout(busLoop, 1500);
}
}
});
......
www/templates/mobile/UNL/TourMap.tpl.php deleted 100644 → 0
View file @ 5bcb7fd9
<!DOCTYPE html>
<html>
<head>
<title>UNL | Campus Maps</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<link rel="shortcut icon" href="/wdn/templates_3.0/images/favicon.ico" />
<script type="text/javascript" src="/wdn/templates_3.0/scripts/wdn.js"></script>
<script type="text/javascript" src="/wdn/templates_3.0/scripts/mobile_analytics.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?v=3.2&amp;sensor=false"></script>
<script type="text/javascript">
var UNL_TOUR_URL = "<?php echo UNL_TourMap::getURL(); ?>";
var mobile = true;
WDN.jQuery = jQuery;
</script>
<script type="text/javascript" src="<?php echo UNL_TourMap::getURL() ?>js/map.js"></script>
<style type="text/css">
@import url(<?php echo UNL_TourMap::getURL() ?>css/map_mobile.css);
</style>
</head>
<body>
<div id="maincontent">
<nav>
<ul>
<li>
<select id="buildingList">
<option value="">Buildings</option>
<optgroup label="City Campus">
<?php $city = new UNL_Common_Building_City();
asort($city->codes);
foreach ($city->codes as $code=>$building):?>
<option value="<?php echo $code; ?>"><?php echo $building; ?></option>
<?php endforeach; ?>
</optgroup>
<optgroup label="East Campus">
<?php $east = new UNL_Common_Building_East();
asort($east->codes);
foreach ($east->codes as $code=>$building):?>
<option value="<?php echo $code; ?>"><?php echo $building; ?></option>
<?php endforeach; ?>
</optgroup>
<!-- <optgroup label="Innovation Campus">-->
<!-- <option value="">Repeat Building List</option>-->
<!-- </optgroup>-->
</select>
</li>
<li id="actionLocation">
<a href="#" class="action">Geo</a>
</li>
<li id="actionLayers">
<a href="#" class="action">Layers</a>
<ul id="selectMarkers">
<li id="check_buildings"><a href="buildings?format=mobile">Buildings</a></li>
<li id="check_policestations"><a href="policestations?format=mobile">Police Stations</a></li>
<li id="check_emergencyphones"><a href="emergencyphones?format=mobile">Emergency Phones</a></li>
<li id="check_sculptures"><a href="sculptures?format=mobile">Sculptures</a></li>
<li id="check_bikeracks"><a href="bikeracks?format=mobile">Bike Racks</a></li>
</ul>
</li>
</ul>
</nav>
<?php echo $savvy->render($context, 'UNL/TourMap-partial.tpl.php'); ?>
<div id="loading">
<div class="meter animate">
<span style="width: 100%"><span></span></span>
</div>
</div>
<section id="infoBox">
</section>
</div>
<script type="text/javascript" src="<?php echo UNL_TourMap::getURL() ?>js/geoLocation.js"></script>
<script type="text/javascript">
var iPhoneOrIPod = false;
if (navigator.userAgent.indexOf('iPod') >= 0 ||navigator.userAgent.indexOf('iPhone') >= 0) {
iPhoneOrIPod = true;
}
function resizeApp() {
var height = getWindowHeight();
if (iPhoneOrIPod) {
var portrait = (typeof window.orientation == "undefined" ||window.orientation == 0 ||window.orientation == 180);
height = (portrait ? 416 : 268);
document.body.style.minHeight = height + "px";
hideUrlBar();
}
var mapElem = document.getElementById("map_canvas");
var map_height = height - calculateOffsetTop(mapElem);
mapElem.style.height = Math.max(0, map_height) + "px";
//document.getElementById('header_sizedebug').innerHTML = map_height;
//document.getElementById('header_width').innerHTML = self.innerWidth;
}
function calculateOffsetTop(element, opt_top) {
var top = opt_top || null;
var offset = 0;
for (var elem = element; elem && elem != opt_top;elem = elem.offsetParent) {
offset += elem.offsetTop;
}
return offset;
}
function getWindowHeight() {
if (window.self && self.innerHeight) {
return self.innerHeight;
}
if (document.documentElement && document.documentElement.clientHeight) {
return document.documentElement.clientHeight;
}
return 0;
}
function hideUrlBar() {
if (iPhoneOrIPod) {
window.scrollTo(0, 0);
}
}
var geo = function() {
return {
success_callback : function(loc) {
UNLTourMap.panTo(loc.coords.latitude, loc.coords.longitude);
UNLTourMap.map.setZoom(16);
var marker = new google.maps.Marker({
position : new google.maps.LatLng(loc.coords.latitude, loc.coords.longitude),
map : UNLTourMap.map,
icon : UNL_TOUR_URL+'images/markers/google/position.png'
});
$('#loading').hide();
},
error_callback : function() {
alert('Unable to determine your location.');
$('#loading').hide();
}
};
}();
WDN.jQuery('document').ready(function($){
resizeApp();
$('#actionLocation').click(function() {
if(geo_position_js.init()){
$('#loading').show();
geo_position_js.getCurrentPosition(geo.success_callback,geo.error_callback);
}
else{
alert("Functionality not available");
}
return false;
});
WDN.log(UNLTourMap.markers['buildings']);
for (var i in UNLTourMap.markers['buildings']) {
WDN.log(UNLTourMap.markers['buildings'][i].getVisible());
}
$('#buildingList').change(function(){
window.location.hash = $(this).val();
});
$('#infoBox a.more').live('click', function(){resizeApp();});
});
window.onorientationchange = function() { resizeApp(); };
window.onresize = function() { resizeApp(); };
</script>
</body>
</html>
\ No newline at end of file
www/templates/mobile/UNL/TourMap/GoogleMap.tpl.php deleted 100644 → 0
View file @ 5bcb7fd9
<script type="text/javascript">
$(window).load(function(e) {
UNLTourMap.defaultZoom = <?php echo (int)$context->zoom; ?>;
UNLTourMap.mapMinZoom = <?php echo (int)$context->mapMinZoom; ?>;
UNLTourMap.mapMaxZoom = <?php echo (int)$context->mapMaxZoom; ?>;
UNLTourMap.centerLat = <?php echo (float)$context->center->lat; ?>;
UNLTourMap.centerLng = <?php echo (float)$context->center->lng; ?>;
<?php if (isset($context->tile_resource)): ?>
UNLTourMap.tileWidth = <?php echo (int)$context->options['tileWidth']; ?>;
UNLTourMap.tileHeight = <?php echo (int)$context->options['tileHeight']; ?>;
UNLTourMap.minx = <?php echo (float)$context->options['minx']; ?>;
UNLTourMap.miny = <?php echo (float)$context->options['miny']; ?>;
UNLTourMap.maxx = <?php echo (float)$context->options['maxx']; ?>;
UNLTourMap.maxy = <?php echo (float)$context->options['maxy']; ?>;
UNLTourMap.mapBounds = new google.maps.LatLngBounds(new google.maps.LatLng(UNLTourMap.minx, UNLTourMap.miny), new google.maps.LatLng(UNLTourMap.maxx, UNLTourMap.maxy));
<?php endif; ?>
<?php if (isset($context->markers)): ?>
UNLTourMap.markerData = {
<?php
$savvy->setTemplatePath((UNL_TourMap::getFileRoot().'/www/templates/json'));
echo $savvy->render($context->markers, 'UNL/TourMap/MarkerList/Generic.tpl.php');
$savvy->setTemplatePath((UNL_TourMap::getFileRoot().'/www/templates/html'));
?>
}
<?php endif; ?>
UNLTourMap.initialize('mobile');
if (window.location.hash) {
$(window).trigger('hashchange');
}
<?php if ($context->getRawObject() instanceof UNL_TourMap_GoogleMap_DynamicCenter) : ?>
UNLTourMap.openBuildingInfo("<?php echo $context->options['code']; ?>");
<?php endif; ?>
});
</script>
<div id="main">
<div id="header">
UNL MAPS- $=<span id="jquery"></span> Map hgt: <span id="header_sizedebug"></span>, ScreenWidth: <span id="header_width"></span>
</div>
<div id="page" style="position:relative;width:100%;">
<div id="main_map">
<div id="map_canvas" style="overflow:hidden;position:relative;">
<noscript>
<img alt="UNL Campus Map" src="http://maps.google.com/maps/api/staticmap?center=<?php echo $context->center->lat.','.$context->center->lng; ?>&zoom=<?php echo $context->zoom; ?>&size=928x620&maptype=<?php echo $context->type; ?>&sensor=false" />
</noscript>
</div>
</div>
</div>
</div>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment