Merge HTML export branch to trunk.

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 4afba1484fd58fd9f39ff6dca1b7f6b3d7bf4afe..4214448696d6fb2d85f7f37fb1b0daec83ca30dd 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -594,8 +594,8 @@ class AmfController < ApplicationController
        # the delete_with_relations_and_nodes_and_history method should do this,
        #   but at present it just throws a 'precondition failed'
     way=way.to_i 
-    db_now='@now'+(rand*100).to_i.to_s+uid.to_s+id.to_i.abs.to_s+Time.new.to_i.to_s
-       db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s
+    db_now='@now'+(rand*100).to_i.to_s+uid.to_s+way.abs.to_s+Time.new.to_i.to_s
+       db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+way.abs.to_s+Time.new.to_i.to_s
     ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
        createuniquenodes(way,db_uqn,[])
        deleteuniquenoderelations(db_uqn,uid,db_now)

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index fab50c40a0396ea49741864b69681f72929c1fab..ee6f67b705dafec18d4d95f785f9788b86074cdb 100755 (executable)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ