X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9189093997610a8f289037d37b683c9fed060ae1..6fe1a503b61cdb1216625ef71d9134b009fd3af2:/app/controllers/segment_controller.rb?ds=inline diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb index 5f2603f0b..76cb5cebb 100644 --- a/app/controllers/segment_controller.rb +++ b/app/controllers/segment_controller.rb @@ -10,18 +10,17 @@ class SegmentController < ApplicationController segment = Segment.from_xml(request.raw_post, true) if segment - 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) - unless segment.precondtions_ok? # are the nodes visible? + 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 @@ -86,7 +85,7 @@ class SegmentController < ApplicationController 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