class RelationController < ApplicationController
require 'xml/libxml'
+ session :off
before_filter :authorize, :only => [:create, :update, :delete]
- before_filter :check_availability, :only => [:create, :update, :delete]
-
+ before_filter :require_public_data, :only => [:create, :update, :delete]
+ before_filter :check_api_writable, :only => [:create, :update, :delete]
+ before_filter :check_api_readable, :except => [:create, :update, :delete]
after_filter :compress_output
def create
- if request.put?
- relation = Relation.from_xml(request.raw_post, true)
-
- if relation
- if !relation.preconditions_ok?
- render :nothing => true, :status => :precondition_failed
- else
- relation.user_id = @user.id
-
- if relation.save_with_history
- render :text => relation.id.to_s, :content_type => "text/plain"
- else
- print "save error\n";
- render :nothing => true, :status => :internal_server_error
- end
- end
+ begin
+ if request.put?
+ relation = Relation.from_xml(request.raw_post, true)
+
+ # We assume that an exception has been thrown if there was an error
+ # generating the relation
+ #if relation
+ relation.create_with_history @user
+ render :text => relation.id.to_s, :content_type => "text/plain"
+ #else
+ # render :text => "Couldn't get turn the input into a relation.", :status => :bad_request
+ #end
else
- render :nothing => true, :status => :bad_request
+ render :nothing => true, :status => :method_not_allowed
end
- else
- render :nothing => true, :status => :method_not_allowed
+ rescue OSM::APIError => ex
+ render ex.render_opts
end
end
def read
begin
relation = Relation.find(params[:id])
-
+ response.headers['Last-Modified'] = relation.timestamp.rfc822
if relation.visible
render :text => relation.to_xml.to_s, :content_type => "text/xml"
else
- render :nothing => true, :status => :gone
+ render :text => "", :status => :gone
end
rescue ActiveRecord::RecordNotFound
render :nothing => true, :status => :not_found
end
def update
+ logger.debug request.raw_post
begin
relation = Relation.find(params[:id])
+ new_relation = Relation.from_xml(request.raw_post)
- if relation.visible
- new_relation = Relation.from_xml(request.raw_post)
-
- if new_relation and new_relation.id == relation.id
- if !new_relation.preconditions_ok?
- render :nothing => true, :status => :precondition_failed
- else
- relation.user_id = @user.id
- relation.tags = new_relation.tags
- relation.members = new_relation.members
- relation.visible = true
-
- if relation.save_with_history
- render :nothing => true
- else
- render :nothing => true, :status => :internal_server_error
- end
- end
- else
- render :nothing => true, :status => :bad_request
- end
+ if new_relation and new_relation.id == relation.id
+ relation.update_from new_relation, @user
+ render :text => relation.version.to_s, :content_type => "text/plain"
else
- render :nothing => true, :status => :gone
+ render :nothing => true, :status => :bad_request
end
rescue ActiveRecord::RecordNotFound
render :nothing => true, :status => :not_found
- rescue
- render :nothing => true, :status => :internal_server_error
+ rescue OSM::APIError => ex
+ render ex.render_opts
end
end
def delete
-#XXX check if member somewhere!
begin
relation = Relation.find(params[:id])
-
- if relation.visible
- if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", params[:id]])
- render :nothing => true, :status => :precondition_failed
- else
- relation.user_id = @user.id
- relation.tags = []
- relation.members = []
- relation.visible = false
-
- if relation.save_with_history
- render :nothing => true
- else
- render :nothing => true, :status => :internal_server_error
- end
- end
+ new_relation = Relation.from_xml(request.raw_post)
+ if new_relation and new_relation.id == relation.id
+ relation.delete_with_history!(new_relation, @user)
+ render :text => relation.version.to_s, :content_type => "text/plain"
else
- render :nothing => true, :status => :gone
+ render :nothing => true, :status => :bad_request
end
+ rescue OSM::APIError => ex
+ render ex.render_opts
rescue ActiveRecord::RecordNotFound
render :nothing => true, :status => :not_found
- rescue
- render :nothing => true, :status => :internal_server_error
end
end
+ # -----------------------------------------------------------------
+ # full
+ #
+ # input parameters: id
+ #
+ # returns XML representation of one relation object plus all its
+ # members, plus all nodes part of member ways
+ # -----------------------------------------------------------------
def full
begin
relation = Relation.find(params[:id])
if relation.visible
- # In future, we might want to do all the data fetch in one step
- seg_ids = relation.segs + [-1]
- segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})"
- node_ids = segments.collect {|segment| segment.node_a }
- node_ids += segments.collect {|segment| segment.node_b }
- node_ids += [-1]
- nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{node_ids.join(',')})")
+ # 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' and m[1] != relation.id }.map { |m| m[1] }
- # Render
+ # next load the relations and the ways.
+
+ relations = Relation.find(relation_ids, :include => [:relation_tags])
+ ways = Way.find(way_ids, :include => [:way_nodes, :way_tags])
+
+ # now additionally collect nodes referenced by ways. Note how we
+ # recursively evaluate ways but NOT relations.
+
+ way_node_ids = ways.collect { |way|
+ way.way_nodes.collect { |way_node| way_node.node_id }
+ }
+ node_ids += way_node_ids.flatten
+ nodes = Node.find(node_ids.uniq, :include => :node_tags)
+
+ # create XML.
doc = OSM::API.new.get_xml_doc
+ visible_nodes = {}
+ visible_members = { "Node" => [], "Way" => [], "Relation" => [] }
+ changeset_cache = {}
+ user_display_name_cache = {}
+
nodes.each do |node|
- doc.root << node.to_xml_node()
+ if node.visible? # should be unnecessary if data is consistent.
+ doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+ visible_nodes[node.id] = node
+ visible_members["Node"][node.id] = true
+ end
+ end
+ ways.each do |way|
+ if way.visible? # should be unnecessary if data is consistent.
+ doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+ visible_members["Way"][way.id] = true
+ end
end
- segments.each do |segment|
- doc.root << segment.to_xml_node()
+ relations.each do |rel|
+ if rel.visible? # should be unnecessary if data is consistent.
+ doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
+ visible_members["Relation"][rel.id] = true
+ end
end
- doc.root << relation.to_xml_node()
-
+ # finally add self and output
+ doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
render :text => doc.to_s, :content_type => "text/xml"
+
else
render :nothing => true, :status => :gone
end
+
rescue ActiveRecord::RecordNotFound
render :nothing => true, :status => :not_found
+
rescue
render :nothing => true, :status => :internal_server_error
end
render :text => doc.to_s, :content_type => "text/xml"
else
- render :nothing => true, :status => :bad_request
+ render :text => "You need to supply a comma separated list of ids.", :status => :bad_request
end
+ rescue ActiveRecord::RecordNotFound
+ render :text => "Could not find one of the relations", :status => :not_found
+ end
+
+ def relations_for_way
+ relations_for_object("Way")
+ end
+ def relations_for_node
+ relations_for_object("Node")
+ end
+ def relations_for_relation
+ relations_for_object("Relation")
end
def relations_for_object(objtype)
- relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq
+ relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id[0] }.uniq
- if relationids.length > 0
- doc = OSM::API.new.get_xml_doc
+ doc = OSM::API.new.get_xml_doc
- Relation.find(relationids).each do |relation|
- doc.root << relation.to_xml_node
- end
-
- render :text => doc.to_s, :content_type => "text/xml"
- else
- render :nothing => true, :status => :bad_request
+ Relation.find(relationids).each do |relation|
+ doc.root << relation.to_xml_node if relation.visible
end
+
+ render :text => doc.to_s, :content_type => "text/xml"
end
end
projects / rails.git / blobdiff