Localisation updates from https://translatewiki.net.

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

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 990eae4077ae33b7b8968a9bd8542504432226c2..f23a4e356e883bd51f0fb0d01cb52897a75fd0ab 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -44,8 +44,6 @@ class Changeset < ApplicationRecord
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }

-  validates :user_id, :presence => true,
-                      :numericality => { :only_integer => true }

   validates :num_changes, :presence => true,
                           :numericality => { :only_integer => true,
                                              :greater_than_or_equal_to => 0 }
   validates :num_changes, :presence => true,
                           :numericality => { :only_integer => true,
                                              :greater_than_or_equal_to => 0 }


@@ -67,35 +65,37 @@ class Changeset < ApplicationRecord
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at
   # least 6 controllers
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at
   # least 6 controllers

-  def is_open?
+  def open?

     # a changeset is open (that is, it will accept further changes) when
     # it has not yet run out of time and its capacity is small enough.
     # note that this may not be a hard limit - due to timing changes and
     # concurrency it is possible that some changesets may be slightly
     # longer than strictly allowed or have slightly more changes in them.
     # a changeset is open (that is, it will accept further changes) when
     # it has not yet run out of time and its capacity is small enough.
     # note that this may not be a hard limit - due to timing changes and
     # concurrency it is possible that some changesets may be slightly
     # longer than strictly allowed or have slightly more changes in them.

-    ((closed_at > Time.now.getutc) && (num_changes <= MAX_ELEMENTS))
+    ((closed_at > Time.now.utc) && (num_changes <= MAX_ELEMENTS))

   end
 
   def set_closed_time_now
   end
 
   def set_closed_time_now

-    self.closed_at = Time.now.getutc if is_open?
+    self.closed_at = Time.now.utc if open?

   end
 
   end
 

-  def self.from_xml(xml, create = false)
+  def self.from_xml(xml, create: false)

     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse
     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse

+    pt = doc.find_first("//osm/changeset")

 
 

-    doc.find("//osm/changeset").each do |pt|
-      return Changeset.from_xml_node(pt, create)
+    if pt
+      Changeset.from_xml_node(pt, :create => create)
+    else
+      raise OSM::APIBadXMLError.new("changeset", xml, "XML doesn't contain an osm/changeset element.")

     end
     end

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

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

-  def self.from_xml_node(pt, create = false)
+  def self.from_xml_node(pt, create: false)

     cs = Changeset.new
     if create
     cs = Changeset.new
     if create

-      cs.created_at = Time.now.getutc
+      cs.created_at = Time.now.utc

       # initial close time is 1h ahead, but will be increased on each
       # modification.
       cs.closed_at = cs.created_at + IDLE_TIMEOUT
       # initial close time is 1h ahead, but will be increased on each
       # modification.
       cs.closed_at = cs.created_at + IDLE_TIMEOUT


@@ -120,7 +120,7 @@ class Changeset < ApplicationRecord
     @bbox ||= BoundingBox.new(min_lon, min_lat, max_lon, max_lat)
   end
 
     @bbox ||= BoundingBox.new(min_lon, min_lat, max_lon, max_lat)
   end
 

-  def has_valid_bbox?
+  def bbox_valid?

     bbox.complete?
   end
 
     bbox.complete?
   end
 


@@ -187,11 +187,11 @@ class Changeset < ApplicationRecord
   # that would make it more than 24h long, in which case clip to
   # 24h, as this has been decided is a reasonable time limit.
   def update_closed_at
   # that would make it more than 24h long, in which case clip to
   # 24h, as this has been decided is a reasonable time limit.
   def update_closed_at

-    if is_open?
+    if open?

       self.closed_at = if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
                          created_at + MAX_TIME_OPEN
                        else
       self.closed_at = if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
                          created_at + MAX_TIME_OPEN
                        else

-                         Time.now.getutc + IDLE_TIMEOUT
+                         Time.now.utc + IDLE_TIMEOUT

                        end
     end
   end
                        end
     end
   end


@@ -205,7 +205,7 @@ class Changeset < ApplicationRecord
     raise OSM::APIUserChangesetMismatchError unless user.id == user_id
 
     # can't change a closed changeset
     raise OSM::APIUserChangesetMismatchError unless user.id == user_id
 
     # can't change a closed changeset

-    raise OSM::APIChangesetAlreadyClosedError, self unless is_open?
+    raise OSM::APIChangesetAlreadyClosedError, self unless open?

 
     # copy the other's tags
     self.tags = other.tags
 
     # copy the other's tags
     self.tags = other.tags