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 f1dc76eb4c6b65053214e1e80f6665f70ad10052..ea027fb47908d2148ae7d07476843972aeeebd86 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -17,32 +17,38 @@ class Way < ActiveRecord::Base
       p.string = xml
       doc = p.parse
 
       p.string = xml
       doc = p.parse
 

-      way = Way.new
-

       doc.find('//osm/way').each do |pt|
       doc.find('//osm/way').each do |pt|

-        if !create and pt['id'] != '0'
-          way.id = pt['id'].to_i
-        end
+       return Way.from_xml_node(pt, create)
+      end
+    rescue
+      return nil
+    end
+  end

 
 

-        if create
-          way.timestamp = Time.now
-          way.visible = true
-        else
-          if pt['timestamp']
-            way.timestamp = Time.parse(pt['timestamp'])
-          end
-        end
+  def self.from_xml_node(pt, create=false)
+    way = Way.new

 
 

-        pt.find('tag').each do |tag|
-          way.add_tag_keyval(tag['k'], tag['v'])
-        end
+    if !create and pt['id'] != '0'
+      way.id = pt['id'].to_i
+    end
+    
+    way.version = pt['version']

 
 

-        pt.find('nd').each do |nd|
-          way.add_nd_num(nd['ref'])
-        end
+    if create
+      way.timestamp = Time.now
+      way.visible = true
+    else
+      if pt['timestamp']
+       way.timestamp = Time.parse(pt['timestamp'])

       end
       end

-    rescue
-      way = nil
+    end
+
+    pt.find('tag').each do |tag|
+      way.add_tag_keyval(tag['k'], tag['v'])
+    end
+
+    pt.find('nd').each do |nd|
+      way.add_nd_num(nd['ref'])

     end
 
     return way
     end
 
     return way


@@ -70,6 +76,7 @@ class Way < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

+    el1['version'] = self.version.to_s

 
     user_display_name_cache = {} if user_display_name_cache.nil?
 
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 


@@ -158,15 +165,12 @@ class Way < ActiveRecord::Base
     t = Time.now
 
     Way.transaction do
     t = Time.now
 
     Way.transaction do

+      self.version += 1

       self.timestamp = t
       self.save!
       self.timestamp = t
       self.save!

-    end

 
 

-    WayTag.transaction do

       tags = self.tags
       tags = self.tags

-

       WayTag.delete_all(['id = ?', self.id])
       WayTag.delete_all(['id = ?', self.id])

-

       tags.each do |k,v|
         tag = WayTag.new
         tag.k = k
       tags.each do |k,v|
         tag = WayTag.new
         tag.k = k


@@ -174,13 +178,9 @@ class Way < ActiveRecord::Base
         tag.id = self.id
         tag.save!
       end
         tag.id = self.id
         tag.save!
       end

-    end

 
 

-    WayNode.transaction do

       nds = self.nds
       nds = self.nds

-

       WayNode.delete_all(['id = ?', self.id])
       WayNode.delete_all(['id = ?', self.id])

-

       sequence = 1
       nds.each do |n|
         nd = WayNode.new
       sequence = 1
       nds.each do |n|
         nd = WayNode.new


@@ -189,11 +189,25 @@ class Way < ActiveRecord::Base
         nd.save!
         sequence += 1
       end
         nd.save!
         sequence += 1
       end

+
+      old_way = OldWay.from_way(self)
+      old_way.timestamp = t
+      old_way.save_with_dependencies!

     end
     end

+  end

 
 

-    old_way = OldWay.from_way(self)
-    old_way.timestamp = t
-    old_way.save_with_dependencies!
+  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?
   end
 
   def preconditions_ok?


@@ -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