X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c11d961f624cb610c4b8184d24e522b2c093d1ea..4b3c207a818b936310f48b768488a6a39845fe81:/app/models/way.rb?ds=inline

diff --git a/app/models/way.rb b/app/models/way.rb
index 5a26e2216..f1dc76eb4 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,12 +1,13 @@
 class Way < ActiveRecord::Base
   require 'xml/libxml'
-  
+
   belongs_to :user
 
-  has_many :way_segments, :foreign_key => 'id'
+  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 :old_ways, :foreign_key => :id
+  has_many :old_ways, :foreign_key => 'id', :order => 'version'
 
   set_table_name 'current_ways'
 
@@ -36,8 +37,8 @@ class Way < ActiveRecord::Base
           way.add_tag_keyval(tag['k'], tag['v'])
         end
 
-        pt.find('seg').each do |seg|
-          way.add_seg_num(seg['id'])
+        pt.find('nd').each do |nd|
+          way.add_nd_num(nd['ref'])
         end
       end
     rescue
@@ -47,21 +48,32 @@ class Way < ActiveRecord::Base
     return way
   end
 
+  # Find a way given it's ID, and in a single SQL call also grab its nodes
+  #
+  
+  # You can't pull in all the tags too unless we put a sequence_id on the way_tags table and have a multipart key
+  def self.find_eager(id)
+    way = Way.find(id, :include => {:way_nodes => :node})
+    #If waytag had a multipart key that was real, you could do this:
+    #way = Way.find(id, :include => [:way_tags, {:way_nodes => :node}])
+  end
+
+  # Find a way given it's ID, and in a single SQL call also grab its nodes and tags
   def to_xml
     doc = OSM::API.new.get_xml_doc
     doc.root << to_xml_node()
     return doc
   end
 
-  def to_xml_node(visible_segments = nil, user_display_name_cache = nil)
+  def to_xml_node(visible_nodes = nil, user_display_name_cache = nil)
     el1 = XML::Node.new 'way'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
 
     user_display_name_cache = {} if user_display_name_cache.nil?
-    
-    if user_display_name_cache and user_display_name_cache[self.user_id]
+
+    if user_display_name_cache and user_display_name_cache.key?(self.user_id)
       # use the cache if available
     elsif self.user.data_public?
       user_display_name_cache[self.user_id] = self.user.display_name
@@ -71,30 +83,30 @@ class Way < ActiveRecord::Base
 
     el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
 
-    # make sure segments are output in sequence_id order
-    ordered_segments = []
-    self.way_segments.each do |seg|
-      if visible_segments
-        # if there is a list of visible segments then use that to weed out deleted segments
-        if visible_segments[seg.segment_id]
-          ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+    # make sure nodes are output in sequence_id order
+    ordered_nodes = []
+    self.way_nodes.each do |nd|
+      if visible_nodes
+        # if there is a list of visible nodes then use that to weed out deleted nodes
+        if visible_nodes[nd.node_id]
+          ordered_nodes[nd.sequence_id] = nd.node_id.to_s
         end
       else
         # otherwise, manually go to the db to check things
-        if seg.segment.visible? and seg.segment.from_node.visible? and seg.segment.to_node.visible?
-          ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+        if nd.node.visible? and nd.node.visible?
+          ordered_nodes[nd.sequence_id] = nd.node_id.to_s
         end
       end
     end
 
-    ordered_segments.each do |seg_id|
-      if seg_id and seg_id != '0'
-        e = XML::Node.new 'seg'
-        e['id'] = seg_id
+    ordered_nodes.each do |nd_id|
+      if nd_id and nd_id != '0'
+        e = XML::Node.new 'nd'
+        e['ref'] = nd_id
         el1 << e
       end
     end
- 
+
     self.way_tags.each do |tag|
       e = XML::Node.new 'tag'
       e['k'] = tag.k
@@ -104,37 +116,37 @@ class Way < ActiveRecord::Base
     return el1
   end 
 
-  def segs
-    unless @segs
-        @segs = Array.new
-        self.way_segments.each do |seg|
-            @segs += [seg.segment_id]
-        end
+  def nds
+    unless @nds
+      @nds = Array.new
+      self.way_nodes.each do |nd|
+        @nds += [nd.node_id]
+      end
     end
-    @segs
+    @nds
   end
 
   def tags
     unless @tags
-        @tags = Hash.new
-        self.way_tags.each do |tag|
-            @tags[tag.k] = tag.v
-        end
+      @tags = {}
+      self.way_tags.each do |tag|
+        @tags[tag.k] = tag.v
+      end
     end
     @tags
   end
 
-  def segs=(s)
-    @segs = s
+  def nds=(s)
+    @nds = s
   end
 
   def tags=(t)
     @tags = t
   end
 
-  def add_seg_num(n)
-    @segs = Array.new unless @segs
-    @segs << n.to_i
+  def add_nd_num(n)
+    @nds = Array.new unless @nds
+    @nds << n.to_i
   end
 
   def add_tag_keyval(k, v)
@@ -142,55 +154,103 @@ class Way < ActiveRecord::Base
     @tags[k] = v
   end
 
-  def save_with_history
-    begin
-      Way.transaction do
-        t = Time.now
-        self.timestamp = t
-        self.save!
-    
-        WayTag.delete_all(['id = ?', self.id])
-
-        self.tags.each do |k,v|
-          tag = WayTag.new
-          tag.k = k
-          tag.v = v
-          tag.id = self.id
-          tag.save!
-        end
+  def save_with_history!
+    t = Time.now
 
-        WaySegment.delete_all(['id = ?', self.id])
-    
-        i = 0
-        self.segs.each do |n|
-          seg = WaySegment.new
-          seg.id = self.id
-          seg.segment_id = n
-          seg.sequence_id = i
-          seg.save!
-          i += 1
-        end
+    Way.transaction do
+      self.timestamp = t
+      self.save!
+    end
+
+    WayTag.transaction do
+      tags = self.tags
 
-        old_way = OldWay.from_way(self)
-        old_way.timestamp = t
-        old_way.save_with_dependencies!
+      WayTag.delete_all(['id = ?', self.id])
+
+      tags.each do |k,v|
+        tag = WayTag.new
+        tag.k = k
+        tag.v = v
+        tag.id = self.id
+        tag.save!
       end
+    end
 
-      return true
-    rescue
-      return nil
+    WayNode.transaction do
+      nds = self.nds
+
+      WayNode.delete_all(['id = ?', self.id])
+
+      sequence = 1
+      nds.each do |n|
+        nd = WayNode.new
+        nd.id = [self.id, sequence]
+        nd.node_id = n
+        nd.save!
+        sequence += 1
+      end
     end
+
+    old_way = OldWay.from_way(self)
+    old_way.timestamp = t
+    old_way.save_with_dependencies!
   end
 
   def preconditions_ok?
-    return false if self.segs.empty?
-    self.segs.each do |n|
-      segment = Segment.find(n)
-      unless segment and segment.visible and segment.preconditions_ok?
+    return false if self.nds.empty?
+    self.nds.each do |n|
+      node = Node.find(:first, :conditions => ["id = ?", n])
+      unless node and node.visible
         return false
       end
     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)
+    if self.visible
+	  # FIXME
+	  # this should actually delete the relations,
+	  # not just throw a PreconditionFailed if it's a member of a relation!!
+      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 = []
+        self.nds = []
+        self.visible = false
+        self.save_with_history!
+      end
+    else
+      raise OSM::APIAlreadyDeletedError
+    end
+  end
+
+  # delete a way and it's nodes that aren't part of other ways, with history
+  def delete_with_relations_and_nodes_and_history(user)
+    
+    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 != #{self.id}")
+    
+    node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id}
+
+    node_ids_to_delete = node_ids - node_ids_not_to_delete
+
+    # 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
+    
+    self.user_id = user.id
+
+    self.delete_with_relations_and_history(user)
+
+  end
 end