Fixed problem where tag lengths were generating a 422 error with no message. They...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 987df9b138b1cdd4658126b7df1e85a9de2d7645..742609c0e1d81e16cad88383e0f7757c21f194ad 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -131,11 +131,11 @@ class Node < ActiveRecord::Base
     # shouldn't be possible to get race conditions.
     Node.transaction do
       check_consistency(self, new_node, user)
-      way = WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", 
+      way = WayNode.find(:first, :joins => :way, 
                          :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
-      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.id}.") unless way.nil?
+      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.way.id}.") unless way.nil?
       
-      rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", 
+      rel = RelationMember.find(:first, :joins => :relation, 
                                 :conditions => [ "visible = ? AND member_type='Node' and member_id=? ", true, self.id])
       raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relation #{rel.relation.id}.") unless rel.nil?
 
@@ -149,30 +149,6 @@ class Node < ActiveRecord::Base
     end
   end
 
-  # As above but doesn't throw an error if node is used elsewhere - instead, just silently
-  # returns without deleting the node. Potlatch needs this in case you ask to delete an
-  # off-screen node while deleting a way - it doesn't know whether the node is used
-  # elsewhere or not.
-  def delete_with_history_unless_used!(new_node, user)
-    unless self.visible
-      raise OSM::APIAlreadyDeletedError.new("node", new_node.id)
-    end
-
-    Node.transaction do
-      check_consistency(self, new_node, user)
-      way = WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", 
-                         :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
-      rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", 
-                                :conditions => [ "visible = ? AND member_type='Node' and member_id=? ", true, self.id])
-      if way.nil? and rel.nil?
-        self.changeset_id = new_node.changeset_id
-        self.visible = false
-        changeset.update_bbox!(bbox)
-        save_with_history!
-      end
-    end
-  end
-
   def update_from(new_node, user)
     check_consistency(self, new_node, user)
 
@@ -278,6 +254,11 @@ class Node < ActiveRecord::Base
     # in the hash to be overwritten.
     raise OSM::APIDuplicateTagsError.new("node", self.id, k) if @tags.include? k
 
+    # check tag size here, as we don't create a NodeTag object until
+    # just before we save...
+    raise OSM::APIBadUserInput.new("Node #{self.id} has a tag with too long a key, '#{k}'.") if k.length > 255
+    raise OSM::APIBadUserInput.new("Node #{self.id} has a tag with too long a value, '#{k}'='#{v}'.") if v.length > 255
+
     @tags[k] = v
   end