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

Merge remote-tracking branch 'openstreetmap/pull/1068'

Browse source
This commit is contained in:
Tom Hughes 2015-10-12 21:15:47 +01:00
commit d2765cb23d
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/routing-sprite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

9
app/assets/javascripts/index/directions/osrm.js
View file

@ -28,7 +28,8 @@ function OSRMEngine() {
'javascripts.directions.instructions.start', // 14
'javascripts.directions.instructions.destination', // 15
'javascripts.directions.instructions.against_oneway', // 16
'javascripts.directions.instructions.end_oneway' // 17
'javascripts.directions.instructions.end_oneway', // 17
'javascripts.directions.instructions.ferry' // 18
];
var params = [
@ -69,6 +70,10 @@ function OSRMEngine() {
var s = data.route_instructions[i];
var linesegend;
var instCodes = s[0].split('-');
if (s[8] === 2) {
/* indicates a ferry in car routing mode, see https://github.com/Project-OSRM/osrm-backend/blob/6cbbd1e5a1b441eb27055f56956e1bac14832a58/profiles/car.lua#L151 */
instCodes = ["18"];
}
var instText = "<b>" + (i + 1) + ".</b> ";
var name = s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
if (instCodes[0] === "11" && instCodes[1]) {
@ -81,7 +86,7 @@ function OSRMEngine() {
} else {
linesegend = s[3] + 1;
}
steps.push([line[s[3]], s[0].split('-')[0], instText, s[2], line.slice(s[3], linesegend)]);
steps.push([line[s[3]], instCodes[0], instText, s[2], line.slice(s[3], linesegend)]);
}
callback(false, {

2
app/assets/stylesheets/common.scss
View file

@ -1003,7 +1003,7 @@ div.direction {
height: 20px;
background-repeat: no-repeat;
}
@for $i from 1 through 17 {
@for $i from 1 through 18 {
div.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; }
}