Remove expand_bbox endpoint
This commit is contained in:
mmd-osm
parent
816ee8ec92
commit
fc8923c305
5 changed files with 2 additions and 122 deletions
|
|
@ -37,7 +37,7 @@ class ApiAbility
|
|||
can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
|
||||
|
||||
if user.terms_agreed?
|
||||
can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
|
||||
can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset
|
||||
can :create, ChangesetComment
|
||||
can [:create, :update, :delete], Node
|
||||
can [:create, :update, :delete], Way
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class ApiCapability
|
|||
can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
|
||||
|
||||
if token&.user&.terms_agreed?
|
||||
can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset if capability?(token, :allow_write_api)
|
||||
can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset if capability?(token, :allow_write_api)
|
||||
can :create, ChangesetComment if capability?(token, :allow_write_api)
|
||||
can [:create, :update, :delete], Node if capability?(token, :allow_write_api)
|
||||
can [:create, :update, :delete], Way if capability?(token, :allow_write_api)
|
||||
|
|
|
|||
|
|
@ -61,50 +61,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.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.
|
||||
cs.save!
|
||||
@changeset = cs
|
||||
render "changeset"
|
||||
end
|
||||
|
||||
##
|
||||
# Upload a diff in a single transaction.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ OpenStreetMap::Application.routes.draw do
|
|||
put "changeset/create" => "api/changesets#create"
|
||||
post "changeset/:id/upload" => "api/changesets#upload", :id => /\d+/
|
||||
get "changeset/:id/download" => "api/changesets#download", :as => :changeset_download, :id => /\d+/
|
||||
post "changeset/:id/expand_bbox" => "api/changesets#expand_bbox", :id => /\d+/
|
||||
get "changeset/:id" => "api/changesets#show", :as => :changeset_show, :id => /\d+/
|
||||
post "changeset/:id/subscribe" => "api/changesets#subscribe", :as => :changeset_subscribe, :id => /\d+/
|
||||
post "changeset/:id/unsubscribe" => "api/changesets#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/
|
||||
|
|
|
|||
|
|
@ -17,10 +17,6 @@ module Api
|
|||
{ :path => "/api/0.6/changeset/1/download", :method => :get },
|
||||
{ :controller => "api/changesets", :action => "download", :id => "1" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/api/0.6/changeset/1/expand_bbox", :method => :post },
|
||||
{ :controller => "api/changesets", :action => "expand_bbox", :id => "1" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/api/0.6/changeset/1", :method => :get },
|
||||
{ :controller => "api/changesets", :action => "show", :id => "1" }
|
||||
|
|
@ -1501,57 +1497,6 @@ CHANGESET
|
|||
assert_select "osm>changeset[max_lat='3.0000000']", 1
|
||||
end
|
||||
|
||||
##
|
||||
# test that the changeset :include method works as it should
|
||||
def test_changeset_include
|
||||
basic_authorization create(:user).display_name, "test"
|
||||
|
||||
# create a new changeset
|
||||
put :create, :body => "<osm><changeset/></osm>"
|
||||
assert_response :success, "Creating of changeset failed."
|
||||
changeset_id = @response.body.to_i
|
||||
|
||||
# NOTE: the include method doesn't over-expand, like inserting
|
||||
# a real method does. this is because we expect the client to
|
||||
# know what it is doing!
|
||||
check_after_include(changeset_id, 1, 1, [1, 1, 1, 1])
|
||||
check_after_include(changeset_id, 3, 3, [1, 1, 3, 3])
|
||||
check_after_include(changeset_id, 4, 2, [1, 1, 4, 3])
|
||||
check_after_include(changeset_id, 2, 2, [1, 1, 4, 3])
|
||||
check_after_include(changeset_id, -1, -1, [-1, -1, 4, 3])
|
||||
check_after_include(changeset_id, -2, 5, [-2, -1, 4, 5])
|
||||
end
|
||||
|
||||
##
|
||||
# test that a not found, wrong method with the expand bbox works as expected
|
||||
def test_changeset_expand_bbox_error
|
||||
basic_authorization create(:user).display_name, "test"
|
||||
|
||||
# create a new changeset
|
||||
xml = "<osm><changeset/></osm>"
|
||||
put :create, :body => xml
|
||||
assert_response :success, "Creating of changeset failed."
|
||||
changeset_id = @response.body.to_i
|
||||
|
||||
lon = 58.2
|
||||
lat = -0.45
|
||||
|
||||
# Try and put
|
||||
xml = "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
|
||||
put :expand_bbox, :params => { :id => changeset_id }, :body => xml
|
||||
assert_response :method_not_allowed, "shouldn't be able to put a bbox expand"
|
||||
|
||||
# Try to get the update
|
||||
xml = "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
|
||||
get :expand_bbox, :params => { :id => changeset_id }, :body => xml
|
||||
assert_response :method_not_allowed, "shouldn't be able to get a bbox expand"
|
||||
|
||||
# Try to use a hopefully missing changeset
|
||||
xml = "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
|
||||
post :expand_bbox, :params => { :id => changeset_id + 13245 }, :body => xml
|
||||
assert_response :not_found, "shouldn't be able to do a bbox expand on a nonexistant changeset"
|
||||
end
|
||||
|
||||
##
|
||||
# test the query functionality of changesets
|
||||
def test_query
|
||||
|
|
@ -1929,26 +1874,6 @@ CHANGESET
|
|||
end
|
||||
end
|
||||
|
||||
##
|
||||
# call the include method and assert properties of the bbox
|
||||
def check_after_include(changeset_id, lon, lat, bbox)
|
||||
xml = "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
|
||||
post :expand_bbox, :params => { :id => changeset_id }, :body => xml
|
||||
assert_response :success, "Setting include of changeset failed: #{@response.body}"
|
||||
|
||||
# check exactly one changeset
|
||||
assert_select "osm>changeset", 1
|
||||
assert_select "osm>changeset[id='#{changeset_id}']", 1
|
||||
|
||||
# check the bbox
|
||||
doc = XML::Parser.string(@response.body).parse
|
||||
changeset = doc.find("//osm/changeset").first
|
||||
assert_equal bbox[0], changeset["min_lon"].to_f, "min lon"
|
||||
assert_equal bbox[1], changeset["min_lat"].to_f, "min lat"
|
||||
assert_equal bbox[2], changeset["max_lon"].to_f, "max lon"
|
||||
assert_equal bbox[3], changeset["max_lat"].to_f, "max lat"
|
||||
end
|
||||
|
||||
##
|
||||
# update the changeset_id of a way element
|
||||
def update_changeset(xml, changeset_id)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue