Merge lp:~costales/unav/0.67-set-mode-routes into lp:unav

[costales]

Choose route mode in each new route or simulation

[lp:~costales/unav/0.67-set-mode-routes]

184. By costales on 2017-02-19

Choose route mode

185. By costales on 2017-02-19

New empty state

186. By costales on 2017-02-19

New empty state

187. By costales on 2017-02-19

Ended

188. By costales on 2017-02-19

Wrong index

189. By costales on 2017-02-19

Updated Settings

190. By costales on 2017-02-19

i18n

=== modified file 'nav/class/Settings.js'
--- nav/class/Settings.js	2016-06-24 09:22:29 +0000
+++ nav/class/Settings.js	2017-02-19 22:22:23 +0000
@@ -16,7 +16,7 @@
 function Settings() {
 	this.sound = true;
 	this.unit = this.KM;
-	this.routing_mode = 0; // 0 car, 1 walk, 2 bike
+	this.routing_mode = 0; // 0 car, 1 walk, 2 bike, 3 multimodal
 	this.avoid_tolls = false;
 	this.alert_radars = true;
 	this.ui_speed = true;
 
=== modified file 'nav/class/UI.js'
--- nav/class/UI.js	2017-01-15 12:10:13 +0000
+++ nav/class/UI.js	2017-02-19 22:22:23 +0000
@@ -28,7 +28,6 @@
 	this.center_1st_pos = true;
 	this.zoom_unav = true;
 	this.map_stretched = true;
-	this.confirm_route = true;
 	
 	this.marker_pos = new ol.Overlay({
 		positioning: 'center-center',
@@ -195,6 +194,51 @@
 	return this.online_layer;
 }
 
+UI.prototype.set_confirm_btn_color = function(mode) {
+	switch (mode) {
+		case 0: 
+			$("#btn1_set_car").css(   {"background": this.COLOR_ORANGE, "border-color":this.COLOR_ORANGE});
+			$("#btn1_set_walk").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_bike").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_public").css({"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_car").css(   {"background": this.COLOR_ORANGE, "border-color":this.COLOR_ORANGE});
+			$("#btn2_set_walk").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_bike").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_public").css({"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			break;
+		case 1: 
+			$("#btn1_set_car").css(   {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_walk").css(  {"background": this.COLOR_ORANGE, "border-color":this.COLOR_ORANGE});
+			$("#btn1_set_bike").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_public").css({"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_car").css(   {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_walk").css(  {"background": this.COLOR_ORANGE, "border-color":this.COLOR_ORANGE});
+			$("#btn2_set_bike").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_public").css({"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			break;
+		case 2: 
+			$("#btn1_set_car").css(   {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_walk").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_bike").css(  {"background": this.COLOR_ORANGE, "border-color":this.COLOR_ORANGE});
+			$("#btn1_set_public").css({"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_car").css(   {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_walk").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_bike").css(  {"background": this.COLOR_ORANGE, "border-color":this.COLOR_ORANGE});
+			$("#btn2_set_public").css({"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			break;
+		case 3: 
+			$("#btn1_set_car").css(   {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_walk").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_bike").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn1_set_public").css({"background": this.COLOR_ORANGE, "border-color":this.COLOR_ORANGE});
+			$("#btn2_set_car").css(   {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_walk").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_bike").css(  {"background": this.COLOR_BLACK,  "border-color":this.COLOR_BLACK});
+			$("#btn2_set_public").css({"background": this.COLOR_ORANGE, "border-color":this.COLOR_ORANGE});
+			break;
+	}
+}
+
 UI.prototype.set_map_layer = function(layer) {
 	var aux_center = this.map.getView().getCenter();
 	var aux_zoom = this.map.getView().getZoom();
@@ -251,14 +295,6 @@
 	this.zoom_unav = zoom;
 }
 
-UI.prototype.get_confirm_route = function() {
-	return this.confirm_route;
-}
-
-UI.prototype.set_confirm_route = function(confirm) {
-	this.confirm_route = confirm;
-}
-
 UI.prototype.markers = function(start_lat, start_lng, end_lat, end_lng) {
 	this.marker_start.setPosition(undefined);
 	this.marker_end.setPosition(undefined);
@@ -278,6 +314,25 @@
 	}
 }
 
+UI.prototype.btns_confirm_route = function(show) {
+	if (show) {
+		$('#btn_start').show();
+		$('#btn_cancel').show();
+		$('#btn_notfound').hide();
+		$('#p_review_time2left').show();
+		$('#p_review_total_dist').show();
+		$('#p_review_time2arrive').show();
+	}
+	else {
+		$('#btn_start').hide();
+		$('#btn_cancel').hide();
+		$('#btn_notfound').show();
+		$('#p_review_time2left').hide();
+		$('#p_review_total_dist').hide();
+		$('#p_review_time2arrive').hide();
+	}
+}
+
 UI.prototype.route = function(redraw_map) {
 	if (this.nav.get_route_status() !== 'drawing' && this.nav.get_route_status() !== 'simulate_drawing') {
 		this.routeSource.clear();
@@ -314,6 +369,7 @@
 			aux_height = aux_height + $('#panel_msg').height();
 		aux_height = aux_height + 110;
 		this.map.getView().fit(this.routeSource.getExtent(), this.map.getSize(), {padding: [150, 25, aux_height, 25]});
+		map.updateSize();
 	}
 }
 
@@ -534,6 +590,7 @@
 			$('#panel_msg').show();
 			break;
 		case '2review':
+		case 'calculating_error':
 			$('#p_review_time2left').html(this.maths.time2human(route_indicator['time'], false));
 			$('#p_review_total_dist').html(this.maths.dist2human(route_indicator['distance_total'], this.settings.get_unit()));
 			$('#p_review_time2arrive').html(this.maths.time2human(route_indicator['time'], true));
@@ -587,8 +644,15 @@
 			$('#panel_msg').show();
 			break;
 		case 'simulate_error':
-			$('#p_msg').html(t("Error simulating route. Try different points"));
-			$('#panel_msg').show();
+			$('#p_time2left').html('');
+			$('#p_total_dist').html('');
+			$('#p_time2arrive').html('');
+			$('#p_speed').hide();
+			$('#p_txt_ind').html(this.compose_btns_routing());
+			this.set_confirm_btn_color(this.settings.get_routing_mode());
+			$('#p_img_ind').attr('src', 'img/mode/noroute.svg');
+			$('#panel_navigation').show();
+			$('#panel_indication, #panel_txt_ind').css('background-color', this.COLOR_BLACK);
 			break;
 		case 'simulate_done_bike':
 		case 'simulate_done_walk':
@@ -598,27 +662,29 @@
 			$('#p_total_dist').html(this.maths.dist2human(route_indicator['distance_total'], this.settings.get_unit()));
 			$('#p_time2arrive').html(this.maths.time2human(route_indicator['time'], true));
 			$('#p_speed').hide();
-			switch (this.nav.get_route_status()) {
-				case 'simulate_done_public':
-					$('#p_img_ind').attr('src', 'img/mode/public.svg');
-					break;
-				case 'simulate_done_bike':
-					$('#p_img_ind').attr('src', 'img/mode/bike.svg');
-					break;
-				case 'simulate_done_walk':
-					$('#p_img_ind').attr('src', 'img/mode/walk.svg');
-					break;
-				default:
-					$('#p_img_ind').attr('src', 'img/mode/car.svg');
-			}
 			$('#p_next_dist').html('');
-			$('#p_txt_ind').html(t("Click onto the icon for reviewing the route"));
+			$('#p_txt_ind').html(this.compose_btns_routing());
+			this.set_confirm_btn_color(this.settings.get_routing_mode());
+			$('#p_img_ind').attr('src', 'img/mode/steps.svg');
 			$('#panel_navigation').show();
 			$('#panel_indication, #panel_txt_ind').css('background-color', this.COLOR_BLACK);
 			break;
 	}
 }
 
+UI.prototype.compose_btns_routing = function() {
+	return "<table class='tg' id='panel_review_btns'> \
+		  <tr> \
+			<th class='tg-yw4l'> \
+				<button data-role='button' id='btn2_set_car' class='btns2_mode_route negative' onClick='javascript:set_simulate_mode(0)'><img class='img2_btn_route' src='img/mode/car.svg'></button> \
+				<button data-role='button' id='btn2_set_walk' class='btns2_mode_route negative' onClick='javascript:set_simulate_mode(1)'><img class='img2_btn_route' src='img/mode/walk.svg'></button> \
+				<button data-role='button' id='btn2_set_bike' class='btns2_mode_route negative' onClick='javascript:set_simulate_mode(2)'><img class='img2_btn_route' src='img/mode/bike.svg'></button> \
+				<button data-role='button' id='btn2_set_public' class='btns2_mode_route negative' onClick='javascript:set_simulate_mode(3)'><img class='img2_btn_route' src='img/mode/public.svg'></button> \
+			</th> \
+		  </tr> \
+		</table>";
+}
+
 UI.prototype.scale_line = function() {
 	switch(this.nav.get_route_status()) {
 		case 'no':
 
=== modified file 'nav/class/WebAPI.js'
--- nav/class/WebAPI.js	2016-12-22 19:23:03 +0000
+++ nav/class/WebAPI.js	2017-02-19 22:22:23 +0000
@@ -17,6 +17,7 @@
 	this.nav = nav;
 	this.ui = ui;
 	this.settings = settings;
+	this.confirm_route = '';
 	
 	this.route_status = '';
 	this.t_prev = $.now() - 1;
@@ -24,12 +25,13 @@
 
 
 // Route
-WebAPI.prototype.set_route = function(lat1, lng1, lat2, lng2) {
+WebAPI.prototype.set_route = function(lat1, lng1, lat2, lng2, confirm_route) {
 	if (this.nav.get_route_status() == 'calculating' || this.nav.get_route_status() == 'calculating_from_out')
 		return;
 	
-	if (this.t_prev < $.now()) { // Avoid several calls in a small time
+	if (confirm_route || this.t_prev < $.now()) { // Avoid several calls in a small time
 		
+		this.confirm_route = confirm_route;
 		if (this.nav.get_route_status() == "errorAPI") // Avoid so many calls
 			this.t_prev = $.now() + 60000;
 		else
@@ -108,8 +110,15 @@
 		qml_show_notification('critical', 'calcfromout_error');
 	}
 	else {
-		this.nav.set_route_status('errorAPI');
-		qml_show_notification('critical', 'webapi_error');
+		if (this.confirm_route) {
+			this.nav.set_route_status('calculating_error');
+			this.ui.route(false);
+			this.ui.btns_confirm_route(false);
+		}
+		else {
+			this.nav.set_route_status('errorAPI');
+			qml_show_notification('critical', 'webapi_error');
+		}
 	}
 }
 
 
=== modified file 'nav/css/unav.css'
--- nav/css/unav.css	2016-07-15 13:22:55 +0000
+++ nav/css/unav.css	2017-02-19 22:22:23 +0000
@@ -89,8 +89,15 @@
 
 .btns_route {
 	width:95%;
-	max-width: 300px;
+	max-width: 200px;
 	height:40px;
+	margin-top: 5px;
+	margin-bottom: 3px;
+}
+
+#btn_start {
+	background: #398DFF;
+	border-color: #398DFF;
 }
 
 #gps_progress {
@@ -99,12 +106,36 @@
 	height:10px;
 	margin-bottom: 8px;
 }
-#btn_start {
+
+.btns1_mode_route {
 	margin-top: 5px;
-	margin-bottom: 3px;
-}
-#btn_cancel {
-	margin-bottom: 3px;
+	margin-left: 10px;
+	margin-right: 10px;
+	margin-bottom: 3px;
+	width: 50px;
+	height: 40px;
+}
+
+.img1_btn_route {
+	width: 25px;
+	height: 25px;
+}
+
+.btns2_mode_route {
+	margin-top: 15px;
+	margin-left: 5px;
+	margin-right: 5px;
+	width: 35px;
+	height: 35x;
+}
+
+.img2_btn_route {
+	width: 20px;
+	height: 20px;
+}
+
+#btn_notfound {
+	max-width: 274px;
 }
 
 .ol-scale-line {
 
=== modified file 'nav/img/mode/bike.svg'
--- nav/img/mode/bike.svg	2016-04-29 21:22:30 +0000
+++ nav/img/mode/bike.svg	2017-02-19 22:22:23 +0000
@@ -31,20 +31,20 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="744"
+     inkscape:window-width="1440"
+     inkscape:window-height="824"
      id="namedview6"
      showgrid="false"
      inkscape:zoom="2.7230142"
-     inkscape:cx="-6.8710741"
-     inkscape:cy="30.019466"
+     inkscape:cx="-5.8601662"
+     inkscape:cy="29.5628"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="24"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2"
      showborder="true"
      inkscape:showpageshadow="false" /><path
-     d="m 76.14832,56.00316 c -1.9964,0 -3.9146,0.33488 -5.7086,0.94208 -1.39104,-3.08384 -3.01668,-6.69208 -4.92016,-10.92776 l 1.2144,-3.3396 4.17404,-0.07636 0,-3.4914 -15.71176,0 c -1.37448,1.88048 0.5566,1.8722 7.51456,3.41504 l -1.2144,3.41596 -31.04356,0 c 2.091161,-7.30388 0.909881,-6.77212 10.322401,-6.75556 l 0,-3.56684 c -12.95728,0.12604 -10.71064,-1.334 -17.64928,20.9852 C 22.064281,56.40612 20.9704,56.29756 19.85076,56.29756 10.00768,56.29756 2,64.30616 2,74.14924 2,83.99232 10.00768,92 19.85076,92 c 9.844,0 17.851681,-8.00768 17.851681,-17.85076 0,-7.36552 -4.485,-13.7034 -10.86704,-16.4266 0.38824,-1.22176 0.80592,-2.52632 1.25396,-3.92012 26.11512,27.54572 16.31804,23.08004 30.371039,23.63848 0.06716,0 0.13156,-9.2e-4 0.19872,-0.0018 1.66428,8.13188 8.874321,14.26736 17.489201,14.26736 C 85.992321,91.70652 94,83.69884 94,73.85576 94,64.01268 85.992321,56.00316 76.148321,56.00316 Z M 33.52656,74.14924 c 0,7.54032 -6.13456,13.67488 -13.67488,13.67488 -7.54032,0 -13.6758,-6.13456 -13.6758,-13.67488 0,-7.54032 6.13456,-13.67488 13.67488,-13.67488 0.67988,0 1.3478,0.05152 2.001,0.14812 -4.3562,13.73744 -3.83364,12.17344 -3.86032,13.33172 -0.02116,0.97704 0.76728,1.75168 1.75904,1.81884 1.77744,-0.18032 1.37724,0.11408 5.819,-14.04012 4.692,2.16752 7.95708,6.91564 7.95708,12.41632 z m 17.6272,-0.851 L 29.55492,49.76096 59.9324,49.70668 51.15376,73.29824 Z m 7.14472,0.49404 -3.3212,-0.01012 8.61764,-22.62096 3.34328,7.40784 c -5.15752,3.1188 -8.61672,8.77312 -8.63972,15.22324 z M 68.67332,62.4128 73.829,73.83644 62.47436,73.80424 c 0.0184,-4.76192 2.48308,-8.9562 6.19896,-11.39144 z m 7.475,25.11784 c -6.30568,0 -11.62696,-4.29272 -13.20016,-10.10896 14.23332,0.0138 15.50292,0.74336 15.70164,-1.72592 -0.01932,-0.71944 -0.28704,-1.21256 -6.48232,-14.9224 1.25948,-0.38456 2.59624,-0.5934 3.97992,-0.5934 7.54032,0 13.67488,6.13456 13.67488,13.6758 0,7.54124 -6.13364,13.67488 -13.67396,13.67488 z"
+     d="m 77.414447,41.964511 c -2.060153,0 -4.039609,0.345574 -5.890898,0.972164 -1.435462,-3.182319 -3.113015,-6.905784 -5.07728,-11.276726 l 1.25318,-3.446246 4.307334,-0.0788 0,-3.602894 -16.213498,0 c -1.418373,1.940531 0.574374,1.931987 7.754529,3.524096 l -1.253181,3.525045 -32.034902,0 c 2.15794,-7.537122 0.938937,-6.988381 10.652036,-6.971292 l 0,-3.680743 c -13.371057,0.130065 -11.052673,-1.3766 -18.212891,21.65534 -1.095584,-0.204117 -2.224397,-0.316144 -3.379791,-0.316144 -10.1574087,0 -18.42080529,8.264346 -18.42080529,18.421755 0,10.157408 8.26339659,18.420804 18.42080529,18.420804 10.158357,0 18.421755,-8.263396 18.421755,-18.420804 0,-7.60073 -4.628224,-14.141004 -11.214067,-16.951166 0.400638,-1.260776 0.831656,-2.606995 1.294004,-4.045305 26.949078,28.425363 16.839139,23.817076 31.340905,24.393349 0.0693,0 0.135761,-9.49e-4 0.205066,-0.0019 1.717427,8.391563 9.157713,14.722973 18.0477,14.722973 10.158357,-4.2e-5 18.421753,-8.263438 18.421753,-18.420846 0,-10.157409 -8.263396,-18.422704 -18.421753,-18.422704 z m -43.98284,18.725556 c 0,7.781112 -6.330461,14.111572 -14.111573,14.111572 -7.781112,0 -14.1125221,-6.33046 -14.1125221,-14.111572 0,-7.781112 6.3304611,-14.111573 14.1115731,-14.111573 0.701591,0 1.39084,0.05316 2.0649,0.15285 -4.495311,14.17613 -3.956064,12.562186 -3.983596,13.757454 -0.02183,1.008241 0.791783,1.807618 1.815213,1.876923 1.834201,-0.186078 1.421221,0.117723 6.004824,-14.488476 4.841834,2.236737 8.211181,7.136483 8.211181,12.812822 z M 51.621712,59.811891 29.333137,35.522973 60.680689,35.46696 51.621712,59.811891 Z m 7.372879,0.509816 -3.427259,-0.01044 8.892835,-23.343336 3.450044,7.644402 c -5.322219,3.218395 -8.891885,9.05328 -8.91562,15.709377 z m 10.70615,-11.742871 5.320321,11.788442 -11.717239,-0.03323 c 0.01899,-4.913986 2.562375,-9.242206 6.396918,-11.755213 z m 7.713706,25.919951 c -6.507045,0 -11.998255,-4.429803 -13.621693,-10.431779 14.687845,0.01424 15.997989,0.767099 16.203055,-1.781035 -0.01994,-0.742414 -0.296207,-1.251282 -6.689326,-15.398931 1.2997,-0.39684 2.679148,-0.612349 4.107014,-0.612349 7.781112,0 14.111573,6.33046 14.111573,14.112522 0,7.782061 -6.329511,14.111572 -14.110623,14.111572 z"
      id="path4"
      style="fill:#ffffff"
      inkscape:connector-curvature="0" /></svg>
 \ No newline at end of file
 
=== modified file 'nav/img/mode/car.svg'
--- nav/img/mode/car.svg	2016-04-29 21:22:30 +0000
+++ nav/img/mode/car.svg	2017-02-19 22:22:23 +0000
@@ -21,7 +21,7 @@
    height="96"><metadata
      id="metadata18"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs16" /><sodipodi:namedview
      pagecolor="#acacac"
      bordercolor="#666666"
@@ -31,19 +31,19 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="744"
+     inkscape:window-width="1440"
+     inkscape:window-height="824"
      id="namedview14"
      showgrid="false"
      inkscape:zoom="1.888"
-     inkscape:cx="-17.266949"
+     inkscape:cx="-112.3411"
      inkscape:cy="62.5"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="24"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" /><switch
      id="switch4"
-     transform="matrix(1.0244202,0,0,1.0244202,-3.4294271,11.070804)"><foreignObject
+     transform="matrix(1.0657046,0,0,1.0657046,-5.2372177,-2.8176641)"><foreignObject
        requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
        x="0"
        y="0"
 
=== added file 'nav/img/mode/noroute.svg'
--- nav/img/mode/noroute.svg	1970-01-01 00:00:00 +0000
+++ nav/img/mode/noroute.svg	2017-02-19 22:22:23 +0000
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 40 40"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="noroute.svg"
+   width="40"
+   height="40"><metadata
+     id="metadata66"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs64" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="824"
+     id="namedview62"
+     showgrid="false"
+     inkscape:zoom="18.88"
+     inkscape:cx="26.51607"
+     inkscape:cy="18.344922"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><g
+     id="g4"><circle
+       cx="6.1999998"
+       cy="6.1999998"
+       r="6.1999998"
+       id="circle6"
+       style="fill:#ffffff" /><g
+       id="g8"><path
+         d="M 9.2,9.3 7.8,9.3 7.3,7.8 5,7.8 4.5,9.3 3.2,9.3 5.4,3 6.9,3 9.2,9.3 Z M 7,6.8 6.1,4.2 5.3,6.8 7,6.8 Z"
+         id="path10"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff" /></g><circle
+       cx="33.799999"
+       cy="33.799999"
+       r="6.1999998"
+       id="circle12"
+       style="fill:#ffffff" /><g
+       id="g14"><path
+         d="m 36.4,35 c 0,0.6 -0.2,1 -0.6,1.3 -0.4,0.3 -0.9,0.5 -1.7,0.5 l -2.4,0 0,-6 2.3,0 c 0.3,0 0.6,0 0.9,0.1 0.3,0.1 0.5,0.2 0.7,0.3 0.2,0.1 0.3,0.3 0.4,0.5 0.1,0.2 0.1,0.4 0.1,0.6 0,0.6 -0.3,1 -0.9,1.3 0.4,0.1 0.6,0.3 0.8,0.5 0.3,0.3 0.4,0.6 0.4,0.9 z m -3.4,-1.8 1,0 c 0.3,0 0.6,-0.1 0.7,-0.2 0.1,-0.1 0.2,-0.3 0.2,-0.6 0,-0.2 -0.1,-0.4 -0.2,-0.6 -0.1,-0.1 -0.4,-0.2 -0.8,-0.2 l -1,0 0,1.6 z m 0,2.6 1,0 c 0.4,0 0.6,-0.1 0.8,-0.2 0.2,-0.1 0.3,-0.3 0.3,-0.6 0,-0.1 0,-0.3 -0.1,-0.4 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,-0.1 -0.2,-0.1 -0.3,-0.1 -0.1,0 -0.3,0 -0.5,0 l -1,0 0,1.5 z"
+         id="path16"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff" /></g><g
+       display="none"
+       id="g18"
+       style="display:none"><g
+         display="inline"
+         id="g20"
+         style="display:inline"><line
+           stroke-miterlimit="10"
+           x1="33.799999"
+           y1="35"
+           x2="33.799999"
+           y2="32"
+           id="line22"
+           style="fill:none;stroke:#000000;stroke-width:3;stroke-miterlimit:10" /><path
+           stroke-miterlimit="10"
+           d="m 33.8,30 0,-18 c 0,-3.8 -3.1,-6.9 -6.9,-6.9 l 0,0 C 23.1,5 20,8.1 20,11.9 l 0,16 c 0,3.8 -3.1,6.9 -6.9,6.9 l 0,0 c -3.8,0 -6.9,-3.1 -6.9,-6.9 l 0,-17.8"
+           id="path24"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:6.0068, 2.0023" /><line
+           stroke-miterlimit="10"
+           x1="6.1999998"
+           y1="9.1000004"
+           x2="6.1999998"
+           y2="6.0999999"
+           id="line26"
+           style="fill:none;stroke:#000000;stroke-width:3;stroke-miterlimit:10" /></g></g></g><g
+     id="g28"><path
+       d="M 21.8,20 25,23.2 23.2,25 20,21.8 16.9,24.9 15,23.1 18.1,20 15,16.9 l 1.8,-1.8 3.1,3.1 3.2,-3.2 1.8,1.8 -3.1,3.2 z"
+       id="path30"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /></g><g
+     id="g32"><rect
+       x="4.6999998"
+       y="19.200001"
+       width="3"
+       height="6"
+       id="rect34"
+       style="fill:#ffffff" /><path
+       d="m 7.7,27.9 0,-0.7 -3,0 0,0.7 c 0,2.2 0.8,4.2 2.3,5.8 l 2.2,-2.1 c -1,-1 -1.5,-2.3 -1.5,-3.7 z"
+       id="path36"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       d="m 10.4,32.6 -1.5,2.6 c 1.3,0.7 2.7,1.1 4.2,1.1 1,0 2,-0.2 2.9,-0.5 L 15,33 c -1.5,0.5 -3.2,0.4 -4.6,-0.4 z"
+       id="path38"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><rect
+       x="4.6999998"
+       y="11.2"
+       width="3"
+       height="6"
+       id="rect40"
+       style="fill:#ffffff" /><polygon
+       points="18.5,13.3 20,14.8 21.5,13.2 21.5,12.3 18.5,12.3 "
+       id="polygon42"
+       style="fill:#ffffff" /><path
+       d="M 24.5,7.1 23.2,4.4 C 21,5.5 19.4,7.5 18.8,9.9 l 2.9,0.7 C 22,9.1 23.1,7.8 24.5,7.1 Z"
+       id="path44"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><rect
+       x="32.299999"
+       y="24"
+       width="3"
+       height="6"
+       id="rect46"
+       style="fill:#ffffff" /><rect
+       x="32.299999"
+       y="15.9"
+       width="3"
+       height="6"
+       id="rect48"
+       style="fill:#ffffff" /><path
+       d="M 33.9,7.3 31.4,9 c 0.6,0.9 0.9,1.9 0.9,3 l 0,2 3,0 0,-2 c 0,-1.7 -0.5,-3.3 -1.4,-4.7 z"
+       id="path50"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       d="m 25.5,3.7 0.5,3 c 1.5,-0.3 3.2,0.2 4.4,1.2 L 32.3,5.6 C 30.4,3.9 27.9,3.2 25.5,3.7 Z"
+       id="path52"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       d="m 16.3,32.2 1.8,2.4 c 2,-1.5 3.2,-3.8 3.3,-6.2 l -3,-0.2 c 0,1.6 -0.8,3.1 -2.1,4 z"
+       id="path54"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><polygon
+       points="21.5,26.7 20,25.2 18.5,26.6 18.5,27.3 21.5,27.3 "
+       id="polygon56"
+       style="fill:#ffffff" /></g></svg>
 \ No newline at end of file
 
=== added file 'nav/img/mode/steps.svg'
--- nav/img/mode/steps.svg	1970-01-01 00:00:00 +0000
+++ nav/img/mode/steps.svg	2017-02-19 22:22:23 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.2"
+   x="0px"
+   y="0px"
+   viewBox="0 0 100 100"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="noun_605854_cc.svg"
+   width="100"
+   height="100"><metadata
+     id="metadata18"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs16" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="824"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="1.888"
+     inkscape:cx="66.155484"
+     inkscape:cy="62.5"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><path
+     d="m 83.18319,-0.402542 c -9.145505,0 -16.585971,7.440467 -16.585971,16.58597 0,7.87502 5.156025,14.894203 9.415303,19.3503 l -37.058588,0 c -1.117895,0 -2.126322,0.673391 -2.554239,1.706143 -0.427918,1.032754 -0.191292,2.221415 0.599306,3.012013 L 90.369338,93.62222 29.843813,93.96721 c 6.060514,-5.86149 14.638779,-16.23767 14.638779,-28.025868 0,-12.194007 -9.920623,-22.114627 -22.114629,-22.114627 -12.194006,0 -22.11462805,9.92062 -22.11462805,22.114627 0,17.836558 19.64442305,32.448798 20.47925205,33.062478 0.464407,0.34168 1.07477,0.53517 1.650856,0.53517 l 74.637975,-0.4257 c 1.114577,-0.007 2.11637,-0.68224 2.540973,-1.71389 0.423496,-1.03164 0.185765,-2.21699 -0.602625,-3.00537 l -53.332743,-53.331645 37.556167,0 c 0.576086,0 1.180921,-0.200137 1.644223,-0.541808 0.610363,-0.452244 14.941752,-11.208799 14.941752,-24.337149 0,-9.145503 -7.440471,-16.58597 -16.585975,-16.58597 z M 22.365752,93.24074 C 17.888645,89.51111 5.7819919,78.28352 5.7819919,65.941342 c 0,-9.145504 7.4404661,-16.585971 16.5859711,-16.585971 9.145504,0 16.585971,7.440467 16.585971,16.585971 0,12.310108 -12.113288,23.563138 -16.588182,27.299398 z M 83.179872,34.728756 C 79.74326,31.755445 72.125876,24.256374 72.125876,16.183428 c 0,-6.097002 4.960311,-11.057313 11.057314,-11.057313 6.097004,0 11.057314,4.960311 11.057314,11.057313 0,8.045302 -7.625124,15.566487 -11.060632,18.545328 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /><path
+     d="m 22.367963,55.309735 c -6.097003,0 -11.057314,4.96031 -11.057314,11.057313 0,6.097004 4.960311,11.057312 11.057314,11.057312 6.097004,0 11.057314,-4.960308 11.057314,-11.057312 0,-6.097003 -4.96031,-11.057313 -11.057314,-11.057313 z m 0,16.58597 c -3.048502,0 -5.528658,-2.480155 -5.528658,-5.528657 0,-3.048501 2.480156,-5.528656 5.528658,-5.528656 3.048501,0 5.528657,2.480155 5.528657,5.528656 0,3.048502 -2.480156,5.528657 -5.528657,5.528657 z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /><path
+     d="m 83.18319,10.654772 c -3.048502,0 -5.528658,2.480155 -5.528658,5.528656 0,3.048503 2.480156,5.528658 5.528658,5.528658 3.048501,0 5.528657,-2.480155 5.528657,-5.528658 0,-3.048501 -2.480156,-5.528656 -5.528657,-5.528656 z"
+     id="path8"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /></svg>
 \ No newline at end of file
 
=== removed file 'nav/img/states/not_found.png'
 Binary files nav/img/states/not_found.png	2016-12-06 15:18:02 +0000 and nav/img/states/not_found.png	1970-01-01 00:00:00 +0000 differ
=== added file 'nav/img/states/not_found.svg'
--- nav/img/states/not_found.svg	1970-01-01 00:00:00 +0000
+++ nav/img/states/not_found.svg	2017-02-19 22:22:23 +0000
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 100 100"
+   version="1.1"
+   x="0px"
+   y="0px"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="not_found.svg"
+   width="100"
+   height="100">
+  <metadata
+     id="metadata68">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Artboard 11 Copy 7</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs66" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="644"
+     id="namedview64"
+     showgrid="false"
+     inkscape:zoom="2.6700352"
+     inkscape:cx="108.3187"
+     inkscape:cy="50.467485"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <title
+     id="title4">Artboard 11 Copy 7</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <g
+     id="g8"
+     transform="matrix(1.2569753,0,0,1.2569753,-12.487126,-22.962943)"
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1">
+    <g
+       id="g10"
+       style="fill:#000000">
+      <path
+         d="m 59,33 c 0,-1.104 -0.896,-2 -2,-2 l -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2"
+         id="path12"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 70,33 c 0,-1.104 -0.896,-2 -2,-2 l -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2"
+         id="path14"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 50,58 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path16"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 61,58 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path24"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 80.711019,56.307407 c -0.468,0.293 -0.964,0.55 -1.476,0.762 -1.021,0.423 -1.505,1.592 -1.082,2.613 0.319,0.771 1.064,1.235 1.849,1.235 0.254,0 0.514,-0.049 0.764,-0.153 0.718,-0.298 1.415,-0.657 2.072,-1.07 0.936,-0.587 1.218,-1.822 0.63,-2.757 -0.587,-0.936 -1.82,-1.219 -2.757,-0.63"
+         id="path26"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 80.907913,33.822331 c 0.272,-1.07 -0.375,-2.159 -1.446,-2.431 -0.75,-0.191 -1.524,-0.32 -2.298,-0.384 -1.097,-0.094 -2.067,0.727 -2.157,1.829 -0.091,1.1 0.727,2.067 1.828,2.157 0.553,0.046 1.106,0.139 1.642,0.275 0.165,0.042 0.331,0.062 0.494,0.062 0.893,0 1.707,-0.603 1.937,-1.508"
+         id="path28"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 87.541704,47.009492 c -1.098,-0.107 -2.076,0.703 -2.179,1.803 -0.052,0.553 -0.151,1.103 -0.294,1.635 -0.286,1.067 0.347,2.164 1.414,2.45 0.173,0.047 0.348,0.069 0.519,0.069 0.883,0 1.691,-0.59 1.931,-1.482 0.2,-0.748 0.339,-1.52 0.412,-2.296 0.104,-1.099 -0.703,-2.075 -1.803,-2.179"
+         id="path30"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 87.72367,41.602421 c 1.015,-0.434999 1.486,-1.61 1.051,-2.626 -0.306,-0.713 -0.673,-1.405 -1.092,-2.058 -0.597,-0.928 -1.833,-1.198 -2.764,-0.600999 -0.929,0.597999 -1.198,1.835 -0.601,2.763999 0.299,0.466 0.562,0.96 0.78,1.47 0.325,0.759 1.063,1.213 1.839,1.213 0.263,0 0.53,-0.052 0.787,-0.162"
+         id="path32"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 72,58 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path34"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 26,85 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path36"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 15.221854,60.429556 c -0.609,0.479 -1.181999,1.015 -1.702999,1.588 -0.742,0.818 -0.681,2.083 0.137,2.825 0.382,0.348 0.863,0.52 1.343,0.52 0.544,0 1.086999,-0.221 1.481999,-0.656 0.372,-0.411 0.782,-0.793 1.218,-1.136 0.867,-0.684 1.016001,-1.942 0.332,-2.809 -0.684,-0.867 -1.942,-1.016 -2.809,-0.332"
+         id="path38"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 14,74 0,-2 c 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 l 0,2 c 0,1.104 0.896,2 2,2 1.104,0 2,-0.896 2,-2"
+         id="path40"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.555974,80.74274 c -0.693,-0.859 -1.952,-0.992 -2.813,-0.299 -0.859,0.695 -0.993,1.953 -0.298,2.813 0.486,0.601 1.026,1.168 1.605,1.682 0.381,0.339 0.856,0.506 1.329,0.506 0.551,0 1.099,-0.226 1.495,-0.671 0.734,-0.825 0.66,-2.09 -0.166,-2.823 -0.416,-0.37 -0.803,-0.776 -1.152,-1.208"
+         id="path42"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 59,85 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path46"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 70,85 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path48"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 37,85 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path50"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 27,58 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path52"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 38.003,58 36,58 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 2.003,0 c 1.104,0 2,-0.896 2,-2 0,-1.104 -0.896,-2 -2,-2"
+         id="path54"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g3410"
+         transform="matrix(0.18603326,0,0,0.18603326,37.13668,22.322767)">
+        <path
+           sodipodi:end="5.5316092"
+           sodipodi:start="0.84415396"
+           d="m 77.532686,81.965718 a 34.997948,34.997948 0 0 1 -49.215014,-2.689822 34.997948,34.997948 0 0 1 2.280696,-49.23567 34.997948,34.997948 0 0 1 49.252924,1.871412 L 54.281315,55.807926 Z"
+           sodipodi:ry="34.997948"
+           sodipodi:rx="34.997948"
+           sodipodi:cy="55.807926"
+           sodipodi:cx="54.281315"
+           id="path1425"
+           style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:1.48216593;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:end="6.2614256"
+           sodipodi:start="0"
+           transform="scale(1,-1)"
+           d="m 58.132071,-41.435452 a 3.1974745,3.1721492 0 0 1 -3.18008,3.172103 3.1974745,3.1721492 0 0 1 -3.214679,-3.137591 3.1974745,3.1721492 0 0 1 3.145105,-3.206238 3.1974745,3.1721492 0 0 1 3.248898,3.102707 l -3.196718,0.06902 z"
+           sodipodi:ry="3.1721492"
+           sodipodi:rx="3.1974745"
+           sodipodi:cy="-41.435452"
+           sodipodi:cx="54.934597"
+           id="path2314"
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.97986925;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+      <ellipse
+         style="fill:#ff6600;fill-rule:evenodd;stroke:#000000;stroke-width:0.25394315px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="path3425"
+         cx="78.25042"
+         cy="86.75573"
+         rx="1.5131676"
+         ry="1.4795417" />
+      <image
+         y="75.993706"
+         x="74.881973"
+         id="image3422"
+         xlink:href="data:image/png;base64,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
+h9Jes4kAAAAASUVORK5CYII=
+"
+         preserveAspectRatio="none"
+         height="11.111693"
+         width="6.944808" />
+    </g>
+  </g>
+  <image
+     y="39.230629"
+     x="-94.559242"
+     id="image3378"
+     xlink:href="data:image/png;base64,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 "
+     preserveAspectRatio="none"
+     height="16.860262"
+     width="16.860262"
+     transform="matrix(0,-1,1,0,0,0)" />
+</svg>
 
=== modified file 'nav/index.html'
--- nav/index.html	2017-01-22 08:34:32 +0000
+++ nav/index.html	2017-02-19 22:22:23 +0000
@@ -47,12 +47,18 @@
 		<table class="tg" id="panel_review_btns">
 		  <tr>
 			<th class="tg-yw4l">
+				<button data-role='button' id='btn1_set_car' class='btns1_mode_route negative' onClick='javascript:set_nav_mode(0)'><img class="img1_btn_route" src="img/mode/car.svg"></button>
+				<button data-role='button' id='btn1_set_walk' class='btns1_mode_route negative' onClick='javascript:set_nav_mode(1)'><img class="img1_btn_route" src="img/mode/walk.svg"></button>
+				<button data-role='button' id='btn1_set_bike' class='btns1_mode_route negative' onClick='javascript:set_nav_mode(2)'><img class="img1_btn_route" src="img/mode/bike.svg"></button>
+				<button data-role='button' id='btn1_set_public' class='btns1_mode_route negative' onClick='javascript:set_nav_mode(3)'><img class="img1_btn_route" src="img/mode/public.svg"></button>
+			</th>
+		  </tr>
+		  
+		  <tr>
+			<th class="tg-yw4l">
 				<button data-role='button' id='btn_start' class='btns_route positive' onClick='javascript:agree_review()' data-localize="Start">Start</button>
-			</th>
-		  </tr>
-		  <tr>
-			<th class="tg-yw4l">
 				<button data-role='button' id='btn_cancel' class='btns_route negative' onClick='javascript:click_cancel_route()' data-localize="Cancel">Cancel</button>
+				<button style="display:none;" data-role='button' id='btn_notfound' class='btns_route negative' data-localize="Not found">Not found</button>
 			</th>
 		  </tr>
 		</table>
@@ -360,16 +366,18 @@
 				case 'simulate_error':
 				case '2review':
 				case 'calculating':
+				case 'calculating_error':
 				case 'calculating_from_out':
 					break;
 				case 'drawing':
 					var route_indication = nav.get_route_indication();
-					if (ui.get_confirm_route() && confirm_route) {
+					if (confirm_route) {
 						if (route_indication['distance_total'] > 1000000)
 							$('#popup_longroute').show();
 						ui.set_center_onpos(false);
 						ui.set_center_1st_pos(false);
 						ui.set_zoom_unav(false);
+						ui.btns_confirm_route(true);
 						ui.route(true);
 						nav.set_route_status('2review');
 						qml_set_center_onpos(1);
@@ -382,13 +390,14 @@
 					break;
 				case 'waiting4signal':
 					confirm_route = true;
+					ui.set_confirm_btn_color(settings.get_routing_mode());
 					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']);
+					webapi.set_route(gps_data['now_lat'], gps_data['now_lng'], gps_data['end_lat'], gps_data['end_lng'], confirm_route);
 					break;
 				case 'out':
 					confirm_route = false;
@@ -519,10 +528,10 @@
 			window.location = 'http://set_ui_speed?' + settings.get_ui_speed().toString();
 		}
 		
-		function qml_save_pos() {
+		function qml_save_data() { // Position & Last route mode
 			if (ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[1].toFixed(6) == 50.009167 && ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[0].toFixed(6) == 4.666389)
-				return;			
-			window.location = 'http://save_pos?' + ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[1] + '/' + ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[0] + '/' + this.map.getView().getZoom();
+				return;
+			window.location = 'http://save_data?' + ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[1] + '/' + ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[0] + '/' + map.getView().getZoom() + '/' + settings.get_routing_mode();
 		}
 
 		function qml_show_notification(mode, message) {
@@ -561,6 +570,23 @@
 			qml_set_center_onpos(2);
 		}
 		
+		function set_nav_mode(mode) {
+			if (mode == settings.get_routing_mode())
+				return;
+			
+			settings.set_routing_mode(mode);
+			nav.set_route_status('waiting4signal');
+			gps_loop('waiting4signal');
+		}
+		
+		function set_simulate_mode(mode) {
+			if (mode == settings.get_routing_mode())
+				return;
+			
+			settings.set_routing_mode(mode);
+			window.location = 'http://simulate_again?';
+		}
+		
 		function load_custom_voices(play) {
 			$.ajax({
 				url:"/home/phablet/.local/share/navigator.costales/4.ogg",
 
=== modified file 'po/unav.pot'
--- po/unav.pot	2017-01-18 17:17:26 +0000
+++ po/unav.pot	2017-02-19 22:22:23 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unav\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-18 14:27+0100\n"
+"POT-Creation-Date: 2017-02-19 23:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -33,7 +33,7 @@
 msgid "Go to your left"
 msgstr ""
 
-#: nav/class/Navigator.js:286 nav/class/UI.js:579
+#: nav/class/Navigator.js:286 nav/class/UI.js:636
 msgid "You have arrived at your destination"
 msgstr ""
 
@@ -209,88 +209,84 @@
 msgid "Leave the Ferry"
 msgstr ""
 
-#: nav/class/UI.js:39 qml/Favorites.qml:227 qml/Main.qml:777
+#: nav/class/UI.js:38 qml/Favorites.qml:227 qml/Main.qml:791
 msgid "Current Position"
 msgstr ""
 
-#: nav/class/UI.js:48
+#: nav/class/UI.js:47
 msgid "Current Start"
 msgstr ""
 
-#: nav/class/UI.js:57
+#: nav/class/UI.js:56
 msgid "Current End"
 msgstr ""
 
-#: nav/class/UI.js:514
+#: nav/class/UI.js:570
 msgid "Waiting for a GPS signal…"
 msgstr ""
 
-#: nav/class/UI.js:521
+#: nav/class/UI.js:577
 msgid "Searching for a route…"
 msgstr ""
 
-#: nav/class/UI.js:525
+#: nav/class/UI.js:581
 msgid "Drawing route…"
 msgstr ""
 
-#: nav/class/UI.js:529
+#: nav/class/UI.js:585
 msgid "Trying search again soon…"
 msgstr ""
 
-#: nav/class/UI.js:533
+#: nav/class/UI.js:589
 msgid "Recalculating route…"
 msgstr ""
 
-#: nav/class/UI.js:554
+#: nav/class/UI.js:611
 msgid "Navigation will start soon"
 msgstr ""
 
-#: nav/class/UI.js:586
+#: nav/class/UI.js:643
 msgid "Simulating route…"
 msgstr ""
 
-#: nav/class/UI.js:590
-msgid "Error simulating route. Try different points"
-msgstr ""
-
-#: nav/class/UI.js:615
-msgid "Click onto the icon for reviewing the route"
-msgstr ""
-
 #: nav/index.html.strings:1
 msgid "Start"
 msgstr ""
 
-#: nav/index.html.strings:2 qml/Favorites.qml:242 qml/SettingsPage.qml:463
+#: nav/index.html.strings:2 qml/Favorites.qml:242 qml/SettingsPage.qml:388
 msgid "Cancel"
 msgstr ""
 
 #: nav/index.html.strings:3
+msgid "Not found"
+msgstr ""
+
+#: nav/index.html.strings:4
 msgid "Route so long"
 msgstr ""
 
-#: nav/index.html.strings:4
+#: nav/index.html.strings:5
 msgid "More than 1000km could affect the performance"
 msgstr ""
 
-#: nav/index.html.strings:5
+#: nav/index.html.strings:6
 msgid "We recommend you a waypoint in the middle as destination"
 msgstr ""
 
-#: nav/index.html.strings:10 qml/Coordinate.qml:152 qml/Coordinate.qml:386
-#: qml/DownloadVoices.qml:246 qml/Main.qml:955
+#: nav/index.html.strings:11 qml/Coordinate.qml:152 qml/Coordinate.qml:386
+#: qml/DownloadVoices.qml:244 qml/Main.qml:973
 msgid "Close"
 msgstr ""
 
-#: nav/index.html.strings:7
+#: nav/index.html.strings:8
 msgid "GPS Denied"
 msgstr ""
 
-#: nav/index.html.strings:8
+#: nav/index.html.strings:9
 msgid "Error reading the GPS status"
 msgstr ""
 
-#: nav/index.html.strings:9
+#: nav/index.html.strings:10
 msgid "Please review your device settings"
 msgstr ""
 
@@ -405,47 +401,35 @@
 "Expected format is:"
 msgstr ""
 
-#: qml/DownloadVoices.qml:51
+#: qml/DownloadVoices.qml:50
 msgid "Download voices"
 msgstr ""
 
-#: qml/DownloadVoices.qml:59
+#: qml/DownloadVoices.qml:58
 msgid "Play current voice"
 msgstr ""
 
-#: qml/DownloadVoices.qml:68 qml/DownloadVoices.qml:242
+#: qml/DownloadVoices.qml:67 qml/DownloadVoices.qml:240
 msgid "How to add a voice"
 msgstr ""
 
-#: qml/DownloadVoices.qml:160
+#: qml/DownloadVoices.qml:158
 msgid "By "
 msgstr ""
 
-#: qml/DownloadVoices.qml:169
-msgid "Male"
-msgstr ""
-
-#: qml/DownloadVoices.qml:169
-msgid "Female"
-msgstr ""
-
-#: qml/DownloadVoices.qml:169
-msgid ". Size: "
-msgstr ""
-
-#: qml/DownloadVoices.qml:205
+#: qml/DownloadVoices.qml:203
 msgid "Cancel Download"
 msgstr ""
 
-#: qml/DownloadVoices.qml:220
+#: qml/DownloadVoices.qml:218
 msgid "About the voices"
 msgstr ""
 
-#: qml/DownloadVoices.qml:226
+#: qml/DownloadVoices.qml:224
 msgid "The stars are for the recommended voices."
 msgstr ""
 
-#: qml/DownloadVoices.qml:234
+#: qml/DownloadVoices.qml:232
 msgid "You can add a new voice to uNav following these steps:"
 msgstr ""
 
@@ -523,68 +507,68 @@
 msgid "Search location"
 msgstr ""
 
-#: qml/Main.qml:214 qml/SettingsPage.qml:35
+#: qml/Main.qml:217 qml/SettingsPage.qml:35
 msgid "Settings"
 msgstr ""
 
-#: qml/Main.qml:225
+#: qml/Main.qml:228
 msgid "Center on Position"
 msgstr ""
 
-#: qml/Main.qml:229 qml/Main.qml:534
+#: qml/Main.qml:232 qml/Main.qml:542
 msgid "Searching your position… This could take a while"
 msgstr ""
 
-#: qml/Main.qml:243 qml/PoiPage.qml:83 qml/SearchPage.qml:69
+#: qml/Main.qml:246 qml/PoiPage.qml:83 qml/SearchPage.qml:69
 msgid "Search"
 msgstr ""
 
-#: qml/Main.qml:254
+#: qml/Main.qml:257
 msgid "Destination"
 msgstr ""
 
-#: qml/Main.qml:410
+#: qml/Main.qml:419
 msgid "Error getting speed cameras!"
 msgstr ""
 
-#: qml/Main.qml:413
+#: qml/Main.qml:422
 msgid "Error finding route! Retrying again in 1 minute…"
 msgstr ""
 
-#: qml/Main.qml:416
+#: qml/Main.qml:425
 msgid "Error finding route! Trying again…"
 msgstr ""
 
-#: qml/Main.qml:462 qml/Main.qml:488
+#: qml/Main.qml:470 qml/Main.qml:496
 msgid "Shared Position"
 msgstr ""
 
-#: qml/Main.qml:719
+#: qml/Main.qml:733
 msgid "Near to destination"
 msgstr ""
 
-#: qml/Main.qml:720
+#: qml/Main.qml:734
 msgid "Cancel route"
 msgstr ""
 
-#: qml/Main.qml:766
+#: qml/Main.qml:780
 #, qt-format
 msgid "Coord: %1, %2"
 msgstr ""
 
-#: qml/Main.qml:834 qml/PoiDetailsPage.qml:225
+#: qml/Main.qml:848 qml/PoiDetailsPage.qml:243
 msgid "Simulate from here! Now click on destination"
 msgstr ""
 
-#: qml/Main.qml:851
+#: qml/Main.qml:865
 msgid "Set a different coordinates for simulating"
 msgstr ""
 
-#: qml/Main.qml:943
+#: qml/Main.qml:961
 msgid "Custom voices"
 msgstr ""
 
-#: qml/Main.qml:944
+#: qml/Main.qml:962
 msgid ""
 "American English voice will be the unique voice installed by default.\n"
 "\n"
@@ -595,39 +579,39 @@
 "the future.\n"
 msgstr ""
 
-#: qml/Main.qml:946
+#: qml/Main.qml:964
 msgid "Set a voice now"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:79
+#: qml/PoiDetailsPage.qml:89
 msgid "Lat, Long:"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:85 qml/PoiDetailsPage.qml:100
+#: qml/PoiDetailsPage.qml:95 qml/PoiDetailsPage.qml:110
 msgid "Available"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:87 qml/PoiDetailsPage.qml:102
+#: qml/PoiDetailsPage.qml:97 qml/PoiDetailsPage.qml:112
 msgid "Not Available"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:89
+#: qml/PoiDetailsPage.qml:99
 msgid "Wi-Fi Hotspot Available"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:91
+#: qml/PoiDetailsPage.qml:101
 msgid "Wired Connection Available (ethernet connection)"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:93
+#: qml/PoiDetailsPage.qml:103
 msgid "Computer Terminal Available"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:105
+#: qml/PoiDetailsPage.qml:115
 msgid "Limited Availability"
 msgstr ""
 
-#: qml/PoiDetailsPage.qml:156
+#: qml/PoiDetailsPage.qml:174
 msgid "Loading POI details..."
 msgstr ""
 
@@ -652,12 +636,12 @@
 
 #. 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:324
+#: qml/PoiListPage.qml:361
 msgid "PH"
 msgstr ""
 
 #. TRANSLATORS: This string indicates that a place is closed.
-#: qml/PoiListPage.qml:326
+#: qml/PoiListPage.qml:363
 msgid "Closed"
 msgstr ""
 
@@ -691,7 +675,7 @@
 msgid "Max. %1 POIs can be selected."
 msgstr ""
 
-#: qml/PoiQuickAccessPage.qml:206 qml/SettingsPage.qml:484
+#: qml/PoiQuickAccessPage.qml:206 qml/SettingsPage.qml:409
 msgid "OK"
 msgstr ""
 
@@ -726,130 +710,106 @@
 msgstr ""
 
 #: qml/SettingsPage.qml:56
-msgid "Car"
+msgid "A voice"
 msgstr ""
 
 #: qml/SettingsPage.qml:57
-msgid "Walking"
+msgid "A notification"
 msgstr ""
 
 #: qml/SettingsPage.qml:58
-msgid "Bicycle"
-msgstr ""
-
-#: qml/SettingsPage.qml:59
-msgid "Public Transport"
-msgstr ""
-
-#: qml/SettingsPage.qml:69
-msgid "A voice"
-msgstr ""
-
-#: qml/SettingsPage.qml:70
-msgid "A notification"
-msgstr ""
-
-#: qml/SettingsPage.qml:71
 msgid "None"
 msgstr ""
 
-#: qml/SettingsPage.qml:81
+#: qml/SettingsPage.qml:68
 msgid "Kilometres"
 msgstr ""
 
-#: qml/SettingsPage.qml:82
+#: qml/SettingsPage.qml:69
 msgid "Miles"
 msgstr ""
 
-#: qml/SettingsPage.qml:108
+#: qml/SettingsPage.qml:95
 msgid "Online"
 msgstr ""
 
-#: qml/SettingsPage.qml:109
+#: qml/SettingsPage.qml:96
 msgid "Offline"
 msgstr ""
 
-#: qml/SettingsPage.qml:131
+#: qml/SettingsPage.qml:118
 msgid "Navigation"
 msgstr ""
 
-#: qml/SettingsPage.qml:139
-msgid "Navigation mode"
-msgstr ""
-
-#: qml/SettingsPage.qml:169
-msgid "Powered by a community-edited data service"
-msgstr ""
-
-#: qml/SettingsPage.qml:186
+#: qml/SettingsPage.qml:125
 msgid "Guidance"
 msgstr ""
 
-#: qml/SettingsPage.qml:218
+#: qml/SettingsPage.qml:157
 msgid "Download custom voices"
 msgstr ""
 
-#: qml/SettingsPage.qml:227
-msgid "Confirm new routes"
+#: qml/SettingsPage.qml:164
+msgid "Car Options"
 msgstr ""
 
-#: qml/SettingsPage.qml:245
+#: qml/SettingsPage.qml:171
 msgid "Avoid tolls"
 msgstr ""
 
-#: qml/SettingsPage.qml:263
+#: qml/SettingsPage.qml:188
 msgid "Speed camera alerts"
 msgstr ""
 
-#: qml/SettingsPage.qml:282
+#: qml/SettingsPage.qml:207
 msgid "Map"
 msgstr ""
 
-#: qml/SettingsPage.qml:289
+#: qml/SettingsPage.qml:214
 msgid "Mode"
 msgstr ""
 
-#: qml/SettingsPage.qml:324
+#: qml/SettingsPage.qml:249
 msgid "How to use offline maps"
 msgstr ""
 
-#: qml/SettingsPage.qml:341
+#: qml/SettingsPage.qml:266
 msgid "Online style"
 msgstr ""
 
-#: qml/SettingsPage.qml:375
+#: qml/SettingsPage.qml:300
 msgid "Units"
 msgstr ""
 
-#: qml/SettingsPage.qml:409
+#: qml/SettingsPage.qml:334
 msgid "Show header in map view"
 msgstr ""
 
-#: qml/SettingsPage.qml:421
+#: qml/SettingsPage.qml:346
 msgid "History"
 msgstr ""
 
-#: qml/SettingsPage.qml:428
+#: qml/SettingsPage.qml:353
 msgid "Store new searches"
 msgstr ""
 
-#: qml/SettingsPage.qml:440 qml/SettingsPage.qml:450
+#: qml/SettingsPage.qml:365 qml/SettingsPage.qml:375
 msgid "Clear history"
 msgstr ""
 
-#: qml/SettingsPage.qml:451
+#: qml/SettingsPage.qml:376
 msgid "You'll delete the current history"
 msgstr ""
 
-#: qml/SettingsPage.qml:454
+#: qml/SettingsPage.qml:379
 msgid "Delete"
 msgstr ""
 
-#: qml/SettingsPage.qml:473
+#: qml/SettingsPage.qml:398
 msgid "Speed Camera alerts and the law"
 msgstr ""
 
-#: qml/SettingsPage.qml:474
+#: qml/SettingsPage.qml:399
 msgid ""
 "uNav is only reading the OpenStreetMap database.\n"
 "uNav will show a max speed notification and a Speed Camera marker (marker "
@@ -859,7 +819,7 @@
 "only if it's legal in the country."
 msgstr ""
 
-#: qml/SettingsPage.qml:480
+#: qml/SettingsPage.qml:405
 msgid "Read more about it"
 msgstr ""
 
 
=== modified file 'qml/Location.qml'
--- qml/Location.qml	2016-12-11 11:01:13 +0000
+++ qml/Location.qml	2017-02-19 22:22:23 +0000
@@ -198,8 +198,8 @@
             anchors.horizontalCenter: notFound.horizontalCenter
             Icon {
                 visible: statusLabel.text !== i18n.tr("Searching…")
-                height: units.gu(12)
-                source: Qt.resolvedUrl("../nav/img/states/not_found.png")
+                height: units.gu(15)
+                source: Qt.resolvedUrl("../nav/img/states/not_found.svg")
             }
         }
         Row {
 
=== modified file 'qml/Main.qml'
--- qml/Main.qml	2017-01-31 20:23:10 +0000
+++ qml/Main.qml	2017-02-19 22:22:23 +0000
@@ -71,10 +71,9 @@
             property int layer: 0
             property int onlineLayer: 0
             property int unit: 0
-            property int routingMode: 0 // 0 car, 1 walk, 2 bicycle, 3 public transport
+            property int routingMode: 0 // 0 car, 1 walk, 2 bicycle, 3 multimodal
             property bool avoidTolls: false
             property bool alertRadars: false
-            property bool confirmRoute: true
             property bool legalRadarShow: true
             property string prevLat: ''
             property string prevLng: ''
@@ -170,6 +169,10 @@
             property string clickedLng: "null"
             property string ptFromLat: "null"
             property string ptFromLng: "null"
+            property string resimulatePTFromLat: "null"
+            property string resimulatePTFromLng: "null"
+            property string resimulatePTToLat: "null"
+            property string resimulatePTToLng: "null"
             property string routeState: "no"
             property int center_onpos: 0 // 0 GPS off, 1 GPS on + not center, 2 GPS on + center
             property bool favPopup: false
@@ -356,7 +359,12 @@
                                 reverseXmlModel.reverseSearch(mainPageStack.clickedLat, mainPageStack.clickedLng);
                             }
                             break;
-
+                        
+                        case "http://simulate_again/":
+                            mainPageStack.routeState = 'simulate_calculating';
+                            mainPageStack.executeJavaScript("simulate2coord(" + mainPageStack.resimulatePTFromLat + ", " + mainPageStack.resimulatePTFromLng + ", " + mainPageStack.resimulatePTToLat + ", " + mainPageStack.resimulatePTToLng + ");");
+                            break;
+                        
                         case "http://hide_popup/":
                             goThereActionPopover.hide();
                             break;
@@ -387,10 +395,11 @@
                             mainPageStack.routeState = 'no';
                             break;
 
-                        case "http://save_pos/":
+                        case "http://save_data/":
                             navApp.settings.prevLat = params[0];
                             navApp.settings.prevLng = params[1];
                             navApp.settings.prevZoom = params[2];
+                            navApp.settings.routingMode = params[3];
                             break;
                         
                         case "http://show_notification/":
@@ -434,7 +443,6 @@
                             mainPageStack.executeJavaScript("settings.set_unit(\'" + ( navApp.settings.unit === 0 ? "km" : "mi" ) +"\')");
                             mainPageStack.executeJavaScript("ui.set_scale_unit(\'" + ( navApp.settings.unit === 0 ? "km" : "mi" ) +"\')");
                             mainPageStack.executeJavaScript("settings.set_routing_mode(" + navApp.settings.routingMode + ")");
-                            mainPageStack.executeJavaScript("ui.set_confirm_route(" + navApp.settings.confirmRoute + ")");
                             mainPageStack.executeJavaScript("settings.set_avoid_tolls(" + navApp.settings.avoidTolls + ")");
                             mainPageStack.executeJavaScript("settings.set_alert_radars(" + navApp.settings.alertRadars + ")");
                             mainPageStack.executeJavaScript("settings.set_ui_speed(" + navApp.settings.uiShowSpeed + ")");
@@ -861,6 +869,10 @@
                                         else {
                                             goThereActionPopover.hide();
                                             mainPageStack.routeState = 'simulate_calculating';
+                                            mainPageStack.resimulatePTFromLat = mainPageStack.ptFromLat;
+                                            mainPageStack.resimulatePTFromLng = mainPageStack.ptFromLng;
+                                            mainPageStack.resimulatePTToLat = mainPageStack.clickedLat;
+                                            mainPageStack.resimulatePTToLng = mainPageStack.clickedLng;
                                             mainPageStack.executeJavaScript("simulate2coord(" + mainPageStack.ptFromLat + ", " + mainPageStack.ptFromLng + ", " + mainPageStack.clickedLat + ", " + mainPageStack.clickedLng + ");");
                                             mainPageStack.ptFromLat = "null";
                                         }
@@ -938,7 +950,7 @@
             target: Qt.application
             onStateChanged:
                 if(Qt.application.state !== Qt.ApplicationActive) {
-                    mainPageStack.executeJavaScript("qml_save_pos();");
+                    mainPageStack.executeJavaScript("qml_save_data()");
                 }
         }
 
 
=== modified file 'qml/SettingsPage.qml'
--- qml/SettingsPage.qml	2017-01-17 17:20:10 +0000
+++ qml/SettingsPage.qml	2017-02-19 22:22:23 +0000
@@ -50,19 +50,6 @@
     signal settingsChanged()
 
     ListModel {
-        id: navigationModeModel
-        Component.onCompleted: initialize()
-        function initialize() {
-            navigationModeModel.append({ "mode": i18n.tr("Car"), "index": 0 })
-            navigationModeModel.append({ "mode": i18n.tr("Walking"), "index": 1 })
-            navigationModeModel.append({ "mode": i18n.tr("Bicycle"), "index": 2 })
-            navigationModeModel.append({ "mode": i18n.tr("Public Transport"), "index": 3 })
-
-            modeList.subText.text = navigationModeModel.get(navApp.settings.routingMode).mode
-        }
-    }
-
-    ListModel {
         id: soundModel
         Component.onCompleted: initialize()
         function initialize() {
@@ -115,7 +102,7 @@
     Flickable {
         id: flickable
         anchors.fill: parent
-        contentHeight: settingsColumn.height + units.gu(5)
+        contentHeight: settingsColumn.height
 
         Column {
             id: settingsColumn
@@ -132,54 +119,6 @@
             }
 
             ExpandableListItem {
-                id: modeList
-
-                listViewHeight: units.gu(17+1)
-                height: infoPublicLabel.visible ? units.gu(11) : units.gu(9)
-                titleText.text: i18n.tr("Navigation mode")
-
-                model: navigationModeModel
-
-                delegate: ListItem {
-                    divider.visible: false
-                    height: navigationListItemLayout.height
-                    ListItemLayout {
-                        id: navigationListItemLayout
-                        title.text: model.mode
-                        title.color: "#5D5D5D"
-                        padding { top: units.gu(1); bottom: units.gu(1) }
-                        Icon {
-                            SlotsLayout.position: SlotsLayout.Trailing
-                            width: units.gu(2)
-                            name: "tick"
-                            visible: navApp.settings.routingMode === model.index
-                        }
-                    }
-
-                    onClicked: {
-                        navApp.settings.routingMode = model.index
-                        mainPageStack.executeJavaScript("if (nav.get_route_status() != 'no' && !nav.get_route_status().startsWith('simulate')){nav.set_route_status('waiting4signal')}; settings.set_routing_mode(" + model.index +");")
-                        modeList.subText.text = navigationModeModel.get(navApp.settings.routingMode).mode
-                        modeList.toggleExpansion()
-                    }
-                }
-                
-                Label {
-                    id: infoPublicLabel
-                    text: "<a href='https://transit.land/'>" + i18n.tr("Powered by a community-edited data service") + "</a>"
-                    visible: navApp.settings.routingMode === 3
-                    width: parent.width
-                    anchors {
-                        left: parent.left
-                        leftMargin: units.gu(2)
-                        bottom: parent.bottom
-                        bottomMargin: units.gu(1)
-                    }
-                    onLinkActivated: Qt.openUrlExternally(link)
-                }
-            }
-
-            ExpandableListItem {
                 id: soundList
 
                 listViewHeight: units.gu(12+1)
@@ -220,25 +159,12 @@
                 onClicked: mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("DownloadVoices.qml"))
             }
 
-            ListItem {
-                height: confirmRouteLayout.height + divider.height
-                ListItemLayout {
-                    id: confirmRouteLayout
-                    title.text: i18n.tr("Confirm new routes")
-                    Switch {
-                        id: confirmRouteSwitch
-                        checked: navApp.settings.confirmRoute
-                        onClicked: {
-                            navApp.settings.confirmRoute = checked;
-                            mainPageStack.executeJavaScript("ui.set_confirm_route(" + checked.toString() + ")")
-                        }
-                        SlotsLayout.position: SlotsLayout.Last
-                    }
-                }
+            ListItemHeader {
+                 id: carListHeader
+                 title: i18n.tr("Car Options")
             }
 
             ListItem {
-                visible: navApp.settings.routingMode === 0
                 height: tollsLayout.height + divider.height
                 ListItemLayout {
                     id: tollsLayout
@@ -256,7 +182,6 @@
             }
 
             ListItem {
-                visible: navApp.settings.routingMode === 0
                 height: speedCameraLayout.height + divider.height
                 ListItemLayout {
                     id: speedCameraLayout