X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b95e9d27599ee55b2fd61a444acc3264c7637265..cdb9d2527a8524eea02856c27fff10ad5c138344:/app/controllers/segment_controller.rb

diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 966ede72a..76cb5cebb 100644
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -2,24 +2,25 @@ class SegmentController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
+  after_filter :compress_output
 
   def create
+    response.headers["Content-Type"] = 'application/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
@@ -35,6 +36,7 @@ class SegmentController < ApplicationController
   end
 
   def rest
+    response.headers["Content-Type"] = 'application/xml'
     unless Segment.exists?(params[:id])
       render :nothing => true, :status => 404
       return
@@ -78,34 +80,19 @@ class SegmentController < ApplicationController
 
   end
 
-  def history
-    segment = Segment.find(params[:id])
-
-    unless segment
-      render :nothing => true, :staus => 404
-      return
-    end
-
-    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
+  def segments
+    response.headers["Content-Type"] = 'application/xml'
+    ids = params['segments'].split(',').collect {|s| s.to_i }
+    if ids.length > 0
+      segmentlist = Segment.find(ids)
+      doc = OSM::API.get_xml_doc
+      segmentlist.each do |segment|
+        doc.root << segment.to_xml_node
+      end 
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400
     end
-
-    render :text => doc.to_s
   end
 
-
 end