X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/15c156483263893d2c767030bd544d589833af93..576745e332c83d74890a19a323d310e602be9dac:/app/assets/javascripts/routing.js.erb

diff --git a/app/assets/javascripts/routing.js.erb b/app/assets/javascripts/routing.js.erb
index f496262d2..7837c5327 100644
--- a/app/assets/javascripts/routing.js.erb
+++ b/app/assets/javascripts/routing.js.erb
@@ -7,10 +7,12 @@
 	https://github.com/apmon/openstreetmap-website/blob/9755c3ae0a8d0684d43760f91dc864ff42d8477a/app/views/routing/start.js.erb
 
 	*** draggable start/end markers
-	*** click each part
 	*** translation (including all alerts and presentation)
 	*** export GPX
 	*** URL history (or do we consciously not want to support that?)
+
+	*** add YOURS engine
+	*** add GraphHopper engine
 */
 
 var TURN_INSTRUCTIONS=["",
@@ -39,16 +41,24 @@ var ROUTING_POLYLINE={
 };
 
 
+OSM.RoutingEngines={
+	list: []
+	// common functions and constants, e.g. OSRM parser, can go here
+};
+
 OSM.Routing=function(map,name,jqSearch) {
 	var r={};
+
 	r.map=map;				// Leaflet map
 	r.name=name;			// global variable name of this instance (needed for JSONP)
 	r.jqSearch=jqSearch;	// JQuery object for search panel
 
-	r.route_from=null;
-	r.route_to=null;
-	r.viaPoints=[];
-	r.polyline=null;
+	r.route_from=null;		// null=unset, false=awaiting response, [lat,lon]=geocoded
+	r.route_to=null;		//  |
+	r.awaitingGeocode=false;// true if the user has requested a route, but we're waiting on a geocode result
+	r.viaPoints=[];			// not yet used
+	r.polyline=null;		// Leaflet polyline object
+	r.chosenEngine=null;	// currently selected routing engine
 
 	// Geocoding
 
@@ -59,6 +69,7 @@ OSM.Routing=function(map,name,jqSearch) {
 		var querystring = '<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(v) + '&format=json';
 		// *** &accept-language=<%#= request.user_preferred_languages.join(',') %>
 		// *** prefer current viewport
+		r[field.id]=false;
 		$.getJSON(querystring, function(json) { _this._gotGeocode(json,field); });
 	};
 	
@@ -72,15 +83,21 @@ OSM.Routing=function(map,name,jqSearch) {
 		var lat=Number(json[0].lat), lon=Number(json[0].lon);
 		r[field.id]=[lat,lon];
 		// ** update markers
+		if (r.awaitingGeocode) {
+			r.awaitingGeocode=false;
+			r.requestRoute();
+		}
 	};
 	
 	// Route-fetching UI
 
 	r.requestRoute=function() {
 		if (r.route_from && r.route_to) {
-			var chosen=jqSearch.find('select.routing_engines :selected').val();
-			r.engines[chosen].getRoute(true,[r.route_from,r.route_to]);
+			r.chosenEngine.getRoute(true,[r.route_from,r.route_to]);
 			// then, when the route has been fetched, it'll call the engine's gotRoute function
+		} else if (r.route_from==false || r.route_to==false) {
+			// we're waiting for a Nominatim response before we can request a route
+			r.awaitingGeocode=true;
 		}
 	};
 
@@ -91,27 +108,23 @@ OSM.Routing=function(map,name,jqSearch) {
 		r.map.fitBounds(r.polyline.getBounds());
 	};
 
-	// Take an array of directions and write it out
-	// (we use OSRM's route_instructions format)
+	// Take directions and write them out
+	// data = { steps: array of [latlng, sprite number, instruction text, distance in metres] }
+	// sprite numbers equate to OSRM's route_instructions turn values
 	// *** translations?
-	r.setItinerary=function(steps) {
+	r.setItinerary=function(data) {
 		// Create base table
 		$("#content").removeClass("overlay-sidebar");
 		$('#sidebar_content').empty();
 		var html='<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;"><span class="icon close"></span></a>Directions</h2>'.replace(/~/g,"'");
 		html+="<table id='turnbyturn' />";
-        $('#sidebar_content').html(html);
+		$('#sidebar_content').html(html);
 		// Add each row
-		for (var i=0; i<steps.length; i++) {
-			var step=steps[i];
-			var instCodes=step[0].split('-');
-			// Assemble instruction text
-			var instText="<b>"+(i+1)+".</b> ";
-			instText+=TURN_INSTRUCTIONS[instCodes[0]];
-			if (instCodes[1]) { instText+="exit "+instCodes[1]+" "; }
-			if (instCodes[0]!=15) { instText+=step[1] ? "<b>"+step[1]+"</b>" : "(unnamed)"; }
+		var cumulative=0;
+		for (var i=0; i<data.steps.length; i++) {
+			var step=data.steps[i];
 			// Distance
-			var dist=step[2];
+			var dist=step[3];
 			if (dist<5) { dist=""; }
 			else if (dist<200) { dist=Math.round(dist/10)*10+"m"; }
 			else if (dist<1500) { dist=Math.round(dist/100)*100+"m"; }
@@ -119,16 +132,18 @@ OSM.Routing=function(map,name,jqSearch) {
 			else { dist=Math.round(dist/1000)+"km"; }
 			// Add to table
 			var row=$("<tr class='turn'/>");
-			row.append("<td class='direction i"+instCodes[0]+"'> ");
-			row.append("<td class='instruction'>"+instText);
+			row.append("<td class='direction i"+step[1]+"'> ");
+			row.append("<td class='instruction'>"+step[2]);
 			row.append("<td class='distance'>"+dist);
-			with ({n: i}) { row.on('click',function(e) { r.clickTurn(n); });
-			}
+			with ({ num: i, ll: step[0] }) {
+				row.on('click',function(e) { r.clickTurn(num, ll); });
+			};
 			$('#turnbyturn').append(row);
+			cumulative+=step[3];
 		}
 	};
-	r.clickTurn=function(num) {
-		console.log("clicked turn",num);
+	r.clickTurn=function(num,latlng) {
+		L.popup().setLatLng(latlng).setContent("<p>"+(num+1)+"</p>").openOn(r.map);
 	};
 
 
@@ -139,59 +154,40 @@ OSM.Routing=function(map,name,jqSearch) {
 		if (r.polyline) map.removeLayer(r.polyline);
 	};
 
-	// Add engines
-	
-	r.engines=[];
-	r.addEngine=function(engine) {
-		// Save engine
-		var i=r.engines.length;
-		engine.subscript=i;
-		r['engine'+i]=engine;
-		r.engines.push(engine);
-
-		// Add generic JSONP function
-		engine.requestJSONP=function(url) {
-			var script = document.createElement('script');
-			script.src = url+"&jsonp="+r.name+".engine"+this.subscript+".gotRoute";
- 			// OSRM doesn't like non-alphanumeric, otherwise we could just do OSM.routing.engines["+engine.subscript+"].gotRoute
-			document.body.appendChild(script); 
-		};
-
-		// Populate dropdown
-		var select=jqSearch.find('select.routing_engines');
-		select.append("<option value='"+i+"'>"+engine.name+"</option>");
+	// Routing engine handling
+
+	// Add all engines
+	var list=OSM.RoutingEngines.list;
+	list.sort(function(a,b) { return a.name>b.name; });
+	var select=r.jqSearch.find('select.routing_engines');
+	for (var i=0; i<list.length; i++) {
+		// Set up JSONP callback
+		with ({num: i}) {
+			list[num].requestJSONP=function(url) {
+				var script = document.createElement('script');
+				script.src = url+r.name+".gotRoute"+num;
+				document.body.appendChild(script); 
+			};
+			r['gotRoute'+num]=function(data) { list[num].gotRoute(r,data); };
+		}
+		select.append("<option value='"+i+"'>"+list[i].name+"</option>");
+	}
+	r.engines=list;
+	r.chosenEngine=list[0];	// default to first engine
+
+	// Choose an engine on dropdown change
+	r.selectEngine=function(e) {
+		r.chosenEngine=r.engines[e.target.selectedIndex];
 	};
-
-	// OSRM car engine
-	// *** this should all be shared from an OSRM library somewhere
-	// *** need to clear hints at some point
-
-	r.addEngine({
-		name: 'Car (OSRM)',
-		draggable: true,
-		_hints: {},
-		getRoute: function(final,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];
+	// Choose an engine by name
+	r.chooseEngine=function(name) {
+		for (var i=0; i<r.engines.length; i++) {
+			if (r.engines[i].name==name) {
+				r.chosenEngine=r.engines[i];
+				r.jqSearch.find('select.routing_engines').val(i);
 			}
-			if (final) url+="&instructions=true";
-			this.requestJSONP(url);
-		},
-		gotRoute: function(data) {
-			if (data.status==207) {
-				alert("Couldn't find route between those two places");
-				return false;
-			}
-			// *** store hints
-			var line=L.PolylineUtil.decode(data.route_geometry);
-			for (i=0; i<line.length; i++) { line[i].lat/=10; line[i].lng/=10; }
-			r.setPolyline(line);
-			r.setItinerary(data.route_instructions);
 		}
-	});
+	};
 
 	return r;
 };