Removed debugging code.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index b2bdfb39b0e0e96bc6ee4d497b240ade8238eef2..591dee9a22c07a000cc4a413b709a2c4f13ad60a 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
 
   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
 
     @tags[k] = v
   end
 


@@ -212,7 +217,7 @@ class Way < ActiveRecord::Base
     if !new_way.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
     end
     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
     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?
   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
     end
     self.version = 0
     self.visible = true


@@ -240,19 +245,12 @@ class Way < ActiveRecord::Base
     return true
   end
 
     return true
   end
 

-  def delete_with_history(new_way, user)
+  def delete_with_history!(new_way, user)

     check_consistency(self, new_way, user)
     if self.visible
     check_consistency(self, new_way, user)
     if self.visible

-      # FIXME
-      # this should actually delete the relations,
-      # not just throw a PreconditionFailed if it's a member of a relation!!
-      # WHY?? The editor should decide whether the node is in the relation or not!
-
-      # FIXME: this should probably renamed to delete_with_history

       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",

-                             :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id])
+                             :conditions => [ "visible = 1 AND member_type='way' and member_id=? ", self.id])

         raise OSM::APIPreconditionFailedError
         raise OSM::APIPreconditionFailedError

-      # end FIXME

       else
         self.changeset_id = new_way.changeset_id
         self.tags = []
       else
         self.changeset_id = new_way.changeset_id
         self.tags = []