Merge remote-tracking branch 'upstream/pull/2442'

[rails.git] / app / controllers / api / changesets_controller.rb

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index dd43f7ed0943e59829d3902ee2142717eb200bb8..5f87324e0a63ddaa112e323005b94e49b306aca5 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -1,20 +1,17 @@
 # The ChangesetController is the RESTful interface to Changeset objects
 
 module Api
 # The ChangesetController is the RESTful interface to Changeset objects
 
 module Api

-  class ChangesetsController < ApplicationController
+  class ChangesetsController < ApiController

     layout "site"
     require "xml/libxml"
 
     layout "site"
     require "xml/libxml"
 

-    skip_before_action :verify_authenticity_token

     before_action :authorize, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]
     before_action :authorize, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]

-    before_action :api_deny_access_handler, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox]

 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]
     before_action :check_api_writable, :only => [:create, :update, :upload, :subscribe, :unsubscribe]
     before_action :check_api_readable, :except => [:create, :update, :upload, :download, :query, :subscribe, :unsubscribe]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]
     before_action :check_api_writable, :only => [:create, :update, :upload, :subscribe, :unsubscribe]
     before_action :check_api_readable, :except => [:create, :update, :upload, :download, :query, :subscribe, :unsubscribe]

-    before_action(:only => [:index, :feed]) { |c| c.check_database_readable(true) }

     around_action :api_call_handle_error
     around_action :api_call_timeout, :except => [:upload]
 
     around_action :api_call_handle_error
     around_action :api_call_timeout, :except => [:upload]
 


@@ -96,10 +93,10 @@ module Api
       lat << cs.max_lat unless cs.max_lat.nil?
 
       # collapse the arrays to minimum and maximum
       lat << cs.max_lat unless cs.max_lat.nil?
 
       # collapse the arrays to minimum and maximum

-      cs.min_lon = lon.min
-      cs.min_lat = lat.min
-      cs.max_lon = lon.max
-      cs.max_lat = lat.max
+      cs.min_lon = lon.min.round
+      cs.min_lat = lat.min.round
+      cs.max_lon = lon.max.round
+      cs.max_lat = lat.max.round

 
       # save the larger bounding box and return the changeset, which
       # will include the bigger bounding box.
 
       # save the larger bounding box and return the changeset, which
       # will include the bigger bounding box.


@@ -367,10 +364,10 @@ module Api
       end
       # stupid Time seems to throw both of these for bad parsing, so
       # we have to catch both and ensure the correct code path is taken.
       end
       # stupid Time seems to throw both of these for bad parsing, so
       # we have to catch both and ensure the correct code path is taken.

-    rescue ArgumentError => ex
-      raise OSM::APIBadUserInput, ex.message.to_s
-    rescue RuntimeError => ex
-      raise OSM::APIBadUserInput, ex.message.to_s
+    rescue ArgumentError => e
+      raise OSM::APIBadUserInput, e.message.to_s
+    rescue RuntimeError => e
+      raise OSM::APIBadUserInput, e.message.to_s

     end
 
     ##
     end
 
     ##