From d92b28d2c3e5d118f78f4f7f3a06f1e39ff7128c Mon Sep 17 00:00:00 2001 From: DennisSchiefer Date: Wed, 14 Mar 2012 10:39:37 +0100 Subject: [PATCH] restructured for release --- WebContent/OSRM.JSONP.js | 10 ++-------- WebContent/OSRM.Markers.js | 7 ++++--- WebContent/geocoder.js | 12 +++++++++++- WebContent/images/cancel.png | Bin 464 -> 429 bytes WebContent/images/cancel_active.png | Bin 617 -> 447 bytes WebContent/images/cancel_hover.png | Bin 592 -> 440 bytes WebContent/images/continue.png | Bin 531 -> 414 bytes WebContent/images/default.png | Bin 294 -> 240 bytes WebContent/images/marker-highlight.png | Bin 1486 -> 1319 bytes WebContent/images/marker-source.png | Bin 1624 -> 1466 bytes WebContent/images/marker-target.png | Bin 1577 -> 1361 bytes WebContent/images/marker-via.png | Bin 1602 -> 1413 bytes WebContent/images/osrm-logo.png | Bin 10483 -> 9183 bytes WebContent/images/round-about.png | Bin 669 -> 617 bytes WebContent/images/sharp-left.png | Bin 739 -> 530 bytes WebContent/leaflet/images/layers.png | Bin 3945 -> 3665 bytes WebContent/main.html | 2 +- WebContent/main.js | 20 ++++++++++++-------- WebContent/routing.js | 2 -- 19 files changed, 30 insertions(+), 23 deletions(-) diff --git a/WebContent/OSRM.JSONP.js b/WebContent/OSRM.JSONP.js index 95d92f14d..38af68549 100644 --- a/WebContent/OSRM.JSONP.js +++ b/WebContent/OSRM.JSONP.js @@ -23,10 +23,6 @@ OSRM.JSONP = { // wrap timeout function OSRM.JSONP.timeouts[id] = function(response) { - if( OSRM.JSONP.fences[id] == undefined ){ // fence to prevent execution after timeout function (when precompiled!) - //OSRM.debug.log("x"); - return; - } timeout_function(response); // var jsonp = document.getElementById('jsonp_'+id); // clean DOM @@ -45,10 +41,8 @@ OSRM.JSONP = { clearTimeout(OSRM.JSONP.timers[id]); // clear timeout timer OSRM.JSONP.timers[id] = undefined; - if( OSRM.JSONP.fences[id] == undefined ){ // fence to prevent execution after timeout function (when precompiled!) - //OSRM.debug.log("y"); - return; - } + if( OSRM.JSONP.fences[id] == undefined ) // fence to prevent execution after timeout function (when precompiled!) + return; callback_function(response); // actual wrapped callback diff --git a/WebContent/OSRM.Markers.js b/WebContent/OSRM.Markers.js index 277f6f633..ff11c7d72 100644 --- a/WebContent/OSRM.Markers.js +++ b/WebContent/OSRM.Markers.js @@ -43,7 +43,8 @@ centerView: function(zooming) { var zoom = OSRM.DEFAULTS.ZOOM_LEVEL; if( zooming == false ) zoom = map.getZoom(); - map.setView( new L.LatLng( this.position.lat, this.position.lng-0.02), zoom); // dirty hack + //map.setView( new L.LatLng( this.position.lat, this.position.lng-0.02), zoom); // dirty hack + map.setView( new L.LatLng( this.position.lat, this.position.lng), zoom); }, toString: function() { return "OSRM.Marker: \""+this.label+"\", "+this.position+")"; @@ -94,8 +95,8 @@ onDrag: function(e) { this.parent.setPosition( e.target.getLatLng() ); if(OSRM.dragging == true) // TODO: hack to deal with drag events after dragend event getRoute(OSRM.NO_DESCRIPTION); -// else -// getRoute(OSRM.FULL_DESCRIPTION); + else + getRoute(OSRM.FULL_DESCRIPTION); updateLocation( this.parent.label ); }, diff --git a/WebContent/geocoder.js b/WebContent/geocoder.js index 3cd83d294..2df228ba0 100644 --- a/WebContent/geocoder.js +++ b/WebContent/geocoder.js @@ -8,11 +8,20 @@ OSRM.TARGET_MARKER_LABEL = "target"; // update locations in input boxes function updateLocation(marker_id) { if (marker_id == OSRM.SOURCE_MARKER_LABEL) { - document.getElementById("input-source-name").value = my_markers.route[0].getPosition().lat.toFixed(6) + ", " + my_markers.route[0].getPosition().lng.toFixed(6); + document.getElementById("input-source-name").value = my_markers.route[0].getPosition().lat.toFixed(6) + ", " + my_markers.route[0].getPosition().lng.toFixed(6); } else if (marker_id == OSRM.TARGET_MARKER_LABEL) { document.getElementById("input-target-name").value = my_markers.route[my_markers.route.length-1].getPosition().lat.toFixed(6) + ", " + my_markers.route[my_markers.route.length-1].getPosition().lng.toFixed(6); } } +function updateReverseGeocoder(marker_id) { + if (marker_id == OSRM.SOURCE_MARKER_LABEL) { + document.getElementById("input-source-name").value = my_markers.route[0].getPosition().lat.toFixed(6) + ", " + my_markers.route[0].getPosition().lng.toFixed(6); + callReverseGeocoder("source", my_markers.route[0].getPosition().lat, my_markers.route[0].getPosition().lng); + } else if (marker_id == OSRM.TARGET_MARKER_LABEL) { + document.getElementById("input-target-name").value = my_markers.route[my_markers.route.length-1].getPosition().lat.toFixed(6) + ", " + my_markers.route[my_markers.route.length-1].getPosition().lng.toFixed(6); + callReverseGeocoder("target", my_markers.route[my_markers.route.length-1].getPosition().lat, my_markers.route[my_markers.route.length-1].getPosition().lng); + } +} function updateLocations() { if( my_markers.route[0] && my_markers.route[0].label == OSRM.SOURCE_MARKER_LABEL) { document.getElementById("input-source-name").value = my_markers.route[0].getPosition().lat.toFixed(6) + ", " + my_markers.route[0].getPosition().lng.toFixed(6); @@ -78,6 +87,7 @@ function callGeocoder(marker_id, query) { if(query.match(/^\s*[-+]?[0-9]*\.?[0-9]+\s*[,;]\s*[-+]?[0-9]*\.?[0-9]+\s*$/)){ var coord = query.split(/[,;]/); onclickGeocoderResult(marker_id, coord[0], coord[1]); +// updateReverseGeocoder(marker_id); return; } diff --git a/WebContent/images/cancel.png b/WebContent/images/cancel.png index 6e9a124d549a9bab670502b84c6be9d6e122c333..c75faf4edc0ae304fdc99ea1e999fd05b8e1b673 100644 GIT binary patch delta 385 zcmV-{0e=3_1FZv)Bq9W7K}|sb0I`n?{9y$E000SaNLh0L00MOY00MOZciF-sks%d- z0X#`WK~y-)os&OKg+LI-w=wSkhK|NiSs5znI02QEG`2K`0~k&~Wl3d8WjKJPbaZr7 zmYjgGYagu@E`Txz#8ndBs9IwiqGIX3}Z+jx#G);!w6=Y8a9PTvN*w1pQs_MbbCWo!FCMC$m zewNEH4A?qhN@?6E35`69_kmnjk4zVE*m fMNv_O`@lpWYMn-LYV>�NkvXXu0mjflEJb1 delta 418 zcmV;T0bTyB1JDDIBoGI5Nliru+yV;`79WV6)9{fo7=Hw3K}|sb0I`n?{9y$E00Cb~ zL_t(|+MQD&PlZqvzPdRY#nC8Aa&vP~q+ug5f<%gy;`jk?`~s4ZdN>1N2DzV!5KQ(aHjWpo;y3%qAB^M+4TF*A*%v9_@Pn>)JbBXk}}8hx%*hJ_h{Qr!WkVl&hk%YBHRp3j>t-qr2`H! z!!>*m-n!j$yP5*h!MZ6yHhd61!_Y~$tf8hMLDCyJ{wD!!z^s~U!cWBnc}LI9=7ll?hr4FU2>h7M@|uI05Ul)tfORLqU3;ThIz5zw~x=DcWLva8A002ovPDHLkV1hcUy;A@H delta 572 zcmV-C0>k~k1L*{iBoGI5Nliru+yV;{4Ffmq`h1Zw7=Hw3K}|sb0I`n?{9y$E00H<( zL_t(|+GAuu1D_r~RJ^}=bIiv(cXVE!KJD=P%NIT&Ev<8s*48_OG&L{CIy-MhR?mpc zxj1D??WL(x8(@46A)z;{JUpL1KYFAD6O(ar+GN|;7skTQ{u{;St---(7i((%1!0gu z-`~C!hJVTZ`T3Le!S?OJ%k=fXgXBRpNDQv|_L?<`Ac@u1)-OR`K#@c;1cZ0R$L|HH z-JhMk9xMT}31;%!t5@}pl$9;q;O>4K*$@yLBnFZLv0>^T@7?RmbZhzYtiQj0vB|r; zui;lwx%TGbMJte>xA^&8gV_pVgTz2`AOo#BI)7q7^wl|YDp;N$J?a7Ch!_|g0|g9F zgBDB!hz7}l*t~Lb_k1>O(gLXgdh;AqT!jflfH=Tt+6AIP3P1`$8bBJ+HG|af$;;md z(V!S&0uc;k0+8WMz{CM|&ZC_>Ltp_0^8(0bm`h+`0#ft-_H9iN4U%I5`5nZ0vVVU7 zx_@Snvyr_6GX!QC*m95nDE>jw0!j~rq7jr%U`P1A_2b<;5p1E(%*OW1w6-=& zH6&y{RsQ*Hv8KmoIL+&^F{l>??yAR%4_49q*6!oqKn)dK*h8+esJkmH(!QzWmq6{{7z)i=$w%+Z%lu@By%*E{4Bw z3^HK0@@*8cb-wHW{r=91sd=H{S-2vQL0?}A!{vY){@qv^40a7j9z-J>^6%p8M7WJ0 zFJQ3&YzPQ1x8DnM2}A;D6Wrt%XZ8PoZHZY3b~chBV2vO#kQ|5&Qx6IgxW7Sx22%*) zLk+RPTfJ0Aq*=98Kf`py5p5L;?ag zSBJm?4DJPx%`lfh!vw76^%YI99-tf($nRjz-Aw@)nn7Mc_72PtsAXWw!66Nbe^9i5 z(tiV?XauDbSb_s3d$0mf{KHZh$Pio!38W5Y87SGKDA=7f8E!HtS%Z=;D3O6QK0Rjs zZ)3V{uWt102D%PDHLkV1mo??S%jU diff --git a/WebContent/images/continue.png b/WebContent/images/continue.png index 305310c5558aebb95b0aeb22c55621e13cfa2577..50a54e0b941a21dfd284ce12108f62fef3ec5bd2 100644 GIT binary patch delta 370 zcmbQtGLLzJiV{n@qpu?a!^VE@KZ&di3=EtF9+AZi4BSE>%y{W;-JgkyqVnl@q_P6 z{9_6gerCQor1a{yoovy@^9sT@mvuPl2{i4}id8Rxl#pU+Wju1crmt=%qF z`2uzV%NXt{ZV`-QtZ2R9GK2X8+rs+R51I|)9K0?0j8_z6l>cxo;Cd+ZFrLAbBb>vV zafQPUhX|Y;ta_hz6uh_eZH5MoS&3>GdFLc(dSpSKfgWm?@5gmE9NLm+kZR_ zY<=O?(poM#$8DA%9t(cLRlr6uB(#)I?%=tG4cRT*a`_J`d+go){Kb=bkE8^{!W9}A o4v9R}5?JUa@MyySxeApGIkt)p({xq1fFa7@>FVdQ&MBb@0OGKK`sf9cB(raTA7H`RNl4CF)ty9eo`c7&i8E|4C$JU|?M2>Eakt zaqI1EU%x{R630Havo)`N$HA_l)6%=QQM;P6nz7ur;UP=jUI$y2heA6pxr)E@ytCt= zUe236iWe2+wdQ_T{q$!t=j18^!(dKvVcIuq|RC0HtiSPUL%{PB;JASyKb5mkAvVN*=E`4nO>GvFh?Oj>Q){INBuy9auU!6q;OE1RNoL zfGBfe5L8iW;1I$l-N5Y1arnd67lM;iX3E(%mA&G)n^&H<_vO_+UNOgatc_d$JxIj0 z{&H#G>DMCj|C=^>S5Myk$dVCgaKriHL$0Br*Rl;)hvwh=TfZQGufS%#MhayL=a3%Wwn;TGj YXR^?al`|%M0y>4k)78&qol`;+08Jk~lmGw# literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^jv&mz1|<8wpL7LM>?NMQuIzW1IXD%V;?tu}0fjgV zJR*x37`TN%nDNrxx<5ccmUKs7pyrMJ+13#ST@YJUW$Nkl1X2Q}riMaGvgxu5)6lf`NSc|ed0maH*sq+oT??u<$2vyv1Z2@&NtKzTqM&1bbAt!2r}Kk zwZ%5N*@Prk$Cj5|oN&AHw={QrVq@MhJrO0;oUE4IE>6Kot2GqY?xQp8wGyJ_;SP66 zs8bl$xiM@*^E*lipOhV?k;C8Lq4# z`Q>>Mtnm(^c29>;MwuIYqe%xhq%&I!i<~uYOG-)T{vJMK@9mg>PAMLB_lnQ1qwz9N z4LyPmVm?XprDC;YWW*=7DAAJBgqpqek}vdBnA}Vh$xt_)obmZXB%(vi>nB+Mj9ShU*zmYqLmLrd)QSZ8GjMS-8`Ye*ik`Bt!MQ4|2ux5~i2Av9{o* z3~dUMp|2WVB!n{LN7P8qc-@`kMq9#L>wit53>|`Z8sAou-}~_~$g?E(a*T2(qZh() zhL|GceC_+*B~pXUcwC%jkzSq*HznhS$aWU6O@jh-`M=!xPr~%2)e(}J1v-5-*c3i) z8k0Q5P}A4c3npQn+7=!YnK@rU_V^w-a-OGf!F$amO8-TCY3gGn-B~&-eAfW4^M4eG z3tsrbEmHj#(Fva04xR$pV2yxJI8TVu*}pW2E~@;@&Wg0haV$LUQ*qJeHYJ2=4w` rUV9soKFbKOwk&!@2BT z;FlX)S3X*Vqzk-htX@i+ZJc+QMoi1;6N*QC3P4$vn0}rEKi$~6a&vT@17!qV(7(dk zrFMH6=M~iqqkja)6igzj85%OuG{ra8+fh4jJ=}l!7ZW67CVC6H-)^;AXv|Qp77GUl z8Z(*=Pb+Bwy!vqe<>ybP&4eMYs;xcWYPT@Wu{l3r?p)Ly-}HF@j5m`vKfCuz7r;4D zoM_jHUTdWZSOqA7;K{r9>BKt4v`;fh5r65dJJGA7=K4vr^DE9f%*s(8 zA+8NL@~lsheM*))^6WlYc0{PdaGo(4tRPL>06#z2f5{)`$&b^-gN2FcNr|DRsveOp z{eaHu_wd7L>L2}!!$*6hF_O00nD$TP%xc6XL~VDy%P%_670`=5X<{-FMZQ5fHE^0 z%{7wtcPYyf5kDqxTH>1?Gkea7Sa(3J6KD|1K+^i^OoHQ#PurVVET{Y;5{D+YRc9vE z;G<1m8Ut?AxdZ?f>*LL)lLs)9+yVOo_K64~kbfkOBEO5qFp~(N-~SJ;kqp0$%0tu$ zulYe{z9JJ$23xvk2w7N@AUqA6W3edqR3~hd0>)sEo zwSNYF)CUD4zLolP(^uXNjCM)AhG3I|3Ss7YzbVT5b z*;P*_|98mq2(ftY*{@%FAHa!3hPXxSeSZ>y0!w4QISU47Izl9F&#EU8*s04L5kZ`t z8OAbY8L^muxN+gvw@*kWPI7~Abf5~V2_srA2th*+!M4ZK(hqCm06Cu5s-i%oc_uSO zJ4anduNZ{j#f9D3sk4v74*stU}t7Jt&B zt~=DVp>=kb$Qx5FfH`9Zc4BoH0aOHaoC;hMjXliS&iaMlPIVtn#F&9QBKA&Il!UN` zpmP!GHZevt^bSPq^_k7gNVhVH9Se^!Gn@-^VV0tykC|Lw-+ZArlVpx2h}fQ4{egx^ zQG8`)w%2tBGb2|0o`~(vZ_A=`3V(LB?tvK2*Heg^5bF%0{$YLdg)ioljOWQDZpN5@ zqR}YwXC|~*1`}fSxWcpZlm_$E5rN%-&6_x7)5G(c#U7zv29&Zq4|kEj$k&YaMP8 zOJY^;fxiEwU;FYj0oaLEb|x+UACkRL>FdC|XA$}z)e@}v{;r`n00000NkvXXu0mjf D9&xUL diff --git a/WebContent/images/marker-source.png b/WebContent/images/marker-source.png index 64e4ee1466a8c22ed286d7a4dd41ee1fd43573fb..d71768e57039dd028e97d9cc995412dd31803746 100644 GIT binary patch delta 1376 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 delta 1539 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 N002ovPDHLkV1nc!w#)zk delta 10465 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 XUttuMjQc!t00000NkvXXu0mjfN+HJD diff --git a/WebContent/images/round-about.png b/WebContent/images/round-about.png index f18d9ad3d0192cfaf364ae0298e42b13e28faed6..4b00bff6fc9f6985c11793bd898007f42a94e010 100644 GIT binary patch delta 401 zcmV;C0dD@C1?dEkBq9W7K}|sb0I`n?{9y$E000SaNLh0L01EH`01EH{Laa2Hks%cb z0r*KoK~y-)kz=rbr{ANaqb2$H_&$IX%gf7uDk>^+hsjk}SIb*iSX_a*%-Y&I5T`-r z=H{s|TZ4jvqR{1=o15i<7J*%+q@=V4r$G@B5vxFofZqF`mzO7wO^v#``gxEVpm#sw zG|1D_a~epIfPldNz`#IBY-(g>WiNu%7#bSh#c7bgzkfJ?%xge)FS$UlGoGI zn}^e&n3x!DDJiL^AcerN_zN+_AB-;XsY~!1U7$OsuH|1qG6zL<`FSpu7pn=oqd783v5jAVQhe v&CN{(7)DD$8J&Tq;Q#;s>UiXY@#zHsowUB&K~-RC00000NkvXXu0mjf86vw3 delta 451 zcmV;!0X+Wc1f2ztBoGI5Nliru+ye~>7&j@E(jbvB7#9R*K}|sb0I`n?{9y$E00JyY zL_t(|+L2?he_1a|z)DF;ef#m_2MdTTD=YgsH8s`a;>C;lhYlSw%*x8r0ebZ+NbdLV z-wgl${riP85Y5faQ(?9S1qDT+%QrVS%k%N^fnBDgq_hU7ixd?VT|u;nhzNs>jLcqi zgKBGQA4*C}-T|?J@~$`y`uOqV8xZ~L*Dr?0j~`=Ae^1}OeFKYs{`~n3PJ`Ik*bai| zPoF-4!k`4*kfNd@_YWUFfYZ+3zkd(n45OHs7;a#IKLv#WFf9K1`}_Cy_4P?^+_+IZ zG&D3yK|$dYNDh=V0s{jra2fGe0WpqMnDFgri|5wK&CyY-o013$2Z^2Or4X*$I002ovPDHLkV1oWU!}kCH diff --git a/WebContent/images/sharp-left.png b/WebContent/images/sharp-left.png index 7abc9e9808f3d18e777b5ea61afced8687457681..18d2ff962e2a98a6bde722ebd7b07c5d7175112f 100644 GIT binary patch delta 487 zcmaFNI*Db1iV{n@qpu?a!^VE@KZ&di3=EtF9+AZi4BSE>%y{W;-JgkyqV@^bUMzmGN`TZREf_4mJr8} zll3OGKFB%O^5NZI^}j}~8~gnWz8k1p*WQ2cUm3h!>G6u*X62oXj2sROOacuIED8(| zrdij8(!1+4x|XYW@*Q51`K$hx$=SVEIanT4##P_?bFKAWx+;_GjQ79Ksxo-RUax*F z@Qfj%(?I-y6^k&#YJrR?`_lxrh&3|ATz~7spphDBx5;gXXoHg}b99R;Lxi#p>jAMu z&jw#bm%uL*Q*WNW#W356qv?T%?5WRxDm@zvc=q2=^l_ZQaHR0hx-5n|j>CQRGnp>z zTO(M<-@-L>C&Tk}p=y@NJo>7I9LdR@8Z9d$U0IlV#dl?1tzuzXvFerM_u6a9FU~Ot za=a2(aW^?s>8K+0P>RDacnP0V$Xo-~gItaCxbH<7t~&pq+hJ|)ZR=NCGLOyE+~oYD zn++NSO_EJhwL_sHGHaPt*qSWCu=uOLtREHrM&U1`IKSrVpM1LCzf3C;!iN b_{k_I`^#E+%1b9;G%|R)`njxgN@xNAX!gDD delta 695 zcmV;o0!aOm1mgveBoGI5Nliru+ye>^F*1bX{ZElG7=Hw3K}|sb0I`n?{9y$E00MGJ zL_t(|+U?shZ`wc<2k;k^)EiR?ONG=@hF0Dff|xQfvN07=MT8|w2Ih+L0T{Am!AnuP zWn!uL0w`-GLaoLKp!UL52~45o8zv7(s>+fDvRE0T@As5r7e7b~oRJ zzs%?Jy>7Q#91e$X|Nku>kI#z5VmFh?{M6bhe4Ze-54r#niNsWV{k>|#b~+8Toeo%- zZQDcFb)P@hc03-x-a3ROfGF;j&f+425Osji5r0eoz=U>n7>!0RQ>oO|I%5EJLP0

mFTCL`EI-Pea0dl$A6?M^TBP>&?R66%T1OX_Q%NLI098(wV8(|62Xf*!bX$A!l zd4Eq`a9{*Xv)TM83i;IU_YeF6h$E>IRRCWI7*R+$pU?OG0*HL3E>szU-R=*7DDwoy)~{b@JdmpC*%MC diff --git a/WebContent/leaflet/images/layers.png b/WebContent/leaflet/images/layers.png index 9be965fc80847f26f93ab6390e9228077a7f1aa6..3db9dd8db6b20712190d50c5bed124e62d48eaa8 100644 GIT binary patch delta 3582 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 Eg1Aubo&W#< delta 3906 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 diff --git a/WebContent/main.html b/WebContent/main.html index 98ec703f8..8c14d1c58 100644 --- a/WebContent/main.html +++ b/WebContent/main.html @@ -23,7 +23,7 @@ - + diff --git a/WebContent/main.js b/WebContent/main.js index 2add3cfbf..7bee258b8 100644 --- a/WebContent/main.js +++ b/WebContent/main.js @@ -17,10 +17,10 @@ function init() { // prefetch images OSRM.images = Array(); function prefetchImages() { - var images = [ 'http://map.project-osrm.org/new/images/marker-source.png', - 'http://map.project-osrm.org/new/images/marker-target.png', - 'http://map.project-osrm.org/new/images/marker-via.png', - 'http://map.project-osrm.org/new/images/marker-highlight.png' + var images = [ 'images/marker-source.png', + 'images/marker-target.png', + 'images/marker-via.png', + 'images/marker-highlight.png' ]; for(var i=0; i