Merge lp:~costales/unav/0.63-round-dist into lp:unav

[costales]

Better round distances

<17 = Same
17-70 = Round 5
71-150 = Round 10
151-350 = Round 20
351-500 = Round 50
501-1000 = Round 100

[lp:~costales/unav/0.63-round-dist]

121. By costales on 2016-09-08

i18n

122. By costales on 2016-09-09

Round better

123. By costales on 2016-09-11

It wasn't perfect yet

[costales (costales)]

review: Approve

=== modified file 'nav/class/Maths.js'
--- nav/class/Maths.js	2016-08-22 17:27:55 +0000
+++ nav/class/Maths.js	2016-09-09 08:19:06 +0000
@@ -83,36 +83,76 @@
 	
 	if (unit2convert == this.KM) {
 		if (m > 999) {
-			value = m * this.M2KM;						// return km
-			unit = 'km';
+			value = parseInt(m * this.M2KM); // km
+			unit = 'km';
+		}
+		else if (m > 949) { // Avoid round of 1000 m
+			value = 1;
+			unit = 'km';
+		}
+		else if (m > 500) {
+			value = Math.round(m / 100) * 100;
+			unit = 'm';
+		}
+		else if (m > 350) {
+			value = Math.round(m / 50) * 50;
+			unit = 'm';
+		}
+		else if (m > 150) {
+			value = Math.round(m / 20) * 20;
+			unit = 'm';
+		}
+		else if (m > 70) {
+			value = Math.round(m / 10) * 10;
+			unit = 'm';
+		}
+		else if (m > 17) {
+			value = Math.round(m / 5) * 5;
+			unit = 'm';
 		}
 		else {
-			value = Math.round(m/10)*10;				// return meters rounded in 10
-			unit = 'm';
-		}
-		
-		if (!value) {
-			value = m;									// 0 after round? return meters
+			value = parseInt(m);
 			unit = 'm';
 		}
 	}
 	else {
-		if (value > 999) {
-			value = m * this.M2MI;						// return milles
-			unit = 'mi';
+		var yards = m * this.M2YD;
+		
+		if (yards > 1759) { // Avoid 0 mi
+			value = parseInt(m * this.M2MI); // milles
+			unit = 'mi';
+		}
+		else if (yards > 949) { // Avoid round 1000 yd
+			value = 1;
+			unit = 'mi';
+		}
+		else if (yards > 500) {
+			value = Math.round(yards / 100) * 100;
+			unit = 'yd';
+		}
+		else if (yards > 350) {
+			value = Math.round(yards / 50) * 50;
+			unit = 'yd';
+		}
+		else if (yards > 150) {
+			value = Math.round(yards / 20) * 20;
+			unit = 'yd';
+		}
+		else if (yards > 70) {
+			value = Math.round(yards / 10) * 10;
+			unit = 'yd';
+		}
+		else if (yards > 17) {
+			value = Math.round(yards / 5) * 5;
+			unit = 'yd';
 		}
 		else {
-			value = Math.round((m*this.M2YD)/10)*10;	// return yards rounded in 10
-			unit = 'yd';
-		}
-		
-		if (!value) {
-			value = m * this.M2YD;						// 0 after round? return yards
+			value = parseInt(yards);
 			unit = 'yd';
 		}
 	}
 	
-	return String(parseInt(value) + ' ' + unit);
+	return (String(value) + ' ' + unit);
 }
 
 Maths.prototype.decode = function(encoded, lat1st) {

=== modified file 'po/unav.pot'
--- po/unav.pot	2016-09-06 20:16:18 +0000
+++ po/unav.pot	2016-09-09 08:19:06 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unav\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-06 22:16+0200\n"
+"POT-Creation-Date: 2016-09-08 12:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"