Display location accuracy (addPlot & addTransect)

NickGulajec · Jun 4, 2014 · d17e23a · d17e23a
1 parent 3aa3e08
commit d17e23a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/app/controllers/addPlot.js b/app/controllers/addPlot.js
@@ -55,16 +55,18 @@ var utmZone;
 
 var current_latitude;
 var current_longitude;
+var current_accuracy;
 
 //Start continuous location capture - based on distance filter
 var gps = require('location');
-	gps.location(function(latitude, longitude, error) {
+	gps.location(function(latitude, longitude, accuracy, error) {
 		if(error == true){
 			//returns an error
 		}else{
 			//updated lat & long
 			current_latitude = latitude;
 			current_longitude = longitude;
+			current_accuracy = accuracy;
 		}
 	});
 
@@ -381,7 +383,7 @@ function getLocation(){
 				ltemaAccessDialog.show();
 			}else{
 				$.location.visible = true;
-				$.location.text = "UTM Zone: " + utmZone + "\nUTM Easting: " + UTMEasting + "\nUTM Northing: " + UTMNorthing;
+				$.location.text = "UTM Zone: " + utmZone + "\nUTM Easting: " + UTMEasting + "\nUTM Northing: " + UTMNorthing  + "\nAccuracy: " + Math.round(current_accuracy);
 			}
 		});
 	}

diff --git a/app/controllers/addTransect.js b/app/controllers/addTransect.js
@@ -15,6 +15,7 @@ var utmZone;
 
 var current_latitude;
 var current_longitude;
+var current_accuracy;
 
 // Create Stake Orientation TabbedBar labels
 var pickStakeLabels = [
@@ -28,13 +29,14 @@ $.pickStake.labels = pickStakeLabels;
 
 //Start continuous location capture - based on distance filter
 var gps = require('location');
-	gps.location(function(latitude, longitude, error) {
+	gps.location(function(latitude, longitude, accuracy, error) {
 		if(error == true){
 			//returns an error
 		}else{
 			//updated lat & long
 			current_latitude = latitude;
 			current_longitude = longitude;
+			current_accuracy = accuracy;
 		}
 	});
 
@@ -268,7 +270,7 @@ function getLocation(){
 				ltemaAccessDialog.show();
 			}else{
 				$.location.visible = true;
-				$.location.text = "UTM Zone: " + utmZone + "\nUTM Easting: " + UTMEasting + "\nUTM Northing: " + UTMNorthing;
+				$.location.text = "UTM Zone: " + utmZone + "\nUTM Easting: " + UTMEasting + "\nUTM Northing: " + UTMNorthing + "\nAccuracy: " + Math.round(current_accuracy);
 			}
 		});
 	}

diff --git a/app/lib/location.js b/app/lib/location.js
@@ -1,6 +1,7 @@
 function location(callback){
 var longitude;
 var latitude;
+var accuracy;
 var error;
 //Turn on the GPS
 if (Ti.Geolocation.locationServicesEnabled) {
@@ -20,11 +21,12 @@ if (Ti.Geolocation.locationServicesEnabled) {
 	        	error = false;
 	            longitude = e.coords.longitude;
 				latitude = e.coords.latitude;
+				accuracy = e.coords.accuracy;
 
 				//callback(latitude, longitude, error);
 				//Ti.API.info(e.coords);
 	        }
-	        callback(latitude, longitude, error);
+	        callback(latitude, longitude, accuracy, error);
 	    });
 	} else {
 		 error = true;

diff --git a/app/styles/addPlot.tss b/app/styles/addPlot.tss
@@ -124,7 +124,7 @@
 },
 "#footerLine": {
 	height: 1,
-	top: 464,
+	top: 479,  //464
 	left: 5,
 	right: 5,
 	borderWidth: 1,

diff --git a/app/styles/addTransect.tss b/app/styles/addTransect.tss
@@ -158,7 +158,7 @@
 },
 "#footerLine":{
 	height: 1,
-	top: 584,
+	top: 599, //584
 	left: 5,
 	right: 5,
 	borderWidth: 1,