cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Map 'full' to api way show action

Browse source
This commit is contained in:
Anton Khorev 2025-02-01 16:49:08 +03:00
parent 51dab659f5
commit 0f2aa939d4
8 changed files with 58 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/abilities/api_ability.rb
View file

@ -16,7 +16,7 @@ class ApiAbility
can :read, Tracepoint
can :read, User
can :read, Node
can [:read, :full, :ways_for_node], Way
can [:read, :ways_for_node], Way
can [:read, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
can [:history, :read], [OldNode, OldWay, OldRelation]
can :read, UserBlock

35
app/controllers/api/ways_controller.rb
View file

@ -26,12 +26,21 @@ module Api
end
def show
@way = Way.find(params[:id])
@way = Way
@way = @way.includes(:nodes => :node_tags) if params[:full]
@way = @way.find(params[:id])
response.last_modified = @way.timestamp
response.last_modified = @way.timestamp unless params[:full]
if @way.visible
# Render the result
if params[:full]
@nodes = []
@way.nodes.uniq.each do |node|
@nodes << node if node.visible
end
end
respond_to do |format|
format.xml
format.json
@ -72,26 +81,6 @@ module Api
end
end
def full
@way = Way.includes(:nodes => :node_tags).find(params[:id])
if @way.visible
@nodes = []
@way.nodes.uniq.each do |node|
@nodes << node if node.visible
end
# Render the result
respond_to do |format|
format.xml
format.json
end
else
head :gone
end
end
##
# returns all the ways which are currently using the node given in the
# :id parameter. note that this used to return deleted ways as well, but

6
app/views/api/ways/full.json.jbuilder
View file

@ -1,6 +0,0 @@
json.partial! "api/root_attributes"
json.elements do
json.array! @nodes, :partial => "/api/nodes/node", :as => :node
json.array! [@way], :partial => "/api/ways/way", :as => :way
end

6
app/views/api/ways/full.xml.builder
View file

@ -1,6 +0,0 @@
xml.instruct!
xml.osm(OSM::API.new.xml_root_attributes) do |osm|
osm << (render(@nodes) || "")
osm << (render(@way) || "")
end

1
app/views/api/ways/show.json.jbuilder
View file

@ -1,5 +1,6 @@
json.partial! "api/root_attributes"
json.elements do
json.array! @nodes, :partial => "/api/nodes/node", :as => :node if @nodes
json.array! [@way], :partial => "way", :as => :way
end

1
app/views/api/ways/show.xml.builder
View file

@ -1,5 +1,6 @@
xml.instruct!
xml.osm(OSM::API.new.xml_root_attributes) do |osm|
osm << (render(@nodes) || "") if @nodes
osm << (render(@way) || "")
end

7
config/routes.rb
View file

@ -37,7 +37,6 @@ OpenStreetMap::Application.routes.draw do
get "node/:id/:version" => "old_nodes#show", :as => :api_old_node, :id => /\d+/, :version => /\d+/
get "way/:id/history" => "old_ways#history", :as => :api_way_history, :id => /\d+/
get "way/:id/full" => "ways#full", :as => :way_full, :id => /\d+/
get "way/:id/relations" => "relations#relations_for_way", :as => :way_relations, :id => /\d+/
post "way/:id/:version/redact" => "old_ways#redact", :as => :way_version_redact, :version => /\d+/, :id => /\d+/
get "way/:id/:version" => "old_ways#show", :as => :api_old_way, :id => /\d+/, :version => /\d+/
@ -55,7 +54,11 @@ OpenStreetMap::Application.routes.draw do
put "node/create" => "nodes#create", :as => nil
resources :ways, :only => [:index, :create]
resources :ways, :path => "way", :id => /\d+/, :only => [:show, :update, :destroy]
resources :ways, :path => "way", :id => /\d+/, :only => [:show, :update, :destroy] do
member do
get :full, :action => :show, :full => true, :as => nil
end
end
put "way/create" => "ways#create", :as => nil
resources :relations, :only => [:index, :create]

44
test/controllers/api/ways_controller_test.rb
View file

@ -27,11 +27,11 @@ module Api
)
assert_routing(
{ :path => "/api/0.6/way/1/full", :method => :get },
{ :controller => "api/ways", :action => "full", :id => "1" }
{ :controller => "api/ways", :action => "show", :full => true, :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/way/1/full.json", :method => :get },
{ :controller => "api/ways", :action => "full", :id => "1", :format => "json" }
{ :controller => "api/ways", :action => "show", :full => true, :id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/way/1", :method => :put },
@ -136,10 +136,10 @@ module Api
##
# check the "full" mode
def test_full
def test_show_full
way = create(:way_with_nodes, :nodes_count => 3)
get way_full_path(way)
get api_way_path(way, :full => true)
assert_response :success
@ -154,10 +154,42 @@ module Api
end
end
def test_full_deleted
def test_show_full_json
way = create(:way_with_nodes, :nodes_count => 3)
get api_way_path(way, :full => true, :format => "json")
assert_response :success
# Check the way is correctly returned
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 4, js["elements"].count
js_ways = js["elements"].filter { |e| e["type"] == "way" }
assert_equal 1, js_ways.count
assert_equal way.id, js_ways[0]["id"]
assert_equal 1, js_ways[0]["version"]
# check that each node in the way appears once in the output as a
# reference and as the node element.
js_nodes = js["elements"].filter { |e| e["type"] == "node" }
assert_equal 3, js_nodes.count
way.nodes.each_with_index do |n, i|
assert_equal n.id, js_ways[0]["nodes"][i]
js_nodes_with_id = js_nodes.filter { |e| e["id"] == n.id }
assert_equal 1, js_nodes_with_id.count
assert_equal n.id, js_nodes_with_id[0]["id"]
assert_equal 1, js_nodes_with_id[0]["version"]
assert_equal n.lat, js_nodes_with_id[0]["lat"]
assert_equal n.lon, js_nodes_with_id[0]["lon"]
end
end
def test_show_full_deleted
way = create(:way, :deleted)
get way_full_path(way)
get api_way_path(way, :full => true)
assert_response :gone
end