Force all OpenLayers resources to load through the asset pipeline

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 3a7cc29b2b95b80cb12c9662876f636d6d63e895..87771caab3440b7603d22143db6f51d88ecd8a0f 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -2,15 +2,21 @@ class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
   
   set_table_name 'relations'
   include ConsistencyValidations
   
   set_table_name 'relations'

+  set_primary_keys :relation_id, :version

 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

+  has_many :old_members, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version], :order => :sequence_id
+  has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version]
+  
+  validates_associated :changeset
+

   def self.from_relation(relation)
     old_relation = OldRelation.new
     old_relation.visible = relation.visible
     old_relation.changeset_id = relation.changeset_id
     old_relation.timestamp = relation.timestamp
   def self.from_relation(relation)
     old_relation = OldRelation.new
     old_relation.visible = relation.visible
     old_relation.changeset_id = relation.changeset_id
     old_relation.timestamp = relation.timestamp

-    old_relation.id = relation.id
+    old_relation.relation_id = relation.id

     old_relation.version = relation.version
     old_relation.members = relation.members
     old_relation.tags = relation.tags
     old_relation.version = relation.version
     old_relation.members = relation.members
     old_relation.tags = relation.tags


@@ -23,7 +29,7 @@ class OldRelation < ActiveRecord::Base
     save!
     clear_aggregation_cache
     clear_association_cache
     save!
     clear_aggregation_cache
     clear_association_cache

-    @attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
+    @attributes.update(OldRelation.where(:relation_id => self.relation_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))

 
     # ok, you can touch from here on
 
 
     # ok, you can touch from here on
 


@@ -31,39 +37,37 @@ class OldRelation < ActiveRecord::Base
       tag = OldRelationTag.new
       tag.k = k
       tag.v = v
       tag = OldRelationTag.new
       tag.k = k
       tag.v = v

-      tag.id = self.id
+      tag.relation_id = self.relation_id

       tag.version = self.version
       tag.save!
     end
 
       tag.version = self.version
       tag.save!
     end
 

-    i = 1
-    self.members.each do |m|
+    self.members.each_with_index do |m,i|

       member = OldRelationMember.new
       member = OldRelationMember.new

-      member.id = self.id
-      member.member_type = m[0]
+      member.id = [self.relation_id, self.version, i]
+      member.member_type = m[0].classify

       member.member_id = m[1]
       member.member_role = m[2]
       member.member_id = m[1]
       member.member_role = m[2]

-      member.version = self.version

       member.save!
     end
   end
 
   def members
     unless @members
       member.save!
     end
   end
 
   def members
     unless @members

-        @members = Array.new
-        OldRelationMember.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |m|
-            @members += [[m.type,m.id,m.role]]
-        end
+      @members = Array.new
+      OldRelationMember.where(:relation_id => self.relation_id, :version => self.version).order(:sequence_id).each do |m|
+        @members += [[m.type,m.id,m.role]]
+      end

     end
     @members
   end
 
   def tags
     unless @tags
     end
     @members
   end
 
   def tags
     unless @tags

-        @tags = Hash.new
-        OldRelationTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
-            @tags[tag.k] = tag.v
-        end
+      @tags = Hash.new
+      OldRelationTag.where(:relation_id => self.relation_id, :version => self.version).each do |tag|
+        @tags[tag.k] = tag.v
+      end

     end
     @tags = Hash.new unless @tags
     @tags
     end
     @tags = Hash.new unless @tags
     @tags


@@ -77,29 +81,27 @@ class OldRelation < ActiveRecord::Base
     @tags = t
   end
 
     @tags = t
   end
 

-#  has_many :relation_segments, :class_name => 'OldRelationSegment', :foreign_key => 'id'
-#  has_many :relation_tags, :class_name => 'OldRelationTag', :foreign_key => 'id'
-
-  def old_members
-    OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
-  end
-
-  def old_tags
-    OldRelationTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc

   end
 
   def to_xml_node
     el1 = XML::Node.new 'relation'
   end
 
   def to_xml_node
     el1 = XML::Node.new 'relation'

-    el1['id'] = self.id.to_s
+    el1['id'] = self.relation_id.to_s

     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?
+    if self.changeset.user.data_public?
+      el1['user'] = self.changeset.user.display_name
+      el1['uid'] = self.changeset.user.id.to_s
+    end

     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'

-      e['type'] = member.member_type.to_s
+      e['type'] = member.member_type.to_s.downcase

       e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
       e['role'] = member.member_role.to_s
       el1 << e
       e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
       e['role'] = member.member_role.to_s
       el1 << e