fixes for search

[rails.git] / app / controllers / segment_controller.rb

diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 21de13be84f56ab1bb2ce9d579c5886c167ed60a..76cb5cebb44e6fbea5e97c64135b92282b25b108 100644 (file)
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -1,18 +1,26 @@
 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
-        if segment.save_with_history
 
-          render :text => segment.id
+        segment.from_node = Node.find(segment.node_a.to_i)
+        segment.to_node = Node.find(segment.node_b.to_i)
+        
+        unless segment.preconditions_ok? # are the nodes visible?
+          render :nothing => true, :status => 412
+        end
+
+        if segment.save_with_history
+          render :text => segment.id.to_s
         else
           render :nothing => true, :status => 500
         end
@@ -28,8 +36,9 @@ class SegmentController < ApplicationController
   end
 
   def rest
+    response.headers["Content-Type"] = 'application/xml'
     unless Segment.exists?(params[:id])
-      render :nothing => true, :status => 400
+      render :nothing => true, :status => 404
       return
     end
 
@@ -56,9 +65,10 @@ class SegmentController < ApplicationController
       segment.timestamp = Time.now
       segment.user_id = @user.id
 
-      segment.latitude = new_segment.latitude 
-      segment.longitude = new_segment.longitude
+      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.id == new_segment.id and segment.save_with_history
         render :nothing => true, :status => 200
@@ -70,5 +80,19 @@ class SegmentController < ApplicationController
 
   end
 
+  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
+  end
 
 end