fix SCALE, make changeset GET use floats

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

diff --git a/app/models/way.rb b/app/models/way.rb
index a6192e2d735e7ce128096a84cd32780da23db9d2..be6531def4bdeac9b71debd94105282e4379fc93 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,15 +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 :nodes, :through => :way_nodes, :order => 'sequence_id'
-  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


@@ -33,14 +42,17 @@ class Way < ActiveRecord::Base
     end
     
     way.version = pt['version']
     end
     
     way.version = pt['version']

+    way.changeset_id = pt['changeset']

 
     if create
       way.timestamp = Time.now
       way.visible = true
     else
       if pt['timestamp']
 
     if create
       way.timestamp = Time.now
       way.visible = true
     else
       if pt['timestamp']

-       way.timestamp = Time.parse(pt['timestamp'])
+        way.timestamp = Time.parse(pt['timestamp'])

       end
       end

+      # if visible isn't present then it defaults to true
+      way.visible = (pt['visible'] or true)

     end
 
     pt.find('tag').each do |tag|
     end
 
     pt.find('tag').each do |tag|


@@ -77,18 +89,19 @@ class Way < ActiveRecord::Base
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['version'] = self.version.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?
+    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?

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


@@ -100,7 +113,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


@@ -158,12 +171,32 @@ 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
       self.version += 1
       self.timestamp = t
     Way.transaction do
       self.version += 1
       self.timestamp = t


@@ -193,25 +226,41 @@ class Way < ActiveRecord::Base
       old_way = OldWay.from_way(self)
       old_way.timestamp = t
       old_way.save_with_dependencies!
       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
 
   def update_from(new_way, user)
     end
   end
 
   def update_from(new_way, user)

+    check_consistency(self, new_way, user)

     if !new_way.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
     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

+    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


@@ -221,20 +270,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

-         # 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",
       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
         raise OSM::APIPreconditionFailedError

-      # end FIXME

       else
       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


@@ -246,27 +289,54 @@ 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

-  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

 
 

+  # FIXME: merge the potlatch code to delete the relations
+  def delete_with_relations_and_nodes_and_history(user)

     # delete the nodes not used by other ways
     # delete the nodes not used by other ways

-    node_ids_to_delete.each do |node_id|
+    self.unshared_node_ids.each do |node_id|

       n = Node.find(node_id)
       n.user_id = user.id
       n.visible = false
       n.save_with_history!
     end
     
       n = Node.find(node_id)
       n.user_id = user.id
       n.visible = false
       n.save_with_history!
     end
     

+    # FIXME needs more information passed in so that the changeset can be updated

     self.user_id = user.id
 
     self.user_id = user.id
 

-    self.delete_with_relations_and_history(user)
+    self.delete_with_history(user)
+  end
+
+  # Find nodes that belong to this way only
+  def unshared_node_ids
+    node_ids = self.nodes.collect { |node| node.id }

 
 

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