Merge lp:~costales/unav/0.68-show-north into lp:unav

[costales]

Show the North if map is rotated

[lp:~costales/unav/0.68-show-north]

190. By costales on 2017-04-05

WIP

191. By costales on 2017-04-05

WIP

192. By costales on 2017-04-06

WIP

193. By costales on 2017-04-06

WIP

=== modified file 'nav/class/Navigator.js'
--- nav/class/Navigator.js	2017-03-31 15:17:02 +0000
+++ nav/class/Navigator.js	2017-04-06 20:44:50 +0000
@@ -231,9 +231,18 @@
 			tracks[i].type = 30;
 		}
 		
+		try {var exit_number_elements = tracks[i].sign.exit_number_elements[0].text;} catch (err) {var exit_number_elements = '';}
+		try {var exit_branch_elements = tracks[i].sign.exit_branch_elements[0].text;} catch (err) {var exit_branch_elements = '';}
+		try {var exit_toward_elements = tracks[i].sign.exit_toward_elements[0].text;} catch (err) {var exit_toward_elements = '';}
+		try {var exit_name_elements = tracks[i].sign.exit_name_elements[0].text;} catch (err) {var exit_name_elements = '';}
+		try {var street_name = tracks[i].street_names[0];} catch (err) {var street_name = '';}
 		instruction = this.compose_instruction_simple(
 			tracks[i].type,
-			tracks[i].hasOwnProperty('street_names') ? tracks[i].street_names[0] : '',
+			exit_number_elements,
+			exit_branch_elements,
+			exit_toward_elements,
+			exit_name_elements,
+			street_name,
 			tracks[i].instruction
 		);
 		
@@ -283,164 +292,133 @@
 	}
 }
 
-Navigator.prototype.compose_instruction_simple = function(type, street_name, original_instruction) {
-	// Return the street name if not public transport
-	if (street_name && (type < 28 || type > 30)) {
-		return street_name;
-	}
-	// Or the instruction if there is not street name
-	var instruction = '';
+Navigator.prototype.compose_instruction_simple = function(type, exit_number_elements, exit_branch_elements, exit_toward_elements, exit_name_elements, street_name, instruction) {
+	// Initial instructions
 	switch (type) {
 		case 0: // None
-			instruction = '';
-			break;
+			return '';
 		case 1: // Start
-			instruction = t("Go");
-			break;
+			return t("Go");
 		case 2: // StartRight
-			instruction = t("Go to your right");
-			break;
+			return t("Go to your right");
 		case 3: // StartLeft
-			instruction = t("Go to your left");
-			break;
+			return t("Go to your left");
 		case 4: // Destination
-			instruction = t("You have arrived at your destination");
-			break;
+			return t("You have arrived at your destination");
 		case 5: // DestinationRight
-			instruction = t("Your destination is on the right");
-			break;
+			return t("Your destination is on the right");
 		case 6: // DestinationLeft
-			instruction = t("Your destination is on the left");
-			break;
+			return t("Your destination is on the left");
+		case 26: // RoundaboutsEnter
+			return t("Enter the roundabout and take the designated exit");
+		case 261:
+			return t("Enter the roundabout and take the first exit");
+		case 262:
+			return t("Enter the roundabout and take the second exit");
+		case 263:
+			return t("Enter the roundabout and take the third exit");
+		case 264:
+			return t("Enter the roundabout and take the fourth exit");
+		case 265:
+			return t("Enter the roundabout and take the fifth exit");
+		case 266:
+			return t("Enter the roundabout and take the sixth exit");
+		case 267:
+			return t("Enter the roundabout and take the seventh exit");
+		case 268:
+			return t("Enter the roundabout and take the eighth exit");
+		case 269:
+			return t("Enter the roundabout and take the ninth exit");
+		case 28: // FerryEnter
+			return t("Take the Ferry");
+		case 29: // FerryExit
+			return t("Leave the Ferry");
+		case 30: // Public transports
+			return instruction;
+	}
+	
+	var aux_exits = '';
+	// exit_number_elements
+	if (exit_number_elements && instruction.split(' ').join('').includes(exit_number_elements.split(' ').join('')))
+		aux_exits = '#' + exit_number_elements;
+	// exit_branch_elements
+	if (exit_branch_elements && instruction.split(' ').join('').includes(exit_branch_elements.split(' ').join('')))
+		aux_exits = aux_exits.concat(' ', exit_branch_elements);
+	// exit_toward_elements
+	if (exit_toward_elements && instruction.split(' ').join('').includes(exit_toward_elements.split(' ').join('')))
+		aux_exits = aux_exits.concat(' ', exit_toward_elements);
+	// exit_name_elements
+	if (exit_name_elements && instruction.split(' ').join('').includes(exit_name_elements.split(' ').join('')))
+		aux_exits = aux_exits.concat(' ', exit_name_elements);
+	aux_exits = aux_exits.trim();
+	if (aux_exits)
+		return aux_exits;
+	
+	// street_name
+	if (street_name && instruction.split(' ').join('').includes(street_name.split(' ').join('')))
+		return street_name;
+	
+	// Instructions without directions
+	switch (type) {
 		case 7: // Becomes
-			instruction = t("The current road becomes into a new road");
-			break;
+			return t("The current road becomes into a new road");
 		case 8: // Continue
-			instruction = t("Continue on the road");
-			break;
+			return t("Continue on the road");
 		case 9: // SlightRight
-			instruction = t("Bear right");
-			break;
+			return t("Bear right");
 		case 10: // Right
-			instruction = t("Turn right");
-			break;
+			return t("Turn right");
 		case 11: // SharpRight
-			instruction = t("Make a sharp right");
-			break;
+			return t("Make a sharp right");
 		case 12: // UturnRight
-			instruction = t("Make a right U-turn");
-			break;
+			return t("Make a right U-turn");
 		case 13: // UturnLeft
-			instruction = t("Make a left U-turn");
-			break;
+			return t("Make a left U-turn");
 		case 14: // SharpLeft
-			instruction = t("Make a sharp left");
-			break;
+			return t("Make a sharp left");
 		case 15: // Left
-			instruction = t("Turn left");
-			break;
+			return t("Turn left");
 		case 16: // SlightLeft
-			instruction = t("Bear left");
-			break;
+			return t("Bear left");
 		case 17: // RampStraight
-			instruction = t("Stay straight to take the ramp");
-			break;
+			return t("Stay straight to take the ramp");
 		case 18: // RampRight
-			instruction = t("Take the ramp on the right");
-			break;
+			return t("Take the ramp on the right");
 		case 19: // RampLeft
-			instruction = t("Take the ramp on the left");
-			break;
+			return t("Take the ramp on the left");
 		case 20: // ExitRight
-			instruction = t("Take the exit on the right");
-			break;
+			return t("Take the exit on the right");
 		case 21: // ExitLeft
-			instruction = t("Take the exit on the left");
-			break;
+			return t("Take the exit on the left");
 		case 22: // StayStraight
-			instruction = t("Keep straight at the fork");
-			break;
+			return t("Keep straight at the fork");
 		case 23: // StayRight
-			instruction = t("Keep right at the fork");
-			break;
+			return t("Keep right at the fork");
 		case 24: // StayLeft
-			instruction = t("Keep left at the fork");
-			break;
+			return t("Keep left at the fork");
 		case 25: // Merge
-			instruction = t("The current road merges into a new one");
-			break;
-		case 26: // RoundaboutsEnter
-			instruction = t("Enter the roundabout and take the designated exit");
-			return instruction;
-		case 261:
-			instruction = t("Enter the roundabout and take the first exit");
-			return instruction;
-		case 262:
-			instruction = t("Enter the roundabout and take the second exit");
-			return instruction;
-		case 263:
-			instruction = t("Enter the roundabout and take the third exit");
-			return instruction;
-		case 264:
-			instruction = t("Enter the roundabout and take the fourth exit");
-			return instruction;
-		case 265:
-			instruction = t("Enter the roundabout and take the fifth exit");
-			return instruction;
-		case 266:
-			instruction = t("Enter the roundabout and take the sixth exit");
-			return instruction;
-		case 267:
-			instruction = t("Enter the roundabout and take the seventh exit");
-			return instruction;
-		case 268:
-			instruction = t("Enter the roundabout and take the eighth exit");
-			return instruction;
-		case 269:
-			instruction = t("Enter the roundabout and take the ninth exit");
-			return instruction;
+			return t("The current road merges into a new one");
 		case 27: // RoundaboutExits
-			instruction = t("Exit the roundabout");
-			return instruction;
+			return t("Exit the roundabout");
 		case 271:
-			instruction = t("Take the first exit");
-			return instruction;
+			return t("Take the first exit");
 		case 272:
-			instruction = t("Take the second exit");
-			return instruction;
+			return t("Take the second exit");
 		case 273:
-			instruction = t("Take the third exit");
-			return instruction;
+			return t("Take the third exit");
 		case 274:
-			instruction = t("Take the fourth exit");
-			return instruction;
+			return t("Take the fourth exit");
 		case 275:
-			instruction = t("Take the fifth exit");
-			return instruction;
+			return t("Take the fifth exit");
 		case 276:
-			instruction = t("Take the sixth exit");
-			return instruction;
+			return t("Take the sixth exit");
 		case 277:
-			instruction = t("Take the seventh exit");
-			return instruction;
+			return t("Take the seventh exit");
 		case 278:
-			instruction = t("Take the eighth exit");
-			return instruction;
+			return t("Take the eighth exit");
 		case 279:
-			instruction = t("Take the ninth exit");
-			return instruction;
-		case 28: // FerryEnter
-			instruction = t("Take the Ferry");
-			break;
-		case 29: // FerryExit
-			instruction = t("Leave the Ferry");
-			break;
-		case 30: // Public transports
-			instruction = original_instruction;
-			break;
+			return t("Take the ninth exit");
 	}
-	
-	return instruction;
 }
 
 Navigator.prototype.get_route_indication = function() {

=== modified file 'nav/class/UI.js'
--- nav/class/UI.js	2017-04-02 07:11:25 +0000
+++ nav/class/UI.js	2017-04-06 20:44:50 +0000
@@ -55,6 +55,10 @@
 	$('#marker_pos_end').click(function () {
 		window.location = 'http://clicked_on_map?nofollow/' + nav.get_pos_data()['end_lat'] + '/' + nav.get_pos_data()['end_lng'] + '/none/none/none/' + t("Current End");
 	});
+	
+	$('#img_north').click(function () {
+		map.getView().setRotation(0);
+	});
 
 	this.markers_POI = [];
 	for (i=0 ; i<50; i++) {
@@ -831,7 +835,16 @@
 		default:
 			this.map.getView().setRotation(0);
 	}
+}
 
+UI.prototype.set_north = function(degress) {
+	if (degress == 0 && this.nav.get_route_status() == 'no') {
+		$('#map_north').hide();
+	}
+	else {
+		$('#img_north').css('transform', 'rotate('+degress+'deg)');
+		$('#map_north').show();
+	}
 }
 
 UI.prototype.speak = function(indication) {

=== modified file 'nav/css/unav.css'
--- nav/css/unav.css	2017-04-02 07:11:25 +0000
+++ nav/css/unav.css	2017-04-06 20:44:50 +0000
@@ -174,14 +174,25 @@
 	color: #333333;
 }
 
-#max_speed_alert {
+#max_speed_alert, #map_north {
 	width: 50px;
 	height: 50px;
 	position: absolute;
-	top: 55px;
-	right: 6px;
-}
-#img_maxspeed {
+}
+@media screen and (orientation:portrait) {
+	#max_speed_alert, #map_north {
+		top: 55px;
+		right: 6px;
+	}
+}
+@media screen and (orientation:landscape) {
+	#max_speed_alert, #map_north {
+		top: 47px;
+		left: 47px;
+	}
+}
+
+#img_maxspeed, #img_north {
 	width: 100%;
 	height: 100%;
 }

=== added file 'nav/img/marker/north.svg'
--- nav/img/marker/north.svg	1970-01-01 00:00:00 +0000
+++ nav/img/marker/north.svg	2017-04-06 20:44:50 +0000
@@ -0,0 +1,71 @@
+<?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 100 100"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="north.svg"
+   width="100"
+   height="100">
+  <metadata
+     id="metadata16">
+    <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="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="968"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="35.186507"
+     inkscape:cy="58.253012"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4" />
+  <g
+     transform="translate(0,-977.36218)"
+     id="g4">
+    <path
+       style="color:#000000;text-indent:0;text-transform:none;direction:ltr;block-progression:tb;baseline-shift:baseline;display:inline;overflow:visible;visibility:visible;fill:#989898;fill-opacity:1;stroke:none;marker:none;enable-background:accumulate"
+       d="m 81.112724,1058.4749 c 17.17469,-17.1747 17.174562,-45.0508 -2.4e-5,-62.22541 -17.174624,-17.17464 -45.050696,-17.17469 -62.225391,-1e-5 -17.1747133,17.17472 -17.1746172,45.05082 0,62.22542 17.174588,17.1746 45.050708,17.1747 62.225415,0 z m -1.414216,-1.4142 c -16.41039,16.4104 -42.986625,16.4103 -59.396993,0 -16.4103107,-16.4103 -16.4103996,-42.9866 1e-6,-59.39701 16.410389,-16.41038 42.986658,-16.41031 59.39698,10e-6 16.410325,16.4103 16.410396,42.9866 1.2e-5,59.397 z m -28.74827,0.6408 10.982203,-29.9857 c 0.0873,-0.216 0.0949,-0.4635 0.0221,-0.685 L 50.950206,997.02292 c -0.288499,-0.76055 -1.607799,-0.74506 -1.878203,0.0221 l -11.004407,29.96368 c -0.08501,0.2252 -0.08497,0.4817 0,0.7071 l 11.004332,30.0078 c 0.701347,1.1294 1.67607,0.7169 1.87831,-0.022 z m -0.95012,-3.2482 -9.546049,-26.0746 19.091922,0 z m 9.567946,-28.0855 -19.091843,0 9.545886,-26.0746 z"
+       visibility="visible"
+       display="inline"
+       overflow="visible"
+       id="path6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ffffff;stroke-width:0.08838835;stroke-opacity:1"
+       d="m 40.59244,48.839471 c 0.672423,-1.978985 9.412024,-25.672085 9.453656,-25.628904 0.03318,0.03442 2.156685,5.790139 4.718899,12.790497 2.562214,7.000357 4.677531,12.77764 4.700704,12.838407 0.03354,0.08796 -1.889614,0.110485 -9.434333,0.110485 -7.542269,0 -9.468804,-0.02255 -9.438926,-0.110485 z"
+       id="path3386"
+       inkscape:connector-curvature="0"
+       transform="translate(0,977.36218)" />
+  </g>
+</svg>

=== modified file 'nav/index.html'
--- nav/index.html	2017-03-31 14:28:02 +0000
+++ nav/index.html	2017-04-06 20:44:50 +0000
@@ -103,6 +103,11 @@
 	<!-- Map attribution -->
 	<div id="map_attribution" style="display:none;"></div>
 	
+	<!-- Where is the North -->
+	<div id="map_north" style="display:none;">
+		<img id="img_north" src="img/marker/north.svg">
+	</div>
+	
 	<!-- Max speed radar alert -->
 	<div id="max_speed_alert" style="display:none;">
 		<img id="img_maxspeed" src="img/marker/maxspeed.svg">
@@ -459,6 +464,10 @@
 			pointerIsDown=false;
 		});
 
+		map.on('moveend', function () {
+			ui.set_north(maths._toDeg(map.getView().getRotation()));
+		});
+		
 		// Drag
 		map.on('pointerdrag', function(evt) {
 			ui.set_zoom_unav(false); // Pinch zoom or drag = custom zoom too