X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c38e4bf4a0f76550300386bbabf4bdda943e56c1..c91b86a1d1271c2bc801ee9dfc3a30fb2758aa9b:/app/controllers/segment_controller.rb diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb index 7e77609f3..28c7580df 100644 --- a/app/controllers/segment_controller.rb +++ b/app/controllers/segment_controller.rb @@ -5,23 +5,22 @@ class SegmentController < ApplicationController after_filter :compress_output def create - response.headers["Content-Type"] = 'application/xml' + response.headers["Content-Type"] = 'text/xml' 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) + segment.from_node = Node.find(segment.node_a.to_i) + segment.to_node = Node.find(segment.node_b.to_i) - unless a and a.visible and b and b.visible - render :nothing => true, :status => 400 + unless segment.preconditions_ok? # are the nodes visible? + render :nothing => true, :status => 412 end if segment.save_with_history - render :text => segment.id + render :text => segment.id.to_s else render :nothing => true, :status => 500 end @@ -37,7 +36,7 @@ class SegmentController < ApplicationController end def rest - response.headers["Content-Type"] = 'application/xml' + response.headers["Content-Type"] = 'text/xml' unless Segment.exists?(params[:id]) render :nothing => true, :status => 404 return @@ -82,11 +81,11 @@ class SegmentController < ApplicationController end def segments - response.headers["Content-Type"] = 'application/xml' + response.headers["Content-Type"] = 'text/xml' ids = params['segments'].split(',').collect {|s| s.to_i } if ids.length > 0 segmentlist = Segment.find(ids) - doc = get_xml_doc + doc = OSM::API.get_xml_doc segmentlist.each do |segment| doc.root << segment.to_xml_node end