From e217f12e71d9cba039194cf48d3a7f171573d341 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Tue, 30 Aug 2016 19:30:53 +0200 Subject: [PATCH] v1.4.4 --- brouter-codec/pom.xml | 2 +- brouter-core/pom.xml | 2 +- .../src/main/java/btools/router/OsmTrack.java | 2 +- brouter-expressions/pom.xml | 2 +- brouter-map-creator/pom.xml | 2 +- brouter-mapaccess/pom.xml | 2 +- .../java/btools/mapaccess/PhysicalFile.java | 5 --- brouter-mem-router/pom.xml | 2 +- brouter-routing-app/AndroidManifest.xml | 4 +- brouter-routing-app/assets/profiles2.zip | Bin 19712 -> 19815 bytes brouter-routing-app/pom.xml | 2 +- .../btools/routingapp/BRouterActivity.java | 35 ++++++++++++++++-- .../java/btools/routingapp/BRouterView.java | 6 +-- brouter-server/pom.xml | 2 +- .../src/main/java/btools/server/BRouter.java | 2 +- .../main/java/btools/server/RouteServer.java | 2 +- brouter-util/pom.xml | 2 +- misc/profiles2/lookups.dat | 9 ++++- pom.xml | 2 +- 19 files changed, 58 insertions(+), 27 deletions(-) diff --git a/brouter-codec/pom.xml b/brouter-codec/pom.xml index c6fc243..6436e1e 100644 --- a/brouter-codec/pom.xml +++ b/brouter-codec/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-codec diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml index de5383c..090dae2 100644 --- a/brouter-core/pom.xml +++ b/brouter-core/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-core diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 9e8ef2c..01f9aa1 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -374,7 +374,7 @@ public final class OsmTrack } else { - sb.append( " creator=\"BRouter-1.4.3\" version=\"1.1\">\n" ); + sb.append( " creator=\"BRouter-1.4.4\" version=\"1.1\">\n" ); } if ( turnInstructionMode == 3) // osmand style diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml index 81d1e28..e454161 100644 --- a/brouter-expressions/pom.xml +++ b/brouter-expressions/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-expressions diff --git a/brouter-map-creator/pom.xml b/brouter-map-creator/pom.xml index 033850a..a7499b2 100644 --- a/brouter-map-creator/pom.xml +++ b/brouter-map-creator/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-map-creator diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml index 910c3f7..56ae527 100644 --- a/brouter-mapaccess/pom.xml +++ b/brouter-mapaccess/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-mapaccess diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java index fd73744..6102449 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java @@ -90,11 +90,6 @@ final public class PhysicalFile throw new IllegalArgumentException( "lookup version mismatch (old rd5?) lookups.dat=" + lookupVersion + " " + f. getAbsolutePath() + "=" + readVersion ); } - if ( i == 1 && lookupMinorVersion != -1 && readVersion < lookupMinorVersion ) - { - throw new IllegalArgumentException( "lookup minor version mismatch (old rd5?) lookups.dat=" - + lookupMinorVersion + " " + f. getAbsolutePath() + "=" + readVersion ); - } fileIndex[i] = lv & 0xffffffffffffL; } diff --git a/brouter-mem-router/pom.xml b/brouter-mem-router/pom.xml index 14cb12a..d55a5ed 100644 --- a/brouter-mem-router/pom.xml +++ b/brouter-mem-router/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-mem-router diff --git a/brouter-routing-app/AndroidManifest.xml b/brouter-routing-app/AndroidManifest.xml index 20180d1..c8250b3 100644 --- a/brouter-routing-app/AndroidManifest.xml +++ b/brouter-routing-app/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="15" + android:versionName="1.4.4" package="btools.routingapp"> h0)-iJ=hVprC+JqOurNsb<9>7E~xGiux!hxF{$nPOh$w-fo_JwpLyR zrkhE-9Ugs*mOn#Zd5XFZ0kOehDC{bz=qg0p+eeD^c&i5M5--)GczjRys?K9>wsYU@OOVZG~^R3T$P&Xv6pnhp+;X|cC87B1VhsU6cB7hA7 zDR|R|EZw!{0Y#Xr(P!^=~_IaT%u*4Y$mi*}>bRJ3zhG_YC`a4eysyHG1)j;+q6=n3)9MoMmi|>DE9~&9cCJvN)MRHu zE*My7jeINXA8CAT3+oH%r0Cyrh5Db%V}34;u#OUj-z=|V^dp5?h6;C#G{_(X3PN(j zLq@#Q z`-tS8YZ)5$%+j7g)2=q5qK?7;;~Z580jk+u#)Bk?@ZaPvC}fDGy@m;@XhI)1j*)Ti zdgLb~tjV`Oi1nnE8`hssa$)|3HJ3E-tY&-9z6`rI7OCH$dHs@p;nn?jpf`cAKaueH zI{R#A>sdnj!9U<%HbBo9a({tLIq3}aQhfI&`G1dne?Qq77_6uQ>rzUp*zOtF_CBzb z>ltt;rxWKV6sW~eJ}pC6DZ6^=)0%Ef;Tmj)_dw8tmn1*e%atc zewfAmSwl=A0!d=z&)e;}N(Y?8zf9P8!!~p>F>U}qo~;SWgX542uzCkd2Oj;+?mCPP z9{ZdT_sF6cZ}6jIfzLA&_9Osw+K2D|xr8=3r8jE36)ZI46I4X%R%JU|MoyEh$2JOj zstJ>}hGH2D(6)2p*6}|{mkuX=H&jAnr24H)ph@k*>u=yHz^)!c=Y&OyVDGkPOI{RT zYSrfEAwM`cF&>2a;dT#IcuwXA^;dIZjyixmv8MJ6-A}4_%T9X#4MqaYnrC(@m2^!g zk9u~Ox`l@KcgFO=PK_+2!+}0Q1D3K9LuctVD0YAKhGh688GTY(PFa_k_uTTnLQvQG zcF~^S%@=_?vS_%|83xi-hVlk!NTLg!-CPG}KgkHQMMV12y4hjwIPAq^7^6_RjxgMK zXcCja=@S@!#@}JRJJbShI|gUe9nczV#T!tftyDX#?XEE)V+nc`#DWmFP2hK5N9#*IkS_h)&V4U} zzONG(oTT^)+#p0IMB*9dGl%-RM(?NTCp8(j4r6Df&M}-EBvo?%S&0#>I{F8

?; zf9oIXG3o%d_9wI9okrJxXVW1Al{qv4(oGypY_P6!FTF{n`zi{GLF$KY3q> ze}4uvxQA@9k~gEx^fneAGubo~y$UD#LM_%=U!PgDg+l=@`omObiBtdMypt`GE3U## zydOV4%uP$NfPo2|mNEYW;!JaPC$MNo8Wu?0v>)ppu4wU(LKuZf*o`wegtf44kIMP@ zS8iPLcmv=bi|~mY*qz&8)VH8J1pg9Si%8d}+tY$78Ot;^nmKq3jk_ig6D)HSc~pbY z(KOfW+l!gFBJ`-cE#i_^=&iv+@P|LrXJ$ekGt2YnvnOS`3}_Q8ofmtvO$9M7!KZ-= z*gqX(I6e4LV+rH&@}U}OaE@EkWgxVw?DLfer;qT`-D@i7WGLURrCf=b3Qj2L5A!4UB}p7j)VnM zj7@gPaZWBHROh9a;ea~PgL^MtVuZJa`Xt#yMnuZ0B?TMhT0uBWG)bC9;EF zjV>$7`fnxu+Iw&utjx#W>44)TX>B|MFpBHl^^p^|dU^x0#~Z6%XNm=1lkyM9qOGu^ zpl>Bqph(E4s-iG`fdq&1q{--ZQ;t4{0a13QE$X6d;;1PvRJsUPg*)6r3_q<;)*3&T0jj6N%J zGhTYXziZKU9eFDfj&IUi>M2(NHCKH&p8E&mO6J6dS?09BgBI-4&>Y}v*&Q&?3XT{nYTpXpC1Q>#D&C1bzBr+M?3s5{GA%B!!_+__I~ewjvzn5Ms#+rT$|JpXF3oxvI&^Jz2~ z4?9j`3ugtfTfSlA6YPINOBbfGN{2o#Ygno{VvR;n$9jaA^?-3JgwJ$0T1| zzYkzyVZtHjK^+f>O{Z|f$ySXYckA=3dlMW+vb7h`_zZqXW+mRk7^3%A27!FNLeei& z#LBJP?OV4$y7IAvJ8zxizLh7)@BF>1n1Q^^6Z81ZOp+N{Xp7E|NscU-+-Y@b zjo0C^nB}nAjN8Sf>xw1F5a>69uTp7U4p902k`XrfHK>$Dfl=eeyx9RVu`qh zMBp*S`f+Vmi!aR{qlIzc{&{wf&&!+x3u;P#!b53(Wy8$sgfLPfa5ow;o6F6&Jfz*l zW6S0o=@&dp9Cx)h@kO2a9%S=x@RCNpRzlFTBQ6RBM z&*`<*5rhy+7qBpFJN~!FHpra{MmAVYDe}F400H3g726W=m2a2rKCn9bZTHWgD?9 zj68&dHerhx;cNM*q2+3OPcN!N3!;83wsPeiOj@#Jk5#1tWmzfL4#*#UK~N@sTC&bI z#*3@+X{C|;MX+RJ_i*ZZiJV&BZD%;nN5kzU4-6nT(*_nbXW+I<^B9@c1fYN8TF~$J z>`V@vtaz+$i6H!$kM80A0^S!V7!`F^rzB zo5xPSlw=|ja9my2FJOt0ytCwGPMQWbR$vG}ZropsulMXRSE4~3Hi5laQ`iz-3qgYP z?12x)dH}4grorMTF_AZJh*d~Jl2kXBHNMqAqq=)C zFAeX~#aNVj%dx-L9VZENkfrw(r9bDPDUZDj8Xs(gK=3>Bf@*a6+z8ucRFk8&E{mS! zZ&4*8L^TwTGo_NOS{)pkBlWUCVcs2>3Vy=$V|9#{#)r) zz`ui(%*t4&YgemaMTU|yXTCR~I+V=xyRN7$Ju^)?U0B%pjg8SV>u2K;bfN`QLAAXT z!m4DgkT*7zU9!=Qi7pgAZy(y3^=y5Dlu5nAV&>c84iC|C@No|O!9G`kMOS_7v5j&E zT|XKA8hXVzq?uulH8X1G^%sP>s5PH{1g50_(L}GS@PwGI0tEg0A2N~$NQNcszGYe0 zpkp@Cx%$g0d{x0Ixojov7Vj$Et%Z6mP7>8su@|kQ-yrmb#hs?TgrjL+RzNluR2Y%w zJI7*M85e)jYKNZc+VQzmu^7HsYy>N&(|<^&D!Y7NOB{c@M7 z$UGx=EuyN02|!1b+PWB3uNPUK0RO^V!POqQoo-{NloY2mWvwV?L{(BARGINo#M!co z8k+w0Fr=x1bFQ?m%tSf1@NlZodcs}#qa)Nq1&&=mZ|f^c*UHIEzmKWj)$null={2B zKxt|*HFk!8*Q<~3X5XRHFl4C{Es%z~tBs?FDwiAyl@AI2V1jv~nA&Mz0%%C&LbsL@ z)EYyxjC6?OqXBZ(Qz_dBrfGAN_~IWepM=~DH0|)feQKY_P~ugMuN`g47<=NZ|N6QV z?=vpF@)h-NBVl3XI$>*!R?_eC@|R7I2kyO38=g%YB7Mh{=4nO#s=2#5aM;PMs9UIH|;s^}q(ZarHBGz4PqK1%B-Vi&CL}1t<_Z zVKEm{i0qSc$#$6d5i9jAX^`oGfq^bsVPrN|m~;zfgGf=~Lg!5zKiyIFlpUrYPqjXj z)LmE5BO4W&-^%^T_9NrdtH~g{56TxN3n601;}y19`l)L6c9*5YPS}9;{A~HEtvk(P z+7b*`4{d+T}5P2U`@4faq)0WCQRitV68I7 zbEBT;$o}4_cVNH%)($xQ;~D@&8(T5ncb(nx$t20r@V@wYBTw*-I>K@i^(} z5g9N2Hko6uCdFrysdL{PiI+v!^XTT&V%6NLN>*pKtEXF9%n4H?dKH(3WqMe#qW5$M zQIK8MAB8-INCm`k7Go5%TX+6uxef^Mjr<)$qq8`Rmi6X0eLirJS9!pK6>Qdf1RDNR z6<~iCt;6_N=r4#m0kTlLFAsE^Yjc%`_6BnQeKc6)l%EyU>~hGCO|wC5eX1U^`$s24mF?gB6qu$JhkxO3a!&qN4i+SF3G? zhvC%4SNCOLX93tUJJrY4Pl!I(8#A@2H;We%iV1SAPrKI95A$(h1mgSqA7xBm80~V| zDBnp-P;q$?C@$-lq1kkb$~QBm_oGKF>c#rX&OAlD7>M{{GU$D^cDn3pEen%t-0~!5 zZX$U*{2G-Q!&Gn#gzr7phFLthf3j)yS`C{RKCa;})(Sjfnxo+6|4yTi?`x=PZj-2U z>!P|Xqaky(R@3v4*&kbI-N!_wC#+RYV0!yVSKP2Ola?5D+QD1`8w%83ma!64LAR!I zh@%_%5V@a_ye@;vq3j22<;A-hp22nl)XQ$Y(AXU+9v(5;??bA(gl@T(*BX5%SwMKK zCx%PwG(d#2g#M$Txu`@=alA9p(W3nej<7hKvJhMfEnvphHB5d7#D>`qMDC1BJ95%)EoHNGZ5p(ISHLO?0XL^+&Rz}V<$ zd+mP9D$_QLmTE@Ntg;_#U)bU3`t`!1pi&z(51{3hyUxRdil?RS(Z^A>Qo9);Tpdyl zXk|=)f5k`1Sz7DBDp=^cU+DD(zc@Iaui!QY}7Hz9O)DPhl7ANR_aPOQD zT8mz``6`ELgwkw;Rsq}l^e0!9P*egbFzrI_>;V+{ciX2o&zdOa2R%G_$Xj)mOwcn5 zw`Xtdg{Ur^q+f*WFAxp=X>0ko`g!?uHC%ex&y=;lLWhl3fT~Em_yVJsEC8o7l z?QFmLO}oc9MIK;liW;Ho(Zc4Lg7pqh);M?l#Q3Tu`t&v~W?CHGL|F+YO@>IMsgwRc zngK2jLrAKY+36@W*$d9hL=B4E;CYw)7sR^Ss}FtoIW<{`=vzL9?n}rBYkm!Yv06)~ zPR1Fc1p|k!lI$y5z1Tn;I2<**5U2ib43fhy**0N~)oX3lAK!P4U{fa1aUV?rYgRuy z?ipv1Mp6^ZedYpODYqJ+dxjR5_g>WevQ1?w#S_> zFM^+`E34L+-CNzQl;1%Cg;X7QU>zN|!rQdEQc!Y^&K4%uU(qIiyN zp>lw+DMCEl{$s{M)Sl<&o%bFu2|M$K>hr6_0);z8Nn`7cVGP?0W+%(D?NR4`_Ad6F zN$@Ea@`LpUhz~Qk)82|o3{}$M8}z`gO5b@uSxhH^n>gyQ$rp9{c%sUNHj<2(n%qm7 z`MS*8zIKcr%jPY$Wi<&PLSvdDO}duG$*3*u@^qV#1I{ksp#CU0wE7N?iMW^B6HAv% z%7JSvmsabD8+|C~7P;am-PwTo=KsSA9<9M(En5YP-=6v)}#QCYti_99(am&=bd&G z7wk=AUH*2hV;#5QH=BO5?E~r`SdsjO@#G^`o4pEUR^mg0g!!B2-$Afu!LQjLLeI_@ za>fo7YF$6XGBYsd*MRbLAvdR@xG{rrvlPk;$cHa;Kk;JR2ZrA`pWu&~JiR(;doaAg z+|+ia7_A6N;>{PP`ogkV#!XIJi-lNEt&j7_-CF$1N%owoo2e`lFGW9m$YMJG9Y->d szkxyOkZzFf?(Xh}p_J|hXGn>Q2I=k&=>}~gRNXSf5WoMAi?T!=#vWI{`m>>|y&C}D>#|y@7XYE~J zwwkmj3Jvxwc?sir64cK3Qxl2~<8wnncOx@7mAqpsoq*W8yk%p`n5aE^Vh47LN-8q^ z^?bS=S`68X@RZOa-ZPZ@^_nmEY+fua)eihLe`LH{;^|#K*Y5<(Wjb@4EX{UHU1N@C zw~reB$#ES#cz@e%DwquCFfbW^I5wiG^R1qANW^SZOl2GLFnoDSQ!DgMApby&2Qil& zbAe=2pOUw}s$j6;ajjuaC56m&Dbuj5v4riR%b|HBPtJhQy(ZJXh~O8QhYmIFd)*)* zDZ;Rb(xsxCwrv4Z=GVSwCmONu-w`oSBDP0MYv4m(lQ4JZq}#<}1`%OWdPl9Nx1Ci_ z?uT_QVAja(oV`kl9_eEfid55Q(5)6#h^(t~mtALR&qk197#i98&CF2{UUycOd7W(( z(og%7VSTUiDbd`KS4wmp!~*I1sA-POmi`5_+oslrHzq(IBU(1Q;~}y_9}PO#Mb--H z%zv}CG&&OQWw`Znx{@)hv1BQaSI5a0alW#SoC}+u8tS-8IV7$Z@SwnYY;Bsr%Z$pZ z58__6T~dC6I%ji1<7G>U99C_`&1u5=KnOns;~5(&T}Oe`rYBzGxjMztS^M^A2NX2` z$AZH57?`wWVwn4duwkf{pCe+P-3P~k+q);2bz@3C`NiXVuk8C?SPtrTqWPpQPqkk8 zN@Y)PStIw`WLs~3A$SZ@R4*^#ut{*_U*IpF?KeuqB|i<52OXcgUuN;AL=;e+Y|xCgy5IM*0juo(##VIgWi^R$AOh&0mk;`q{z}ya zu)h!g)*wj^PyhagC*v4WKv7!h>(Tf3-%>}D5z|MI$t$n_c==d_Oi;tPch+zsFH01~ zJ4cbs7uhw{V9(?8?#v)QtO3n^thSY<1v`fbGkG+3a0Zu{8b-)-1Hl3d)#< zLC=ldHHPXKZLgVwH^bM1>=_Qfrt5li{wAZjR?3RS!ynzyh@H+*s5z(B*zg(40K$+; zPv6%`12BCs%JHA!KMr72_rYX9X&LI91`z3L*CSlHv&f3JI?O`&m5GcqURd*brXqe4 zUu+1Q@B~Ut(7JLHo9x)K>LlCZh8~*TPB}Dg>@g4V}`^ByL;As2y2uUg#_b?#n&OJnSb{7Ts;ESuB zokU{iZIZ!0X3h3^QK2&Nun3Wk3fFW*leoD)ahf%v6=iOdbhKZ9AR+r?4*7XCoka`$ zI5?7g?kIkKeHehllWLeAzfT`c+N?8Mmv4#I_)t)4V^--mtq#5}Wcy4Q zVr#@Yov?&X?KD)s`H8dr%iU-wfdscLId+g;28EcUeOJexX+ON6o(|fKnIkH)Y$y;= zuQas6?G#l>FSTyz(uLI&VtnVF6p(&l+_`^f(qLsFD?nT?d40XTfu#-n+mcVMx*KMJ zptXRWez5#CpfbI^(x)+VYi1@K3H0q6wvrY9_dC4~_XBpegD%2TgWZ>Q-6u&ItpyK;GFXUkh-&Y)er+>fkZTmM zaSrYsJRp}(N$>0`>VBmV4(pwo9gPgz`AfFDTaYm@iu_=Uk%R1#N#RRgRPKAnQr`;~ zXmSS6RT4c?PK3-?M$0SPBrR#5gNkora8*m`lqhyi)8XE-F#&+UUyNqw?MfL0VJNcz z#XK3F%UDh)Iuee8Wfv`qtuM}+VhhkPb3Mg&S4JW?6+uW1&NLkKu|#Z_5*bcN=EUff zGX6UgT^Fmxugalb{T0>N^rHW06ieIZY@bc*d)6cIswCKfqaqSq>`f?fV zbgYP(BB^*YSpk@g?Lrh&aUV;A-Cd+z2?`xA)aTLb%j zj#Y5rnKsxg*yf#PY51w1~e>wk8w*Hya`2%};#9Ot3YMPXj-;J#9@h%4S^r0GLL2lpnrMi~ta4v~Ig0&t zm6vqC_UGka>|1|P4YVwXm1r1S9B;zN~i6DT+zCOS<(;M_2c056W;PE4at zuB1GWAV57tOQWxy1C{#r#}sgmC;%LU(iP`3&~L^pJ;M<`FuPx>JWpco@|E9Sv!2f&Kx0 zxTx>hl6LOB8ncjm3~?X&P_cXyEQcDLi+ZB+8~}<5$;n=QrHRxa!j+ZmM9L$c^a$z$ za2~;^i>}6+$S0i&D!K#|dd_0vWs?s&%u1vwY{$H^UHE$y+NnoVDVB~%emK#Sg#odl z6sbCzmw1PKinV|2f>m7#XWOpv36|gYgh=={3)TgovF_*oN*$H}dgRn*mQ}gv$Ryoj z2x2Nr5#mlUH^kvPmnBqh-jNXby*jf4COE%tSof9`@V+o1Ibn^BoTVtDK7J&%DnU9W z0EK&gGXPPQjxmPf>3{knM>5`%$%Fey{DL*x<#6yp9qLajm*P#@n(5QKSrT4PVmHri zA6OANJ9{|F>AY;l#?-6CP`_6v4ag^QiHQ;8Bj+b}r3WFA%@yA;l=8o@`wBb**BYya zfOa<(9Td|)OX14ph|F~bM|dfDJt|Sq-L(8FK|7MNS#UTXR!VmkSxH=HJebi{KU15T z{Ls_1wp=Z+E1fqKt<-dAHs_pcKme@0^E27!WwIvYgvH?Q!~AHF3xWhuZ8}f-lkiIg zA9q8IrY(uUX47f zH${%9l!iyKnCe*1BWrJqJM&S@uvB#%=;-d`o8jJA7QM7Ehxf^Lp^${%P`a9{IO@k5AJg;{Y7L%vl}h*UDA(7ecQ?>_j8Z8= zx(FS5YV}SJTx{>h(?UDmms{7l`UK_J0B@vQieQ;Fi6OfqTdBtDVwS-)M>KRXU>I!)5@D+BTD~4}7x`di09Ndg0VS`3u!$LLSgxXHh z`@=?8v!nbc0^hHhT4FZ@D39@+q4t}$+kD+TXW9~D{5{(T_;YEd=^$vXTSGw;T8w4* z`3ta9o}~}hMb5^XyDTs=whzMlWc1w`{zP&O&NkF1!4MB9Cd0}8JGA<=Tr&ll-?DxO zuM1o)o{+c)ONW&pYI$Br0LWf+k`=o+6Xn@`13OzIkatl`ySQ|@jkCV5-=T6ir}ihx zyWsS)3`DE`Mx-O zrY5Of9BGgkD`0_YXJ%~3P9c~xU&S@xKaSGF!Fl9`S#GSoZ*lcz>Qj_t$>Vx*cdQsHCK()!~O?GV+q-@Cp@;eqB z40^uXvqg{nL^*XU?)DYhy&%|RNR&6yj`3Zo+@Yj;u%ktkVGux_5T5ca5_^>f(DvjsDba(tfXN~u|6}6R9}rS zux!NEuR>#|QiFUE%Vx^jdw9G)b zUq5&iJ+lG@cb?~R;7Ix}rH!=pyIDqWQ8omRO}^rskIFO7%+UtiV>FlTl|dDv4Glg-}UbjQqvSU9?Hvm zDG#_ef-G;_xegcg%BmdNs#2gUdMj^pDfI&)PXt%Zv0u3-sjBpRPdh*9JPP~uE11S`{zI0B6FLI30b1AG6;PmJNv*V(RC@UPzJJ2O_sbbJ0+;#957 z8!!=amC@4`N?rZP6_Ii@wCS9hY<$YwtVz@bZagvL)mn zeK-p~~g_+^kAj5xj-6=cSWb4#cW>ojsoOL0dlMWc~F4-Qh?kjKumQh zmVHMjc#_cxO@Ys7Gd7K+%J!-km!fTINLD359ytonxj$K4}@#E5SG0?*aMMAgHH(7$KBl4D2WX3 zs@w{8`PW@AH1o%}xLZN0Ku?lqHujwQyyFf^f}ert>BUQ3M{p%tWOlVgOi}Zef)4|B zUfUBevj)~`MbC04zmZBHBzD@rpOLoYq`-hVP=;zck_f?sP$^xT*B_KB-biewwD75Y z>p#*O(?>J$E3GHgLLTRAY;)S`#!S;C76aPftYjFesd{3taI%R-Ez*61q$4y780mD%N=oU zEkEC|{3(R|=660oHs`NT0cUjrzIVnvv~CM6)HvIQH-`XzhRA$r@N;^P>H}+r zOKS$7u}isV+6Wuwq}bwj-acvp-1+#lafjvV>hDxIdALME`W=ny>@JiSj~=8#`dPkp z)v18arlrmp&!|DbkWy`H3aN{}mi1FnoziMGL8MLV#Uh!w%timPY){j3=?CRE#H-CmL2@u=P6FI(AAIpQCvX6CLa0U8`N^AvqTy1Dw~=QEq_ z*5d5m(~4p0Sy#W}Xe!}RlJ{x4$VQtdj*JBC{E47#-V*iM>2|ke6EflopKB(hJrdSy zr(kl^z8xj;TbHv98Gk5wL)z=&Pf! zj_n(PcwM%`p2>#yFC;0+L)Z$emm+{7hCS+#V3P4mgfH8(#aQN*BH1k*oxpQ6@P{%s8MFv3tMu zR$pwMbk6ok1?e~2d$t)#=a7AAfMbE7GDvQN&2)8O#obziJ#d^aGH56(pkbmL(oPKo&_=3N$Lj~{U*ucuer?#jD-48u1t zq8?5dE~g>Zv%SYESjF25PwEMDr@UPymgzpbY_&xVYy1`29AmDZcKAF2eXRR6zY;lFPI1WHHIl4jOX1%Y5ro=|Ul bm^Zf#)InDR4gG&3_`mESfk5aQ|7-sT1kL`) diff --git a/brouter-routing-app/pom.xml b/brouter-routing-app/pom.xml index 87e6521..c99ee64 100644 --- a/brouter-routing-app/pom.xml +++ b/brouter-routing-app/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-routing-app diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java index cf7d1b7..3c90aca 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java @@ -38,6 +38,7 @@ public class BRouterActivity extends Activity implements OnInitListener private static final int DIALOG_OLDDATAHINT_ID = 13; private static final int DIALOG_SHOW_WP_HELP_ID = 14; private static final int DIALOG_SHOW_WP_SCANRESULT_ID = 15; + private static final int DIALOG_SHOW_REPEAT_TIMEOUT_HELP_ID = 16; private BRouterView mBRouterView; private PowerManager mPowerManager; @@ -145,6 +146,22 @@ public class BRouterActivity extends Activity implements OnInitListener } } ); return builder.create(); + case DIALOG_SHOW_REPEAT_TIMEOUT_HELP_ID: + builder = new AlertDialog.Builder( this ); + builder + .setTitle( "Successfully prepared a timeout-free calculation" ) + .setMessage( + "You successfully repeated a calculation that previously run into a timeout " + + "when started from your map-tool. If you repeat the same request from your " + + "maptool, with the exact same destination point and a close-by starting point, " + + "this request is guaranteed not to time out." ).setNegativeButton( "Exit", new DialogInterface.OnClickListener() + { + public void onClick( DialogInterface dialog, int id ) + { + finish(); + } + } ); + return builder.create(); case DIALOG_SHOW_WP_SCANRESULT_ID: builder = new AlertDialog.Builder( this ); builder @@ -304,8 +321,8 @@ public class BRouterActivity extends Activity implements OnInitListener } ); return builder.create(); case DIALOG_SHOWRESULT_ID: - String leftLabel = wpCount < 0 ? ( wpCount == -1 ? "Exit" : "Help") : ( wpCount == 0 ? "Select from" : "Select to/via" ); - String rightLabel = wpCount < 2 ? "Server-Mode" : "Calc Route"; + String leftLabel = wpCount < 0 ? ( wpCount != -2 ? "Exit" : "Help") : ( wpCount == 0 ? "Select from" : "Select to/via" ); + String rightLabel = wpCount < 2 ? ( wpCount == -3 ? "Help" : "Server-Mode" ) : "Calc Route"; builder = new AlertDialog.Builder( this ); builder.setTitle( title ).setMessage( errorMessage ).setPositiveButton( leftLabel, new DialogInterface.OnClickListener() { @@ -328,8 +345,14 @@ public class BRouterActivity extends Activity implements OnInitListener { public void onClick( DialogInterface dialog, int id ) { - if ( wpCount < 2 ) + if ( wpCount == -3 ) + { + showRepeatTimeoutHelp(); + } + else if ( wpCount < 2 ) + { mBRouterView.startConfigureService(); + } else { mBRouterView.finishWaypointSelection(); @@ -504,6 +527,12 @@ public class BRouterActivity extends Activity implements OnInitListener showNewDialog( DIALOG_SHOW_WP_HELP_ID ); } + @SuppressWarnings("deprecation") + public void showRepeatTimeoutHelp() + { + showNewDialog( DIALOG_SHOW_REPEAT_TIMEOUT_HELP_ID ); + } + @SuppressWarnings("deprecation") public void showWpDatabaseScanSuccess( String bestGuess ) { diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java index 6586d4f..87077f5 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java @@ -168,7 +168,7 @@ public class BRouterView extends View String basedir = fbd.getAbsolutePath(); AppLogger.log( "using basedir: " + basedir ); - String version = "v1.4.3"; + String version = "v1.4.4"; // create missing directories assertDirectoryExists( "project directory", basedir + "/brouter", null, null ); @@ -748,7 +748,7 @@ public class BRouterView extends View } else { - String result = "version = BRouter-1.4.3\n" + "distance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend() + String result = "version = BRouter-1.4.4\n" + "distance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend() + " m\n" + "plain ascend = " + cr.getPlainAscend(); rawTrack = cr.getFoundRawTrack(); @@ -763,7 +763,7 @@ public class BRouterView extends View if ( cr.getAlternativeIndex() > 0 ) title += " / " + cr.getAlternativeIndex() + ". Alternative"; - ( (BRouterActivity) getContext() ).showResultMessage( title, result, -1 ); + ( (BRouterActivity) getContext() ).showResultMessage( title, result, rawTrackPath == null ? -1 : -3 ); cr = null; waitingForSelection = true; return; diff --git a/brouter-server/pom.xml b/brouter-server/pom.xml index f6277ed..10aba25 100644 --- a/brouter-server/pom.xml +++ b/brouter-server/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-server diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java index ec361f7..85c9f49 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -88,7 +88,7 @@ public class BRouter } System.exit(0); } - System.out.println("BRouter 1.4.3 / 06082016 / abrensch"); + System.out.println("BRouter 1.4.4 / 29082016 / abrensch"); if ( args.length < 6 ) { System.out.println("Find routes in an OSM map"); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index a786e9a..d46dca4 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -155,7 +155,7 @@ public class RouteServer extends Thread public static void main(String[] args) throws Exception { - System.out.println("BRouter 1.4.3 / 06082016"); + System.out.println("BRouter 1.4.4 / 29082016"); if ( args.length != 5 ) { System.out.println("serve BRouter protocol"); diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml index f086584..545a67d 100644 --- a/brouter-util/pom.xml +++ b/brouter-util/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-util diff --git a/misc/profiles2/lookups.dat b/misc/profiles2/lookups.dat index ff5ed3b..a1cc7fe 100644 --- a/misc/profiles2/lookups.dat +++ b/misc/profiles2/lookups.dat @@ -1,5 +1,5 @@ ---lookupversion:10 ----minorversion:5 +---minorversion:6 ---context:way @@ -505,6 +505,13 @@ estimated_traffic_class;0000000001 5 estimated_traffic_class;0000000001 6 estimated_traffic_class;0000000001 7 +mtb:scale:uphill;0000018869 0 0+ 0- +mtb:scale:uphill;0000015578 1 1+ 1- +mtb:scale:uphill;0000012338 2 2+ 2- +mtb:scale:uphill;0000009099 3 3+ 3- +mtb:scale:uphill;0000005825 4 4+ 4- +mtb:scale:uphill;0000004628 5 5+ 5- + ---context:node highway;0001314954 bus_stop diff --git a/pom.xml b/pom.xml index dd352a6..7f7d333 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.btools brouter - 1.4.3 + 1.4.4 pom http://brouter.de/brouter/ brouter