X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d0ca940d26bdc23aa791178b01b816185c5a086..f07819d81a7437e58c6e64c2e76ba7e54fad9034:/app/models/way.rb?ds=sidebyside

diff --git a/app/models/way.rb b/app/models/way.rb
index 935a7422c..cc9343e7c 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -25,6 +25,7 @@ class Way < ActiveRecord::Base
   validates_numericality_of :id, :on => :update, :integer_only => true
   validates_associated :changeset
 
+  # Read in xml as text and return it's Way object representation
   def self.from_xml(xml, create=false)
     begin
       p = XML::Parser.string(xml)
@@ -33,6 +34,7 @@ class Way < ActiveRecord::Base
       doc.find('//osm/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end
+      raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.")
     rescue LibXML::XML::Error, ArgumentError => ex
       raise OSM::APIBadXMLError.new("way", xml, ex.message)
     end
@@ -41,27 +43,27 @@ class Way < ActiveRecord::Base
   def self.from_xml_node(pt, create=false)
     way = Way.new
 
-    if !create and pt['id'] != '0'
-      way.id = pt['id'].to_i
-    end
-    
+    raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create or not pt['version'].nil?
     way.version = pt['version']
-    raise OSM::APIBadXMLError.new("node", pt, "Changeset is required") if pt['changeset'].nil?
+    raise OSM::APIBadXMLError.new("way", pt, "Changeset id is missing") if pt['changeset'].nil?
     way.changeset_id = pt['changeset']
 
-    # This next section isn't required for the create, update, or delete of ways
-    if create
-      way.timestamp = Time.now.getutc
-      way.visible = true
-    else
-      if pt['timestamp']
-        way.timestamp = Time.parse(pt['timestamp'])
-      end
-      # if visible isn't present then it defaults to true
-      way.visible = (pt['visible'] or true)
+    unless create
+      raise OSM::APIBadXMLError.new("way", pt, "ID is required when updating") if pt['id'].nil?
+      way.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 way cannot be zero when updating.") if way.id == 0
     end
 
+    # We don't care about the timestamp nor the visibility as these are either
+    # set explicitly or implicit in the action. The visibility is set to true, 
+    # and manually set to false before the actual delete.
+    way.visible = true
+
     pt.find('tag').each do |tag|
+      raise OSM::APIBadXMLError.new("way", pt, "tag is missing key") if tag['k'].nil?
+      raise OSM::APIBadXMLError.new("way", pt, "tag is missing value") if tag['v'].nil?
       way.add_tag_keyval(tag['k'], tag['v'])
     end
 
@@ -204,17 +206,20 @@ class Way < ActiveRecord::Base
   end
 
   def update_from(new_way, user)
-    check_consistency(self, new_way, user)
-    unless new_way.preconditions_ok?(self.nds)
-      raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.")
+    Way.transaction do
+      self.lock!
+      check_consistency(self, new_way, user)
+      unless new_way.preconditions_ok?(self.nds)
+        raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.")
+      end
+      
+      self.changeset_id = new_way.changeset_id
+      self.changeset = new_way.changeset
+      self.tags = new_way.tags
+      self.nds = new_way.nds
+      self.visible = true
+      save_with_history!
     end
-
-    self.changeset_id = new_way.changeset_id
-    self.changeset = new_way.changeset
-    self.tags = new_way.tags
-    self.nds = new_way.nds
-    self.visible = true
-    save_with_history!
   end
 
   def create_with_history(user)
@@ -229,8 +234,8 @@ class Way < ActiveRecord::Base
 
   def preconditions_ok?(old_nodes = [])
     return false if self.nds.empty?
-    if self.nds.length > APP_CONFIG['max_number_of_way_nodes']
-      raise OSM::APITooManyWayNodesError.new(self.nds.length, APP_CONFIG['max_number_of_way_nodes'])
+    if self.nds.length > MAX_NUMBER_OF_WAY_NODES
+      raise OSM::APITooManyWayNodesError.new(self.id, self.nds.length, MAX_NUMBER_OF_WAY_NODES)
     end
 
     # check only the new nodes, for efficiency - old nodes having been checked last time and can't
@@ -258,6 +263,7 @@ class Way < ActiveRecord::Base
     # provide repeatable reads for the used-by checks. this means it
     # shouldn't be possible to get race conditions.
     Way.transaction do
+      self.lock!
       check_consistency(self, new_way, user)
       rel = RelationMember.find(:first, :joins => :relation,
                              :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])