From 4b931074151252d0bbc2e9f56ad83bd790c8fd0a Mon Sep 17 00:00:00 2001 From: DennisSchiefer Date: Fri, 23 Mar 2012 18:13:07 +0100 Subject: [PATCH] made logo a bit smaller so that it is centered, removing source or target now clears route description, changed GUI handling to no longer be dependent on the actual width of the sidebar --- WebContent/OSRM.GUI.js | 27 +++++++++++++-------------- WebContent/OSRM.Markers.js | 8 ++++++-- WebContent/OSRM.Route.js | 4 ++-- WebContent/images/osrm-logo.png | Bin 9183 -> 10558 bytes WebContent/main.css | 2 +- WebContent/main.js | 22 ++++++++++++++++++---- 6 files changed, 40 insertions(+), 23 deletions(-) diff --git a/WebContent/OSRM.GUI.js b/WebContent/OSRM.GUI.js index 566f439e6..e2096f664 100644 --- a/WebContent/OSRM.GUI.js +++ b/WebContent/OSRM.GUI.js @@ -20,31 +20,26 @@ or see http://www.gnu.org/licenses/agpl.txt. OSRM.GUI = { + +// default state +visible: true, +width: 410, // show/hide main-gui toggleMain: function() { // show main-gui - if( document.getElementById('main-wrapper').style.left == "-410px" ) { + if( OSRM.GUI.visible == false ) { getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="hidden"; - getElementsByClassName(document,'leaflet-control-zoom')[0].style.left="420px"; - getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px"; + getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.GUI.width+10)+"px";; - document.getElementById('blob-wrapper').style.visibility="hidden"; + document.getElementById('blob-wrapper').style.visibility="hidden"; document.getElementById('main-wrapper').style.left="5px"; - if( OSRM.Browser.FF3!=-1 || OSRM.Browser.IE6_9!=-1 ) { - getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible"; - } // hide main-gui } else { getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="hidden"; getElementsByClassName(document,'leaflet-control-zoom')[0].style.left="30px"; - getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px"; - document.getElementById('main-wrapper').style.left="-410px"; - if( OSRM.Browser.FF3!=-1 || OSRM.Browser.IE6_9!=-1 ) { - document.getElementById('blob-wrapper').style.visibility="visible"; - getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible"; - } + document.getElementById('main-wrapper').style.left=-OSRM.GUI.width+"px"; } // execute after animation @@ -53,18 +48,22 @@ toggleMain: function() { document.getElementById('main-wrapper').addEventListener("webkitTransitionEnd", OSRM.GUI.onMainTransitionEnd, false); document.getElementById('main-wrapper').addEventListener("oTransitionEnd", OSRM.GUI.onMainTransitionEnd, false); document.getElementById('main-wrapper').addEventListener("MSTransitionEnd", OSRM.GUI.onMainTransitionEnd, false); + } else { + OSRM.GUI.onMainTransitionEnd(); } }, // do stuff after main-gui animation finished onMainTransitionEnd: function() { // after hiding main-gui - if( document.getElementById('main-wrapper').style.left == "-410px" ) { + if( OSRM.GUI.visible == true ) { document.getElementById('blob-wrapper').style.visibility="visible"; getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible"; + OSRM.GUI.visible = false; // after showing main-gui } else { getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible"; + OSRM.GUI.visible = true; } }, diff --git a/WebContent/OSRM.Markers.js b/WebContent/OSRM.Markers.js index 19baf24c0..801b2359e 100644 --- a/WebContent/OSRM.Markers.js +++ b/WebContent/OSRM.Markers.js @@ -61,9 +61,9 @@ centerView: function(zoom) { zoom = OSRM.DEFAULTS.ZOOM_LEVEL; var position; - if( document.getElementById('main-wrapper').style.left != "-410px" ) { + if( OSRM.GUI.visible == true ) { var point = OSRM.G.map.project( this.position, zoom); - point.x-=200; + point.x-=OSRM.GUI.width/2; position = OSRM.G.map.unproject(point,zoom); } else { position = this.position; @@ -204,10 +204,14 @@ removeMarker: function(id) { if( id==0 && this.route[0].label == OSRM.C.SOURCE_LABEL ) { this.removeVias(); document.getElementById('input-source-name').value = ""; + document.getElementById('information-box').innerHTML = ""; + document.getElementById('information-box-headline').innerHTML = ""; } else if( id == this.route.length-1 && this.route[ this.route.length-1 ].label == OSRM.C.TARGET_LABEL ) { this.removeVias(); id = this.route.length-1; document.getElementById('input-target-name').value = ""; + document.getElementById('information-box').innerHTML = ""; + document.getElementById('information-box-headline').innerHTML = ""; } this.route[id].hide(); diff --git a/WebContent/OSRM.Route.js b/WebContent/OSRM.Route.js index d76af161e..277a953c0 100644 --- a/WebContent/OSRM.Route.js +++ b/WebContent/OSRM.Route.js @@ -54,12 +54,12 @@ setStyle: function(style) { centerView: function() { var bounds = new L.LatLngBounds( this.getPositions() ); - if( document.getElementById('main-wrapper').style.left != "-410px" ) { + if( OSRM.GUI.visible == true ) { var southwest = bounds.getSouthWest(); var northeast = bounds.getNorthEast(); var zoom = OSRM.G.map.getBoundsZoom(bounds); var sw_point = OSRM.G.map.project( southwest, zoom); - sw_point.x-=410; + sw_point.x-=OSRM.GUI.width/2; sw_point.y+=10; var ne_point = OSRM.G.map.project( northeast, zoom); ne_point.y-=10; diff --git a/WebContent/images/osrm-logo.png b/WebContent/images/osrm-logo.png index c3519dade65c22bf3b23636e5585b5a07b9dd0c1..30d24942516e7d8f7a36c9ca4273413b65e6bb6c 100644 GIT binary patch literal 10558 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 M07*qoM6N<$f(?dfd;kCd literal 9183 zcmV<5BOu&~P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2ipZ7 z2o@w-KaNWP03%;XL_t(|+U{}X(ftdTDn2(T3-e5p&7)jCV(Ag*fv8C!2u;ADOsMvr4|#% zC?<}nD30WMD2}~mfNe5tN0H3bLx@czA?-?Pu4H*iEXPRm$_x}ong?+>iNtP6f=fhF zvi$2UhdG;zgSl0n#32*O_Ds7-B1$Yt$@1?MM@{^9IEusP&XmH6LoO1sB>uLTq(meo z%fHZaO!g_f@^8MD;z<{VhLe++l7bkI zn1fh`SSdpmViDqb#9(}?=D4ne@P3R+({a)#6i}vfxx=vBj>Ky&9K&C!;99lf@!t`S z;@C~8T#4|%zUKw6_BXNA>t5W z2vY&?s-W^ZAeta5^F}Sdx~Fpd5!DbaJY1_OBARpPi4zL7#DREMjd4A_VT|(d#!0$6 z=NB6u{qG$UoLgvs&lfr3tEEP`z1{>T=NkSP(@}FpqY~c6bBFQ@^(w?eQklVsR*0AD zM=OtEnRoLmQ(o?;ZyNqwFjV_}`&z0Kc>Y`j^*;nYhCsRH7-C-KK^%npJB)w_c|<^f z0$@-6mgEKt+#gFMMAq_DzdaIF2bPc0-B>hC`~AXU+8+vw#lv;q&F-hY);2+P6tA-s z(GOAG!@DZ5yhX!w->)2_yAtFltjFWJAj){Cdo{n-AbeMQ-Cs-leb#8*)k+}>;!rYg zq@Ng(7!^`QJ%M^A_aZ(s%4d+*9b7Prv`r6 zY=S+r^uLuYrP#_XK}bHXm$l5PJ(JWI@4s(?9Wx3pQ(i6|*E(J$W{=UqpYNGqP)qeW zyk2i!xkV1hS55J`O96QUH{xLU$egc08bo8PvMYag%bMLPUoN;q5#JHDmnyS~mY6*Yoma>nUyUC%N?Tt3(OX`=~-v{IkOHj{fD(CXj4M7o3_WS!inPu<={K-N0g9Oel_KRl^l~h}0nn|*(+I3J z!!jniX~|rc1SXEbUaP10{KUjjJs)upa9`!Jo&_=p1@7({Slw**&`%OkC`&?h*OFWl zYRQSL?3xVb!ozw$Ozd9xt_)7Ep)8S#8$Of zgK;D(MWt`UHWRZNHtN4z zrj>Xj+iBp;eD=~8@zyXOanPd=LUDNiG^K|@Y*>&u2xuLe$E!UGWOjd@%lT9vSC$)L z(KA|mqvIlyppJ!zKRS}1PVNZocO)qwu{^`N-wh$R`NEBCA9nBL+C&B_b_xl0CG!vKq;`i z;R~6_L*#~qU#HkoxRmwDyt=~p5KW^oL1x4xZhS%OK*u6Y~N9JpnN{Q~y88cJNFTHHt4@TY=V{tjF#k zJf09NVV4a2Z_C^OCXiO~s^i5e5IqrgVzTDS=I3-&ITBGlkdhH+pBJ2e%LtbL7?>X` z#R6UqrrUuWh|B0}qT9nrp-~BIcx*6_+&TLF(N;3s?oBuB_JK>w%`mB}7BW&fQgo0r z-T=4OU@CL>Zv|IF>%yzv>elVXdFmS&nthfjg$2r1@hwt zrwa`+;noI|J+?xTE8;m3lawMc2`$HinTn#^OX71^7o^i65cPJE(3qgc>#>ZjUAgbU`e79t_fv5!ZNSS6Cn^H&znS4<`?F2Qf_l&x_A0Q-aIoSbh}zA zcs@;wq}8y$QyQq@(KcV^JGz+g9r#dfXK6pP49g1jqUh3~^ZOR5J9RqopNb<2H zGJ)XxIz%Kx!tM^`gyYyB2C0b#s8vw`v(hvWAE{uOzQ)ycaQEF%5Z#h941X^RZw~VV z$_93+r~ZhiemmL9I}(8nXt{hLB66N91*6)j#U&$jcc?>&x(jw@>K{af3gW%@!%?Vs zoxSDrg=Kz7u?vKJ!v_7DtIuYQ)xJJX##&Ko+^R>9ZV zMwZUS^DZOy<8_YoOj2LlHeG+8#7!@QuDyAR56tRqW^oktpHNB>;VXaWnlTOnpgta}AOJ#i53hTQ*9U7pxb_?T@sIofbK_xt_`g83b2Xm6Ci%e2Gz^ii!Hi;3m!v7&EcdD{?g@eaY& zDy4Ah%|Y5f=w;9~m!nl8an!7!d=Fijy7Dw{Y}FY2w=WaNbNPtFoj@oX=Xi_>ULUA) zA^nMY26jCX$9=qStwzYV&t%ycj90ds97M8nmR%&}%LjGxD3GI-97)QFXIT)67G5LP zk5*D*WGe3y+A=F$3zJhduzFIU6Dcb)Qo_EWKJU|*C6@O>Xe!_@Qu zz!+2P-&_svPtil8Dhlz$Vze;04;W(dg=JAhu?vJc(Psbtt_cFXRm?0q5Y%eA_k}Uj zOdUIQD=V)d>ALeETgiupR6#7jctlL1N?1_F$%I?C!{Oq}U~HL`@Nyq5%*^9E~gW93oa{s`g_3iz{@amuq@>N3|L6YsMD z4-nZ>sUo@4{k?Oh6)X;S0(lX|=W-kd-Wr(zl44bMi-2)QjS4E;KAqN47+Tri7nYhF z`+A&25@{C+2_)H(utdygJCJ;qh2e}`7%X4sop#jMw2;WUdaMrS3=i}`%qp;Zb~wzy z_^WMA)hB$IkzJ6-t07OSdO#Jvj+JmAmc2LfI0*jUSl^cF_Wk>-*>OOQShlt-u7J;= zE>?j=qFeGVnciXTF+kqyOi)f*{9Uh>Tns$t1vfrDb^g^aS6XqL%xF?9wut-PnQt_| z$0~wBBL%$ajny!ri<+5q+kSVZdtU{3g!^(|4#rl=A7aYs*fmgSQqMWMSX-v*DOLPm zypK)1qbr76NT~#+AW`bi7ZZrrkoqt5?uUDC%NevaGB&wNJ zu@e0Tx`i+F*1<8dJO|9swzksYdfQ&q!SC;xV10%jR-lXPk~!oep_t^_N;3$m@L1j` z^;u*k>s9|&mjflse)To3*V>)Plqh50=`}UR?x1@xRtHaQa0dNf8 zPlX^h3L@HOL8vkNG#-zu;Q>hgk85zm0elh%DUE&MqnGqBvaK3&riO!P-S=_42iW&n z-l|;e0;$%%mg?Z_z8c8MDC5STlyH1e7$fqCwwiAh(jYgrhv5&izQo{}f}?x<%SPgfI6*6}Y%266TExMC+$Uw@(1-`M8NGCc5(nXr4_t%rzAZH_Lr9n)c1ppx#~y#&-zvdTAe(3C z3e~5xYMdVWw^WN+AhNK5; z0-UUkE};^*kY3?KLps{ZJ6Q*hOK^jld|k@{cXQ*|eU$RmNar5HV-DfIL$wQpWob;Y z3nZR8VaODdNp|Z?qRF1rBLH@0>H+=P!+h|eyM_Gxp6K@6i=v8j@iD7N_@pXS#y|}N zYxc4pA_*zDwwvcdm~I(F`u%7%xVJq9QXBg~*#Lo!;Ta_L1`n{0D+)=vxWWKolsVet zRiHSmm|L=HRPg`UoY+V;p5=12H<&D)KvAQ?b zw-KiG3x(BF%flnK&zYdo-{QgAuzp4)OL#0BrMt!BOS6MOPB*}JSXaWKy7p~`I(%Kv z29b_A)ewc;07Toq`mQ)E1N*xHSe8{Qet}ToOdyNOdn9N^T4|PArJi=47xy>>0!{kO zNy%z7@sW*Q0^y6r?0VmzRr(bJIYw?c7GF5i?H0K2a6FvKin0xv7|=p} zfe)WH)vIS7mOW03LA=g$EAMtli3u&9%0(of&NCM6I%sw3S8=?~mgjYa>S+D&6+LvQ zjTU4=>7%@^CoOUzY&{n+LLNi19Vc?u%ZHS7Y<;-#UIM$X`%?b}jmnMU?z3GWXBy%0 z4P782q2bdcj4=|?dywI<{O^XgZIRY_jq(2QdPkCENVIKRmd8CQ0#Rc?RM7(|;~*nF z&?=CPe0Yc_fi&-ysJ{Munwt5K4yOB{v=;I2DZPWO*V{uGuv=?Q54+Y^i7AcH)jCrb zTe6x3nr??`6(0Cb(a%#H$4D)IUs6kZ?? zwz`h~&6{g1udua4E|Ou~8vyxXU=iCXh3Y9SP}zh7P222k~$c+<3o^6q`6T zEDl*SD(`GFwAhVZ@Zgh1P&wQPb4FvsXla7KIioROH)VK)+m*vjcs#oC$M83cGn#=V zE8&R{$T236B~czpIVmj|D0@^sP_d6^tUOJw>PnfV`106-Z;zAtnsw~3)P=+v-Ylzu z$1maYHnQ(-Fo_eBHKInXguE=YT&J)_I_%kWJHpX)i-+pL`k57h#&*5hSNjbg+JZ5N z*R{z#v|_i0MH}-)ME!1!YdkW%y{2%kR<0Qaw{z^3SCd=0w_tG?P#oW`(ZhgFm0p%L zMBVI!ZSIDQZb)hIgeGuzZz8*=JL^r*r>Xh}K0L%ah(GZ>U1bwJ%sWRC|wv)3&BUq>3KeIf(h8@HxKZ6WH1vE!cG1TE=rt+1!*% zOO20spN+R5)bw6A-TUsd$yzpqzo-Kv-x%T=kFcTM`JQKjoiDg{6wd6W^(Zb9$4!|y z1}0bi4^{A%EnBQruLGIiH5ZUi-B%H9Kt@QVo9YL#6vA8Tc0$uAf?WKLzV@|YVuw>US zc7ar?5Tw{~;tc~#?ORszBbiUh*PL{>a_d4&r~uoh>mTqT%)V~it5~&C$R)QX1_c10 zT766T8gZs6%W_>>X0#56rYV|@XqFPqYzr@~IGZz0_bX*lD8tpKiBi<71iYpf3`-7$ zoSD&ZYZuR$!hSE@8Ety@V6(ZQGXY29VKJ1(%l@A*wu*{2;euZfdy$xZdCX5jCu z2bxghZx)X6xyJ^XIB2%uq&Eg>f2RycPG$^<LpT{;IbCW1Sg+z0qB z;^-RdEDl$~e%Zx|h#VKXfS7WCc@jk2-n+OSgars9cYU+?{0p^9 zc^6agoX$=lGAA($g7G9!7W3Xg6vW9c9G&gk=TcBWzHI0aWgDX-ec5l){$!4>43^c6 zi(Md;!W(&Pj^RGF(h|{{Noz}Uo2e!e?w%hH2^9qK$F-~icOW|RN~ED2lhJqmk$hOm z2W{(U#*a%rrHI=bU#teRk>sfj)Rad2=+-*Z1DYRDF;D!)6*D&4)?Q zdWBXkeA20o>KB@6_;!XKTOSnlnRa&5Eo&XA#hfyrqKiQOl1O%&p=_w4a00==zE?BX z`66fEG89Q1`3_cOgzY9Hq8*=PCBdK;N;vYm0Un`c&}$WNc`G&?4n*u?C*;`_7@iu* zMl0-?ssDpg$%wK%wzRu+mwIA@nc@P=nx+^~tJp9W>W^xaPzJ?I$EHfhoK6K1w{Pxl z57fc=F229B3k)a_Z0OGS!2S3fr@K4AlGCi%1)`!akkCgKC=OZwLUlCFt+-$5WVTPY zgOp}LK-ng8Te>HziNyOu0~C4x8KC`>#KAhIwl>Kglc zq2_}y!lrQ&I)W2cq*2h=;D|S|#rF3z!h^gNPR3MMQeNo=zCL=^=arG7p+1+syxt^% z1Y>zudSl)8kfA$UTXI@3fmAD}WSx>J^_603%WxDP-rtoz0N47$-la`!nX+mTN{U0p z=tzGQNH28BP)wiUv7e>eU|HL$*agCdn_w`TLxj{&;Ph3p&0loE7oA~5Y6SQh1z0^+ z%L46_a}6+{xsnCdSGP82KBm=l+k8rdh}(H<8$qKgg1BRb{&y_*19Y?QRYsQuu6C15 zHJajkAGc#I8Fe1^ZK@P$fZ%W3y`qZ0v%y4T!o=DYG0+_vjbuo6GS3{ByE_NzF8`@b zx$rP1lALMYcgClnNE*0`Gg>-{wnX^D_$ z(l{YGDbJ*XNZaRov-_onCAOUMghC-uYB|kT-qrqid@mW&+1j$UH7l=S3>zHz>8*9f zhvX5^`=#@u5G~^rY~DM18#F#FkNU!*BLlFJ>xV+>!_n6U%euBtgh0s6N_%UB?)Ic) zjW}aS6t*TvxV$cIO*foLhC2t^!<=!|AY(u@OzIy6+vnBCmaMzXe0Op1B^ge21ucq* zM%hM`Vd>(`1w*yB+?wsvh%0HZeSSljI=Bi{j_?I)X$VnhlDoDDXZzrb?y{B;aY|Z? z_*>3PbzpcK6{UH<6{O)Y8g~z0t{fN1R7oT$&LY8JdU$(nzN2vowW5^{b3n4jJEnza zrt3V4!)Oyn)q=#~Dv+xKkf7MApOpdswybNz$kj4VmB)wOEckAXQA~&w#J$V0A!Fw_ z5|SW()(1|%-GLfG>vRFiYGoqX@3Qi)55}0GpA-6nWqmtVUh^8N&uIQKVkX9xrf=kU@9!mi_<)ZuyLYS?h;B&9aA6S491#yG4V2==CCmbU z_F6yf16JOR5qQiXj)Btpi@{*o&{1AqJ)XF!gJ>hTeprs;!3ke3A%T>}_dgu3F$6Kx z0hW!Op9q1lX}9#bA2g{)e|=l3z|)&rxglZ?x1@9dH{Bv_qe)J|7QZX{q}Ns$AJR-h z{`sHw)VeSi>s&7s&2|!6uH`g%pRYKyHp?1a-t9By1-u zxsLH6>on{?bx=$74eIpu^Tqr9`WZ)3o|obJNJy#`3aiHI#Hrmh@Jb&obCuxh(YSw@ z3oIME$jghDHNNgXO-k=$oFoto=C9&?TtMMn80i4ZrmpU;S!@e^o~6g&R_ZTFB>pBr zTsWl`23G^o?Dn#mZaX>qcmUsbt}om>+LMuWQnFgSyTL>)QIms8*!rG#gouRQo7DkkbXU>G_YUzn z;R= zuO?y3fi1A*>t@vC5+jn^g+&PjCnIq%b9Czx3%+1vQrdA4z6w>rfy=*T0te;Rg zi7|rMxONC!+J&y!O>9Xn4Mp=m&`rze*h<2AG|M+e;(6U6wRHvXNB5AvoPw_0UGjms zIoA}W5*$R5>f~r0YHtC2aUD5i~0x7+Fd4(j7>#OuIBqg?} z;;_D_I@EVGe~1QBT2})2ej+wxW9_&y7X19Y*mT>S=ryy2lzZg^vFr1NS4TuTPM0bv%~m?XEme3pJ3*2VOSZ zp?AM=ZaaW)@R~O!*>QDZQLp)riNqh>tri-Ukd1-WUGn28*rkk6quQY`c}P6uz1@YG za5-{jH-Txx6Cl9f3t~b9F>ADzrE~i>V*}sD^B1F+506(UgoM&QitMkJ8t>ERO{Fu@xJ?~a3wAGW$4s{~j&JS?bDpaY!+KT&olXmF;{}nvmO-CMZCaiAt2CAM^uUC0v5xV6soaAL9=bb1{`R}5sR zQaOmt;-fDYt{tzVaaFzKvnuHw@P;b;$F-)1G?JQ*r}M1Wh^`ofe+PqJrxbt4F#*;o z1>Re3uQNT6%G0xB*l|(81(oM%U~APNKVcoEy-6gcO8G%_r62|>`!TNhkIz-7q0YTA z$lXMlASCf4>Sd)I`Hb#L<{Qc}yRVv!(4~~@j+y%3`!!?V#(hJOK1LnnVf+?-lb7a~ zOlTORJcxq)@xoiiht#uAmWRx%b2)^Wi0m<1*3m>mQr1t<-D?o7q-nR)@Op{34iFyW zqt&h=sbyM?BAJLH=~`bB37cn*!l#C#u*2Qu;`lB{4?Q}?zWNv6kCuPSc=qbCy00%U zGu|hE9$leF7nc|wUR`1QV^Xq)>VGtEd7bORz&{lDLPm<_;??EGKj=IEp+9c$%*vccXL#l%wXe5h*t5!pCPVq%mSNkdgv4d0DKynyRCn>$1;L zZsb#d(|90S`f;s>=fFLIL~?s#s+;WAV_1%!e_b4MHzks1iH7oe8%MJZ5&Z?}%lyF} zW`9~IxKVsY-zOW$&l@MhSl&_CfWIHZUo6iPzi2cDeK32ZQ`wJm&01gYU2dcjp#q?TzFieyr^qKd=> zCl{MQqqDkIf15a*>&(E(X6AD^^hF?*nxAiyUBh}EgVS~Xj`G~OTRP5}zw4SM%RjkD zmZT1|B!w4=3Gx=1K#StIf#OK-6#Gg^O_nVG+9je~StgQIlO>T@V-io|IJ?9IW}^U? zR_dW++bT>P+qP{hsmPM$Uu;R3NNO8NB+qrzc@T*S&dJ2lxowq~OTR(Qr)<4tk10@a}1EyOe@Yz(}-WKFhSeq5mQRUQL;SsON|=R@SxgpKBHb6>a*sB p{=N$ZA%^|9ef##33VOnp{{vGouWU(4WdQ&H002ovPDHLkV1m*msoMYm diff --git a/WebContent/main.css b/WebContent/main.css index dfb7a8d72..062bb3f9d 100644 --- a/WebContent/main.css +++ b/WebContent/main.css @@ -169,7 +169,7 @@ html, body, #map { display: block; margin-left: auto; margin-right: auto; - width: 200px; + width: 192px; height: 50px; text-align:center; vertical-align: middle; diff --git a/WebContent/main.js b/WebContent/main.js index 55b19f71e..9be9ce245 100644 --- a/WebContent/main.js +++ b/WebContent/main.js @@ -28,6 +28,7 @@ function init() { prefetchIcons(); initLocale(); + initGUI(); initMap(); initRouting(); @@ -72,6 +73,13 @@ function prefetchIcons() { } +// init GUI +function initGUI() { + OSRM.GUI.visible = true; + OSRM.GUI.width = document.getElementById("main-wrapper").clientWidth; +} + + // init localization function initLocale() { document.getElementById("gui-reset").innerHTML = OSRM.loc("GUI_RESET"); @@ -147,15 +155,21 @@ function initMap() { OSRM.G.map.addControl(layersControl); // move zoom markers - getElementsByClassName(document,'leaflet-control-zoom')[0].style.left="420px"; + getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.GUI.width+10)+"px"; getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px"; // initial map position and zoom - OSRM.G.map.setView( new L.LatLng( OSRM.DEFAULTS.ONLOAD_LATITUDE, OSRM.DEFAULTS.ONLOAD_LONGITUDE), OSRM.DEFAULTS.ZOOM_LEVEL); + var position = new L.LatLng( OSRM.DEFAULTS.ONLOAD_LATITUDE, OSRM.DEFAULTS.ONLOAD_LONGITUDE); + if( OSRM.GUI.visible == true ) { + var point = OSRM.G.map.project( position, OSRM.DEFAULTS.ZOOM_LEVEL); + point.x-=OSRM.GUI.width/2; + position = OSRM.G.map.unproject(point,OSRM.DEFAULTS.ZOOM_LEVEL); + } + OSRM.G.map.setView( position, OSRM.DEFAULTS.ZOOM_LEVEL); + + // map events OSRM.G.map.on('zoomend', function(e) { getRoute(OSRM.C.FULL_DESCRIPTION); }); OSRM.G.map.on('contextmenu', function(e) {}); - - // click on map to set source and target nodes OSRM.G.map.on('click', function(e) { if( !OSRM.G.markers.hasSource() ) { var index = OSRM.G.markers.setSource( e.latlng );