cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflict

Browse source
This commit is contained in:
Richard Fairhurst 2014-03-09 12:05:37 +00:00
parent 5853f81ee8
commit 42c1dec8f0
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/routing.js.erb
View file

@ -206,8 +206,8 @@ OSM.Routing=function(map,name,jqSearch) {
row.append("<td class='direction i"+step[1]+"'> "); row.append("<td class='direction i"+step[1]+"'> ");
row.append("<td class='instruction'>"+step[2]); row.append("<td class='instruction'>"+step[2]);
row.append("<td class='distance'>"+dist); row.append("<td class='distance'>"+dist);
with ({ num: i, ll: step[0], lineseg: step[4] }) { with ({ instruction: step[2], ll: step[0], lineseg: step[4] }) {
row.on('click',function(e) { r.clickTurn(num, ll); }); row.on('click',function(e) { r.clickTurn(instruction, ll); });
row.hover(function(e){r.highlightSegment(lineseg);}, function(e){r.unhighlightSegment();}); row.hover(function(e){r.highlightSegment(lineseg);}, function(e){r.unhighlightSegment();});
}; };
$('#turnbyturn').append(row); $('#turnbyturn').append(row);
@ -216,8 +216,8 @@ OSM.Routing=function(map,name,jqSearch) {
$('#sidebar_content').append('<p id="routing_credit">' + r.chosenEngine.creditline + '</p>'); $('#sidebar_content').append('<p id="routing_credit">' + r.chosenEngine.creditline + '</p>');
}; };
r.clickTurn=function(num,latlng) { r.clickTurn=function(instruction,latlng) {
r.popup=L.popup().setLatLng(latlng).setContent("<p>"+(num+1)+"</p>").openOn(r.map); r.popup=L.popup().setLatLng(latlng).setContent("<p>"+instruction+"</p>").openOn(r.map);
}; };
r.highlightSegment=function(lineseg){ r.highlightSegment=function(lineseg){
if (r.highlighted) map.removeLayer(r.highlighted); if (r.highlighted) map.removeLayer(r.highlighted);