Added a bunch more tests on the API 0.6. Fixed node/way/relation from_xml code to...

[rails.git] / app / models / way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index b2bdfb39b0e0e96bc6ee4d497b240ade8238eef2..90458006e8cf15a64a85bd797a5bf6a4116d2130 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -169,6 +169,11 @@ class Way < ActiveRecord::Base
 
   def add_tag_keyval(k, v)
     @tags = Hash.new unless @tags
+
+    # duplicate tags are now forbidden, so we can't allow values
+    # in the hash to be overwritten.
+    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+
     @tags[k] = v
   end
 
@@ -212,7 +217,7 @@ class Way < ActiveRecord::Base
     if !new_way.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
     end
-    self.changeset_id = changeset_id
+    self.changeset_id = new_way.changeset_id
     self.tags = new_way.tags
     self.nds = new_way.nds
     self.visible = true
@@ -222,7 +227,7 @@ class Way < ActiveRecord::Base
   def create_with_history(user)
     check_create_consistency(self, user)
     if !self.preconditions_ok?
-      raise OSM::APIPreconditionsFailedError.new
+      raise OSM::APIPreconditionFailedError.new
     end
     self.version = 0
     self.visible = true