X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/be0e33862fedbf02e52a9e126cac31dfb5775b43..3c38bad5611b0344b69ac6b419069ab32867f8b1:/app/controllers/api/relations_controller.rb?ds=sidebyside
diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index a0740b382..19aed6a85 100644
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -1,38 +1,58 @@
module Api
- class RelationsController < ApplicationController
+ class RelationsController < ApiController
require "xml/libxml"
- skip_before_action :verify_authenticity_token
+ before_action :check_api_writable, :only => [:create, :update, :delete]
+ before_action :check_api_readable, :except => [:create, :update, :delete]
before_action :authorize, :only => [:create, :update, :delete]
- before_action :api_deny_access_handler
authorize_resource
before_action :require_public_data, :only => [:create, :update, :delete]
- before_action :check_api_writable, :only => [:create, :update, :delete]
- before_action :check_api_readable, :except => [:create, :update, :delete]
around_action :api_call_handle_error, :api_call_timeout
- def create
- assert_method :put
+ before_action :set_request_formats, :except => [:create, :update, :delete]
- relation = Relation.from_xml(request.raw_post, true)
+ def index
+ raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]
- # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
- relation.create_with_history current_user
- render :plain => relation.id.to_s
+ ids = params["relations"].split(",").collect(&:to_i)
+
+ raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
+
+ @relations = Relation.find(ids)
+
+ # Render the result
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
def show
- relation = Relation.find(params[:id])
- response.last_modified = relation.timestamp
- if relation.visible
- render :xml => relation.to_xml.to_s
+ @relation = Relation.find(params[:id])
+ response.last_modified = @relation.timestamp
+ if @relation.visible
+ # Render the result
+ respond_to do |format|
+ format.xml
+ format.json
+ end
else
head :gone
end
end
+ def create
+ assert_method :put
+
+ relation = Relation.from_xml(request.raw_post, :create => true)
+
+ # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
+ relation.create_with_history current_user
+ render :plain => relation.id.to_s
+ end
+
def update
logger.debug request.raw_post
@@ -72,9 +92,9 @@ module Api
# first find the ids of nodes, ways and relations referenced by this
# relation - note that we exclude this relation just in case.
- node_ids = relation.members.select { |m| m[0] == "Node" }.map { |m| m[1] }
- way_ids = relation.members.select { |m| m[0] == "Way" }.map { |m| m[1] }
- relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.map { |m| m[1] }
+ node_ids = relation.members.select { |m| m[0] == "Node" }.pluck(1)
+ way_ids = relation.members.select { |m| m[0] == "Way" }.pluck(1)
+ relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.pluck(1)
# next load the relations and the ways.
@@ -90,56 +110,43 @@ module Api
node_ids += way_node_ids.flatten
nodes = Node.where(:id => node_ids.uniq).includes(:node_tags)
- # create XML.
- doc = OSM::API.new.get_xml_doc
visible_nodes = {}
- changeset_cache = {}
- user_display_name_cache = {}
+ @nodes = []
nodes.each do |node|
next unless node.visible? # should be unnecessary if data is consistent.
- doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+ @nodes << node
visible_nodes[node.id] = node
end
+ @ways = []
ways.each do |way|
next unless way.visible? # should be unnecessary if data is consistent.
- doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+ @ways << way
end
+ @relations = []
relations.each do |rel|
next unless rel.visible? # should be unnecessary if data is consistent.
- doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)
+ @relations << rel
end
- # finally add self and output
- doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache)
- render :xml => doc.to_s
+ # finally add self
+ @relations << relation
+ # Render the result
+ respond_to do |format|
+ format.xml
+ format.json
+ end
else
head :gone
end
end
- def index
- raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]
-
- ids = params["relations"].split(",").collect(&:to_i)
-
- raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
-
- doc = OSM::API.new.get_xml_doc
-
- Relation.find(ids).each do |relation|
- doc.root << relation.to_xml_node
- end
-
- render :xml => doc.to_s
- end
-
def relations_for_way
relations_for_object("Way")
end
@@ -157,13 +164,17 @@ module Api
def relations_for_object(objtype)
relationids = RelationMember.where(:member_type => objtype, :member_id => params[:id]).collect(&:relation_id).uniq
- doc = OSM::API.new.get_xml_doc
+ @relations = []
Relation.find(relationids).each do |relation|
- doc.root << relation.to_xml_node if relation.visible
+ @relations << relation if relation.visible
end
- render :xml => doc.to_s
+ # Render the result
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
end
end