New way id is now returned complete

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 3a11d8a6054f5cb6c92bd15f7e45868131b34de4..10e0f844278ecfc3856f7eb9f93ef11bc6f20157 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -2,6 +2,7 @@ class WayController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
   require 'xml/libxml'
 
   before_filter :authorize

+  after_filter :compress_output

 
   def create
     if request.put?
 
   def create
     if request.put?


@@ -9,10 +10,17 @@ class WayController < ApplicationController
 
       if way
         way.user_id = @user.id
 
       if way
         way.user_id = @user.id

+        unless way.preconditions_ok? # are the segments (and their nodes) visible?
+          render :nothing => true, :status => 412
+          return
+        end
+

         if way.save_with_history
         if way.save_with_history

-          render :text => way.id
+          render :text => way.id.to_s
+          return

         else
           render :nothing => true, :status => 500
         else
           render :nothing => true, :status => 500

+          return

         end
         return
       else
         end
         return
       else


@@ -32,7 +40,7 @@ class WayController < ApplicationController
 
     way = Way.find(params[:id])
     case request.method
 
     way = Way.find(params[:id])
     case request.method

-   
+

     when :get
       unless way.visible
         render :nothing => true, :status => 410
     when :get
       unless way.visible
         render :nothing => true, :status => 410


@@ -77,4 +85,19 @@ class WayController < ApplicationController
     end
   end
 
     end
   end
 

+  def ways
+    response.headers["Content-Type"] = 'application/xml'
+    ids = params['ways'].split(',').collect {|w| w.to_i }
+    if ids.length > 0
+      waylist = Way.find(ids)
+      doc = get_xml_doc
+      waylist.each do |way|
+        doc.root << way.to_xml_node
+      end 
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400
+    end
+  end
+

 end
 end