Update bundle

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 2c25bbd14cc72cd268c3c078b92b829c1b8dae87..2f528076eba632140ac85df651960617c78c5883 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -3,17 +3,18 @@ class Node < ActiveRecord::Base
 
   include GeoRecord
   include ConsistencyValidations
 
   include GeoRecord
   include ConsistencyValidations

+  include NotRedactable

 
 

-  set_table_name 'current_nodes'
+  self.table_name = "current_nodes"

 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

-  has_many :old_nodes, :foreign_key => :id
+  has_many :old_nodes, :order => :version

 
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
 
 
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
 

-  has_many :node_tags, :foreign_key => :id
+  has_many :node_tags

   
   has_many :old_way_nodes
   has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
   
   has_many :old_way_nodes
   has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way


@@ -30,9 +31,12 @@ class Node < ActiveRecord::Base
   validate :validate_position
   validates_associated :changeset
 
   validate :validate_position
   validates_associated :changeset
 

+  scope :visible, where(:visible => true)
+  scope :invisible, where(:visible => false)
+

   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position

-    errors.add_to_base("Node is not in the world") unless in_world?
+    errors.add(:base, "Node is not in the world") unless in_world?

   end
 
   #
   end
 
   #


@@ -41,7 +45,6 @@ class Node < ActiveRecord::Base
   # Also adheres to limitations such as within max_number_of_nodes
   #
   def self.search(bounding_box, tags = {})
   # Also adheres to limitations such as within max_number_of_nodes
   #
   def self.search(bounding_box, tags = {})

-    min_lon, min_lat, max_lon, max_lat = *bounding_box

     # @fixme a bit of a hack to search for only visible nodes
     # couldn't think of another to add to tags condition
     #conditions_hash = tags.merge({ 'visible' => 1 })
     # @fixme a bit of a hack to search for only visible nodes
     # couldn't think of another to add to tags condition
     #conditions_hash = tags.merge({ 'visible' => 1 })


@@ -56,9 +59,8 @@ class Node < ActiveRecord::Base
     #end 
     #conditions = keys.join(' AND ')
  
     #end 
     #conditions = keys.join(' AND ')
  

-    find_by_area(min_lat, min_lon, max_lat, max_lon,
-                    :conditions => {:visible => true},
-                    :limit => APP_CONFIG['max_number_of_nodes']+1)  
+    find_by_area(bounding_box, :conditions => {:visible => true},
+                       :limit => MAX_NUMBER_OF_NODES+1)

   end
 
   # Read in xml as text and return it's Node object representation
   end
 
   # Read in xml as text and return it's Node object representation


@@ -70,6 +72,7 @@ class Node < ActiveRecord::Base
       doc.find('//osm/node').each do |pt|
         return Node.from_xml_node(pt, create)
       end
       doc.find('//osm/node').each do |pt|
         return Node.from_xml_node(pt, create)
       end

+      raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")

     rescue LibXML::XML::Error, ArgumentError => ex
       raise OSM::APIBadXMLError.new("node", xml, ex.message)
     end
     rescue LibXML::XML::Error, ArgumentError => ex
       raise OSM::APIBadXMLError.new("node", xml, ex.message)
     end


@@ -82,7 +85,7 @@ class Node < ActiveRecord::Base
     raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil?
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f
     raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil?
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f

-    raise OSM::APIBadXMLError.new("node", pt, "changeset id missing") if pt['changeset'].nil?
+    raise OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt['changeset'].nil?

     node.changeset_id = pt['changeset'].to_i
 
     raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
     node.changeset_id = pt['changeset'].to_i
 
     raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?


@@ -92,21 +95,25 @@ class Node < ActiveRecord::Base
     node.version = create ? 0 : pt['version'].to_i
 
     unless create
     node.version = create ? 0 : pt['version'].to_i
 
     unless create

-      if pt['id'] != '0'
-        node.id = pt['id'].to_i
-      end
+      raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil?
+      node.id = pt['id'].to_i
+      # .to_i will return 0 if there is no number that can be parsed. 
+      # We want to make sure that there is no id with zero anyway
+      raise OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id == 0

     end
 
     end
 

-    # visible if it says it is, or as the default if the attribute
-    # is missing.
-    # Don't need to set the visibility, when it is set explicitly in the create/update/delete
-    #node.visible = pt['visible'].nil? or pt['visible'] == 'true'
-

     # We don't care about the time, as it is explicitly set on create/update/delete
     # We don't care about the time, as it is explicitly set on create/update/delete

+    # We don't care about the visibility as it is implicit based on the action
+    # and set manually before the actual delete
+    node.visible = true

 
 

-    tags = []
+    # Start with no tags
+    node.tags = Hash.new

 
 

+    # Add in any tags from the XML

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

+      raise OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag['k'].nil?
+      raise OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag['v'].nil?

       node.add_tag_key_val(tag['k'],tag['v'])
     end
 
       node.add_tag_key_val(tag['k'],tag['v'])
     end
 


@@ -117,7 +124,7 @@ class Node < ActiveRecord::Base
   # the bounding box around a node, which is used for determining the changeset's
   # bounding box
   def bbox
   # the bounding box around a node, which is used for determining the changeset's
   # bounding box
   def bbox

-    [ longitude, latitude, longitude, latitude ]
+    BoundingBox.new(longitude, latitude, longitude, latitude)

   end
 
   # Should probably be renamed delete_from to come in line with update
   end
 
   # Should probably be renamed delete_from to come in line with update


@@ -130,16 +137,16 @@ class Node < ActiveRecord::Base
     # provide repeatable reads for the used-by checks. this means it
     # shouldn't be possible to get race conditions.
     Node.transaction do
     # provide repeatable reads for the used-by checks. this means it
     # shouldn't be possible to get race conditions.
     Node.transaction do

+      self.lock!

       check_consistency(self, new_node, user)
       check_consistency(self, new_node, user)

-      way = WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", 
-                         :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
-      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.id}.") unless way.nil?
+      ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id)
+      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by ways #{ways.collect { |w| w.id }.join(",")}.") unless ways.empty?

       
       

-      rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", 
-                                :conditions => [ "visible = ? AND member_type='Node' and member_id=? ", true, self.id])
-      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relation #{rel.id}.") unless rel.nil?
+      rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Node", :member_id => id }).order(:id)
+      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relations #{rels.collect { |r| r.id }.join(",")}.") unless rels.empty?

 
       self.changeset_id = new_node.changeset_id
 
       self.changeset_id = new_node.changeset_id

+      self.tags = {}

       self.visible = false
       
       # update the changeset with the deleted position
       self.visible = false
       
       # update the changeset with the deleted position


@@ -150,25 +157,28 @@ class Node < ActiveRecord::Base
   end
 
   def update_from(new_node, user)
   end
 
   def update_from(new_node, user)

-    check_consistency(self, new_node, user)
-
-    # update changeset first
-    self.changeset_id = new_node.changeset_id
-    self.changeset = new_node.changeset
-
-    # update changeset bbox with *old* position first
-    changeset.update_bbox!(bbox);
-
-    # FIXME logic needs to be double checked
-    self.latitude = new_node.latitude 
-    self.longitude = new_node.longitude
-    self.tags = new_node.tags
-    self.visible = true
-
-    # update changeset bbox with *new* position
-    changeset.update_bbox!(bbox);
-
-    save_with_history!
+    Node.transaction do
+      self.lock!
+      check_consistency(self, new_node, user)
+      
+      # update changeset first
+      self.changeset_id = new_node.changeset_id
+      self.changeset = new_node.changeset
+      
+      # update changeset bbox with *old* position first
+      changeset.update_bbox!(bbox);
+      
+      # FIXME logic needs to be double checked
+      self.latitude = new_node.latitude 
+      self.longitude = new_node.longitude
+      self.tags = new_node.tags
+      self.visible = true
+      
+      # update changeset bbox with *new* position
+      changeset.update_bbox!(bbox);
+      
+      save_with_history!
+    end

   end
   
   def create_with_history(user)
   end
   
   def create_with_history(user)


@@ -191,11 +201,14 @@ class Node < ActiveRecord::Base
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s

-    el1['lat'] = self.lat.to_s
-    el1['lon'] = self.lon.to_s

     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
 
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
 

+    if self.visible?
+      el1['lat'] = self.lat.to_s
+      el1['lon'] = self.lon.to_s
+    end
+

     if changeset_cache.key?(self.changeset_id)
       # use the cache if available
     else
     if changeset_cache.key?(self.changeset_id)
       # use the cache if available
     else


@@ -282,12 +295,12 @@ class Node < ActiveRecord::Base
 
       # Create a NodeTag
       tags = self.tags
 
       # Create a NodeTag
       tags = self.tags

-      NodeTag.delete_all(['id = ?', self.id])
+      NodeTag.delete_all(:node_id => self.id)

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

+        tag.node_id = self.id

         tag.k = k 
         tag.v = v 
         tag.k = k 
         tag.v = v 

-        tag.id = self.id

         tag.save!
       end 
 
         tag.save!
       end