Make capabilities report the current version for from/to version

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 121dff8bd4cece70358ecf3f2a7974658b5d5aa7..255f4329f89983c49f4a760a32df77caeafeb3f9 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -3,6 +3,7 @@ class Way < ActiveRecord::Base
 
   belongs_to :user
 
 
   belongs_to :user
 

+  has_many :nodes, :through => :way_nodes, :order => 'sequence_id'

   has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
   has_many :way_tags, :foreign_key => 'id'
 
   has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
   has_many :way_tags, :foreign_key => 'id'
 


@@ -16,32 +17,36 @@ 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

 
 

-        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


@@ -69,6 +74,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?
 


@@ -157,15 +163,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


@@ -173,13 +176,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


@@ -188,11 +187,23 @@ 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
+    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?


@@ -209,10 +220,15 @@ class Way < ActiveRecord::Base
   # 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)
     if self.visible
   # 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)
     if self.visible

-      # omg FIXME
+         # 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

+      # end FIXME

       else
         self.user_id = user.id
         self.tags = []
       else
         self.user_id = user.id
         self.tags = []


@@ -226,38 +242,27 @@ 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

-  # WARNING, INCOMPLETE - Read the code

   def delete_with_relations_and_nodes_and_history(user)
   def delete_with_relations_and_nodes_and_history(user)

-    return false # until complete, just return false

     
     node_ids = self.nodes.collect {|node| node.id }
     node_ids_not_to_delete = []
     
     node_ids = self.nodes.collect {|node| node.id }
     node_ids_not_to_delete = []

-    way_nodes = WayNode.find(:all, :conditions => "node_id in [#{node_ids.join(',')}] and id not #{self.id}")
+    way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}")

     
     node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id}
 
     
     node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id}
 

-    nodes_to_delete = node_ids - node_ids_not_to_delete
-
-    # update the visibility etc on the current nodes
-    update_time = Time.now()
-    
-    Node.update(node_ids_to_delete, {:user_id = user.id, :timestamp => update_time, :visibility => false})
-
-    # create old nodes
+    node_ids_to_delete = node_ids - node_ids_not_to_delete

 
 

-    old_nodes_to_create = []
-    OldNode.find(node_ids_to_delete).each do |old_node|
-      old_nodes_to_create << {:id => old_node.id, :timestamp => update_time, :latitude => old_node.latitude, :longitude => old_node.longitude, :visible => false}
+    # delete the nodes not used by other ways
+    node_ids_to_delete.each do |node_id|
+      n = Node.find(node_id)
+      n.user_id = user.id
+      n.visible = false
+      n.save_with_history!

     end
     end

-
-    OldNode.create(old_nodes_to_create)
-
-    # FIXME - the old nodes need to have their tile updated and I have no idea how that works
-    # they also need their tags copied over, and that depends on normalising the tags out to their own table that nicks working on
-
-    # finally, delete the way

     
     

-    self.delete_with_relations_and_history
+    self.user_id = user.id
+
+    self.delete_with_relations_and_history(user)

 
   end
 end
 
   end
 end