Merge lp:~costales/unav/0.60-simple-code into lp:unav

[costales]

Added calculating route status because 'searching' flag is n...
Rework error web API
Rework no confirm route
No donation btn
Bug 1/15 pos doesn't exits anymore
Recalculate if API error
i18n updated
Message looking for position when user clicks center
Remove decimals from lat,lng in another way. If not, the coo...
Large font for info msg and hide if click fast on map
Msgs for more intuitive simulation process
Added log for check denied
Removed check accuracy
No maximumAge (testing purpose)
Securize all GPS data
Allow double click for zooming
Allow wheel mouse for zooming (check this on phone)
Redefine distance for zoom near
Speak voice before high zoom
Removed timer auto confirm route in X seconds
Remove timer for gps died
Max zoom 19
BG image for map

[lp:~costales/unav/0.60-simple-code]

137. By costales on 2016-06-08

No panel if calculating state

138. By costales on 2016-06-09

If no out of route, recalc after more time

139. By costales on 2016-06-09

Set different messages for API error

140. By costales on 2016-06-13

preload none for audio

=== modified file 'nav/class/Navigator.js'
--- nav/class/Navigator.js	2016-05-11 17:09:31 +0000
+++ nav/class/Navigator.js	2016-06-13 21:48:55 +0000
@@ -77,8 +77,8 @@
 	if (lat === null || lng === null)
 		return;
 	
-	this.pos_now['lat'] = lat;
-	this.pos_now['lng'] = lng;
+	this.pos_now['lat'] = parseFloat(lat.toFixed(5));
+	this.pos_now['lng'] = parseFloat(lng.toFixed(5));
 	this.accuracy = parseInt(accu);
 	this.speed = this.maths.speed2human(speed);
 }
@@ -656,7 +656,7 @@
 		this.set_route_status('out');
 		return;
 	}
-		
+	
 	// Ended?
 	if (this.nearest['indication'] >= 4 && this.nearest['indication'] <= 6 && this.nearest['dist2turn'] <= (this.DIST4INDICATION/2)) {
 		this.set_route_status('ended');

=== modified file 'nav/class/UI.js'
--- nav/class/UI.js	2016-06-08 17:14:51 +0000
+++ nav/class/UI.js	2016-06-13 21:48:55 +0000
@@ -101,23 +101,16 @@
 	
 	this.scaleline = new ol.control.ScaleLine();
 	this.map.addControl(this.scaleline);
-	
-	// Disable zoom events: Bug https://goo.gl/hxDwa3
-	var interactions = this.map.getInteractions().getArray();
-	var inte1 = interactions.filter(function(interaction) {
-	  return interaction instanceof ol.interaction.DoubleClickZoom;
-	})[0];
-	var inte2 = interactions.filter(function(interaction) {
-	  return interaction instanceof ol.interaction.MouseWheelZoom;
-	})[0];
-	inte1.setActive(false);
-	inte2.setActive(false);
 }
 
 UI.prototype.ZOOM_CITY = 17;
 UI.prototype.ZOOM_HIGHWAY = 16;
 UI.prototype.ZOOM_POI = 17;
+<<<<<<< TREE
 UI.prototype.LONG_TRACK_HIGHWAY = 2000;
+=======
+UI.prototype.LONG_TRACK_HIGHWAY = 850;
+>>>>>>> MERGE-SOURCE
 UI.prototype.DIST4ROTATION = 3;
 UI.prototype.SPEED4ROTATION = 5;
 UI.prototype.COLOR_ORANGE = '#DD4814';
@@ -271,7 +264,7 @@
 		this.map.getView().setZoom(this.ZOOM_CITY); // City
 	}
 	else {
-		if (!radar && dist2turn > this.LONG_TRACK_HIGHWAY && dist_track_done > (this.LONG_TRACK_HIGHWAY/3))
+		if (!radar && dist2turn > this.LONG_TRACK_HIGHWAY && dist_track_done > this.LONG_TRACK_HIGHWAY)
 			this.map.getView().setZoom(this.ZOOM_HIGHWAY - 3); // Highway special zoom
 		else
 			this.map.getView().setZoom(this.ZOOM_HIGHWAY); // Highway
@@ -387,6 +380,7 @@
 			break;
 		case 'calc':
 		case 'calc_from_out':
+		case 'calculating':
 			$('#p_msg').html(t("Searching for a route…"));
 			$('#panel_msg').show();
 			break;
@@ -395,7 +389,7 @@
 			$('#panel_msg').show();
 			break;
 		case 'errorAPI':
-			$('#p_msg').html(t("Error finding route between points. Check the connection and try again"));
+			$('#p_msg').html(t("Trying search again soon…"));
 			$('#panel_msg').show();
 			break;
 		case 'out':
@@ -502,13 +496,16 @@
 	}
 }
 
+<<<<<<< TREE
 UI.prototype.KO_API_radars = function() {
 	qml_show_notification('warning', 'speed_camera_error')
 }
 
+=======
+>>>>>>> MERGE-SOURCE
 UI.prototype.map_height = function() {
 	// car + route = car on bottom
-	if (this.map_stretched && this.settings.get_routing_mode() != 1 && (this.nav.get_route_status() == 'yes' || this.nav.get_route_status() == 'out' || this.nav.get_route_status() == 'calc_from_out')) {
+	if (this.map_stretched && this.settings.get_routing_mode() != 1 && this.nav.get_route_status() == 'yes') {
 		var aux_height = 0;
 		if ($('#panel_summary').is(':visible'))
 			aux_height = aux_height + $('#panel_summary').height();
@@ -577,6 +574,7 @@
 		case 'drawing':
 		case 'calc':
 		case 'calc_from_out':
+		case 'calculating':
 		case 'out':
 			if (speed > this.SPEED4ROTATION) {
 				var dist = geolib.getDistance(

=== modified file 'nav/class/WebAPI.js'
--- nav/class/WebAPI.js	2016-04-14 20:18:01 +0000
+++ nav/class/WebAPI.js	2016-06-13 21:48:55 +0000
@@ -18,7 +18,6 @@
 	this.ui = ui;
 	this.settings = settings;
 	
-	this.searching = false;
 	this.route_status = '';
 	this.t_prev = $.now() - 1;
 }
@@ -26,14 +25,18 @@
 
 // Route
 WebAPI.prototype.set_route = function(lat1, lng1, lat2, lng2) {
-	if (this.searching)
+	if (this.nav.get_route_status() == 'calculating')
 		return;
 	
 	if (this.t_prev < $.now()) { // Avoid several calls in a small time
-		this.t_prev = $.now() + 7000;
-		
-		this.searching = true;
+		
+		if (this.nav.get_route_status() == "errorAPI") // Avoid so many calls
+			this.t_prev = $.now() + 55000;
+		else
+			this.t_prev = $.now() + 8000;
+		
 		this.route_status = this.nav.get_route_status();
+		this.nav.set_route_status('calculating');
 		
 		// API parameters
 		var avoid_tolls = '';
@@ -58,7 +61,7 @@
 				api_key: 'valhalla-4DcFzeQ' // TODO debug
 			},
 			dataType: 'json',
-			timeout: 50000,
+			timeout: 40000,
 			success: this.OK_callback_set_route.bind(this),
 			error: this.KO_callback_set_route.bind()
 		});
@@ -67,8 +70,6 @@
 }
 
 WebAPI.prototype.OK_callback_set_route = function(data) {
-	this.searching = false;
-	
 	if (this.nav.get_route_status() == 'no') // Stop route if users canceled between calculation
 		return;
 	
@@ -81,23 +82,29 @@
 		gps_loop(this.nav.get_route_status()); // Show route = Avoid wait for GPS
 	}
 	else {
-		if (this.route_status == 'calc_from_out')
-			this.nav.set_route_status('calc_from_out'); // recalculate
-		else
+		if (this.route_status == 'calc_from_out') { // recalculate
+			this.nav.set_route_status('calc_from_out');
+			qml_show_notification('critical', 'calcfromout_error');
+		}
+		else {
 			this.nav.set_route_status('errorAPI');
+			qml_show_notification('critical', 'webapi_error');
+		}
 	}
 }
 
 WebAPI.prototype.KO_callback_set_route = function() {
-	this.searching = false;
-	
 	if (this.nav.get_route_status() == 'no') // Stop route if users canceled between calculation
 		return;
 	
-	if (this.route_status == 'calc_from_out')
-		this.nav.set_route_status('calc_from_out'); // recalculate
-	else
+	if (this.route_status == 'calc_from_out') { // recalculate
+		this.nav.set_route_status('calc_from_out');
+		qml_show_notification('critical', 'calcfromout_error');
+	}
+	else {
 		this.nav.set_route_status('errorAPI');
+		qml_show_notification('critical', 'webapi_error');
+	}
 }
 
 
@@ -126,7 +133,7 @@
 			api_key: 'valhalla-4DcFzeQ' // TODO debug
 		},
 		dataType: 'json',
-		timeout: 50000,
+		timeout: 40000,
 		success: this.OK_callback_simulate.bind(this),
 		error: this.KO_callback_simulate.bind()
 	});
@@ -268,7 +275,7 @@
 	var poly_box = '(poly:\"' + routeBoundaryPolygon_1 + routeBoundaryPolygon_2 + '\");out;'
 	$.ajax({
 		url: 'https://overpass-api.de/api/interpreter?data=node[highway=speed_camera]' + poly_box,
-		timeout: 50000,
+		timeout: 55000,
 		dataType: 'xml',
 		success: this.OK_callback_set_radars.bind(this),
 		error: this.KO_callback_set_radars.bind()
@@ -294,5 +301,5 @@
 }
 
 WebAPI.prototype.KO_callback_set_radars = function() {
-	this.ui.KO_API_radars();
+	qml_show_notification('warning', 'speed_camera_error');
 }

=== modified file 'nav/index.html'
--- nav/index.html	2016-06-08 17:14:51 +0000
+++ nav/index.html	2016-06-13 21:48:55 +0000
@@ -132,22 +132,6 @@
 	  </section>
 	</div>
 
-	<!-- Error GPS died (?) -->
-	<div id="gps_died" style="display:none;" data-role="dialog">
-	  <section>
-		<h1 data-localize="GPS device is not working">GPS device is not working</h1>
-		<p>
-			<span data-localize="The GPS device didn't return a position yet">The GPS device didn't return a position yet</span><br>
-			<span data-localize="Review the GPS device settings (check at bottom of battery settings too)">Review the GPS device settings (check at bottom of battery settings too)</span><br>
-			<span data-localize="If everything is OK, try a device reboot :( The GPS device will work again">If everything is OK, try a device reboot :( The GPS device will work again</span><br>
-			<span data-localize="It doesn't work either, please fill a bug: bugs.launchpad.net/unav">It doesn't work either, please fill a bug: bugs.launchpad.net/unav</span><br>
-		</p>
-		<menu>
-		  <button id="died_gps" data-role="button" onclick="$('#gps_died').hide()" data-localize="Close">Close</button>
-		</menu>
-	  </section>
-	</div>
-
 	<!-- js -->
 	<script src="libraries/jquery.min.js"></script>
 	
@@ -233,7 +217,7 @@
 			center: ol.proj.transform([4.666389, 50.009167], 'EPSG:4326', 'EPSG:3857'),
 			zoom: 4,
 			minZoom: 1,
-			maxZoom: 20
+			maxZoom: 19
 		  })
 		});
 	</script>
@@ -251,27 +235,81 @@
 	<script src="class/Maths.js"></script>
 	<script>
 		var settings = new Settings();
-		var maths	= new Maths();
-		var nav	  = new Navigator(maths, lang);
-		var ui	   = new UI(map, nav, settings, maths, lang);
+		var maths    = new Maths();
+		var nav      = new Navigator(maths, lang);
+		var ui       = new UI(map, nav, settings, maths, lang);
 		var webapi   = new WebAPI(nav, ui, settings);
 		
 		// Navigation (map in review mode by default, without read GPS for not drain battery)
 		var id_gps = 0;
-		var id_auto_accept = 0;
-		var id_gps_died = 0;
-		var times_without_accuracy = -1; // Control 1st time
+		var confirm_route = true;
 		
 		function center_pos() {
 			ui.set_center_1st_pos(true);
 			ui.set_map_stretched(true);
-			if (id_gps == 0) {
-				id_gps_died = setTimeout('$("#gps_died").show();', 900000); // 15 minutes
-				var t_prev_run = $.now() - 1;
-				gps_start(t_prev_run); // GPS will run forever
+			if (id_gps === 0) // GPS will run forever
+				gps_start();
+		}
+		
+		
+		function gps_start() {
+
+			console.log('Starting GPS...');
+			
+			if (!navigator.geolocation) {
+				qml_set_center_onpos(0);
+				$('#gps_denied').show();
+				return;
 			}
+
+			/** TESTING BEGIN
+			var route = [
+				[43.51557,-5.655146666666667],[43.515764999999995,-5.655245000000001],[43.515955,-5.655354999999999],[43.51614333333334,-5.655476666666668],[43.51633,-5.655601666666667],[43.516515,-5.6557216666666665],[43.516695,-5.655835],[43.516871666666674,-5.655946666666667],[43.517039999999994,-5.656053333333333],[43.517208333333336,-5.6561650000000006],[43.517363333333336,-5.656270000000001],[43.517515,-5.656368333333334],[43.51765833333334,-5.656464999999999],[43.51779333333334,-5.6565666666666665],[43.51792333333333,-5.656670000000001],[43.518055000000004,-5.656765],[43.518188333333335,-5.656851666666667],[43.518323333333335,-5.656935000000001],[43.518458333333335,-5.657018333333333],[43.518591666666666,-5.657103333333334],[43.518724999999996,-5.657188333333333],[43.51885666666667,-5.657273333333334],[43.51898500000001,-5.657354999999999],[43.51910833333333,-5.6574366666666664],[43.51923,-5.657515000000001],[43.51935166666667,-5.657591666666667],[43.51946833333333,-5.657673333333334],[43.51958333333334,-5.65776],[43.51969166666666,-5.657848333333334],[43.519800000000004,-5.657933333333333],[43.519909999999996,-5.658021666666667],[43.520021666666665,-5.658115],[43.520134999999996,-5.658213333333333],[43.520224999999996,-5.658365],[43.520273333333336,-5.658556666666668],[43.520296666666674,-5.6587733333333325],[43.52031,-5.65899],[43.520329999999994,-5.659196666666666],[43.52035166666666,-5.6594],[43.52037833333334,-5.6595949999999995],[43.520405,-5.659795000000001],[43.520431666666674,-5.659996666666666],[43.52046166666667,-5.660196666666667],[43.52049999999999,-5.660386666666667],[43.52054,-5.660563333333332],[43.52058166666667,-5.660741666666667],[43.52062166666666,-5.6609266666666676],[43.52066833333333,-5.6611183333333335],[43.52072166666667,-5.661316666666666],[43.520786666666666,-5.661518333333333],[43.520865,-5.661720000000001],[43.52095333333333,-5.661916666666667],[43.521049999999995,-5.662096666666668],[43.521151666666675,-5.662258333333334],[43.52125833333333,-5.662405],[43.521363333333326,-5.662538333333333],[43.52146666666666,-5.662656666666667],[43.52155833333333,-5.662758333333333],[43.521634999999996,-5.66284],[43.52169666666667,-5.6629016666666665],[43.52174,-5.662941666666668],[43.52177,-5.66297],[43.52178833333334,-5.662984999999999],[43.52179666666666,-5.662993333333333],[43.5218,-5.6629950000000004],[43.5218,-5.662993333333333],[43.52182,-5.663011666666667],[43.52185166666666,-5.663041666666667],[43.521894999999994,-5.663076666666666],[43.521945,-5.6631149999999995],[43.52201,-5.663164999999999],[43.52208166666666,-5.663216666666667],[43.52216,-5.66327],[43.52225,-5.663326666666667],[43.52235166666666,-5.663381666666667],[43.52246333333333,-5.663433333333334],[43.52258,-5.663478333333334],[43.52269666666666,-5.663518333333333],[43.522816666666664,-5.66355],[43.52293666666666,-5.663576666666668],[43.52306,-5.663595],[43.52318166666667,-5.663603333333333],[43.523303333333324,-5.663605],[43.52342166666667,-5.663600000000001],[43.523541666666674,-5.663588333333333],[43.52366,-5.66357],[43.52378166666667,-5.663544999999999],[43.52390666666667,-5.6635133333333325],[43.52403833333333,-5.663475],[43.524175,-5.663433333333334],[43.524316666666664,-5.66339],[43.52445833333333,-5.6633466666666665],[43.52459833333334,-5.6633033333333325],[43.52474,-5.663258333333332],[43.52488166666667,-5.663213333333334],[43.52502333333334,-5.663170000000001],[43.52516833333334,-5.663128333333333],[43.525310000000005,-5.6630899999999995],[43.52545333333334,-5.663056666666667],[43.52559666666666,-5.663023333333332],[43.52574,-5.662986666666666],[43.52588333333333,-5.662945000000001],[43.52602666666667,-5.6629033333333325],[43.52617,-5.66286],[43.526309999999995,-5.662816666666667],[43.52645166666666,-5.662774999999999],[43.526595,-5.662733333333334],[43.526738333333334,-5.66269],[43.52688,-5.6626433333333335],[43.52702166666666,-5.662598333333333],[43.52716166666667,-5.662554999999999],[43.52729666666667,-5.662515],[43.52742,-5.662476666666667],[43.52753333333333,-5.662441666666666],[43.527635,-5.6624083333333335],[43.527725,-5.662374999999999],[43.52780500000001,-5.662344999999999],[43.52787,-5.662319999999999],[43.527925,-5.662303333333334],[43.52797166666666,-5.66229],[43.528009999999995,-5.662276666666666],[43.52804166666667,-5.662266666666667],[43.52806666666667,-5.662256666666667],[43.52807833333333,-5.66225],[43.52808166666667,-5.66225],[43.52808,-5.662248333333334],[43.52807833333333,-5.6622466666666655]
+			];
+			var z1 = 0;
+			id_gps = setInterval(function(){
+				accuracy = 300;
+				speed = 2;
+				z1++;
+				latitude = route[z1][0];
+				longitude = route[z1][1];
+				nav.set_gps_data(latitude, longitude, accuracy, speed);
+				gps_loop(nav.get_route_status());
+			},1000);
+			return;
+			TESTING END **/
+			
+			var t_prev_run = 0;
+			id_gps = navigator.geolocation.watchPosition(
+				function (pos) {
+					if (t_prev_run < $.now()) { // Device bug #1500539 There are 3 positions at the same time
+						t_prev_run = $.now() + 450;
+						
+						nav.set_gps_data(pos.coords.latitude, pos.coords.longitude, pos.coords.accuracy, pos.coords.speed);
+						gps_loop(nav.get_route_status());
+					}
+				},
+				function (error) {
+					if (error.code == 1) { // Denied?
+						console.log('GPS Denied!');
+						navigator.geolocation.clearWatch(id_gps);
+						id_gps = 0;
+						nav.set_route_status('no');
+						ui.update();
+						ui.markers_radar_clear();
+						ui.route(false);
+						qml_set_center_onpos(0);
+						$('#gps_denied').show();
+					}
+				},
+				{
+					enableHighAccuracy: true
+					// maximumAge: 0 TODO 0.60: Uncomment, this could stops uNav (?)
+				}
+			);
 		}
 		
+		
 		// Dragons here! The 'status' is critical in the app, it will pass for states that will determine how to work the app
 		function gps_loop(status) {
 			
@@ -279,25 +317,26 @@
 				case 'no':
 				case 'yes':
 				case 'ended':
-				case 'errorAPI':
 				case 'simulate_calculating':
 				case 'simulate_done_car':
 				case 'simulate_done_bike':
 				case 'simulate_done_walk':
 				case 'simulate_drawing':
 				case 'simulate_error':
-					break;
 				case '2review':
-					if (id_auto_accept == 0)
-						id_auto_accept = setTimeout('agree_review()', 3500);
+				case 'calculating':
 					break;
 				case 'drawing':
 					var route_indication = nav.get_route_indication();
+<<<<<<< TREE
 					if (id_auto_accept == 0 && ui.get_map_layer() == 0) { // No auto accept & online maps
 						if (route_indication['distance_total'] > 1000000) {
 							id_auto_accept = -1;
+=======
+					if (confirm_route) {
+						if (route_indication['distance_total'] > 1000000)
+>>>>>>> MERGE-SOURCE
 							$('#popup_longroute').show();
-						}
 						ui.set_center_onpos(false);
 						ui.set_center_1st_pos(false);
 						ui.set_zoom_unav(false);
@@ -312,16 +351,17 @@
 					webapi.set_radars();
 					break;
 				case 'waiting4signal':
-					id_auto_accept = 0; // ask recalculating
+					confirm_route = true;
 					nav.set_route_status('calc');
 					// Not use here break for calc route now
 				case 'calc':
 				case 'calc_from_out':
+				case 'errorAPI':
 					var gps_data = nav.get_pos_data();
 					webapi.set_route(gps_data['now_lat'], gps_data['now_lng'], gps_data['end_lat'], gps_data['end_lng']);
 					break;
 				case 'out':
-					id_auto_accept = -2; // not ask recalculating
+					confirm_route = false;
 					nav.set_route_status('calc_from_out');
 					break;
 			}
@@ -332,92 +372,6 @@
 		}
 		
 		
-		
-		function gps_start(t_prev) {
-
-			console.log('Starting GPS...');
-			
-			if (!navigator.geolocation) {
-				clearTimeout(id_gps_died);
-				id_gps_died = 0;
-				qml_set_center_onpos(0);
-				$('#gps_denied').show();
-				return;
-			}
-
-			/** TESTING BEGIN
-			var route = [
-				[43.51557,-5.655146666666667],[43.515764999999995,-5.655245000000001],[43.515955,-5.655354999999999],[43.51614333333334,-5.655476666666668],[43.51633,-5.655601666666667],[43.516515,-5.6557216666666665],[43.516695,-5.655835],[43.516871666666674,-5.655946666666667],[43.517039999999994,-5.656053333333333],[43.517208333333336,-5.6561650000000006],[43.517363333333336,-5.656270000000001],[43.517515,-5.656368333333334],[43.51765833333334,-5.656464999999999],[43.51779333333334,-5.6565666666666665],[43.51792333333333,-5.656670000000001],[43.518055000000004,-5.656765],[43.518188333333335,-5.656851666666667],[43.518323333333335,-5.656935000000001],[43.518458333333335,-5.657018333333333],[43.518591666666666,-5.657103333333334],[43.518724999999996,-5.657188333333333],[43.51885666666667,-5.657273333333334],[43.51898500000001,-5.657354999999999],[43.51910833333333,-5.6574366666666664],[43.51923,-5.657515000000001],[43.51935166666667,-5.657591666666667],[43.51946833333333,-5.657673333333334],[43.51958333333334,-5.65776],[43.51969166666666,-5.657848333333334],[43.519800000000004,-5.657933333333333],[43.519909999999996,-5.658021666666667],[43.520021666666665,-5.658115],[43.520134999999996,-5.658213333333333],[43.520224999999996,-5.658365],[43.520273333333336,-5.658556666666668],[43.520296666666674,-5.6587733333333325],[43.52031,-5.65899],[43.520329999999994,-5.659196666666666],[43.52035166666666,-5.6594],[43.52037833333334,-5.6595949999999995],[43.520405,-5.659795000000001],[43.520431666666674,-5.659996666666666],[43.52046166666667,-5.660196666666667],[43.52049999999999,-5.660386666666667],[43.52054,-5.660563333333332],[43.52058166666667,-5.660741666666667],[43.52062166666666,-5.6609266666666676],[43.52066833333333,-5.6611183333333335],[43.52072166666667,-5.661316666666666],[43.520786666666666,-5.661518333333333],[43.520865,-5.661720000000001],[43.52095333333333,-5.661916666666667],[43.521049999999995,-5.662096666666668],[43.521151666666675,-5.662258333333334],[43.52125833333333,-5.662405],[43.521363333333326,-5.662538333333333],[43.52146666666666,-5.662656666666667],[43.52155833333333,-5.662758333333333],[43.521634999999996,-5.66284],[43.52169666666667,-5.6629016666666665],[43.52174,-5.662941666666668],[43.52177,-5.66297],[43.52178833333334,-5.662984999999999],[43.52179666666666,-5.662993333333333],[43.5218,-5.6629950000000004],[43.5218,-5.662993333333333],[43.52182,-5.663011666666667],[43.52185166666666,-5.663041666666667],[43.521894999999994,-5.663076666666666],[43.521945,-5.6631149999999995],[43.52201,-5.663164999999999],[43.52208166666666,-5.663216666666667],[43.52216,-5.66327],[43.52225,-5.663326666666667],[43.52235166666666,-5.663381666666667],[43.52246333333333,-5.663433333333334],[43.52258,-5.663478333333334],[43.52269666666666,-5.663518333333333],[43.522816666666664,-5.66355],[43.52293666666666,-5.663576666666668],[43.52306,-5.663595],[43.52318166666667,-5.663603333333333],[43.523303333333324,-5.663605],[43.52342166666667,-5.663600000000001],[43.523541666666674,-5.663588333333333],[43.52366,-5.66357],[43.52378166666667,-5.663544999999999],[43.52390666666667,-5.6635133333333325],[43.52403833333333,-5.663475],[43.524175,-5.663433333333334],[43.524316666666664,-5.66339],[43.52445833333333,-5.6633466666666665],[43.52459833333334,-5.6633033333333325],[43.52474,-5.663258333333332],[43.52488166666667,-5.663213333333334],[43.52502333333334,-5.663170000000001],[43.52516833333334,-5.663128333333333],[43.525310000000005,-5.6630899999999995],[43.52545333333334,-5.663056666666667],[43.52559666666666,-5.663023333333332],[43.52574,-5.662986666666666],[43.52588333333333,-5.662945000000001],[43.52602666666667,-5.6629033333333325],[43.52617,-5.66286],[43.526309999999995,-5.662816666666667],[43.52645166666666,-5.662774999999999],[43.526595,-5.662733333333334],[43.526738333333334,-5.66269],[43.52688,-5.6626433333333335],[43.52702166666666,-5.662598333333333],[43.52716166666667,-5.662554999999999],[43.52729666666667,-5.662515],[43.52742,-5.662476666666667],[43.52753333333333,-5.662441666666666],[43.527635,-5.6624083333333335],[43.527725,-5.662374999999999],[43.52780500000001,-5.662344999999999],[43.52787,-5.662319999999999],[43.527925,-5.662303333333334],[43.52797166666666,-5.66229],[43.528009999999995,-5.662276666666666],[43.52804166666667,-5.662266666666667],[43.52806666666667,-5.662256666666667],[43.52807833333333,-5.66225],[43.52808166666667,-5.66225],[43.52808,-5.662248333333334],[43.52807833333333,-5.6622466666666655]
-			];
-			var z1 = 0;
-			id_gps = setInterval(function(){
-				if (id_gps_died != 0) {
-					clearTimeout(id_gps_died);
-					id_gps_died = 0;
-				}
-				accuracy = 300;
-				speed = 2;
-				z1++;
-				latitude = route[z1][0];
-				longitude = route[z1][1];
-				nav.set_gps_data(latitude, longitude, accuracy, speed);
-				if (accuracy <= nav.ACCU4DRIVE)
-					times_without_accuracy = 0;
-				else
-					times_without_accuracy++;
-				if (times_without_accuracy != 1)
-					gps_loop(nav.get_route_status());
-				console.log('~~~~~ '+nav.get_route_status() + ' ' + times_without_accuracy);
-			},1000);
-			return;
-			TESTING END **/
-
-			id_gps = navigator.geolocation.watchPosition(
-				function (pos) {
-					
-					if (id_gps_died != 0) {
-						clearTimeout(id_gps_died);
-						id_gps_died = 0;
-					}
-					
-					if (t_prev < $.now() && pos.coords.latitude !== null && pos.coords.longitude !== null) { // Avoid several GPS positions in a small time #1500539 and avoid null Nexus positions
-						t_prev = $.now() + 350;
-						
-						nav.set_gps_data(pos.coords.latitude, pos.coords.longitude, pos.coords.accuracy, pos.coords.speed);
-						
-						if (pos.coords.accuracy <= nav.ACCU4DRIVE)
-							times_without_accuracy = 0;
-						else
-							times_without_accuracy++;
-						
-						if (times_without_accuracy != 1) // Hack: Ubuntu devices are losting the signal 1/15 times #1469008
-							gps_loop(nav.get_route_status());
-					}
-				},
-				function (error) {
-					if (error.code == 1) { // Denied?
-						navigator.geolocation.clearWatch(id_gps);
-						id_gps = 0;
-						if (id_auto_accept > 0) {
-							clearTimeout(id_auto_accept);
-							id_auto_accept = 0;
-						}
-						nav.set_route_status('no');
-						ui.update();
-						ui.markers_radar_clear();
-						ui.route(false);
-						qml_set_center_onpos(0);
-						$('#gps_denied').show();
-					}
-				},
-				{
-					enableHighAccuracy: true,
-					maximumAge: 0
-				}
-			);
-		}
-		
-
 		// Map events
 		// Clicks
 		var longpress = false;
@@ -450,6 +404,17 @@
 			!longpress ? window.location = 'http://hide_popup?' : undefined;
 		});
 
+		map.on('dblclick', function(evt) {
+			ui.set_zoom_unav(false); // custom zoom too
+			if (id_gps != 0 && ui.get_center_onpos()) { // Unfocus center if GPS ON
+				ui.set_center_onpos(false);
+				if (ui.get_center_1st_pos())
+					qml_set_center_onpos(2);
+				else
+					qml_set_center_onpos(1);
+			}
+		});
+
 		map.on('pointerup', function () {
 			window.clearTimeout(longpressTimer);
 			pointerIsDown=false;
@@ -462,6 +427,7 @@
 			
 			if (id_gps != 0 && ui.get_center_onpos()) { // Unfocus center if GPS ON
 				ui.set_center_onpos(false);
+<<<<<<< TREE
 				ui.map_rotation();
 				if (ui.get_center_1st_pos())
 					qml_set_center_onpos(2);
@@ -471,17 +437,26 @@
 			if (nav.get_route_status() == '2review' && id_auto_accept > 0) {
 				clearTimeout(id_auto_accept);
 				id_auto_accept = -1;
+=======
+				if (ui.get_center_1st_pos())
+					qml_set_center_onpos(2);
+				else
+					qml_set_center_onpos(1);
+>>>>>>> MERGE-SOURCE
 			}
 		});
 		
 		// Zoom
 		function custom_zoom(value) {
 			ui.set_zoom_unav(false);
+<<<<<<< TREE
 			
 			if (nav.get_route_status() == '2review' && id_auto_accept > 0) {
 				clearTimeout(id_auto_accept);
 				id_auto_accept = -1;
 			}
+=======
+>>>>>>> MERGE-SOURCE
 			
 			var zoom = ol.animation.zoom({duration: 300, resolution: map.getView().getResolution()});
 			map.beforeRender(zoom);
@@ -554,12 +529,6 @@
 
 		function simulate2coord(lat1, lng1, lat2, lng2) {
 			nav.set_route_status('simulate_calculating');
-			
-			if (id_auto_accept > 0) {
-				clearTimeout(id_auto_accept);
-				id_auto_accept = 0;
-			}
-			
 			webapi.simulate(lat1, lng1, lat2, lng2);
 			ui.update();
 			ui.markers_radar_clear();
@@ -567,11 +536,6 @@
 		}
 		
 		function click_cancel_route() {
-			if (id_auto_accept > 0) {
-				clearTimeout(id_auto_accept);
-				id_auto_accept = 0;
-			}
-			
 			nav.cancel_route();
 			
 			ui.update();
@@ -582,14 +546,7 @@
 		}
 		
 		function agree_review() {
-			if (id_auto_accept > 0) {
-				clearTimeout(id_auto_accept);
-				id_auto_accept = 0;
-			}
-			if (id_auto_accept > -2) { // Disabled auto accept
-				id_auto_accept = 0;
-				center_pos();
-			}
+			center_pos();
 			nav.set_route_status('yes');
 			ui.update();
 			qml_set_center_onpos(2);
@@ -599,36 +556,36 @@
 
 
 	<!-- Notifications -->
-	<audio id="voice_notif" type="audio/ogg" src="sounds/notification.ogg" />
-	<audio id="radar_sound_alert" type="audio/ogg" src="sounds/radar.ogg" />
+	<audio id="voice_notif"       type="audio/ogg" src="sounds/notification.ogg" preload="none"/>
+	<audio id="radar_sound_alert" type="audio/ogg" src="sounds/radar.ogg"        preload="none"/>
 
-	<audio id="4"   type="audio/ogg" src="voices/en/4.ogg"/>
-	<audio id="7"   type="audio/ogg" src="voices/en/7.ogg"/>
-	<audio id="8"   type="audio/ogg" src="voices/en/8.ogg"/>
-	<audio id="9"   type="audio/ogg" src="voices/en/9.ogg"/>
-	<audio id="10"  type="audio/ogg" src="voices/en/10.ogg"/>
-	<audio id="11"  type="audio/ogg" src="voices/en/11.ogg"/>
-	<audio id="12"  type="audio/ogg" src="voices/en/12.ogg"/>
-	<audio id="13"  type="audio/ogg" src="voices/en/13.ogg"/>
-	<audio id="14"  type="audio/ogg" src="voices/en/14.ogg"/>
-	<audio id="15"  type="audio/ogg" src="voices/en/15.ogg"/>
-	<audio id="16"  type="audio/ogg" src="voices/en/16.ogg"/>
-	<audio id="17"  type="audio/ogg" src="voices/en/17.ogg"/>
-	<audio id="18"  type="audio/ogg" src="voices/en/18.ogg"/>
-	<audio id="19"  type="audio/ogg" src="voices/en/19.ogg"/>
-	<audio id="20"  type="audio/ogg" src="voices/en/20.ogg"/>
-	<audio id="21"  type="audio/ogg" src="voices/en/21.ogg"/>
-	<audio id="22"  type="audio/ogg" src="voices/en/22.ogg"/>
-	<audio id="23"  type="audio/ogg" src="voices/en/23.ogg"/>
-	<audio id="24"  type="audio/ogg" src="voices/en/24.ogg"/>
-	<audio id="25"  type="audio/ogg" src="voices/en/25.ogg"/>
-	<audio id="26"  type="audio/ogg" src="voices/en/26.ogg"/>
-	<audio id="261" type="audio/ogg" src="voices/en/261.ogg"/>
-	<audio id="262" type="audio/ogg" src="voices/en/262.ogg"/>
-	<audio id="263" type="audio/ogg" src="voices/en/263.ogg"/>
-	<audio id="264" type="audio/ogg" src="voices/en/264.ogg"/>
-	<audio id="28"  type="audio/ogg" src="voices/en/28.ogg"/>
-	<audio id="29"  type="audio/ogg" src="voices/en/29.ogg"/>
+	<audio id="4"   type="audio/ogg" src="voices/en/4.ogg"   preload="none"/>
+	<audio id="7"   type="audio/ogg" src="voices/en/7.ogg"   preload="none"/>
+	<audio id="8"   type="audio/ogg" src="voices/en/8.ogg"   preload="none"/>
+	<audio id="9"   type="audio/ogg" src="voices/en/9.ogg"   preload="none"/>
+	<audio id="10"  type="audio/ogg" src="voices/en/10.ogg"  preload="none"/>
+	<audio id="11"  type="audio/ogg" src="voices/en/11.ogg"  preload="none"/>
+	<audio id="12"  type="audio/ogg" src="voices/en/12.ogg"  preload="none"/>
+	<audio id="13"  type="audio/ogg" src="voices/en/13.ogg"  preload="none"/>
+	<audio id="14"  type="audio/ogg" src="voices/en/14.ogg"  preload="none"/>
+	<audio id="15"  type="audio/ogg" src="voices/en/15.ogg"  preload="none"/>
+	<audio id="16"  type="audio/ogg" src="voices/en/16.ogg"  preload="none"/>
+	<audio id="17"  type="audio/ogg" src="voices/en/17.ogg"  preload="none"/>
+	<audio id="18"  type="audio/ogg" src="voices/en/18.ogg"  preload="none"/>
+	<audio id="19"  type="audio/ogg" src="voices/en/19.ogg"  preload="none"/>
+	<audio id="20"  type="audio/ogg" src="voices/en/20.ogg"  preload="none"/>
+	<audio id="21"  type="audio/ogg" src="voices/en/21.ogg"  preload="none"/>
+	<audio id="22"  type="audio/ogg" src="voices/en/22.ogg"  preload="none"/>
+	<audio id="23"  type="audio/ogg" src="voices/en/23.ogg"  preload="none"/>
+	<audio id="24"  type="audio/ogg" src="voices/en/24.ogg"  preload="none"/>
+	<audio id="25"  type="audio/ogg" src="voices/en/25.ogg"  preload="none"/>
+	<audio id="26"  type="audio/ogg" src="voices/en/26.ogg"  preload="none"/>
+	<audio id="261" type="audio/ogg" src="voices/en/261.ogg" preload="none"/>
+	<audio id="262" type="audio/ogg" src="voices/en/262.ogg" preload="none"/>
+	<audio id="263" type="audio/ogg" src="voices/en/263.ogg" preload="none"/>
+	<audio id="264" type="audio/ogg" src="voices/en/264.ogg" preload="none"/>
+	<audio id="28"  type="audio/ogg" src="voices/en/28.ogg"  preload="none"/>
+	<audio id="29"  type="audio/ogg" src="voices/en/29.ogg"  preload="none"/>
 
 	<script>
 		// Localize voices

=== modified file 'nav/locales/unav.pot'
--- nav/locales/unav.pot	2016-05-09 17:56:34 +0000
+++ nav/locales/unav.pot	2016-06-13 21:48:55 +0000
@@ -8,7 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2016-05-09 19:56+0200\n"
+=======
+"POT-Creation-Date: 2016-06-06 19:37+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -154,11 +158,19 @@
 msgid "Insert a favorite name"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Favorites.qml:211 qml/Main.qml:695 nav/class/UI.js:48
+=======
+#: qml/Favorites.qml:211 qml/Main.qml:740 nav/class/UI.js:40
+>>>>>>> MERGE-SOURCE
 msgid "Current Position"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Favorites.qml:226 qml/SettingsPage.qml:359
+=======
+#: qml/Favorites.qml:226 qml/SettingsPage.qml:367
+>>>>>>> MERGE-SOURCE
 msgid "Cancel"
 msgstr ""
 
@@ -174,81 +186,161 @@
 msgid "Update"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Location.qml:39 qml/PoiListPage.qml:142
+=======
+#: qml/Location.qml:40 qml/PoiListPage.qml:142
+>>>>>>> MERGE-SOURCE
 msgid "Time out! Please try again"
 msgstr ""
 
+<<<<<<< TREE
 #. TRANSLATORS: This string is search shown when no POIs are found with the chosen search radius. %1 is the POI type eg..Pub, Airport
 #. Example string, "Sorry, no Airport found nearby. Try again with a larger search radius"
 #: qml/Location.qml:47 qml/PoiListPage.qml:150
 #, qt-format
 msgid "Sorry, no %1 found nearby. Try again with a larger search radius"
+=======
+#. TRANSLATORS: This string is search shown when no POIs are found with the chosen search radius.
+#: qml/Location.qml:48
+msgid "Sorry, nothing found. Try another search"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Location.qml:130 qml/Location.qml:318 qml/Location.qml:380
+=======
+#: qml/Location.qml:131 qml/Location.qml:319 qml/Location.qml:381
+>>>>>>> MERGE-SOURCE
 msgid "Search history"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Location.qml:140 qml/Location.qml:324 qml/Location.qml:382
+=======
+#: qml/Location.qml:141 qml/Location.qml:325 qml/Location.qml:383
+>>>>>>> MERGE-SOURCE
 msgid "Favorite history"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Location.qml:150 qml/Location.qml:321 qml/Location.qml:337
 #: qml/Location.qml:348 qml/Location.qml:363 qml/Location.qml:370
 #: qml/Location.qml:401 qml/Location.qml:407
+=======
+#: qml/Location.qml:151 qml/Location.qml:322 qml/Location.qml:338
+#: qml/Location.qml:349 qml/Location.qml:364 qml/Location.qml:371
+#: qml/Location.qml:402 qml/Location.qml:408
+>>>>>>> MERGE-SOURCE
 msgid "Nearby history"
 msgstr ""
 
-#: qml/Location.qml:167
+#: qml/Location.qml:168
 msgid "No history yet…"
 msgstr ""
 
-#: qml/Location.qml:167
+#: qml/Location.qml:168
 msgid "History is disabled"
 msgstr ""
 
-#: qml/Location.qml:214
+#: qml/Location.qml:215
 msgid "Search location"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Location.qml:219 qml/PoiListPage.qml:160
+=======
+#: qml/Location.qml:220 qml/PoiListPage.qml:160
+>>>>>>> MERGE-SOURCE
 msgid "Searching…"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Main.qml:193 qml/SettingsPage.qml:35
+=======
+#: qml/Main.qml:190 qml/SettingsPage.qml:35
+>>>>>>> MERGE-SOURCE
 msgid "Settings"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Main.qml:205
+=======
+#: qml/Main.qml:202
+>>>>>>> MERGE-SOURCE
 msgid "Center on Position"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Main.qml:218 qml/PoiPage.qml:83 qml/SearchPage.qml:69
+=======
+#: qml/Main.qml:206 qml/Main.qml:502
+msgid "Searching your position… This could take a while"
+msgstr ""
+
+#: qml/Main.qml:220 qml/PoiPage.qml:83 qml/SearchPage.qml:69
+>>>>>>> MERGE-SOURCE
 msgid "Search"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Main.qml:230
+=======
+#: qml/Main.qml:232
+>>>>>>> MERGE-SOURCE
 msgid "Destination"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Main.qml:410 qml/Main.qml:436
+=======
+#: qml/Main.qml:377
+msgid "Error getting speed cameras!"
+msgstr ""
+
+#: qml/Main.qml:429 qml/Main.qml:455
+>>>>>>> MERGE-SOURCE
 msgid "Shared Position"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Main.qml:639
+=======
+#: qml/Main.qml:684
+>>>>>>> MERGE-SOURCE
 msgid "NearBy Destination"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Main.qml:640
+=======
+#: qml/Main.qml:685
+>>>>>>> MERGE-SOURCE
 msgid "Cancel Route"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/Main.qml:684
+=======
+#: qml/Main.qml:729
+>>>>>>> MERGE-SOURCE
 #, qt-format
 msgid "Coord: %1, %2"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:77
+<<<<<<< TREE
+#: qml/PoiDetailsPage.qml:77
+=======
+#: qml/Main.qml:796
+msgid "Simulate from here! Now click on destination"
+msgstr ""
+
+#: qml/Main.qml:813
+msgid "Set a different coordinates for simulating"
+msgstr ""
+
+#: qml/PoiDetailsPage.qml:77
+>>>>>>> MERGE-SOURCE
 msgid "Lat, Long:"
 msgstr ""
 
@@ -292,6 +384,13 @@
 msgid "Something was wrong. Please, try again…"
 msgstr ""
 
+#. TRANSLATORS: This string is search shown when no POIs are found with the chosen search radius. %1 is the POI type eg..Pub, Airport
+#. Example string, "Sorry, no Airport found nearby. Try again with a larger search radius"
+#: qml/PoiListPage.qml:150
+#, qt-format
+msgid "Sorry, no %1 found nearby. Try again with a larger search radius"
+msgstr ""
+
 #. TRANSLATORS: Abbreviation for Public Holiday. This string is used while showing the opening hours
 #. of a place which might be closed during public holidays.
 #: qml/PoiListPage.qml:316
@@ -319,6 +418,24 @@
 msgid "Most recent"
 msgstr ""
 
+#: qml/PoiQuickAccessPage.qml:63
+msgid "Quick Access: "
+msgstr ""
+
+#: qml/PoiQuickAccessPage.qml:201
+msgid "Selection"
+msgstr ""
+
+#. TRANSLATORS: argument is a number > 1.
+#: qml/PoiQuickAccessPage.qml:203
+#, qt-format
+msgid "Max. %1 POIs can be selected."
+msgstr ""
+
+#: qml/PoiQuickAccessPage.qml:206 qml/SettingsPage.qml:388
+msgid "OK"
+msgstr ""
+
 #: qml/RouteInfoListPage.qml:29
 msgid "Route Info"
 msgstr ""
@@ -413,6 +530,7 @@
 msgid "Map"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:232
 msgid "Mode"
 msgstr ""
@@ -422,38 +540,81 @@
 msgstr ""
 
 #: qml/SettingsPage.qml:271
+=======
+#: qml/SettingsPage.qml:232
+msgid "Mode"
+msgstr ""
+
+#: qml/SettingsPage.qml:262
+msgid "How to use offline maps"
+msgstr ""
+
+#: qml/SettingsPage.qml:279
+>>>>>>> MERGE-SOURCE
 msgid "Units"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:305
+=======
+#: qml/SettingsPage.qml:313
+>>>>>>> MERGE-SOURCE
 msgid "Show header in map view"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:317
+=======
+#: qml/SettingsPage.qml:325
+>>>>>>> MERGE-SOURCE
 msgid "History"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:324
+=======
+#: qml/SettingsPage.qml:332
+>>>>>>> MERGE-SOURCE
 msgid "Store new searches"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:336 qml/SettingsPage.qml:346
+=======
+#: qml/SettingsPage.qml:344 qml/SettingsPage.qml:354
+>>>>>>> MERGE-SOURCE
 msgid "Clear History"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:347
+=======
+#: qml/SettingsPage.qml:355
+>>>>>>> MERGE-SOURCE
 msgid "You'll delete the current history"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:350
+=======
+#: qml/SettingsPage.qml:358
+>>>>>>> MERGE-SOURCE
 msgid "Delete"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:369
+=======
+#: qml/SettingsPage.qml:377
+>>>>>>> MERGE-SOURCE
 msgid "Speed Camera alerts and the law"
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:370
+=======
+#: qml/SettingsPage.qml:378
+>>>>>>> MERGE-SOURCE
 msgid ""
 "uNav is only reading the OpenStreetMap database.\n"
 "uNav will show a max speed notification and a Speed Camera marker (marker "
@@ -463,6 +624,7 @@
 "only if it's legal in the country."
 msgstr ""
 
+<<<<<<< TREE
 #: qml/SettingsPage.qml:376
 msgid "Read more about it"
 msgstr ""
@@ -472,6 +634,13 @@
 msgstr ""
 
 #: qml/Share.qml:33
+=======
+#: qml/SettingsPage.qml:384
+msgid "Read more about it"
+msgstr ""
+
+#: qml/Share.qml:33
+>>>>>>> MERGE-SOURCE
 msgid "Share location to"
 msgstr ""
 
@@ -487,9 +656,6 @@
 msgid "Start"
 msgstr ""
 
-msgid "Error getting speed cameras"
-msgstr ""
-
 msgid "Route so long"
 msgstr ""
 
@@ -508,23 +674,6 @@
 msgid "Please review your device settings"
 msgstr ""
 
-msgid "GPS device is not working"
-msgstr ""
-
-msgid "The GPS device didn't return a position yet"
-msgstr ""
-
-msgid ""
-"Review the GPS device settings (check at bottom of battery settings too)"
-msgstr ""
-
-msgid ""
-"If everything is OK, try a device reboot :( The GPS device will work again"
-msgstr ""
-
-msgid "It doesn't work either, please fill a bug: bugs.launchpad.net/unav"
-msgstr ""
-
 #: qml/js/PoiCategories.js:4
 msgid "Transport"
 msgstr ""
@@ -1009,7 +1158,11 @@
 msgid "Go to your left"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/Navigator.js:288 nav/class/UI.js:451
+=======
+#: nav/class/Navigator.js:288 nav/class/UI.js:436
+>>>>>>> MERGE-SOURCE
 msgid "You have arrived at your destination"
 msgstr ""
 
@@ -1149,47 +1302,91 @@
 msgid ", %1"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:57
+=======
+#: nav/class/UI.js:49
+>>>>>>> MERGE-SOURCE
 msgid "Current Start"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:66
+=======
+#: nav/class/UI.js:58
+>>>>>>> MERGE-SOURCE
 msgid "Current End"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:389
+=======
+#: nav/class/UI.js:374
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for a GPS signal…"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:394
+=======
+#: nav/class/UI.js:379
+>>>>>>> MERGE-SOURCE
 msgid "Searching for a route…"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:398
+=======
+#: nav/class/UI.js:383
+>>>>>>> MERGE-SOURCE
 msgid "Drawing route…"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:402
+=======
+#: nav/class/UI.js:387
+>>>>>>> MERGE-SOURCE
 msgid "Error finding route between points. Check the connection and try again"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:406
+=======
+#: nav/class/UI.js:391
+>>>>>>> MERGE-SOURCE
 msgid "Recalculating route…"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:427
+=======
+#: nav/class/UI.js:412
+>>>>>>> MERGE-SOURCE
 msgid "Navigation will start soon"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:458
+=======
+#: nav/class/UI.js:443
+>>>>>>> MERGE-SOURCE
 msgid "Simulating route…"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:462
+=======
+#: nav/class/UI.js:447
+>>>>>>> MERGE-SOURCE
 msgid "Error simulating route. Try different points"
 msgstr ""
 
+<<<<<<< TREE
 #: nav/class/UI.js:483
+=======
+#: nav/class/UI.js:468
+>>>>>>> MERGE-SOURCE
 msgid "Click onto the icon for reviewing the route"
 msgstr ""
 

=== modified file 'qml/AboutPage.qml'
--- qml/AboutPage.qml	2016-05-05 19:21:33 +0000
+++ qml/AboutPage.qml	2016-06-13 21:48:55 +0000
@@ -106,7 +106,7 @@
 
         header: Item {
             width: parent.width
-            height: appColumn.height + donateColumn.height + units.gu(10)
+            height: appColumn.height + units.gu(10)
             Column {
                 id: appColumn
                 spacing: units.gu(1)
@@ -134,28 +134,6 @@
                     onLinkActivated: Qt.openUrlExternally(link)
                 }
             }
-
-            Column {
-                id: donateColumn
-                anchors.top: appColumn.bottom
-                anchors.topMargin: units.gu(3)
-                width: parent.width
-                spacing: units.gu(1)
-                Label {
-                    id: donateLabel
-                    text: i18n.tr("Support its future development")
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
-                    horizontalAlignment: Text.AlignHCenter
-                    width: parent.width - units.gu(12)
-                }
-                Button {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: UbuntuColors.green
-                    text: i18n.tr("Buy Donate Version")
-                    onClicked: Qt.openUrlExternally("scope://com.canonical.scopes.clickstore?q=unavdonateversion")
-                }
-            }
         }
 
         delegate: ListItem {

=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-06-08 17:16:09 +0000
+++ qml/Main.qml	2016-06-13 21:48:55 +0000
@@ -202,6 +202,11 @@
                                 text: i18n.tr("Center on Position")
                                 enabled: navigationPage.buttonsEnabled && mainPageStack.center_onpos !== 2
                                 onTriggered: {
+                                    if (mainPageStack.center_onpos === 0) {
+                                        notifiactionBar.text =  i18n.tr("Searching your position… This could take a while");
+                                        notifiactionBar.info();
+                                        notificationBarTimer.start();
+                                    }
                                     mainPageStack.center_onpos = 2;
                                     goThereActionPopover.hide();
                                     mainPageStack.executeJavaScript("center_pos()");
@@ -302,6 +307,7 @@
                             goThereActionPopover.osm_id = 'none';
                             goThereActionPopover.phone = '';
                             goThereActionPopover.poiName = "";
+                            notifiactionBar.visible = false;
                             
                             if (params[0] === 'nofollow' && mainPageStack.center_onpos === 2)
                                 mainPageStack.center_onpos = 1;
@@ -365,6 +371,7 @@
                             navApp.settings.prevLng = params[1];
                             navApp.settings.prevZoom = params[2];
                             break;
+<<<<<<< TREE
                         
                         case "http://show_notification/":
                             if (params[1] === "speed_camera_error") {
@@ -381,7 +388,37 @@
                                 notifiactionBar.critical();
                             }
                             notificationBarTimer.start();
+=======
+                        
+                        case "http://show_notification/":
+                            switch (params[0]) {
+                                case "info":
+                                    notifiactionBar.info();
+                                    break;
+                                case "warning":
+                                    notifiactionBar.warning();
+                                    break;
+                                case "critical":
+                                    notifiactionBar.critical();
+                            }
+                            switch (params[1]) {
+                                case "speed_camera_error":
+                                    notifiactionBar.text =  i18n.tr("Error getting speed cameras!");
+                                    break;
+                                case "webapi_error":
+                                    notifiactionBar.text =  i18n.tr("Error finding route! Retrying again in 1 minute…");
+                                    break;
+                                case "calcfromout_error":
+                                    notifiactionBar.text =  i18n.tr("Error finding route! Trying again…");
+                                    break;
+                            }
+                            notificationBarTimer.start();
+>>>>>>> MERGE-SOURCE
                         }
+<<<<<<< TREE
+=======
+                        
+>>>>>>> MERGE-SOURCE
                         request.action = Oxide.NavigationRequest.ActionReject;
                     }
 
@@ -491,7 +528,11 @@
                             icon.name: mainPageStack.center_onpos ? "media-optical-symbolic" : "gps"
                             enabled: navigationPage.buttonsEnabled && mainPageStack.center_onpos !== 2
                             onClicked: {
-                                mainPageStack.center_onpos = 2;
+                                if (mainPageStack.center_onpos === 0) {
+                                    notifiactionBar.text =  i18n.tr("Searching your position… This could take a while");
+                                    notifiactionBar.info();
+                                    notificationBarTimer.start();
+                                }                                mainPageStack.center_onpos = 2;
                                 goThereActionPopover.hide();
                                 mainPageStack.executeJavaScript("center_pos()");
                             }
@@ -522,6 +563,7 @@
                     }
                 }
 
+<<<<<<< TREE
                 Timer {
                     id: notificationBarTimer
                     interval: 8000
@@ -535,6 +577,21 @@
                     id: notifiactionBar
                 }
 
+=======
+                Timer {
+                    id: notificationBarTimer
+                    interval: 7000
+                    repeat: false
+                    onTriggered: {
+                        notifiactionBar.visible = false
+                    }
+                }
+
+                NotificationBar {
+                    id: notifiactionBar
+                }
+
+>>>>>>> MERGE-SOURCE
                 XmlListModel {
                     id: reverseXmlModel
 
@@ -782,6 +839,10 @@
                                         goThereActionPopover.hide();
                                         mainPageStack.ptFromLat = mainPageStack.clickedLat;
                                         mainPageStack.ptFromLng = mainPageStack.clickedLng;
+                                        notifiactionBar.text =  i18n.tr("Simulate from here! Now click on destination");
+                                        notifiactionBar.info();
+                                        notificationBarTimer.start();
+
                                     }
                                 }
 
@@ -791,10 +852,20 @@
                                     icon.height: units.gu(3)
                                     highlightSize: units.gu(-1)
                                     onClicked: {
-                                        goThereActionPopover.hide();
-                                        mainPageStack.routeState = 'simulate_calculating';
-                                        mainPageStack.executeJavaScript("simulate2coord(" + mainPageStack.ptFromLat + ", " + mainPageStack.ptFromLng + ", " + mainPageStack.clickedLat + ", " + mainPageStack.clickedLng + ");");
-                                        mainPageStack.ptFromLat = "null";
+                                        // Validate coordinates are different points
+                                        if (mainPageStack.ptFromLat === mainPageStack.clickedLat && mainPageStack.ptFromLng === mainPageStack.clickedLng) {
+                                            goThereActionPopover.hide();
+                                            mainPageStack.ptFromLat = "null";
+                                            notifiactionBar.text = i18n.tr("Set a different coordinates for simulating");
+                                            notifiactionBar.warning();
+                                            notificationBarTimer.start();
+                                        }
+                                        else {
+                                            goThereActionPopover.hide();
+                                            mainPageStack.routeState = 'simulate_calculating';
+                                            mainPageStack.executeJavaScript("simulate2coord(" + mainPageStack.ptFromLat + ", " + mainPageStack.ptFromLng + ", " + mainPageStack.clickedLat + ", " + mainPageStack.clickedLng + ");");
+                                            mainPageStack.ptFromLat = "null";
+                                        }
                                     }
                                 }
                             }

=== modified file 'qml/components/NotificationBar.qml'
--- qml/components/NotificationBar.qml	2016-05-22 17:20:29 +0000
+++ qml/components/NotificationBar.qml	2016-06-13 21:48:55 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * GPS Navigation http://launchpad.net/unav
  * Copyright (C) 2015-2016 JkB https://launchpad.net/~joergberroth
@@ -86,3 +87,93 @@
         elide: Text.ElideRight
     }
 }
+=======
+/*
+ * GPS Navigation http://launchpad.net/unav
+ * Copyright (C) 2015-2016 JkB https://launchpad.net/~joergberroth
+ * Copyright (C) 2015-2016 Marcos Alvarez Costales https://launchpad.net/~costales
+ *
+ * GPS Navigation is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPS Navigation is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Rectangle {
+    id: notificationRectangle
+
+    property alias text: notificationLabel.text
+
+    signal info()
+    signal warning()
+    signal critical()
+
+    onInfo: {
+        notificationLabel.color = UbuntuColors.slate
+        notificationRectangle.color = "#FFFFFF"
+        notificationRectangle.visible = true;
+        notificationIcon.name = ""
+        notificationLabel.fontSize = "large"
+        notificationRectangle.height = notificationLabel.height + units.gu(1)
+    }
+    onWarning: {
+        notificationLabel.color = "#FFFFFF"
+        notificationRectangle.color = UbuntuColors.orange;
+        notificationRectangle.visible = true;
+        notificationLabel.fontSize = "large"
+        notificationIcon.name = "dialog-warning-symbolic"
+        notificationRectangle.height = notificationLabel.height + units.gu(4)
+    }
+    onCritical: {
+        notificationLabel.color = "#FFFFFF"
+        notificationRectangle.color = UbuntuColors.red
+        notificationRectangle.visible = true;
+        notificationLabel.fontSize = "large"
+        notificationIcon.name = "dialog-error-symbolic"
+        notificationRectangle.height = notificationLabel.height + units.gu(4)
+    }
+
+    width: parent.width
+    visible: false
+
+    anchors {
+        top: goThereActionPopover.isShown ? goThereActionPopover.bottom : navigationPage.header.bottom
+    }
+
+    Icon {
+        id: notificationIcon
+        width: units.gu(3.5)
+        height: width
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            leftMargin: units.gu(2)
+        }
+        visible: name !== ""
+        color: "#FFFFFF"
+
+    }
+
+    Label {
+        id: notificationLabel
+        anchors {
+            left: notificationIcon.visible ? notificationIcon.right : parent.left
+            margins: units.gu(1)
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+        horizontalAlignment: Text.AlignHCenter
+        maximumLineCount: 3
+        wrapMode: Text.WordWrap
+        elide: Text.ElideRight
+    }
+}
+>>>>>>> MERGE-SOURCE