From c65a3d76aeba12e6808d107e53cb1284ae3e9b99 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Thu, 23 Apr 2009 08:32:26 +0000 Subject: [PATCH] fix nodes bug --- app/controllers/amf_controller.rb | 4 ++-- public/potlatch/potlatch.swf | Bin 174605 -> 174639 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 7f1bae483..6f07fa2c7 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -903,7 +903,7 @@ class AmfController < ApplicationController def sql_get_nodes_in_way(wayid) points=[] sql=<<-EOF - SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id + SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id,current_nodes.version FROM current_way_nodes,current_nodes WHERE current_way_nodes.id=#{wayid.to_i} AND current_way_nodes.node_id=current_nodes.id @@ -916,7 +916,7 @@ class AmfController < ApplicationController nodetags[n['k']]=n['v'] end nodetags.delete('created_by') - points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags] + points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags,row['version'].to_i] end points end diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf index b5190343f3db17b9c4fe46d6df3db9dbba97ccd2..7befcbdbd3447aaeff524a49d41fd3986ecd79ff 100755 GIT binary patch delta 1329 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 UzA%nSQ$LL^r2bETf*;EN08)v70RR91 -- 2.43.2