Merge branch 'jfire2' into routing

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

diff --git a/app/models/way.rb b/app/models/way.rb
index b1057f673fadaf222ae245da0485277db3901c6f..1da048c96b00b39c3c2bd91028949bb531c9efa2 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -2,20 +2,22 @@ class Way < ActiveRecord::Base
   require 'xml/libxml'
   
   include ConsistencyValidations
   require 'xml/libxml'
   
   include ConsistencyValidations

+  include NotRedactable
+  include ObjectMetadata

 
 

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

   
   belongs_to :changeset
 
   
   belongs_to :changeset
 

-  has_many :old_ways, :foreign_key => 'id', :order => 'version'
+  has_many :old_ways, -> { order(:version) }

 
 

-  has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
-  has_many :nodes, :through => :way_nodes, :order => 'sequence_id'
+  has_many :way_nodes, -> { order(:sequence_id) }
+  has_many :nodes, -> { order("sequence_id") }, :through => :way_nodes

 
 

-  has_many :way_tags, :foreign_key => 'id'
+  has_many :way_tags

 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
 
   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
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation

 
   validates_presence_of :id, :on => :update
   validates_presence_of :changeset_id,:version,  :timestamp
 
   validates_presence_of :id, :on => :update
   validates_presence_of :changeset_id,:version,  :timestamp


@@ -25,6 +27,10 @@ class Way < ActiveRecord::Base
   validates_numericality_of :id, :on => :update, :integer_only => true
   validates_associated :changeset
 
   validates_numericality_of :id, :on => :update, :integer_only => true
   validates_associated :changeset
 

+  scope :visible, -> { where(:visible => true) }
+  scope :invisible, -> { where(:visible => false) }
+
+  # Read in xml as text and return it's Way object representation

   def self.from_xml(xml, create=false)
     begin
       p = XML::Parser.string(xml)
   def self.from_xml(xml, create=false)
     begin
       p = XML::Parser.string(xml)


@@ -33,6 +39,7 @@ class Way < ActiveRecord::Base
       doc.find('//osm/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end
       doc.find('//osm/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end

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

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


@@ -41,27 +48,31 @@ class Way < ActiveRecord::Base
   def self.from_xml_node(pt, create=false)
     way = Way.new
 
   def self.from_xml_node(pt, create=false)
     way = Way.new
 

-    if !create and pt['id'] != '0'
-      way.id = pt['id'].to_i
-    end
-    
+    raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create or not pt['version'].nil?

     way.version = pt['version']
     way.version = pt['version']

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

     way.changeset_id = pt['changeset']
 
     way.changeset_id = pt['changeset']
 

-    # This next section isn't required for the create, update, or delete of ways
-    if create
-      way.timestamp = Time.now.getutc
-      way.visible = true
-    else
-      if pt['timestamp']
-        way.timestamp = Time.parse(pt['timestamp'])
-      end
-      # if visible isn't present then it defaults to true
-      way.visible = (pt['visible'] or true)
+    unless create
+      raise OSM::APIBadXMLError.new("way", pt, "ID is required when updating") if pt['id'].nil?
+      way.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 way cannot be zero when updating.") if way.id == 0

     end
 
     end
 

+    # We don't care about the timestamp nor the visibility as these are either
+    # set explicitly or implicit in the action. The visibility is set to true, 
+    # and manually set to false before the actual delete.
+    way.visible = true
+
+    # Start with no tags
+    way.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("way", pt, "tag is missing key") if tag['k'].nil?
+      raise OSM::APIBadXMLError.new("way", pt, "tag is missing value") if tag['v'].nil?

       way.add_tag_keyval(tag['k'], tag['v'])
     end
 
       way.add_tag_keyval(tag['k'], tag['v'])
     end
 


@@ -90,33 +101,10 @@ class Way < ActiveRecord::Base
   end
 
   def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cache = {})
   end
 
   def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cache = {})

-    el1 = XML::Node.new 'way'
-    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
-
-    if changeset_cache.key?(self.changeset_id)
-      # use the cache if available
-    else
-      changeset_cache[self.changeset_id] = self.changeset.user_id
-    end
-
-    user_id = changeset_cache[self.changeset_id]
+    el = XML::Node.new 'way'
+    el['id'] = self.id.to_s

 
 

-    if user_display_name_cache.key?(user_id)
-      # use the cache if available
-    elsif self.changeset.user.data_public?
-      user_display_name_cache[user_id] = self.changeset.user.display_name
-    else
-      user_display_name_cache[user_id] = nil
-    end
-
-    if not user_display_name_cache[user_id].nil?
-      el1['user'] = user_display_name_cache[user_id]
-      el1['uid'] = user_id.to_s
-    end
+    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)

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


@@ -136,39 +124,23 @@ class Way < ActiveRecord::Base
 
     ordered_nodes.each do |nd_id|
       if nd_id and nd_id != '0'
 
     ordered_nodes.each do |nd_id|
       if nd_id and nd_id != '0'

-        e = XML::Node.new 'nd'
-        e['ref'] = nd_id
-        el1 << e
+        node_el = XML::Node.new 'nd'
+        node_el['ref'] = nd_id
+        el << node_el

       end
     end
 
       end
     end
 

-    self.way_tags.each do |tag|
-      e = XML::Node.new 'tag'
-      e['k'] = tag.k
-      e['v'] = tag.v
-      el1 << e
-    end
-    return el1
+    add_tags_to_xml_node(el, self.way_tags)
+
+    return el

   end 
 
   def nds
   end 
 
   def nds

-    unless @nds
-      @nds = Array.new
-      self.way_nodes.each do |nd|
-        @nds += [nd.node_id]
-      end
-    end
-    @nds
+    @nds ||= self.way_nodes.collect { |n| n.node_id }

   end
 
   def tags
   end
 
   def tags

-    unless @tags
-      @tags = {}
-      self.way_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags
+    @tags ||= Hash[self.way_tags.collect { |t| [t.k, t.v] }]

   end
 
   def nds=(s)
   end
 
   def nds=(s)


@@ -191,11 +163,6 @@ class Way < ActiveRecord::Base
     # in the hash to be overwritten.
     raise OSM::APIDuplicateTagsError.new("way", self.id, k) if @tags.include? k
 
     # in the hash to be overwritten.
     raise OSM::APIDuplicateTagsError.new("way", self.id, k) if @tags.include? k
 

-    # check tag size here, as we don't create a WayTag object until
-    # just before we save...
-    raise OSM::APIBadUserInput.new("Way #{self.id} has a tag with too long a key, '#{k}'.") if k.length > 255
-    raise OSM::APIBadUserInput.new("Way #{self.id} has a tag with too long a value, '#{k}'='#{v}'.") if v.length > 255
-

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


@@ -205,21 +172,24 @@ class Way < ActiveRecord::Base
   def bbox
     lons = nodes.collect { |n| n.longitude }
     lats = nodes.collect { |n| n.latitude }
   def bbox
     lons = nodes.collect { |n| n.longitude }
     lats = nodes.collect { |n| n.latitude }

-    [ lons.min, lats.min, lons.max, lats.max ]
+    BoundingBox.new(lons.min, lats.min, lons.max, lats.max)

   end
 
   def update_from(new_way, user)
   end
 
   def update_from(new_way, user)

-    check_consistency(self, new_way, user)
-    unless new_way.preconditions_ok?(self.nds)
-      raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.")
+    Way.transaction do
+      self.lock!
+      check_consistency(self, new_way, user)
+      unless new_way.preconditions_ok?(self.nds)
+        raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.")
+      end
+      
+      self.changeset_id = new_way.changeset_id
+      self.changeset = new_way.changeset
+      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.changeset = new_way.changeset
-    self.tags = new_way.tags
-    self.nds = new_way.nds
-    self.visible = true
-    save_with_history!

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


@@ -234,22 +204,23 @@ class Way < ActiveRecord::Base
 
   def preconditions_ok?(old_nodes = [])
     return false if self.nds.empty?
 
   def preconditions_ok?(old_nodes = [])
     return false if self.nds.empty?

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

     end
     end

-    
-    # pre-set all the old nodes to OK, as we must have checked them before.
-    checked = old_nodes.inject(Hash.new) {|h,n| h[n] = true; h }
-
-    self.nds.each do |n|
-      unless checked.key? n
-        node = Node.find(:first, :conditions => ["id = ?", n])
-        unless node and node.visible
-          raise OSM::APIPreconditionFailedError.new("Way #{self.id} requires the node with id #{n}, which either does not exist, or is not visible.")
-        end
-        checked[n] = true
+
+    # check only the new nodes, for efficiency - old nodes having been checked last time and can't
+    # be deleted when they're in-use.
+    new_nds = (self.nds - old_nodes).sort.uniq
+
+    unless new_nds.empty?
+      db_nds = Node.where(:id => new_nds, :visible => true)
+
+      if db_nds.length < new_nds.length
+        missing = new_nds - db_nds.collect { |n| n.id }
+        raise OSM::APIPreconditionFailedError.new("Way #{self.id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible.")

       end
     end
       end
     end

+

     return true
   end
 
     return true
   end
 


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

+      self.lock!

       check_consistency(self, new_way, user)
       check_consistency(self, new_way, user)

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

       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset
 
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset
 


@@ -316,17 +287,17 @@ class Way < ActiveRecord::Base
       self.save!
 
       tags = self.tags
       self.save!
 
       tags = self.tags

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

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

+        tag.way_id = self.id

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

-        tag.id = self.id

         tag.save!
       end
 
       nds = self.nds
         tag.save!
       end
 
       nds = self.nds

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

       sequence = 1
       nds.each do |n|
         nd = WayNode.new
       sequence = 1
       nds.each do |n|
         nd = WayNode.new


@@ -354,5 +325,4 @@ class Way < ActiveRecord::Base
       cs.save!
     end
   end
       cs.save!
     end
   end

-

 end
 end