Implement context menu with: directions, add note, describe, centre.

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

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 89aaa262d4e0b9057dbf3cd54973e75540148843..bf939e425e5c5f0b08577c95678c37c2d89a39f8 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -1,5 +1,5 @@
 class Changeset < ActiveRecord::Base
-  require 'xml/libxml'
+  require "xml/libxml"
 
   belongs_to :user, :counter_cache => true
 
@@ -13,15 +13,18 @@ class Changeset < ActiveRecord::Base
   has_many :old_relations
 
   has_many :comments, -> { where(:visible => true).order(:created_at) }, :class_name => "ChangesetComment"
-  has_and_belongs_to_many :subscribers, :class_name => 'User', :join_table => 'changesets_subscribers', :association_foreign_key => 'subscriber_id'
-
-  validates_presence_of :id, :on => :update
-  validates_presence_of :user_id, :created_at, :closed_at, :num_changes
-  validates_uniqueness_of :id
-  validates_numericality_of :id, :on => :update, :integer_only => true
-  validates_numericality_of :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true, :integer_only => true
-  validates_numericality_of :user_id,  :integer_only => true
-  validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0
+  has_and_belongs_to_many :subscribers, :class_name => "User", :join_table => "changesets_subscribers", :association_foreign_key => "subscriber_id"
+
+  validates :id, :uniqueness => true, :presence => { :on => :update },
+                 :numericality => { :on => :update, :integer_only => true }
+  validates :user_id, :presence => true,
+                      :numericality => { :integer_only => true }
+  validates :num_changes, :presence => true,
+                          :numericality => { :integer_only => true,
+                                             :greater_than_or_equal_to => 0 }
+  validates :created_at, :closed_at, :presence => true
+  validates :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true,
+                                                    :numericality => { :integer_only => true }
 
   before_save :update_closed_at
 
@@ -57,7 +60,7 @@ class Changeset < ActiveRecord::Base
     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse
 
-    doc.find('//osm/changeset').each do |pt|
+    doc.find("//osm/changeset").each do |pt|
       return Changeset.from_xml_node(pt, create)
     end
     fail OSM::APIBadXMLError.new("changeset", xml, "XML doesn't contain an osm/changeset element.")
@@ -76,10 +79,10 @@ class Changeset < ActiveRecord::Base
       cs.num_changes = 0
     end
 
-    pt.find('tag').each do |tag|
-      fail OSM::APIBadXMLError.new("changeset", pt, "tag is missing key") if tag['k'].nil?
-      fail OSM::APIBadXMLError.new("changeset", pt, "tag is missing value") if tag['v'].nil?
-      cs.add_tag_keyval(tag['k'], tag['v'])
+    pt.find("tag").each do |tag|
+      fail OSM::APIBadXMLError.new("changeset", pt, "tag is missing key") if tag["k"].nil?
+      fail OSM::APIBadXMLError.new("changeset", pt, "tag is missing value") if tag["v"].nil?
+      cs.add_tag_keyval(tag["k"], tag["v"])
     end
 
     cs
@@ -117,10 +120,6 @@ class Changeset < ActiveRecord::Base
     self.num_changes += elements
   end
 
-  def tags_as_hash
-    tags
-  end
-
   def tags
     unless @tags
       @tags = {}
@@ -183,8 +182,8 @@ class Changeset < ActiveRecord::Base
   end
 
   def to_xml_node(user_display_name_cache = nil, include_discussion = false)
-    el1 = XML::Node.new 'changeset'
-    el1['id'] = id.to_s
+    el1 = XML::Node.new "changeset"
+    el1["id"] = id.to_s
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 
@@ -196,32 +195,32 @@ class Changeset < ActiveRecord::Base
       user_display_name_cache[user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[user_id] unless user_display_name_cache[user_id].nil?
-    el1['uid'] = user_id.to_s if user.data_public?
+    el1["user"] = user_display_name_cache[user_id] unless user_display_name_cache[user_id].nil?
+    el1["uid"] = user_id.to_s if user.data_public?
 
     tags.each do |k, v|
-      el2 = XML::Node.new('tag')
-      el2['k'] = k.to_s
-      el2['v'] = v.to_s
+      el2 = XML::Node.new("tag")
+      el2["k"] = k.to_s
+      el2["v"] = v.to_s
       el1 << el2
     end
 
-    el1['created_at'] = created_at.xmlschema
-    el1['closed_at'] = closed_at.xmlschema unless is_open?
-    el1['open'] = is_open?.to_s
+    el1["created_at"] = created_at.xmlschema
+    el1["closed_at"] = closed_at.xmlschema unless is_open?
+    el1["open"] = is_open?.to_s
 
-    bbox.to_unscaled.add_bounds_to(el1, '_') if bbox.complete?
+    bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete?
 
-    el1['comments_count'] = comments.count.to_s
+    el1["comments_count"] = comments.count.to_s
 
     if include_discussion
-      el2 = XML::Node.new('discussion')
+      el2 = XML::Node.new("discussion")
       comments.includes(:author).each do |comment|
-        el3 = XML::Node.new('comment')
-        el3['date'] = comment.created_at.xmlschema
-        el3['uid'] = comment.author.id.to_s if comment.author.data_public?
-        el3['user'] = comment.author.display_name.to_s if comment.author.data_public?
-        el4 = XML::Node.new('text')
+        el3 = XML::Node.new("comment")
+        el3["date"] = comment.created_at.xmlschema
+        el3["uid"] = comment.author.id.to_s if comment.author.data_public?
+        el3["user"] = comment.author.display_name.to_s if comment.author.data_public?
+        el4 = XML::Node.new("text")
         el4.content = comment.body.to_s
         el3 << el4
         el2 << el3