X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0f3e5a28c04a1a7899a39d594eb05a2f48d5db6d..2e2b556a254e25610d28083c4e87f0f9d3daa542:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index d69e7f4c1..bba012a9c 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -114,6 +114,8 @@ class ChangesetController < ApplicationController render :nothing => true, :status => :method_not_allowed end + rescue LibXML::XML::Error, ArgumentError => ex + raise OSM::APIBadXMLError.new("osm", xml, ex.message) rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found rescue OSM::APIError => ex @@ -461,7 +463,7 @@ private # if parameter 'open' is nill then open and closed changsets are returned def conditions_open(open) return open.nil? ? nil : ['closed_at >= ? and num_changes <= ?', - DateTime.now, Changeset::MAX_ELEMENTS] + Time.now.getutc, Changeset::MAX_ELEMENTS] end ## @@ -469,7 +471,7 @@ private # ('closed at' time has passed or changes limit is hit) def conditions_closed(closed) return closed.nil? ? nil : ['closed_at < ? and num_changes > ?', - DateTime.now, Changeset::MAX_ELEMENTS] + Time.now.getutc, Changeset::MAX_ELEMENTS] end ##