Added min_lat > max_lat test.

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 9ee118f6e0c22fb26f4bff0012e30e3cb2c92173..db4dd52a6799f68960b32a001bf1d0b7b50626c7 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -1,9 +1,11 @@
 class Relation < ActiveRecord::Base
   require 'xml/libxml'
   
 class Relation < ActiveRecord::Base
   require 'xml/libxml'
   

+  include ConsistencyValidations
+  

   set_table_name 'current_relations'
 
   set_table_name 'current_relations'
 

-  belongs_to :user
+  belongs_to :changeset

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


@@ -19,32 +21,39 @@ class Relation < ActiveRecord::Base
       p.string = xml
       doc = p.parse
 
       p.string = xml
       doc = p.parse
 

-      relation = Relation.new
-

       doc.find('//osm/relation').each do |pt|
       doc.find('//osm/relation').each do |pt|

-        if !create and pt['id'] != '0'
-          relation.id = pt['id'].to_i
-        end
+       return Relation.from_xml_node(pt, create)
+      end
+    rescue
+      return nil
+    end
+  end

 
 

-        if create
-          relation.timestamp = Time.now
-          relation.visible = true
-        else
-          if pt['timestamp']
-            relation.timestamp = Time.parse(pt['timestamp'])
-          end
-        end
+  def self.from_xml_node(pt, create=false)
+    relation = Relation.new

 
 

-        pt.find('tag').each do |tag|
-          relation.add_tag_keyval(tag['k'], tag['v'])
-        end
+    if !create and pt['id'] != '0'
+      relation.id = pt['id'].to_i
+    end

 
 

-        pt.find('member').each do |member|
-          relation.add_member(member['type'], member['ref'], member['role'])
-        end
+    relation.version = pt['version']
+    relation.changeset_id = pt['changeset']
+
+    if create
+      relation.timestamp = Time.now
+      relation.visible = true
+    else
+      if pt['timestamp']
+        relation.timestamp = Time.parse(pt['timestamp'])

       end
       end

-    rescue
-      relation = nil
+    end
+
+    pt.find('tag').each do |tag|
+      relation.add_tag_keyval(tag['k'], tag['v'])
+    end
+
+    pt.find('member').each do |member|
+      relation.add_member(member['type'], member['ref'], member['role'])

     end
 
     return relation
     end
 
     return relation


@@ -61,18 +70,20 @@ class Relation < 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?
+    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?

 
     self.relation_members.each do |member|
       p=0
 
     self.relation_members.each do |member|
       p=0


@@ -105,6 +116,36 @@ class Relation < ActiveRecord::Base
     return el1
   end 
 
     return el1
   end 
 

+  def self.find_for_nodes(ids, options = {})
+    if ids.empty?
+      return []
+    else
+      self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'node' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+        return self.find(:all, options)
+      end
+    end
+  end
+
+  def self.find_for_ways(ids, options = {})
+    if ids.empty?
+      return []
+    else
+      self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'way' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+        return self.find(:all, options)
+      end
+    end
+  end
+
+  def self.find_for_relations(ids, options = {})
+    if ids.empty?
+      return []
+    else
+      self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'relation' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+        return self.find(:all, options)
+      end
+    end
+  end
+

   # FIXME is this really needed?
   def members
     unless @members
   # FIXME is this really needed?
   def members
     unless @members


@@ -141,19 +182,23 @@ class Relation < 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
 
   def save_with_history!
     Relation.transaction do
       t = Time.now
     @tags[k] = v
   end
 
   def save_with_history!
     Relation.transaction do
       t = Time.now

+      self.version += 1

       self.timestamp = t
       self.save!
 
       tags = self.tags
       self.timestamp = t
       self.save!
 
       tags = self.tags

-

       RelationTag.delete_all(['id = ?', self.id])
       RelationTag.delete_all(['id = ?', self.id])

-

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


@@ -163,9 +208,7 @@ class Relation < ActiveRecord::Base
       end
 
       members = self.members
       end
 
       members = self.members

-

       RelationMember.delete_all(['id = ?', self.id])
       RelationMember.delete_all(['id = ?', self.id])

-

       members.each do |n|
         mem = RelationMember.new
         mem.id = self.id
       members.each do |n|
         mem = RelationMember.new
         mem.id = self.id


@@ -181,6 +224,45 @@ class Relation < ActiveRecord::Base
     end
   end
 
     end
   end
 

+  def delete_with_history!(new_relation, user)
+    if self.visible
+      check_consistency(self, new_relation, user)
+      if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=? ", self.id ])
+        raise OSM::APIPreconditionFailedError.new
+      else
+        self.changeset_id = new_relation.changeset_id
+        self.tags = []
+        self.members = []
+        self.visible = false
+        save_with_history!
+      end
+    else
+      raise OSM::APIAlreadyDeletedError.new
+    end
+  end
+
+  def update_from(new_relation, user)
+    check_consistency(self, new_relation, user)
+    if !new_relation.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new
+    end
+    self.changeset_id = new_relation.changeset_id
+    self.tags = new_relation.tags
+    self.members = new_relation.members
+    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?
     # These are hastables that store an id in the index of all 
     # the nodes/way/relations that have already been added.
   def preconditions_ok?
     # These are hastables that store an id in the index of all 
     # the nodes/way/relations that have already been added.