Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/node.rb b/app/models/node.rb
index eeb6e6da5d0af7e784dd81c175e0d0dc80db3878..1aff4101e75b8643f05c21a481629ff499197128 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -8,7 +8,7 @@ class Node < ActiveRecord::Base
 
   belongs_to :changeset
 
-  has_many :old_nodes, :foreign_key => :id
+  has_many :old_nodes, :foreign_key => :id, :order => :version
 
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
@@ -58,7 +58,7 @@ class Node < ActiveRecord::Base
  
     find_by_area(min_lat, min_lon, max_lat, max_lon,
                     :conditions => {:visible => true},
-                    :limit => APP_CONFIG['max_number_of_nodes']+1)  
+                    :limit => MAX_NUMBER_OF_NODES+1)  
   end
 
   # Read in xml as text and return it's Node object representation
@@ -70,6 +70,7 @@ class Node < ActiveRecord::Base
       doc.find('//osm/node').each do |pt|
         return Node.from_xml_node(pt, create)
       end
+      raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")
     rescue LibXML::XML::Error, ArgumentError => ex
       raise OSM::APIBadXMLError.new("node", xml, ex.message)
     end
@@ -105,6 +106,8 @@ class Node < ActiveRecord::Base
     node.visible = true
 
     pt.find('tag').each do |tag|
+      raise OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag['k'].nil?
+      raise OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag['v'].nil?
       node.add_tag_key_val(tag['k'],tag['v'])
     end
 
@@ -139,6 +142,7 @@ class Node < ActiveRecord::Base
       raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relation #{rel.relation.id}.") unless rel.nil?
 
       self.changeset_id = new_node.changeset_id
+      self.tags = {}
       self.visible = false
       
       # update the changeset with the deleted position