api06: simplify exception handling and add exception handling to the diff

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 0c927c11c7d0c35fca3624661887f60116213323..ea027fb47908d2148ae7d07476843972aeeebd86 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -18,13 +18,11 @@ class Way < ActiveRecord::Base
       doc = p.parse
 
       doc.find('//osm/way').each do |pt|
       doc = p.parse
 
       doc.find('//osm/way').each do |pt|

-       way = Way.from_xml_node pt, create
+       return Way.from_xml_node(pt, create)

       end
     rescue
       end
     rescue

-      way = nil
+      return nil

     end
     end

-
-    return way

   end
 
   def self.from_xml_node(pt, create=false)
   end
 
   def self.from_xml_node(pt, create=false)


@@ -33,6 +31,8 @@ class Way < ActiveRecord::Base
     if !create and pt['id'] != '0'
       way.id = pt['id'].to_i
     end
     if !create and pt['id'] != '0'
       way.id = pt['id'].to_i
     end

+    
+    way.version = pt['version']

 
     if create
       way.timestamp = Time.now
 
     if create
       way.timestamp = Time.now


@@ -196,6 +196,20 @@ class Way < ActiveRecord::Base
     end
   end
 
     end
   end
 

+  def update_from(new_way, user)
+    if !new_way.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new
+    elsif new_way.version != version
+      raise OSM::APIVersionMismatchError.new(new_way.version, version)
+    else
+      self.user_id = user.id
+      self.tags = new_way.tags
+      self.nds = new_way.nds
+      self.visible = true
+      save_with_history!
+    end
+  end
+

   def preconditions_ok?
     return false if self.nds.empty?
     self.nds.each do |n|
   def preconditions_ok?
     return false if self.nds.empty?
     self.nds.each do |n|


@@ -207,12 +221,13 @@ class Way < ActiveRecord::Base
     return true
   end
 
     return true
   end
 

-  # Delete the way and it's relations, but don't really delete it - set its visibility to false and update the history etc to maintain wiki-like functionality.
-  def delete_with_relations_and_history(user)
+  def delete_with_history(user)

     if self.visible
          # FIXME
          # this should actually delete the relations,
          # not just throw a PreconditionFailed if it's a member of a relation!!
     if self.visible
          # FIXME
          # this should actually delete the relations,
          # not just throw a PreconditionFailed if it's a member of a relation!!

+
+      # 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",
                              :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id])
         raise OSM::APIPreconditionFailedError
       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])
         raise OSM::APIPreconditionFailedError


@@ -230,6 +245,8 @@ class Way < ActiveRecord::Base
   end
 
   # delete a way and it's nodes that aren't part of other ways, with history
   end
 
   # delete a way and it's nodes that aren't part of other ways, with history

+
+  # FIXME: merge the potlatch code to delete the relations

   def delete_with_relations_and_nodes_and_history(user)
     
     node_ids = self.nodes.collect {|node| node.id }
   def delete_with_relations_and_nodes_and_history(user)
     
     node_ids = self.nodes.collect {|node| node.id }


@@ -250,7 +267,7 @@ class Way < ActiveRecord::Base
     
     self.user_id = user.id
 
     
     self.user_id = user.id
 

-    self.delete_with_relations_and_history(user)
+    self.delete_with_history(user)

 
   end
 end
 
   end
 end