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

[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 ffd9a112bb433048e55380b593fac7ecae0e7494..a5a37b485868f8e986053cd723b17e0b671f5710 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -2,7 +2,6 @@
 
 module Api
   class ChangesetsController < ApiController
-    layout "site"
     require "xml/libxml"
 
     before_action :authorize, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]
@@ -61,50 +60,6 @@ module Api
       head :ok
     end
 
-    ##
-    # insert a (set of) points into a changeset bounding box. this can only
-    # increase the size of the bounding box. this is a hint that clients can
-    # set either before uploading a large number of changes, or changes that
-    # the client (but not the server) knows will affect areas further away.
-    def expand_bbox
-      # only allow POST requests, because although this method is
-      # idempotent, there is no "document" to PUT really...
-      assert_method :post
-
-      cs = Changeset.find(params[:id])
-      check_changeset_consistency(cs, current_user)
-
-      # keep an array of lons and lats
-      lon = []
-      lat = []
-
-      # the request is in pseudo-osm format... this is kind-of an
-      # abuse, maybe should change to some other format?
-      doc = XML::Parser.string(request.raw_post, :options => XML::Parser::Options::NOERROR).parse
-      doc.find("//osm/node").each do |n|
-        lon << n["lon"].to_f * GeoRecord::SCALE
-        lat << n["lat"].to_f * GeoRecord::SCALE
-      end
-
-      # add the existing bounding box to the lon-lat array
-      lon << cs.min_lon unless cs.min_lon.nil?
-      lat << cs.min_lat unless cs.min_lat.nil?
-      lon << cs.max_lon unless cs.max_lon.nil?
-      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
-
-      # save the larger bounding box and return the changeset, which
-      # will include the bigger bounding box.
-      cs.save!
-      @changeset = cs
-      render "changeset"
-    end
-
     ##
     # Upload a diff in a single transaction.
     #