X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bd5ae239950a842e565ba747466da903e605bda..bf895a0332242df4189b507e647d0aa4ce4a5a04:/app/assets/javascripts/routing_engines/osrm_car.js

diff --git a/app/assets/javascripts/routing_engines/osrm_car.js b/app/assets/javascripts/routing_engines/osrm_car.js
index f0c05a850..da94adf05 100644
--- a/app/assets/javascripts/routing_engines/osrm_car.js
+++ b/app/assets/javascripts/routing_engines/osrm_car.js
@@ -3,17 +3,18 @@
 // *** need to clear hints at some point
 
 OSM.RoutingEngines.list.push({
-	name: 'Car (OSRM)',
+	name: "javascripts.directions.engines.osrm_car",
+	creditline: 'Directions courtesy of <a href="http://project-osrm.org/" target="_blank">OSRM</a>',
 	draggable: true,
 	_hints: {},
-	getRoute: function(final,points) {
+	getRoute: function(isFinal,points) {
 		var url="http://router.project-osrm.org/viaroute?z=14&output=json";
 		for (var i=0; i<points.length; i++) {
 			var pair=points[i].join(',');
 			url+="&loc="+pair;
 			if (this._hints[pair]) url+= "&hint="+this._hints[pair];
 		}
-		if (final) url+="&instructions=true";
+		if (isFinal) url+="&instructions=true";
 		this.requestJSONP(url+"&jsonp=");
 	},
 	gotRoute: function(router,data) {
@@ -21,10 +22,22 @@ OSM.RoutingEngines.list.push({
 			alert("Couldn't find route between those two places");
 			return false;
 		}
-		// *** store hints
+		// Draw polyline
 		var line=L.PolylineUtil.decode(data.route_geometry);
 		for (i=0; i<line.length; i++) { line[i].lat/=10; line[i].lng/=10; }
 		router.setPolyline(line);
-		router.setItinerary(data.route_instructions);
+		// *** store hints
+		// Assemble instructions
+		var steps=[];
+		for (i=0; i<data.route_instructions.length; i++) {
+			var s=data.route_instructions[i];
+			var instCodes=s[0].split('-');
+			var instText="<b>"+(i+1)+".</b> ";
+			instText+=TURN_INSTRUCTIONS[instCodes[0]];
+			if (instCodes[1]) { instText+="exit "+instCodes[1]+" "; }
+			if (instCodes[0]!=15) { instText+=s[1] ? "<b>"+s[1]+"</b>" : I18n.t('javascripts.directions.instructions.unnamed'); }
+			steps.push([line[s[3]], s[0].split('-')[0], instText, s[2]]);
+		}
+		if (steps.length) router.setItinerary({ steps: steps });
 	}
 });