Minor fixes

2017-03-29 08:02:16 -04:00 · 2017-03-29 08:02:16 -04:00 · b50b83a6d1
parent f95e77f4c3
commit b50b83a6d1
3 changed files with 59 additions and 31 deletions
--- a/index.html
+++ b/index.html
@ -1,4 +1,5 @@
 <html>
+	
 	<head>
 		
 		<!-- Metadata -->
@ -39,6 +40,8 @@
 		
 		<link rel="stylesheet" href="style.css" />
 		
+	</head>
+	
 	<body>
 		
 		<header>
@ -46,7 +49,7 @@
 			<div class='error' id='no-gps'>No GPS data available. </div>
 			<div class='coord' id='lat'>0.00000 N</div>
 			<div class='coord' id='lon'>0.00000 E</div>
-
+			
 			<div class='coord' id='alt'>0.0 m</div>
 			<div class='error' id='no-alt'>No altitude data available. </div>
 			
@ -70,6 +73,7 @@
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
 		<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAnM0oMEWtnYTEaHURDQTt6BK5BuGGH2E4&callback=gmapsCB"></script>
 		<script src="script.js"></script>
-			
+		
 	</body>
+	
 </html>
--- a/script.js
+++ b/script.js
@ -1,15 +1,14 @@
-window.addEventListener("deviceorientation", setRose, true);
+'use strict';
+/* global navigator google $ */
+
+// Set units based on browser locale
 const metric = !(window.navigator.language=='en-US'||window.navigator.language=='my');
-var elevator;
-function gmapsCB(){
-	elevator = new google.maps.ElevationService;
-}
-

+// Track GPS location
 if (!navigator.geolocation){ $('#no-gps').show(); }
-else {
-	navigator.geolocation.watchPosition(
-		// success
+else { navigator.geolocation.watchPosition(
+		
+		// Got location
 		function(pos) {
 			setAltitude(pos.coords.latitude, pos.coords.longitude);
 			var lat = pos.coords.latitude.toFixed(4);
@ -18,51 +17,72 @@ else {
 			lon = (lon.substring(0,1)=='-')? lon.substring(1)+' E' : lon+' W';
 			$('#lat').text(lat);
 			$('#lon').text(lon);
-		}, 
-		// error
+		},
+		
+		// Got error
 		function() {
 			$('.coord').hide();
 			$('#rotated').hide();
 			$('#no-gps').show();
 		}, 
-		// options
+		
+		// Options
 		{ enableHighAccuracy:true }
+		
 	);
 }

+// Set altitude
 function setAltitude(lat,lon) {
-	if (typeof elevator != 'undefined') {
+	
+	// Create elevator
+	if (typeof elevator == 'undefined') {
+		var elevator = new google.maps.ElevationService;
+	}
+		
+	// Query API
+	else {
 		elevator.getElevationForLocations({
 			'locations': [ new google.maps.LatLng(lat,lon) ]
 		}, function(res) {
-			console.log(res);
-			if (res[0].elevation){
-				$('#no-alt').hide();
-				var alt = res[0].elevation;
-				// Convert
-				if (metric) {
-					alt = alt.toFixed(1)+' m';
-				} else {
-					alt = (alt*0.3048).toFixed(1)+' ft';
-				}
-				// Set element text
-				$('#alt').text(alt);
-			} else {
-				// Show error
+			
+			// Show error
+			if (!res[0].elevation) {
 				if (res.status && res.status!='OK') {
 					$('#no-alt').text('No altitude data available: '+res.status+'. ');
 				}
 				$('#no-alt').show();
 			}
+				
+			// Successfully got altitude
+			else {
+				$('#no-alt').hide();
+				var alt = res[0].elevation;
+				
+				// Convert
+				if (metric) { alt=alt.toFixed(1)+' m'; }
+				else { alt=(alt*0.3048).toFixed(1)+' ft'; }
+				
+				// Set element text
+				$('#alt').text(alt);
+				
+			}
+			
 		});
 	}
 }

+// Set compass orientation
 function setRose(e) {
-	if(!e.absolute) { // No orientation data
+	
+	// No orientation data
+	if(!e.absolute) {
 		$('#rotated').hide();
 		$('#no-dir').show();
-	} else {
+	}
+		
+	// Set orientation
+	else {
 		var rot = 'rotate('+e.alpha.toString().substring(0,5)+'deg)';
 		$('#rose').css({
 			'-ms-transform': rot,
@ -70,4 +90,6 @@ function setRose(e) {
 			'transform': rot
 		});
 	}
+	
 }
+window.addEventListener("deviceorientation", setRose, true);
--- a/style.css
+++ b/style.css
@ -32,6 +32,8 @@ header, main, footer, .error, noscript {
 #rose {
 	width: 100%;
 	-webkit-transition-duration: 2s;
+	-moz-transition-duration: 2s;
+	-o-transition-duration: 2s;
 	transition-duration: .2s;
 }