From 6690a9a09bca0afc3aac41e0d51789e965d9b9e7 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Sun, 16 Nov 2008 13:30:02 +0000 Subject: [PATCH] changeset comments and a couple of other small fixes --- app/controllers/amf_controller.rb | 13 ++++++++++--- public/potlatch/potlatch.swf | Bin 167475 -> 168667 bytes 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 1fa433c9e..6e1b364d4 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -135,6 +135,14 @@ class AmfController < ApplicationController # close previous changeset and add comment if closeid + cs = Changeset.find(closeid) + cs.open = false + if closecomment.empty? + cs.save! + else + cs.tags['comment']=closecomment + cs.save_with_tags! + end end # open a new changeset @@ -206,14 +214,13 @@ class AmfController < ApplicationController begin check_boundaries(xmin, ymin, xmax, ymax) rescue Exception => err - # FIXME: report an error rather than just return an empty result - return [[]] + return [-2,"Sorry - I can't get the map for that area."] end nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history) way_ids = nodes_in_area.collect { |node| node.ways_via_history_ids }.flatten.uniq - [way_ids] + [0,way_ids] end # Get a way including nodes and tags. diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf index d26ff6e0d5d6c5abb5dcb6ef0958488f08b92a98..cf17a3091e4ad07362976700026183defa1f7548 100755 GIT binary patch delta 6076 zcmai2d3@AGvj5d@x--*BAPG4pftkrk5&{WH2;s^EkuwMrh_bALAjWV*FvQ0K!Qg?o zAZJ5rSJo%)x~tCv^#uqZE-bLi+g044u0BAX_+-s;EE2*YXI^#xW+vfypZ(|8zpkpT z`c`#Sb^m_#zY0C}+t83<;~#V!TmM1GvssSx>89~wW$|z7*Jf?ctsgNV!>l#RE9cCc zT~S>zcy{Id3PV4W%BN46JFQ}VMRihIo-wbAB&sKuD}In+44qqDQI#|$>4}Q@Sxz$E><+yqCDyjxgnIAt$eN}!$Gfb|`AgFnRsUww8h|ab@2Pxx&N?;S z+`?q*X{S7U$^q}yUplpc6~510bv8qMz+7Q!{Li*&xSH2n^R0gNHvd%aIoG*%J5$S) zR5w!(?H3PMbW$ExR2O211|~>FJJEn55(w9#WQas*&2~$U1`VLWn$kdWcEb*aVK@qu zDtZ1qlM{c)aqh5027_-zr%tb!hQm;LcF5O$h^yGi?6kmeEV$3Di9yjiZs`iEb6788 zr^OorWlo}rwV+q(WquY}Q2KvvDwlS#z>1yHbw0l6Lniz{)`H8Y)GNb2?f&i{Zx_3h z_Yv{ryz}wnet(yc^3_ss)h2dZ@ILhKM7ybu)9)?zM}Br-DvzIcb=YGCp-8#4SB5lu zvk1lr<;s5;%9Sl<0Qwt#=-RRs#W~HMEWb9tO|qd_gha(oxhej@yn6HY%5BYA-aSl^ zBDYe#myvdto3b&tRV~^>i~OM}A^S;ss}wP~3(|F=ORhiQ@7v1SZ(AUEZRji{yO@0P zY>Zrdp&0hbT^H`R9cC_UWRM`AZV8c|mMHj4=C-7<&zU_$=3R`Fb6XOkKW9D#Fb%|4 z;3`$v4$GHYy20o2KuaDyFSn$|Dj8yow9zg^_|xPInR788zK~NcX2M~);^MF2Z!-JR zczQ0oR7lU=`q^^nVBwd{>nyFKe000&!VK{hvyW4;`fmbFiEPrlquE=k-s#nFWb3FN zk>@X`M1MwxDNHd$*VXYE8!gvej* zgw6!K>!xVq_WnZ3N^P=sVS#y+;h|2Z%RI*9kF~k(mxyEUK~c3c1%%)d=q&B}Q6`fX zWjc>qfpD7?2&aY19uJ0GwX`^%t01aH6seuytLtEh<4kunJGK)x>|NyArJZ58 zOnxp_?pCO`OtL+gpo|)L9h@ZCRCQdYyI5a9nrXa8tk?-`I~IKW?}c=>!KoUR5KpTJ5c^ ztrqKwBDG;5<-s(4-KPEht&N&Rn?$@4q3KE6CQdMo35HrgFEVdI%%j9O!O9f>TUMf~ z_xJylDsP=>V+fFd)c(JU?9lyJvk2FBx0RaaNeB}4Lfbw+`eYwb2qqoG|>M*Y~* zXo~{H_P>;&^5&J4sPC8s*dWJA^gD)QH$aRW@?*ugll~4Gf1j@Kle&P#B)#Kg=@&kY z_In~*)@ixQ0veQP5Yb>w`i@9c3V)Zke*E0t#6%Ob+vK?$P8oTP$(E~W&?MupC7b_X zviU{~5$)1LaW1Vl5Mo|W5fOox9;&&^4ma}*!{4jSSIUCtVdcH+Ez z`DQ<}S(j3RJa;n-nq|VRA@rPdD~X=9x4NB2`gCtkpDcQ<= z;?_MyU%FEixG;F2D1%CaJ8CtE=8Ydf5j1Z+2gA6H3zK6%fDCBHDF9=zmkpxu_yb_~ z1ls2jziq3@r0A?*97}BA=0}*|9EAxff^p3`Li^0X;|NUg5fd`|IQ*z?*WpvqOr&U1 zJi@pL4MJB02Nwc&nvfb$<-jov65D2BHc}k^FBL~{(eXCL;aqgUnYK2?;aaiFk2swC zAXtxC<<&tSw~^Rr15cl*e`zd+i|E^o?O>u4c4ckGqO`GOzp<#>jJX2M#}Ki&mVwu# zIRBM_TaD)!jLP>X;s|x)p}dacE^117hKg4gE;_fF4)luzoXw%LGoB0Qy_m0XNC6k_ z<+-MstPVj!F6`{DM_5RLmCYc4mb}fb%J1~pi4kk z8txY`nufIkra98M?$TYcRX}50I`@vExFi}{V~Otj8C?2K#o_f(=oFF3OZ2rf(on4} z6J24j0J`CZFz89cfiTF1EX)pv1Plv@WazHmGiVqW4vC3bobKK2uC;`@cbN*1x*mug zD8r#Yq~oXIfVo-Rf6C4PYPyzpbYgT5kZ1bI0f;zuDa1Cs)d6Y&vN0=yjOXB}2yn&! zf0}S<1UyWjk48W)Y{9Td*h#}5BOx(k3+)^A6LmodAEDw=Lh+ytSwW{P4Ssegei8}s zu%#g_3g+0LC$5hn_j7S?40MLvhGQ{6Z6O!EagYZ+8!F?73VFD~2@Ns%+@%jiZq$Kc z7AvLsI4&N>I|{fqQHWdPAqn#FZ}GH?z3^H*Jl4n0>&=7v%?-zLLCQ)uMHsUx7LKW^ zm_NVb34+~A1Y7x+xGn)=oqc#&QC+AZCR$g0hZVTK_)!8(f_@FI&fqj5v7x{P;{f{O z3OB5Z9YDEBw^@fdO6`EPq6m9-I1?rNKma z7+0r3Iy{2g(!kqsf(0Z?-_9Pc>q>Pqu_2`^tTx#sE*{0L889CvH)LkQWX7j(@ferM zo87pyJ0<1UJ)na{!>CWFpG0QEdUzavlMU}V%ekm0WK>1UJAF~E;Nl6Kkwdo2acvHy znB`pE%oFfX4t0-myqN>Tx|LgJp}NLV%Bjvq(JZH;uv!2;t)sXcpUedhuILFFem$B8)Yvtk!fBkI4_URR zt(#DR`sxfiQ|I&PPsa)na|k`1470hYpukaAv{B&1T<#4B%(Db4?;#Lw&?0e@i6`&D zBz&Y1qk6#)P=!!Hy?;KI7Lb3{IJE$V_-FCeR_OI-F|7%VPvMaQD02Lp#a)2z-tfBl zGcLCr%)~Rj;TSB$gN0B`Lr5RUjb5k^)*go6M|H`>l0MKgevwrGRHPlOj<0`jh()-z z4?$Vf@J1gn!M2!t<)G6}+}{_vq*H$go)=d4so`b%{GrQ5;7A;VtRL))zK1Lx=?B-@ z5^fK{_lv+2rm~4PzLtxp)y8MQ66`hrN>URkuw4!Db1q)wVmTKtaIuVw=ec-}i)Xob zhKr@RaR5w!71%rgX0n&KSc#L1pfGlY6_grvspw?b9csr`DWRTtqzE2lYq(gAxn3xQ zRXEKHOV~Ot*5W_B@H-~CSdZ(Ap#(Nq3mz+mPUs#8E>_3IM)VG(RU5E+APfX-*g6oV z+u#@I9t^wLFR9_<-ofCsrHPmE%3#QKY$6wE&o<%VA&?Q7Zk0`d$mNMcaWZ$MUCvv{ zVwD(4Q)SY(U#tF~vgtMn^$Bv9gi@Syo0;x%!}2IRHv~d)^iW6}bJoi5U)^!ES*cEm zeU=I0=?|z17^KkBbdiFz*?2c&wjZV*OgQ4yliE)idVXK_Fvs)wAZG+D+el&Rk^wD-)m62NMo_*7V_m z=gru}Mm9*b#JhYZS^+|GCV}G>JZ8HXTuoSp0(7mo?HaOkDGf*#$SgU`nPSVvptK^>)~6 aUNpz*X#<5ggLhQ_8G_9z6+>2=+5ZP@ezO_? delta 5486 zcmZ`-d3;nw5`NXwote&kPZDM(B$<#&IC4Qak^urJ5Fmjdq9{nj0G^z#$0`sGksEoE zT2NQ;r|x=z8Z@GyBI11zZvjD3xprL*S7euCtNYDN!Zm-qp6>d(y6UU0>V9wcQ{fGd zhKF4_dZeRx`AcDQ^Bl7#Fyq19{ad|_@l&=J;~yADjx8yf!@ zGqMe5eY{}@!!Ya#>cQwCzXeyl&5)B>wQ8OJJ&FyeZy6URzT!N9=2x9hke$rS+k}Lf64$i#?At6#vTcSji&R+WO~jy(jH!H zSbyYUUh)#xtGvuz5o(!+)^4QgZ?gKY1jMffy5_CFr_FBUlBOwCF4Ilh$ph6mDUT?t z4>ROzT#|}5(4Zm$L~1B4L{OU3XyK^Q2E1lsH;@d281~DKO2g7nb6PdWZE#zHYAgBW?EUA?-@{BBoq< zgOeWZN~<(9ztXKBTez}7>0Svgtz21AshQXslD)w%l)V{}S@TR^bL6PELW98xYM)rj zPTAyEYoRTH0JZ6A`rfj{ZwAD{uDPh$74^17M;SRSx0x?D`{QYaLCVu-4CTfKCO4aK z)Crr-)T5rfz}&zJq)|CY>nhF^uks!4FH>XN%$lQlv)|_OAK=n_Y~!TM<)$rKa83c< zrb)!OB4seG)?UX<4Tjjaln(&CuO}My5sFGZAxQp0e>;doKnSG-cW>jjl^Rci7V+(mX38RqimQ_V;Jlmwi5 zypWzx9M95l!c^EO1~Gx{@-|Tq>Dx#Kly&jx7_cns;B+yb}47SR8&X_OF&s#Fck!Jl&_%q8LK-{EwRbfms0vgGb@63^Z_TXRh%4{>ECBaT3b6B;8) ze?7FDhRBm2%m>bV$@g)&&m4QUAM7*Noy}lBax-FYr$n0g)A?)vq}Oh6o{It4zd8rf z;pf!@VT7K)`cd#*y^lz+8;&gdr(|xBFw&E0*%1(X?ctXd3q!sDism-6FbyCRenCIL zWcU@I1{mi#KoLhNfLwO5BQlR-~7Y`%5Ig?BUX!C_p_U;s4-7__IxZi8(8 zFD{Q@felJ&;5M5cUuJ`Sg@?%tQs!oripi7J&U$IcW-kBD z`zZCI40)W(V|u?Cj!k}zK0yN78cT8vqgW3FkS$!Eyd-kzg~(G}{&_Ld3Nt8>@>&HF!1!)6;MiilbTHJ_G$8- zI_cy#d2^1-v!RvMz%DM&aC|5XGNnQiPrEqYkjhe`Tc@i*+#d$M?uO8(r3&a}7O)A) z0-#NPwSXZcV7VQ#g8B_{3H=6|cJL+hOX|ldVc_OmNP$P&DB_l)%<~N8Lc2TOO0pWpxR@M?=Nym%QJ5mZZzCGb=Z>YSq^G~x zSaS#xaEXNO69OA?5EWWQbhJ=)uh38|B?uYcx^l2G#|g>`BAV#thGUh0Dyr%pJt0=e zm`hB+>~P2|OBC`DT@r!^c&R^_yHt3SggkgTnS;wDoEJ_TD-oXyhXP2(J>gUqlJRsn z%mgP+i-5Gm6cHjfn6at&cm(7^8h#i7rAcX43{<9B#*?#Ym>LP!5Mp{Hc&Wii_`|J$ z9Zvc{1J*OH|-CQ?i`qL~PrsTr0;CT_&rlfXmGQr&BO zJ_&BOfe+JCp|dOZydAGfK#1Pl#tErV15{IXq(Pz0CtSF)2$CCP+5rQ|!*~}oCUz7q zeY6Rq9t_r7ZQ73bg9}DGItxv7K9;$u(00VJZi;Froa=`1!veA{BD9_`91A5Wt9m5H zxV844;nQnp%&1idXMzkBeRU?QYvU}Y4}m}=3ozdUNl=Jacwih9H9qM9Cj)2Wmi90T zWHFIP8Bt>3)B;Gt{7jgd)YTeuu%WH{p&M?>gls6mU8?C`p9L-osymB<+5@i%^*ZAd zS&&DPPqSdO1?Ze{z0pQdPf@7}i8n%a_re)osDM)3>!mo9;TbQam-}hM(WYzz>us48 zPG%8{eJ+yswd6-Y%gb?WHWX#_y9n0bf}sT)fG?6)>{*V7vLV-Tg$2*X#a`Mo{ti$D z#ki~kc(6-0*x51zyJv&PaXWcLHVnpHB!UV&)d42L5FDQaSJ;M%fw=AfrT>;3m;}Sn z>w_LpiDP}xj(Yd_C^sr`y$|wbrEuxPuL{5S!Syg4OLCzDjKHzE;E%4hEXmV%&EfdZ zT*!ctjUVO0awbLzd6mG8r>UIG>;%`r)r~tl!3|toBjjj-dkY{RckhH~bKTT1e7qw> z#c#DPro(mJ3!$92b0-9ojhjGPZ-Wcpr z44G_W!gYZe=!p4ifIi*zUBi zb>keXUlM9T-b5zTc`!l9TH=c;xlP@@YK1=tm}CJaUIGwFK#(W6oP2>0H+F|p{ANmh z{Cgx-%#V9O$CO)yJ)U$2ZVkni5d$^Xw_SMN3@ODnGU%y~;DMfx7W|Tp4$}}sb zC|9E_4)mu1Ijym(j7p(xy6~HYYZGy@A3Pl>|3jy$RqtnrYJIfOO(S?1_QL1=@J_-d zuvpg{{s%Mh{yyLne-ZLdwFxl49HMEksSga!auVm+hMXhhY$0a}dB2eN3Hetc?-lYM zA@3IQF7)?>>sXz@@q%jJ%03W{Tl>P5e4dbV(OwQE$#oVv_o;gZed%zhxX!--AAxn{ zFp@tYm;M&u@XCkq@j*~P z7aYA^SK-FNkb`Fjfn5fN1Qs^aY5wLQ2*-7U!5*&!bO}F4KmF>x>Ow@^MF^#~V+7?x zP^lWY#qo=E?KLr@0#Xuw;nGy5608==Rb%4N3P|Ovg?t!qu7D04g{((Y{aYjC-*9UM zEQhag=n(KZ=#B4TW~2ZvPlfcxM~1+|0M!c%hCyS&Ft(#8{as$E&V}H4N>zp2u%5Ki zc1)bZy2$Oka=2P}I}Vw{`op`pVh(f0z02wP*9OaR-2|4LK(~Y)`~odM&S5DPq-BKG z!iQ;ZcF-Fl5vD(91k})m)!)7XBHAW~j>{IcaoSkbuZ|VMcAQzqiUgTqRAJmQM!~3K z754YJe2?30xNRI=j8@EL4(v6TEplwP-em*Gy>r=7_yC*cF=xyNWCuA{V!c9sfGzWw zhh)j~*(UxGmmlJ}g{&vq7qENaW2{@i5(a(3<@;3Lg2tDr>7S4mGGBQkKejYJ!m5ed ztMrkh#Dr23Dz~3;`6;(^Y?{w{M*3P4^%Kl^fF(o(z(dGu%dzSQ*z%AqBe2^-_Fky_ zG2hAM=lI!!Y@(xym#Yf;fi{zO1^PE~5u4}^xY#}5qGe0S;cphP0f|jq_OZS=`l-O_ zF9A*1Wigw`nmGR63|{p?qY2+!%yOU!4=iRqs7YVKUJ5Ng0<)LW$seR_1bUaT5v|?E WkCxGgkLY$(+(L!Pg&S6}&i@Bdt`(^O -- 2.43.2