From ee5e4ac5a440335e5a13f7f7b25511cafc2f432c Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Tue, 6 Oct 2015 21:08:35 +0200 Subject: [PATCH] Add ferry routing information for OSRM Relates to #1000. Uses instruction code 18 to represent a ferry instruction. Ferry icon taken from Mapbox Maki set (CC0). --- app/assets/images/routing-sprite.png | Bin 1770 -> 1647 bytes .../javascripts/index/directions/osrm.js | 9 +++++++-- app/assets/stylesheets/common.scss | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/images/routing-sprite.png b/app/assets/images/routing-sprite.png index 37d94886ddf07ea4074f92c01584394761984983..42ec7b4cdf94c3098160e40542d81ca645bc3b32 100644 GIT binary patch literal 1647 zcmZXUdpOg39LIke8=INK#)*+5m)w%e8t16owxlKZ$vu~C4bAG*YaQvmz9t4x6Y|IL za&!j(DH`Z#SqPYA9P$iUSh7+hYy1u6%`fvgNQX~YtZR*a7&?3zzGy8l^PZn21-as2zd?AK}aOhx;QvE zfP!1Y%*+h*^#nyvPfu4@S4T%@^XARk+S*`)#bUwy7c?5Z?uv?vC=?3x^#lcpM9Ry{ zuWvzt!@pk!M0O2OU@+KvLZQ&_iyuHB-!JxmJWZlLf-N=P-Ngft+5kl;C@LzURa7^s zX=rI_n{2bRwz0Lfvv(vAcRM*bJCjKJ_Pe@zlYN4N!zhQMQ&KaI9m^>wEG{WKS5?ia zyVKO#-uZ~f>*?+97YGIhUJZ|py_uMtnwk;MFDx#8mV8-SUTF|E-~m87V~?YqXL8^y zSrmuCp`Sv|U`m10P``pregT>25qnFFk3UW(rUvd;r)HosxxBiXX<;gA8=063qvqzL zH2NO@rjLJDVcks;7G@RPu2yQrvzVwMF4Il?W>L8Rf07vTn)vv^jouOP^( z^MG~byRTnMn}+34*W8X<7dVrV{#w^{Hk96J&?d%Wa%3W}APhPNuL<5(+x)qA0h5pdTlYr(_gvin8)up2*_B)1ybInOiL}(?hBHX9QJLN2^I$L0zd7Fat z9Pr4o)0|DRVq<0>ZC!@vS9)i)$mq;aq_hlQFRN=Yv5^e)>kz0$V#IaGmk)5nL8;q@ zh3`u!^ZHJFpw0{h+?qd%4r!lG!Cnb$ivG)DLX+1Koh+dl2l$v=B@71qMwQW$-e6A1;;5yZ3cS|rPxE5*Gv>C+v36F`g zxxW)7?qTt7MOli%Vk<-|t9PiJt?t_EJ5PzRNy*ZTFEDCXWCzu9fgWXyI^Vwpe=NaE zI&-UWWOWM9PXb;fY!q&2{&EwE$D7_C9iiGjXELE&q;1!Q$b04s%wo!aVUH{imn?92 zb2hTG&@+@fM%ZISY2qqmVBSum7)e?{j_IB5A5&#mOkP>yr_1zr5tqbwS{aMogZp~x zo4?IHv?Z^|9`V9Yz-wxd6>_#u4;0Icq75dMo3@&N(pFXQacxedT`ut&rFoh09VNwy zl@M76xp?7z`gV&`F~9mh*m5((cqD%=A}A#2B=L_Iz?Snj7>n7kX>o8=VY%?6t$5mP z%<5*xUXJ|eYAXG_tqBjGeI(#`w%Dkp=t7v{q¥*O+lUSC^_rB6?TvvOe*5Lq=n0A~P zmk|cbtKA(ar$9I4QoXHr4B!kO8UZd#x{^S^b;mSwDDy^vJZQvqg7*%mSkg;0~;AilIh7_=_l6sP+D6+zj z$uGn{J4piH>Ee#C(LF=1ZC8J zn=dO9@*OBq#OKs~%tkb)b=N`0#hnjaE*w3tk;cewGg!{gkdiyD+OSh8@8S1<;vRyF JW37EK^B*eCwfX=6 literal 1770 zcmVxx#T*F9q_3p z3ce)@b|XnXjI1#(TjCGIEG2P_gg(KajYiz&R?Ys5x#+O{v0^<`OZ0DUJW$SaLi@WQ zX3n+h;#50BV_VYTSlC%gVuNcg^ex4Jro!vj1k`O>dc@7ww`#<%!n4TwL9Dm{Mb;`4 z0&fsx;HM4HDj+=<9xMz{Giki07_W&_iBcnLUd*00uN(b`*=#*+c7(~rjz!UqfR+fn zSln90q6PiS=rzxH@tn5UF{6bQnOc9w8PX|hcj94>lY?5pKi==wONpOiPGe<29VL2b zx3HdbKzQFm9%F5thuwU@W+s@DQ+>$nO`5J-7+{HUOfBtSPXy8pyYAtL-VsM`C1J8y|ok0f8|cEEo$T$SpoMQ>I{+&ra1s$XvXZBP_9eZ1mW3{dp@LEa&de zI6y-2y+>>vqu;5Jou&i?Ypj(*2++NM#~S|45I>dt5^|9F0_wo*?F?{=0CflBh?NVa z7JzbVnPOgZ0R=}u?S^Rn!06UY7&W^Iz*h_;*=s2Q2cwRx$?`!X76R(OW23vrRF!M2 z$e?}tGX>P^N;iDq&96!~MpgXNjGtD1nVnVvP=^RwOLO52s0dgcqW{mt@aOoYjnewv zrk|<`?^JL3-DT{MYsrE=xzn8x7Trx{2`nM`g!S2})BcD7Yr}l41b~|L3>iCS{XpH^qWQMa&+d>h9bQj-?!r3?G$SItN8p>|B!ayHh{ z1%R4Z+Se(q{fTEabM$8x^B++~%O;Fy{9*KaeD&D@qv@Y&{50~5-1JcFfp&7?-rc+A`jYvk@q`H^>H}jd-4zRm zjlwx>F1Bpgei=5!8?Eq(mR)g&PI41{6bss_*|FTiWJ&DNP2@*2?c45L+B!pj?qdc0 zHhe8`$bqJbVKm8i<^pl$uG}sg2pU07z>-`q$gUsnah;-z2BLHu@E^ z^wz<@a$zy+6!W>6@R|BNpTI!?Jf-~v2bBBxugjB8eL+?Xm`V!~nc`p412pq*BlJ&O zX3Hj=(pt58%BS}CAN)+?VQx_yFD>n0-!#RlHtC^7s;`gjNX`W&u@;kMWs}l4HrX8F)xJj-Mf^S>?4xoE`;Sw(LLF%f$LrU^t4$J zlh1JZ=517d&WZJycHTB`-#2>8yuZZ&rV{%1!+?MJ0p+(v#@O*e1%D9bQ$k!yCEp=m zH*Me?80z_q&ZTye4>(@1wp^fY7UUNI!s|xABZpz{=oN{d<{ALN&y47bMrJe?MdJru73v%cq zpWhq>P%$qL@ZWo|>%ymhSp56sdHPLMj9s-);u5C(=agt%&#FQ+f&`gWN&>F4%PRb0 ze~=&^1@v?aRnLBM-iW0MJ+G3_ddYI{*Lx M07*qoM6N<$f|-VHxBvhE diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js index 4a42d5dc9..d9ce0a6b1 100644 --- a/app/assets/javascripts/index/directions/osrm.js +++ b/app/assets/javascripts/index/directions/osrm.js @@ -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 = "" + (i + 1) + ". "; var name = s[1] ? "" + s[1] + "" : 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, { diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 9b795aeab..3afef70e3 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -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; } } -- 2.43.2