Make sure the ruby quadtile code give the same result as the C version

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

diff --git a/app/models/map_bug.rb b/app/models/map_bug.rb
index 61c9f145f5aff0b2c37c73b009cf90d873cc7009..b07ef2941d290cfce75363e1ce957ff118ccb69b 100644 (file)
--- a/app/models/map_bug.rb
+++ b/app/models/map_bug.rb
@@ -1,7 +1,10 @@
 class MapBug < ActiveRecord::Base
   include GeoRecord
 
 class MapBug < ActiveRecord::Base
   include GeoRecord
 

-  set_table_name 'map_bugs'
+  has_many :comments, :class_name => "MapBugComment", 
+                      :foreign_key => :bug_id, 
+                      :order => :date_created, 
+                      :conditions => "visible = true and comment is not null"

 
   validates_presence_of :id, :on => :update
   validates_uniqueness_of :id
 
   validates_presence_of :id, :on => :update
   validates_uniqueness_of :id


@@ -9,24 +12,46 @@ class MapBug < ActiveRecord::Base
   validates_numericality_of :longitude, :only_integer => true
   validates_presence_of :date_created
   validates_presence_of :last_changed
   validates_numericality_of :longitude, :only_integer => true
   validates_presence_of :date_created
   validates_presence_of :last_changed

-  validates_inclusion_of :status, :in => [ "open", "closed", "hidden" ]
-
-
-  def self.create_bug(lat, lon, comment)
-       bug = MapBug.new(:lat => lat, :lon => lon);
-       raise OSM::APIBadUserInput.new("The node is outside this world") unless bug.in_world?
-       bug.text = comment
-       bug.date_created = Time.now.getutc
-       bug.last_changed = Time.now.getutc
-       bug.status = "open";
-       bug.save;
-       return bug;
+  validates_presence_of :date_closed if :status == "closed"
+  validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
+
+  def self.create_bug(lat, lon)
+    bug = MapBug.new(:lat => lat, :lon => lon)
+    raise OSM::APIBadUserInput.new("The node is outside this world") unless bug.in_world?
+
+    bug.date_created = Time.now.getutc
+    bug.last_changed = Time.now.getutc
+    bug.status = "open"
+
+    return bug

   end
 
   def close_bug
   end
 
   def close_bug

-       self.status = "closed"
-       self.last_changed = Time.now.getutc
-       self.save;
+    self.status = "closed"
+    close_time = Time.now.getutc
+    self.last_changed = close_time
+    self.date_closed = close_time
+
+    self.save

   end
 
   end
 

+  def flatten_comment(separator_char, upto_timestamp = :nil)
+    resp = ""
+    comment_no = 1
+    self.comments.each do |comment|
+      next if upto_timestamp != :nil and comment.date_created > upto_timestamp
+      resp += (comment_no == 1 ? "" : separator_char)
+      resp += comment.comment if comment.comment
+      resp += " [ " 
+      resp += comment.commenter_name if comment.commenter_name
+      resp += " " + comment.date_created.to_s + " ]"
+      comment_no += 1
+    end
+
+    return resp
+  end
+
+  def visible
+    return status != "hidden"
+  end

 end
 end