[Maposmatic-dev] [PATCH 1/2] Modifying index.html HTML form / nominatim integration

[Pierre Mauduit]

From: Pierre Mauduit <address@hidden>

- Adding new "disabled" icon form (gray arrow). Not yet
functionning

- Adding some JS code related to form validation, ...
---
 www/media/Go-next-disabled.png      |  Bin 0 -> 5273 bytes
 www/media/loading.gif               |  Bin 0 -> 1787 bytes
 www/templates/maposmatic/index.html |   43 +++++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 www/media/Go-next-disabled.png
 create mode 100644 www/media/loading.gif

diff --git a/www/media/Go-next-disabled.png b/www/media/Go-next-disabled.png
new file mode 100644
index 
0000000000000000000000000000000000000000..a1e3163da8928a85960e5a990b45a4280d1c327a
GIT binary patch
literal 5273
zcmai2g+o*C*B_0PlaO$d0|7x0r5iy?a&(CxAuwVfl9NV|E-4X)<k;wLP~l4nj&4Lc
zbu<ir*MH!Bw{xGnd-pu&p67Ya`JB(WG5Wgdv{Y<VAP|UFQ$y7dIQ#uOD9M3V`lZAV
z;6&tYsICISjzG463vxScbyd*cf8YG}l2qW%4NnboZ(#V;zk^7HKj)tU3Li}!HHsM;
zCMphS38V)B0x_~`swx}#&address@hidden@address@hidden
zz$s!EEB|fQNdI#~Ov{|FF}w)dGUkh3xE?b>yP)F_Etm$P&Xj4SYPyT7!$bR(W8&=Z
zP$(Ym%uY>p95kPfY;pX0c5~H#VQ1$aJ{7w^-|Xaw-FURLbWT8S46#%Vi46+X{@;z8
zFk9o~b$(4vP2HC-U&0}M*0SE~L;byUna^F{>f71<R3tg$;d<HB)^=r1eK=dInEY2N
z&x46{MHslMdF3cg)}<cCc{NVl_HD?qmP=YX>l-TvW!T|L>address@hidden>OH-m
z$?EI{Xx(address@hidden)Bh81x-zv*x5e(mAEokOQ_5BOG;|0fr&}fLhBox
zF)address@hidden>;_3cV2l_Jl+eE>BmNyTgyrw1BOQq$}2ds)address@hidden)#+;cs<}N-
address@hidden;address@hidden|RkKc<|%)address@hidden&dNm^0e**i
zmz;d-EJy*Q<m)address@hidden@YYkp=o;address@hidden>address@hidden@V5Je;;
zQSn*|eq9IE{Ft7eu4f)%D&VY{BC4Q3SAx3%0<4h=Iup$c+?Sqx{0aQ0lZlC`66j+9
address@hidden)address@hidden&kqxismaKIK^agt(MQ?BKJ5_E_
z$X!|AWnhXLT3V=$HB(@Q`|*;C8dac5{l<z29lYHI6)7<b8=DFz7{o<-etr%nC1Pb|
z^{IV>`|;y}iLo&p=!yz?U+*aux3coWPmUd=<mkvps;s1}Oa%XffYNW3R#XT9i%nmu
zWvrbN5qP@)U$-d&A+{KV*V&zKPL&AG1tWC85$(5^nf9^fr2~|address@hidden
zlqcx&WUnwsfjGYzg+k2}w-Mub#7lSI9Mul4^(-%QsuX}hwx|0G|JKA!;tmMv1u+$-
z>=CKbTCe>|P|x`A!DHS38b1F?ry6pi4bsro?%l$b5P@(wTxNE5_C{X)yd)Q?rlw~9
z_wVX<KMB&r3=9lXZ}xMoXh{yMp_(c>I`MxCh=nLs9)&address@hidden&address@hidden
z^0E57`;9Yh{ey!~EG*b4xeop0N->zo-j)1eEQyqrwYB{9Xp^%_e=N&0Jsll!CeP~q
z?7hO!%eCQx0<NK<p%8G`zfG49V6<#>FUnEWrrZ(|5m`DP<!?fv?2=ZSdivM{X+%2C
zeqNCvwxf-(8&bNpn8lL_uqyX0PsqJQ79Aa(>T(address@hidden
zdEr0F4|QL^KK`0cKHXs^tE;address@hidden&#GQysd0((gUHRAPxon!Q;E}
zawq!>?}vt-)z#I3lw?BiVVrHI*46}$n`E{DcG3yq-#4D{Go~nK8dp!s<RxOAZjgr;
zhm?mpz}?;HNJvPgYaFO|ePw<3=VJgRj~_qgWTct_T?MMCscr4<?grA*(address@hidden)h
zf3OL-0UDi~yI*oQ;Lyx-OvS2HU}wUjn|U~ynwom6&PwW|?)cP{y}Nrt!{4}#^FpVQ
z+$?LHf0e~DiutVSyj<*!wNPn59}cnCZ3_l8cJJ;AQF2XJy&y?omyeyFw+dL<zZX$w
zYGQI5W8URvpzN;_&u!kG%0cbt`**-zAQ63HIgadvYO+8eY2l5pcP3X3S9<address@hidden
za|AtK400bftw~cOlUEw+nG7qT&=Scu*}+ew=}g5ZB-lASQ$~QN_k7!~{tQmnI^Be4
zlPuS8QaZTKs@>NPb5ueL=-n5Nt&address@hidden;Wux>*-J{b}9td6ds+1gl=#iA)A?L^T
zESlxFf`Wp`2FTj5nrYP!!d7TPL#KG5jl*ow>w>C5NMF{)g3!yvzVMC?g)_qG{SR{u
address@hidden|b?5SaFUYC4GPrzja4>Z;address@hidden<g?1}w2U
address@hidden@>$Pg=35gLvFprPDf1x)Ji+3&uhc7
zZ}x2w2>KK#m%RMl%Fb(<2DcfNoC7jX41nAeuEjS^v}MOLj!`db3B~MIJco5dWyNOo
zgiQxB09{yES&6tvV`5^YJeNVfd$VdejKAfUY|address@hidden|8H7SIj-qvOKcNPfi);Hx<b=
zv{4$fYO7F>RptIe8g_k+1f2U&E>S-4WI2-ACcm$rGvYB-n5PRc(t?1_s*57%>b$TZ
zRNDL<address@hidden>jm7^CU#qE?4|L7hNik*sV#$%ao5O;Tsp
z+3py(q?IKv9^G*O_mMwy0~Zy$i#H`}kOEGG?BoE%rjl9V(@address@hidden<Vle
z(a}-Y&M`6Q&address@hidden|E-AqkA2>NWPG+R17k$l9p0CWdZuM>d?q&59h(U<iXvh<f
address@hidden(+n6I<Po`0-K1J8Ej4b>address@hidden@6zwcFIT<address@hidden
zFb!SZr&?N6hK7dvR#r68y~<8L8MAH;iox4uC2SrGE#i$onJS7wg{9M_+b{WsAHswT
zTt#BJ=iMcNc;@5dTShc5<Ill#(Hs7^PQq6Fk&address@hidden>3R<2m?
zi_1%|gGG6e67Vn^|23wxw0>`B-UX7lyB6J}hAv`A)=*_`$Wju_c&address@hidden
zmzkFr)wh~V!p*C?Cd1P|u+PszGtd<n7&wN*g=;{GTNe_7FHcrxoE(aqe+OORQr5a%
address@hidden@Q*J3k2hr_&buz#{tTe-KlyCF&x*2
z(LN`R^Xz}?Ue-I;address@hidden(v#h(Xx%6tT*X2)UTKjLx2682waR6^d~-c9~^
zK46Yusz`l(address@hidden>%zVEd0mfT1{lDfjwqVRF4`EG`?Xp
z%;Z{T4wtRPS`2Sai|G(O5)+#aqm)Xxtc?_{vX6P@@mS-2%LJRKex8pCWzR|#q&=$l
z1&address@hidden
z(s(%$b(9-NIjL)Ltg7-4$Om$_0R|VNO?`BNKs&{EJbt!J*#s*om{J9#uxN~B<G`NB
zVq45yqX(|address@hidden&v{{mB>
zP^gehmcL7XB=?^Enedr~iJ>address@hidden|5DO7Z(qvj<icmb=i6!J(4dW
address@hidden(D3NbFk5#Dk~urXQ1%LiXkw2TwUKgA^W1O7^ZH
z#`uIKa`yIaDqeZ=v6t71FwIkZ#`X);hh&GM>xb9}`QflT%TusN)aHZ6=sihZUNTwV
z-K358dU|?=MMY$xN+Is2m!YAdxV^nSySDjq`4Lb5M+0LPlVMm2$&8>address@hidden
z;X-8k^eK6R$5KK>#HC&YKu&rl(573zc{Nk63yO=^r$CfEj5YKi{20HPcDqZxW36X>
address@hidden<address@hidden;b^1Q}Xd{t=^D7CW
zBE&y3Y{t}RTO1}OikK0y!gQDq6KZbBQ(I_P2MEx&i>56%x-Z1GwaH1N&wjoa5fv3x
zYV6!VG%rfOy$)jLq1Q}K7LvBr{i-%7qC)B9XcB3oSXQjh)8xXVS8X(67Gl91X%nkD
zH|r*mmX>C_`t35YgpQQh84gePuuq3>p;uN`Y8o0E3?fCPzRFSu{|EA}<~Q4lIyNd_
ztErzYZGKfKXNE2<h^WY*DkC#6`U-$8zp$_xz(b&#JwPtBu(0?=(XPs!{OyjUd+zSu
z-ti{?2V+rYbjqGr)address@hidden|address@hidden
zZ+(address@hidden)MfT)YJc;Vs&address@hidden@{WAsbcr}
address@hidden<JYi4VI8Z$Qm8vMpDa}y6b{l1PY1lo1XntzU
z?~pzyWF<cxux9AMq_y)?zhQWISnb7&address@hidden(VFjerLBFL
z;gmC*NZa}l?aE&)+P|NmM+;2GZF%e-VOvT|DQ9M8I3ob|QBYsc1mvS5vn5&@8p^wO
z?~(|P+7hp)address@hidden)OfYHgX+5$QF229&aV!{Ty?P2SX1HRGxN|aGPt;K^jE>d<O<g
zy;address@hidden(Y;#l$E;Na7XkwkW(k%*fA>;address@hidden>x|eJY%z(a?VFa_sZau_
zT?L<$fb#N&g2T$n1gu(oG&>{(SZI**<KsuL4}-i<Z#=}_c1>bRhcC9VcH4U9v89Lq
z3J^3VmMC|tzD+|uvtjv)ZcE_O4CA{qRjKaf^{_n<{N`X$&D*=y%GalLp%aV25a4lL
zKdFK=$*;D;wd2<1%ZPqlxH&address@hidden@qU8$O5G-gXlHF>skb0Lh3jQu;UEiImei`OkT
address@hidden<S(XEh#mXew3%nWEAx-sXQguP_42EY>->mM)-#Mtk>
z#-$(EL4SZUOm<>address@hidden&address@hidden;address@hidden
z`0EKSGBUD%XejN|address@hidden<BEs_
z_1}!{#k;SWX|;N9(5V`z8XEp+!zy{yY23&vR`#KpT0<06R~vLtNU_k^GzXpkS(1X#
zRT9bB5%a~Is)66XH(}o;;!R9U{4_E$f{X^IsE7d0TvC5Ua2gGzT61!s8$nh!BmxAS
z2hvx>maaNsRZWio%97aFSlh-qAoFZ)^0VE!v!<@%FPFFUN%8HqWWnYAI?n7+U6lS6
z>b}`&address@hidden;;cxFYke<KtRgX`xp~S#zCl|4tX{<RB|dyAAKi>663$Z5`moaxDL{
z;(b%>XmCVHaWN9P(i5rZ0usZkKo~onl`{<3OO79`{B;U0CHOhWY7)VIuuLaSc|q>I
address@hidden)(n&CCcWelSe=+?<@8d}?87*{L7Or$!`Za;CkHI#zns>@B=G
z;GnzqsKk)T5Q`IXt>IB}c_1Sx$$Up*{x1gv#gA%kW+e~^KA9d(t*w_LEiEnkrCn(>
address@hidden&@dr2}U<ZY|XIa6C_f>5C&T-SqB(>|4n*kwcmrTQ&_?p
zP*Hy*FHfgo)OjZO*4*mxvnG3S$%+!Qk<YU0G~}{P2QQumi_tSM{N5}~<mTd1ejqzJ
zG4bC-r4pxp;P0Pb-vVB2$C&h)address@hidden(R`UJb48+EdBg}>&_(RiH!|=
zJNhP2TQqsD5PziATwh<m#$d7gozGN~>_Q%7ZT5aBGAi3ZP7w2oe?XI)>a~kLw9*`p
zqDcQf0*&D0;UNLIZ_3>3*RKmOIvp^msI>HX<A(><address@hidden)adm64gC-$o9I
zRTh~!sKRS!pyF$SOWp`XQhGY?(yGrt1PrlBf%XCO)eF8p-)OYc2>;A7DNHr*M<W5I
zZ4~}msxKk7ZcHT*z)address@hidden(-BRmunQ^BG3fluo5;address@hidden
zrkJVI2W<address@hidden(UqnU;Y(+|<address@hidden@pP#NdX^FL;1
zFHBcgR~PvO^-}Cu`Ce>e`m~7Sq>eBT$&A<zRLiVX-d&~n2JH0r_fu|fZ~y8e0CnA8
zEE;_o$sc<wKKGL<k*tYi$8K-r7^w|)q$^*3wq&8IaI7v+6-UwDv8|oq)TDP`>WD8c
z=4;;F^lg1>Vrh99%`y;8?Ju0|!ptCg8LggkqPm(OZv8li0_SCUu{6k?OerHHGfi|M
zU4rwksjjZpDWO-lGde<TG!2rOVLTGL&X9b)+~jdi2!&A!+#hJLm=X-e0OS(q&p~he
z{F>address@hidden>r1)A)0;MOvzrHB#QemM0wW!X?v7+jXCq(7}bAf#d42)l#PywxzW;5+uCXg
zq-+Ft3(>h>sEt^y$VxTzW8FQIi4l^DIMiJ_itU}9naePR7R1`X^TdP%a`EjpsBV7!
z><bL><aXh$d;NF>9;address@hidden@y*ZL6e_1J`&rEEtH#X>a;vgqs5T}&o)fdoc
zJ_7Uf_I_l21S}+uBlu{nPc-j=eX*hhNq|~raO4#ouiKY=8;qP^&+6|sYfH;On0mEi
address@hidden@S`AnB!(aW1TeeE^}i?g${FBp`D%bD-9Zn}WnNFg#^x9FmG_Iv|b
zxn4T^`koM?qR8Jc9{W_7BxRU8W;y&njl9*#TOUdjGm8JvR=|5hkfxfhDptid?0=Z`
B9!&rM

literal 0
HcmV?d00001

diff --git a/www/media/loading.gif b/www/media/loading.gif
new file mode 100644
index 
0000000000000000000000000000000000000000..5bb90fd6a49107a321c35b9cee4a7b810314b51f
GIT binary patch
literal 1787
zcmZXTYfw{X9>&iJhvXcHF*h)T1OnEW1i^?zgDfop1p?usL<AaZh+-&$2EttwaxsAf
z5io^RBQ=UPTxzXY7jdwOT$Up2+E!WCUNl|`3%bncxazX5dz|address@hidden@9+1Y
z=l>*#<AssAEPw^{0l?e0Z~OZC78e(%rl#C(address@hidden|m<u
zZ{EC-N~Hh*1ikf6-6GA16Qyqn5951)@19;mo}TEv20iGfEC7IJh+|@Ia_`*a=SfKd
z;wfLo_A}d(i59AzLpaB#xaoXB$l7m<6sl#_$A|Fi{4m(4_dM6dfwl{Pn1}o`F)m*&
zA{_uhD0qFbR4^d>PMGT;HQkSO{q6FlJyb$PWkPf|h*eTST}7h8z$}MF(XD(aQ)ZLZ
zM?v0rT<1C4XHn<6PbNA{XL@>1^)address@hidden;Az74wGs`!SI
zLs$GEZHsafXsu1i-WleMzAL(yw$-LK{0hv;6hrx8kx!!4$``dAyBnY9Jz&DqJo2$A
z!(L$H=Kq<U2CP75FF|address@hidden<58P`hz`4Hm_=#Mb<=9UbJeyuy7Fb|`nwzAh9;D7O{?
zO}<<l%|Y%=xj9nmkWCJ`4L7#!F*k^Mn2A_;qJ_*d!t;~Pr{)8r#*1$pzbrn4u%J#~
z3uyI6YBdcy!?EU;*5e7)2TA{p;9VX}fbg4!GDa}Jj8T&9Ownx(;ymVzbC^b<-AcXq
z0uCIqCBbdUis{!S{dPUL9?S<address@hidden&Ra
address@hidden>BeY~CF_viHPz^tTglc?D97CqEBjzUwH}7GI
zapg8YZM~>2Wk%E$d<zRTCN<FubZw&59(address@hidden&+|#QoyaKu)|JPWMeo0o)9=
zk3u<FocZ1-C;x7FaK!&=`KzGzg+&3P(RzJwNNYrDfqF#0gpQ66kO3M>&address@hidden
address@hidden(OExUlG%Xcjz3MU+9U^r!SkpjNThDtaP)7>j6L5z%o5|^hlVOyI*uY
zt^UU6NTuY?(Lb4ZIU2Zb5Vz}Pb7KF%ivf&j^CL>$cDz?rMNTQQ|NqDVD7mhghUp%h
zhIA{gi{S8y9Y<VS&a(?VJO6BQ#<sEVV=4}tHeh=cLI(D{OC^sese$63*F8@;_WsQq
zpN`<K-Cv`Sl-GRlC?dAETz}7Z{G>hIIbSv$`B!JiPi!0#4#Jge0)p&YVPHchWcyAn
zQhvb8ggXGXs9;k`u9Uq*YB>address@hidden|%ySP%bWG
zV~mA;?P`Q2L_Ss})address@hidden)xX3O{
z8!d=YthI-13OI;RN~`>|6u5L{z20oBp%9MIj)n$!Aw{Wpq&address@hidden>B
zz(Rk;;>2lp73<2;d=r*8z%WkdsG=vRuG_fvxO#uN^El|+5Qoz^X!2MfxJ3m}vyi?>
zMLLDi8+${Z6YbUg?8GNR>-+SwHKdFyr%HqWcs|X_l*-DAC^bG&KCqWg7<ibsL;!=r
z|5K96cU|>-_`UlwQ`EdOp_LJkr`L$mHHs75uP?fSgVfsDjuE#ft2b8HDt0yFt!+;C
zEgL=)G9ZFt4wa+N3Xg7FGc0~`&EEt6_%7tyzmnb9B_h1~<!NTIpwtUg?<ZHuxVxCf
zS_)PfVDKTpO*JLWf+aElu>7~GD4V-Bhx7~QKRkF>&aT>(address@hidden@8E?HW$G8g
address@hidden><wR~WOzd0xZ{GtRDxS#{c$7Gv=g(o+daNys40p(74`t7`+HIaOPkdaZZC
zSl3?)u$cvPJZ|?!x;IYjzl03}FuED<iX!88meviv>iCp;lU1ieF6n7!oAa-1E!rS0
address@hidden@Q|iG<a+7Sy>60vIDVpV%4tW8rKyzwRo_<25;address@hidden
z-sX>W*b;M)address@hidden@dg$PTR9uE$O2&a?KAe?xRlCj&Z$iZYw<FFlif|
zt(VCOVKeoIF!ez^&address@hidden<address@hidden@EaZ|5p7
jQhtb^?hAtPfskfTAXcOE^Uxg5(^Myb6<o+n0;2v6mm+^t

literal 0
HcmV?d00001

diff --git a/www/templates/maposmatic/index.html 
b/www/templates/maposmatic/index.html
index 87988d1..ac57670 100644
--- a/www/templates/maposmatic/index.html
+++ b/www/templates/maposmatic/index.html
@@ -75,17 +75,42 @@ function pageinit()
   
document.getElementById('id_administrative_city').setAttribute('onchange','reset_osmid_field()');
 }
 
+var elemFound = 0 ;
+
+function toggle_form_validation(enableForm)
+{
+
+  if (enableForm == "true")
+    {
+       $("#id-go-next-btn").attr("disabled", "false");
+       $("#id-go-next-btn").attr("src", "/smedia/Go-next.png");
+    }
+  else
+    {
+       $("#id-go-next-btn").attr("disabled", "true");
+       $("#id-go-next-btn").attr("src", "/smedia/Go-next-disabled.png");
+    }
+}
+
 function validate_city_search()
 {
+  $("#result_nominatim_search").empty();
+  $("#result_nominatim_search").append("<li><img src=\"/smedia/loading.gif\" 
alt=\"Loading\" /></li>");
+
   var searchPat = document.getElementById("id_administrative_city").value ;
+
+  elemFound = 0;
+
   $.getJSON("/nominatim/" + searchPat,
             function(data){
               $("#result_nominatim_search").empty();
 
+
               $.each(data, function(i,item){
                if (typeof item.ocitysmap_params == "undefined")
                {
-                 $("#result_nominatim_search").append("<li><img 
src=\"/smedia/icon_alert.png\" alt=\"Work In Progress\" />&nbsp;<label 
class=\"place_unavailable\""
+                 $("#result_nominatim_search").append("<li><img 
src=\"/smedia/icon_alert.png\" "+
+                   "alt=\"Work In Progress\" />&nbsp;<label 
class=\"place_unavailable\""
                    + ">" +item.display_name + "</label></li>");
                 }
                else
@@ -95,13 +120,23 @@ function validate_city_search()
                     +item.ocitysmap_params['id']+"\" 
id=\"rd"+item.ocitysmap_params['id']+"\"/><label for=\"rd"+
                     item.ocitysmap_params['id']+"\">"
                     +item.display_name+"</label></li>");
+                 elemFound = elemFound + 1;
                 }
+             });
+
+             if (elemFound == 0)
+              {
+                toggle_form_validation("false");
+                $("#result_nominatim_search").empty();
+                 $("#result_nominatim_search").append("<li><b>{% trans 'No 
results found.' %}</b></li>");
               }
-            );
-           });
+           });
 }
+
 function update_hidden(obj, nloc)
 {
+  toggle_form_validation("true");
+
   document.getElementById("id_administrative_osmid").value = obj.value;
   document.getElementById("id_administrative_city").value = nloc;
 }
@@ -174,7 +209,7 @@ maps.{% endblocktrans %}</p>
     <tr class="label">
       <td>{% trans "Area selection mode:" %}</td>
       <td rowspan="4" class="image">
-        <input type="image" src="/smedia/Go-next.png" value="{% trans 
"Generate" %}"
+        <input id="id-go-next-btn" type="image" 
src="/smedia/Go-next-disabled.png" value="{% trans "Generate" %}"
                title="{% trans "Generate" %}" />
       </td>
     </tr>
-- 
1.6.5.7