more diary entry tests, and a minor fix to the relation member that makes the code...

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 121dff8bd4cece70358ecf3f2a7974658b5d5aa7..7c29a44b379857574a7327a6b2f458099916bf9a 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,14 +1,24 @@
 class Way < ActiveRecord::Base
   require 'xml/libxml'
 class Way < ActiveRecord::Base
   require 'xml/libxml'

+  
+  include ConsistencyValidations

 
 

-  belongs_to :user
+  set_table_name 'current_ways'

 
 

-  has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
-  has_many :way_tags, :foreign_key => 'id'
+  validates_presence_of :changeset_id, :timestamp
+  validates_inclusion_of :visible, :in => [ true, false ]
+  
+  belongs_to :changeset

 
   has_many :old_ways, :foreign_key => 'id', :order => 'version'
 
 
   has_many :old_ways, :foreign_key => 'id', :order => 'version'
 

-  set_table_name 'current_ways'
+  has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
+  has_many :nodes, :through => :way_nodes, :order => 'sequence_id'
+
+  has_many :way_tags, :foreign_key => 'id'
+
+  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder

 
   def self.from_xml(xml, create=false)
     begin
 
   def self.from_xml(xml, create=false)
     begin


@@ -16,32 +26,41 @@ 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']
+    way.changeset_id = pt['changeset']

 
 

-        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
+      # if visible isn't present then it defaults to true
+      way.visible = (pt['visible'] or true)
+    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,18 +88,23 @@ 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
+    el1['changeset'] = self.changeset_id.to_s

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

-    if user_display_name_cache and user_display_name_cache.key?(self.user_id)
+    if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)

       # use the cache if available
       # use the cache if available

-    elsif self.user.data_public?
-      user_display_name_cache[self.user_id] = self.user.display_name
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name

     else
     else

-      user_display_name_cache[self.user_id] = nil
+      user_display_name_cache[self.changeset.user_id] = nil

     end
 
     end
 

-    el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
+    if not user_display_name_cache[self.changeset.user_id].nil?
+      el1['user'] = user_display_name_cache[self.changeset.user_id]
+      el1['uid'] = self.changeset.user_id.to_s
+    end

 
     # make sure nodes are output in sequence_id order
     ordered_nodes = []
 
     # make sure nodes are output in sequence_id order
     ordered_nodes = []


@@ -92,7 +116,7 @@ class Way < ActiveRecord::Base
         end
       else
         # otherwise, manually go to the db to check things
         end
       else
         # otherwise, manually go to the db to check things

-        if nd.node.visible? and nd.node.visible?
+        if nd.node and nd.node.visible?

           ordered_nodes[nd.sequence_id] = nd.node_id.to_s
         end
       end
           ordered_nodes[nd.sequence_id] = nd.node_id.to_s
         end
       end


@@ -150,22 +174,39 @@ class Way < ActiveRecord::Base
 
   def add_tag_keyval(k, v)
     @tags = Hash.new unless @tags
 
   def add_tag_keyval(k, v)
     @tags = Hash.new unless @tags

+
+    # duplicate tags are now forbidden, so we can't allow values
+    # in the hash to be overwritten.
+    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+

     @tags[k] = v
   end
 
     @tags[k] = v
   end
 

+  ##
+  # the integer coords (i.e: unscaled) bounding box of the way, assuming
+  # straight line segments.
+  def bbox
+    lons = nodes.collect { |n| n.longitude }
+    lats = nodes.collect { |n| n.latitude }
+    [ lons.min, lats.min, lons.max, lats.max ]
+  end
+

   def save_with_history!
     t = Time.now
 
   def save_with_history!
     t = Time.now
 

+    # update the bounding box, but don't save it as the controller knows the 
+    # lifetime of the change better. note that this has to be done both before 
+    # and after the save, so that nodes from both versions are included in the 
+    # bbox.
+    changeset.update_bbox!(bbox) unless nodes.empty?
+

     Way.transaction do
     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 +214,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,15 +225,45 @@ 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!
+
+      # update and commit the bounding box, now that way nodes 
+      # have been updated and we're in a transaction.
+      changeset.update_bbox!(bbox) unless nodes.empty?
+      changeset.save!

     end
     end

+  end

 
 

-    old_way = OldWay.from_way(self)
-    old_way.timestamp = t
-    old_way.save_with_dependencies!
+  def update_from(new_way, user)
+    check_consistency(self, new_way, user)
+    if !new_way.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new
+    end
+    self.changeset_id = new_way.changeset_id
+    self.tags = new_way.tags
+    self.nds = new_way.nds
+    self.visible = true
+    save_with_history!
+  end
+
+  def create_with_history(user)
+    check_create_consistency(self, user)
+    if !self.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new
+    end
+    self.version = 0
+    self.visible = true
+    save_with_history!

   end
 
   def preconditions_ok?
     return false if self.nds.empty?
   end
 
   def preconditions_ok?
     return false if self.nds.empty?

+    if self.nds.length > APP_CONFIG['max_number_of_way_nodes']
+      raise OSM::APITooManyWayNodesError.new(self.nds.count, APP_CONFIG['max_number_of_way_nodes'])
+    end

     self.nds.each do |n|
       node = Node.find(:first, :conditions => ["id = ?", n])
       unless node and node.visible
     self.nds.each do |n|
       node = Node.find(:first, :conditions => ["id = ?", n])
       unless node and node.visible


@@ -206,15 +273,14 @@ 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!(new_way, user)
+    check_consistency(self, new_way, user)

     if self.visible
     if self.visible

-      # omg FIXME

       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
       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])
+                             :conditions => [ "visible = ? AND member_type='way' and member_id=? ", true, self.id])

         raise OSM::APIPreconditionFailedError
       else
         raise OSM::APIPreconditionFailedError
       else

-        self.user_id = user.id
+        self.changeset_id = new_way.changeset_id

         self.tags = []
         self.nds = []
         self.visible = false
         self.tags = []
         self.nds = []
         self.visible = false


@@ -225,39 +291,57 @@ class Way < ActiveRecord::Base
     end
   end
 
     end
   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)
-    return false # until complete, just return false
-    
-    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}")
-    
-    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()
+  # delete a way and its nodes that aren't part of other ways, with history
+
+  # FIXME: merge the potlatch code to delete the relations
+  #        and refactor to use delete_with_history!
+  def delete_with_relations_and_nodes_and_history(changeset_id)
+    # delete the nodes not used by other ways
+    self.unshared_node_ids.each do |node_id|
+      n = Node.find(node_id)
+      n.changeset_id = changeset_id
+      n.visible = false
+      n.save_with_history!
+    end

     
     

-    Node.update(node_ids_to_delete, {:user_id = user.id, :timestamp => update_time, :visibility => false})
+    self.changeset_id = changeset_id
+    self.tags = []
+    self.nds = []
+    self.visible = false
+    self.save_with_history!
+  end

 
 

-    # create old nodes
+  # Find nodes that belong to this way only
+  def unshared_node_ids
+    node_ids = self.nodes.collect { |node| node.id }

 
 

-    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}
+    unless node_ids.empty?
+      way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}")
+      node_ids = node_ids - way_nodes.collect { |way_node| way_node.node_id }

     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
+    return node_ids
+  end

 
 

-    # finally, delete the way
-    
-    self.delete_with_relations_and_history
+  # Temporary method to match interface to nodes
+  def tags_as_hash
+    return self.tags
+  end

 
 

+  ##
+  # if any referenced nodes are placeholder IDs (i.e: are negative) then
+  # this calling this method will fix them using the map from placeholders 
+  # to IDs +id_map+. 
+  def fix_placeholders!(id_map)
+    self.nds.map! do |node_id|
+      if node_id < 0
+        new_id = id_map[:node][node_id]
+        raise "invalid placeholder for #{node_id.inspect}: #{new_id.inspect}" if new_id.nil?
+        new_id
+      else
+        node_id
+      end
+    end

   end
   end

+

 end
 end