X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/613e88c4a8728c2f1ab8a2fb9338762b947eac6a..183841d10e7acbb6dad17cc7cc3283817d44164b:/app/controllers/segment_controller.rb diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb index 2bc4f07c7..070c2be81 100644 --- a/app/controllers/segment_controller.rb +++ b/app/controllers/segment_controller.rb @@ -1,111 +1,148 @@ class SegmentController < ApplicationController require 'xml/libxml' - before_filter :authorize + before_filter :authorize, :only => [:create, :update, :delete] + before_filter :check_availability, :only => [:create, :update, :delete] + after_filter :compress_output def create if request.put? segment = Segment.from_xml(request.raw_post, true) if segment - - segment.user_id = @user.id - - a = Node.find(segment.node_a.to_i) - b = Node.find(segment.node_b.to_i) - - unless a and a.visible and b and b.visible - render :nothing => true, :status => 400 - end - - if segment.save_with_history - render :text => segment.id + if segment.node_a == segment.node_b + render :nothing => true, :status => :expectation_failed + elsif !segment.preconditions_ok? + render :nothing => true, :status => :precondition_failed else - render :nothing => true, :status => 500 + segment.user_id = @user.id + segment.from_node = Node.find(segment.node_a.to_i) + segment.to_node = Node.find(segment.node_b.to_i) + + if segment.save_with_history + render :text => segment.id.to_s, :content_type => "text/plain" + else + render :nothing => true, :status => :internal_server_error + end end - return - else - render :nothing => true, :status => 400 # if we got here the doc didnt parse - return + render :nothing => true, :status => :bad_request end + else + render :nothing => true, :status => :method_not_allowed end - - render :nothing => true, :status => 500 # something went very wrong end - def rest - unless Segment.exists?(params[:id]) - render :nothing => true, :status => 400 - return - end - - segment = Segment.find(params[:id]) - - case request.method - - when :get - render :text => segment.to_xml.to_s - return + def read + begin + segment = Segment.find(params[:id]) - when :delete if segment.visible - segment.visible = 0 - segment.save_with_history - render :nothing => true + render :text => segment.to_xml.to_s, :content_type => "text/xml" else - render :nothing => true, :status => 410 + render :nothing => true, :status => :gone end + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found + rescue + render :nothing => true, :status => :internal_server_error + end + end - when :put - new_segment = Segment.from_xml(request.raw_post) + def update + begin + segment = Segment.find(params[:id]) - segment.timestamp = Time.now - segment.user_id = @user.id + if segment.visible + new_segment = Segment.from_xml(request.raw_post) + + if new_segment and new_segment.id == segment.id + if new_segment.node_a == new_segment.node_b + render :nothing => true, :status => :expectation_failed + elsif !new_segment.preconditions_ok? + render :nothing => true, :status => :precondition_failed + else + segment.user_id = @user.id + segment.node_a = new_segment.node_a + segment.node_b = new_segment.node_b + segment.tags = new_segment.tags + segment.visible = new_segment.visible + + if segment.save_with_history + render :nothing => true + else + render :nothing => true, :status => :internal_server_error + end + end + else + render :nothing => true, :status => :bad_request + end + 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 + end - segment.node_a = new_segment.node_a - segment.node_b = new_segment.node_b - segment.tags = new_segment.tags - segment.visible = new_segment.visible + def delete + begin + segment = Segment.find(params[:id]) - if segment.id == new_segment.id and segment.save_with_history - render :nothing => true, :status => 200 + if segment.visible + if WaySegment.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_segments.id", :conditions => [ "current_ways.visible = 1 AND current_way_segments.segment_id = ?", segment.id ]) + render :nothing => true, :status => :precondition_failed + else + segment.user_id = @user.id + segment.visible = 0 + + if segment.save_with_history + render :nothing => true + else + render :nothing => true, :status => :internal_server_error + end + end else - render :nothing => true, :status => 500 + render :nothing => true, :status => :gone end - return + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found + rescue + render :nothing => true, :status => :internal_server_error end - end - def history - segment = Segment.find(params[:id]) + def segments + ids = params['segments'].split(',').collect { |s| s.to_i } - unless segment - render :nothing => true, :staus => 404 - return - end + if ids.length > 0 + doc = OSM::API.new.get_xml_doc - doc = XML::Document.new - doc.encoding = 'UTF-8' - root = XML::Node.new 'osm' - root['version'] = '0.4' - root['generator'] = 'OpenStreetMap server' - doc.root = root - - segment.old_segments.each do |old_segment| - el1 = XML::Node.new 'segment' - el1['id'] = old_segment.id.to_s - el1['from'] = old_segment.node_a.to_s - el1['to'] = old_segment.node_b.to_s - Segment.split_tags(el1, old_segment.tags) - el1['visible'] = old_segment.visible.to_s - el1['timestamp'] = old_segment.timestamp.xmlschema - root << el1 - end + Segment.find(ids).each do |segment| + doc.root << segment.to_xml_node + end - render :text => doc.to_s + render :text => doc.to_s, :content_type => "text/xml" + else + render :nothing => true, :status => :bad_request + end end + def segments_for_node + segmentids = Segment.find(:all, :conditions => ['node_a = ? OR node_b = ?', params[:id], params[:id]]).collect { |s| s.id }.uniq + if segmentids.length > 0 + doc = OSM::API.new.get_xml_doc + + Segment.find(segmentids).each do |segment| + doc.root << segment.to_xml_node + end + + render :text => doc.to_s, :content_type => "text/xml" + else + render :nothing => true, :status => :bad_request + end + end end