From 22dda2b2855d841af3a1123e57dc1dca657afd8e Mon Sep 17 00:00:00 2001 From: DennisSchiefer Date: Wed, 14 Mar 2012 17:42:14 +0100 Subject: [PATCH] added new gui buttons for opening/closing, route button now works, more precise error message when geocoder does not find a result, added maximum input length for text boxes --- WebContent/OSRM.Localization.js | 6 +++++- WebContent/geocoder.js | 11 ++++++++--- WebContent/images/cancel.png | Bin 429 -> 402 bytes WebContent/images/cancel_active.png | Bin 447 -> 484 bytes WebContent/images/cancel_hover.png | Bin 440 -> 483 bytes WebContent/images/gui.pdf | Bin 0 -> 3881 bytes WebContent/images/restore.png | Bin 0 -> 477 bytes WebContent/images/restore_active.png | Bin 0 -> 480 bytes WebContent/images/restore_hover.png | Bin 0 -> 488 bytes WebContent/main.css | 24 +++++++++++++++++++++--- WebContent/main.html | 8 ++++---- WebContent/routing.js | 12 +++++++++++- 12 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 WebContent/images/gui.pdf create mode 100644 WebContent/images/restore.png create mode 100644 WebContent/images/restore_active.png create mode 100644 WebContent/images/restore_hover.png diff --git a/WebContent/OSRM.Localization.js b/WebContent/OSRM.Localization.js index 48d02d2f9..b3f0225b6 100644 --- a/WebContent/OSRM.Localization.js +++ b/WebContent/OSRM.Localization.js @@ -40,7 +40,7 @@ OSRM.loc = OSRM.Localization.translate; OSRM.Localization["de"] = { //gui "GUI_START": "Start", -"GUI_END": "Ende", +"GUI_END": "Ziel", "GUI_RESET": "Reset", "GUI_SEARCH": "Suchen", "GUI_ROUTE": "Route", @@ -54,6 +54,8 @@ OSRM.Localization["de"] = { "SEARCH_RESULTS": "Suchergebnisse", "TIMED_OUT": "Zeitüberschreitung", "NO_RESULTS_FOUND": "Keine Ergebnisse gefunden", +"NO_RESULTS_FOUND_SOURCE": "Keine Ergebnisse gefunden für Start", +"NO_RESULTS_FOUND_TARGET": "Keine Ergebnisse gefunden für Ziel", // routing "ROUTE_DESCRIPTION": "Routenbeschreibung", "GET_LINK": "Generiere Link", @@ -85,6 +87,8 @@ OSRM.Localization["en"] = { "SEARCH_RESULTS": "Search Results", "TIMED_OUT": "Timed Out", "NO_RESULTS_FOUND": "No results found", +"NO_RESULTS_FOUND_SOURCE": "No results found for start", +"NO_RESULTS_FOUND_TARGET": "No results found for end", //routing "ROUTE_DESCRIPTION": "Route Description", "GET_LINK": "Generate Link", diff --git a/WebContent/geocoder.js b/WebContent/geocoder.js index ea1a8b843..6b08907b5 100644 --- a/WebContent/geocoder.js +++ b/WebContent/geocoder.js @@ -78,7 +78,7 @@ function showGeocoderResults_Target(response) { showGeocoderResults(OSRM.TARGET_ function showGeocoderResults(marker_id, response) { if(response){ if(response.length == 0) { - showGeocoderResults_Empty(); + showGeocoderResults_Empty(marker_id); return; } @@ -108,9 +108,14 @@ function showGeocoderResults(marker_id, response) { onclickGeocoderResult(marker_id, response[0].lat, response[0].lon); } } -function showGeocoderResults_Empty() { +function showGeocoderResults_Empty(marker_id) { document.getElementById('information-box-headline').innerHTML = OSRM.loc("SEARCH_RESULTS")+":"; - document.getElementById('information-box').innerHTML = "

"+OSRM.loc("NO_RESULTS_FOUND")+".

"; + if(marker_id == OSRM.SOURCE_MARKER_LABEL) + document.getElementById('information-box').innerHTML = "

"+OSRM.loc("NO_RESULTS_FOUND_SOURCE")+".

"; + else if(marker_id == OSRM.TARGET_MARKER_LABEL) + document.getElementById('information-box').innerHTML = "

"+OSRM.loc("NO_RESULTS_FOUND_TARGET")+".

"; + else + document.getElementById('information-box').innerHTML = "

"+OSRM.loc("NO_RESULTS_FOUND")+".

"; } function showGeocoderResults_Timeout() { document.getElementById('information-box-headline').innerHTML = OSRM.loc("SEARCH_RESULTS")+":"; diff --git a/WebContent/images/cancel.png b/WebContent/images/cancel.png index c75faf4edc0ae304fdc99ea1e999fd05b8e1b673..e0ffbcf48124827f11298c27279b21cfea7db205 100644 GIT binary patch delta 375 zcmV--0f_#s1Cj%fB!35VNliru+yf2|H!nWjp+^7!010qNS#tmY3h)2`3h)6!tTdPa z000DMK}|sb0I`n?{9y$E00ALML_t(|+O3n#N`^obhG!zw2)qD=7H-@cEd<-@g@_7X zQBcu^)Yia-*tSgzp)Md0iv-8MNAkmjh%n*cnRA}^%$Yx-lz);-tLyqS&+`k{bsu$I zf5-5Nkz4a(cDk-R%ChWIN~wepqh(nyVHn delta 403 zcmV;E0c`$~1FZv)B!2{FK}|sb0I`n?{9y$E000SaNLh0L00MOY00MOZciF-s00007 zbV*G`2iyV+5f&eaozw6D00BHnL_t(I%bk-yPK7`a#IrF3+3RF<58>Lv19`OJ#=d~uS2-TD8`%zqlQp>Z6q%CdY+)3otC zZ#o;?7lHu5O-K}~h{qAFO xGwiV{JozHYNS7%Q+`jL>7e!G~h5NunA8MUOaccB=5extT002ovPDHLkV1o4rwtfHr diff --git a/WebContent/images/cancel_active.png b/WebContent/images/cancel_active.png index ba9379e170bef0baac8cf25d6d29c3ff436db85c..0abe88c83f8f30ec95a582fcf14d409bfc481f1f 100644 GIT binary patch delta 438 zcmV;n0ZIP91LOmcBoGI5Nliru+yf2|IuoQEqm7X<7=Hw3K}|sb0I`n?{9y$E00DDJ zL_t(|+KrPvOM+1thR>Tp5=gs!kJeHK4vIrVwDuPQOIo5K@HYev(PCE6&>wJhv7w9* z)TX8&DROs_8ltXa_leV+Q4d_ahv$9nbDocLg7ZWoFyCzfHeeZM~oKn8AL7p_B@rC}d7VIEeY=Q22y_!P1O#74fXVlvY7 zOGv^x)Rbmisir(}O1`*aYSJX_26?cJEWjI-VNoTeL`A-`VhYma1Ez4#Vg#nV)2v_& zy7IZTt-CJYBfQ!SX5r3Dx30jhgoDIJnn~Bh@PA$Sj|HxY50D5o%rC)Z;(FrDYM$%{ zRhZD6trbIQ`{fk9J7G0dyFm%wVGkm(1}(2<*OQk1MHFi_CA&cr&U88K2_0ApHLNaQ zM==>`ny!i4x*R$4dH2)ir=|5Tr&z1`dJ8>RfdljT60hLd8}A&9EA3<0ftUU${&>#Q g8XH&J{PLVX0Iy13n3!IhbN~PV07*qoM6N<$f+4%d=l}o! delta 421 zcmV;W0b2g#1HS{1B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FZT01FZU(%pXi00007 zbV*G`2iyV+5)A`4?D~8F00B-(L_t(I%bkC&SsI)ygo29*70NI0$$xE3t@OZ2?)iVdbI&y< zMXM+}eeHA_lUl7mC=`}guDiZ3m!Hrrg5b;?BAhNAXDcSbZK)L6y0P!yd~G%-d%<^} zHTp?#4t7=Hw3K}|sb0I`n?{9y$E00DAI zL_t(|+KrRFN&`_4h3^`{AO!pPU#g8p*kYFyR<^!^5DhlLLdY{H7Ge{Fg0GM^O)MlL z3rVc31cPGwG@^w+XOc58UL!d0v6tC7voo`Ig3lutxSzHPcEAQ$psx$Az&W_H!DHr} z24|oJ_J2SIT$2oaEyko(G|uNFsDl{Xf&*~lRThC`unSheCV15fPAR?s`4M7AU!E~B zHG>v%U>h`9W|pOfMjXnqq*z@PNYvm@{7! z!4&Azr)TLqq3;R2O9hMI-jtg#uutJAv7=^Ihkxkbh5uNfLwp2F-oR`NT8Yj?O*GGv zpaEw1pT#O(*|wdExf7ykNP;T(0*4?4wm`@9tTXBGU5c@ysY-%2xa8%KFZ95=H?V}h z9%Eu^+B(D%FGs-*?|$TdTf}z-#+C+?G}|Z(a^i-YD83i-dzZm9%a)DY2XB4?HM`F9 fOd8g8f2{L2e~n+_kmVp800000NkvXXu0mjf(uKe- delta 414 zcmV;P0b%~*1Goc_B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FZT01FZU(%pXi00007 zbV*G`2iyV+5)3W!A;$6m00BoyL_t(I%VS_b1OMLLR{VFQzV_e7kd^_;eT1UB9K8}UkbzJfExbY zSQ!j<4M-kDBOCJX;_O7YjUX>zu>oud2rswa3v&rX0%#N50K+_D5DX5nj!2Skt zUSH9~a55}V(SN)IRs$7hfGZ@&03c=n`yCo}M0){f8NvlXzk@lTbU(^b diff --git a/WebContent/images/gui.pdf b/WebContent/images/gui.pdf new file mode 100644 index 0000000000000000000000000000000000000000..497b124c5c4d01b3c0787abac1dcabc8f28525f6 GIT binary patch literal 3881 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 XF>pi3;PJ&VB#?+WKvmUjk2&y9Prt+Q literal 0 HcmV?d00001 diff --git a/WebContent/images/restore.png b/WebContent/images/restore.png new file mode 100644 index 0000000000000000000000000000000000000000..8db6754d49fb5b2e6b3cc44e033126e90a9e8cb2 GIT binary patch literal 477 zcmV<30V4j1P)%MEPE@P_000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0004ONkl!1+O zA%zM;tk%$^_6w$@w}~AzaNuyhpWJiqxg?HbCL6BnYL;c4s;YWlDwRGF$Wa4E^GTXa zCX?-Mw|mAgOiT!wOOo_r7{)aMIcmVb0e8h92m(RZ^;?kY_4=LTI7jrKPy+@IxX>&O zOw+ss&~CRc!Z2i0(R4cHvL?X50T-IYU@#aQE($SRv*Lcg->TJW51!}k(aG@_SmD*Xjc$~0CicGpJ)?sfhAf+Q68(+>T?uDD?Qt`eay0Km}demG|-a8WTR%Y zc|{LxlL<5&$9-)Ppz}FHaz5Yp_hz#hi@Z{)yp_x4_Y_-didyLPdM6kZxSFQ9a{$-W_{FsWKGtcuMo1XJGV>=@b TvwBux00000NkvXXu0mjfg-gh4 literal 0 HcmV?d00001 diff --git a/WebContent/images/restore_active.png b/WebContent/images/restore_active.png new file mode 100644 index 0000000000000000000000000000000000000000..ef8d1cee66c0c73a59e011af7901d5549149fbdd GIT binary patch literal 480 zcmV<60U!Q}P)>cmU(kjC000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0004RNkl2ze_?<6bJD8v_Jy4hM=S$OT1db(P&7hhW>%J2r7vn8Up9WpdlnMOK50lY!1Q( zdyf_^99$EsEvO+R2&wPM?~T*zWfwjuzVkiackX-6iR(J%=bC^On1&(#)__Ymf?Hi2 zQQu>502Nq+IFu>Q-zuz$*-#fhd*B=<;TpEU59}-jyRZu5Fb7S$gB-&}m{Q?x)xhVq zB5QN@7Lu?89=F+IU><6aP)%B_@t8?UgAB+Zvnt#Rr!dOl1)F4<$w-4VJOu9f2^QfU zMnanS%%r8kFx1WObp{I^nn)&Lhv=B_)u&GC1zy!P#}4rh+>r1(?6a^6Gw`ggOXgl0 zlwg48Y?lmiyF)m|Oi3CP-~)Cbs)i_`i;!@XwUQ}B_z%Z?IP$8=4a|mw^Q@Ij)edok z567};Kl}Q2^tQ{a@tFCZaFbizGwnC=3Le$*jzK@SeF&TI_H`8hyv~ChWW)UNI)4H* W#8~7fQ65bI0000P)&1MCK$Z{000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0004ZNkljwIHzw z7i<#6!b&t4>;x@D6p8wVyoK>xUHHgxH*d1HduuRQrglI}BZ%ww%Z{cnddhLm%f} eHmjLGj`KG?d|BdSkSmV>0000

-
+
@@ -77,21 +77,21 @@ or see http://www.gnu.org/licenses/agpl.txt.
-
+
- + - + diff --git a/WebContent/routing.js b/WebContent/routing.js index 6b09a785f..b758f9f11 100644 --- a/WebContent/routing.js +++ b/WebContent/routing.js @@ -408,7 +408,17 @@ function getDirectionIcon(name) { // click: button "route" function startRouting() { - getRoute(OSRM.FULL_DESCRIPTION); + my_route.hideRoute(); + my_markers.removeAll(); + my_markers.highlight.hide(); + + document.getElementById('information-box').innerHTML = ""; + document.getElementById('information-box-headline').innerHTML = ""; + + callGeocoder(OSRM.SOURCE_MARKER_LABEL, document.getElementById('input-source-name').value); + callGeocoder(OSRM.TARGET_MARKER_LABEL, document.getElementById('input-target-name').value); + //getRoute(OSRM.FULL_DESCRIPTION); + //TODO: center map on route } // click: button "reset"
Start: Suchen
Ende: Suchen