X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..3a654c89197b40f4a623c0dd33b87b415623d97d:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 6ef1b9e6f..1aff4101e 100644
--- 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
@@ -82,7 +83,7 @@ class Node < ActiveRecord::Base
     raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil?
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f
-    raise OSM::APIBadXMLError.new("node", pt, "changeset id missing") if pt['changeset'].nil?
+    raise OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt['changeset'].nil?
     node.changeset_id = pt['changeset'].to_i
 
     raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
@@ -93,17 +94,20 @@ class Node < ActiveRecord::Base
 
     unless create
       raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil?
-      if pt['id'] != '0'
-        node.id = pt['id'].to_i
-      end
+      node.id = pt['id'].to_i
+      # .to_i will return 0 if there is no number that can be parsed. 
+      # We want to make sure that there is no id with zero anyway
+      raise OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id == 0
     end
 
     # We don't care about the time, as it is explicitly set on create/update/delete
     # We don't care about the visibility as it is implicit based on the action
-
-    tags = []
+    # and set manually before the actual delete
+    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
 
@@ -138,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