From 57aeccccc8d23adceac028616b7877ae6c4e0c87 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Fri, 3 Aug 2007 12:09:24 +0000 Subject: [PATCH] various bugfixes, new natural presets --- app/controllers/amf_controller.rb | 24 ++++++++++++++++++++---- public/potlatch/potlatch.swf | Bin 56482 -> 56774 bytes 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index ed4f87b21..47f8f2458 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -122,6 +122,15 @@ preserved railway: railway=preserved disused railway tracks: railway=disused course of old railway: railway=abandoned +way/natural +forest: natural=wood,landuse=forest +woodland: natural=wood,landuse= +reservoir: natural=water,landuse=reservoir +lake: natural=water,landuse= +marsh: natural=marsh +beach: natural=beach +coastline: natural=coastline + point/road mini roundabout: highway=mini_roundabout traffic lights: highway=traffic_signals @@ -146,6 +155,9 @@ point/railway station: railway=station viaduct: railway=viaduct level crossing: railway=crossing + +point/natural +peak: natural=peak EOF StringIO.open(txt) do |file| @@ -297,10 +309,14 @@ EOF # compare node if node<0 # new node - create - newnode=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes ( latitude,longitude,timestamp,user_id,visible,tags) VALUES ( #{ys},#{xs},#{db_now},#{uid},1,#{tagsql})") - ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{newnode},#{ys},#{xs},#{db_now},#{uid},1,#{tagsql})") - points[i][2]=newnode - renumberednodes[node.to_s]=newnode.to_s + if renumberednodes[node.to_s].nil? + newnode=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes ( latitude,longitude,timestamp,user_id,visible,tags) VALUES ( #{ys},#{xs},#{db_now},#{uid},1,#{tagsql})") + ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags) VALUES (#{newnode},#{ys},#{xs},#{db_now},#{uid},1,#{tagsql})") + points[i][2]=newnode + renumberednodes[node.to_s]=newnode.to_s + else + points[i][2]=renumberednodes[node.to_s].to_i + end elsif xc.has_key?(node) # old node from original way - update diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf index 3302bda3d78f12d755922628878a93919393b8f0..28db77cc4fabfccd3977c723459714ac2fe316d1 100755 GIT binary patch delta 1676 zcmX|>c}&x17{{OY*XwPS0uAESwp;^Sw}EnB$|-Uma*GH*X*r}&)|N}qjwFXW%u{Z;DdX6e?Hp{MdFch=(gvzgCVR7&?q|HI3nV5a+^V(+ESiBC5x^NmY) zE_D5sr&&?I>mGGapgZKj@YQS%)^VpgQk4k+MjD6qEg^~qVI7Z8RLvv->uD=V#2eH| zlJE}IlVp5KL(*b}uv1DUfjIDzgLp<6BrwV$kx>Cjj7mrb@J&b+CKzO9nudMqJtQ43 zsw2sM{6bhCz<<;xl7YK4tt1o2H7}AZysU`~$%d52RSz~#C+LsA|Gld1TKxLi$ortD zIrvZ$*5ExnmM4|X;~# zExCjo!nLhcBp+Y$OC|-_>i0Y;#PfbRqzJ$9iz3DN$Zvm9t`y}UQ*n^TD1$?ca>!>? zKmnr?3K>;U#7Lo78ePhc%0$cXEv=c9WBt`x{9mw)q=K6`t{rAl3MR ze|S-eG`p0!I4EP3K{=xwDi{@Tm{AFpj4G&Nq);u*u4NZtS-1#wm>O_nSB+$@WtAM% z`6`p>5&SSPQKqL2SQ=;`N6{8&jHs8YkBHU6jS`Mo21li?V?tLlX~N$F)3TePtg5l= zuFxai|DB&)zZ8}>^yi~B6a1oXlw`+5S(7MhmSo3S1OsisIh~PM@S4uBo0qzdi(M^Z zm&MnWp$#Gc+i^p8VWgXP^*VSP#6pk5>a@C=`gxbt(a#S;inQaf^A^aJUbPIi*sR|7 zOQanK-(mA^)JPkxcDu{FQ4ifhrOV}jMsQerth|f8;Dzl0-_pdCK;jmt zJ1v}8F?TguYZX7WKm%>X(bcfbR)BBSZPKx{`;Or?Wt1G+0J?Z*r}O1r-eDDrI;5f# zzM|KaQ3~k5Usr>P4WFz|(@wDf6Fle1I^Om8{y)sriJ6`~#D$-&8A&hlw|9^}EdN0- z3#I*d(-RiwkjzdopG*8!dKu-=$EbjQ-()i#WX6-sc#0WMGoz6X;q2{@xBl?S z##5s4v}hcXjHApr#*E{Far;OH6@Gg#0kv;5&)-|;gf(oiyGVTNux(lM$@hzG7w^a0 zex9A*_uR)O?v;EV%%PgPcjk69>*^FU1@A$9Xt3Eb+5R@bx_VfOH7dp$6Jw2wu_mNA zQ-E0>GdauhOndXFGN|z10q2nXnAb2ViKax+Sy41Ciq82&FbLOb7WfiCE=c7wzF XJOBe;^w@fxFzj8~VbTkyT^R5`G?=BB delta 1441 zcmYk6YfO_@7{{NdZ~OLbnWcb?U1*CyNimxuXhA9#<)TvLA|PtzQlS;(Qq~qIhygF# z$lN~YlYLmSWC@AM_F;*n@?qJ=oZC!HNVa5&5f~f$u*A7bOtxs|K6K|jeNVD}=BSN%Fokdzy=AgvDSc$h#WK2U za!^z$%y~nW4NwZeC_@=QHA~r*J(Op5pqr}A+p(O6%ucMJYizuiJ~O+pl72CV&_j)B zui!qKN^@creUN6u{q%X-Hveuw)rPQ#TXo>(l%Skb4;7pS*vlzHC8rTQoC@sYG(i=o z8TN~=s%g{eFnAH*K%(opTEv62u%#Vq=;@XUtfdl5A=Xicr3UNiJxdWDqT7}#pI5ZQ z-i)=Sg9Drr9OTqP4W|KWIc2EhG(tV60*A!%N7$y=B$v`a1L?)+qwDEAu#vt@Z^=6f z4H@5j^%q-dd3iYr)@)akqxJr+`6sTW(YaiuiFR3S*i6mV0&JnEHQ#qwGKNOT0&F9F#_g9|h4mP((m`9Qs$A)ypE4@&IK7Z* z!%lK%+6&r6ZHHESoKu2MkvYjSZmCi^MK?1&=%?RV>V!z0)KaIk6uWHd%_ c*>@9 zQz*+`*8|P*=v*30CD{k8Tc2K?_;~G)8%rBL*fgCMwl2-qt=W1~Hm^luXZ<|g%X)Wq zG7t+!CIeHj8^$8RXfW0j2?zSYE1vqM`i6t*?}x=qBrrIvPPB@NP&gb@C)#0@RmNfw zI02F1STGRd52x95JT-JFeK4DRa^IW$etr&Nb2CYQZhZ-ZWXg8x9^FZlWWV#i?jJpU zvFOtMDE2QaHYA=cdGfKB+z)ol_G<6PXj1|ZpLzVO`0Jd| z93aBV%1RQQKmVOIKi&OUy`d5W0KPMw5u4MO+Kg**ksi(fj0B=X(bvWUksvGT7e&ET z(RI1V0R8_jDrM)w{tVt^hjW%5J($l5iOAVhq*xiGAJ@0zIl8%O$07Q5^+g<}k@ejC zho%8hJE*8yPNM1(lT#p7H&!NrqIY{xjgz3wQB z3VBSEk8ARYlpH2G4G