X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b95e9d27599ee55b2fd61a444acc3264c7637265..932c2d4f8faa0e43f4777089c859d99dfb517d9d:/app/controllers/way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 49a3b3bfe..10e0f8442 100644
--- 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
+  after_filter :compress_output
 
   def create
     if request.put?
@@ -9,12 +10,17 @@ class WayController < ApplicationController
 
       if way
         way.user_id = @user.id
-        if way.save_with_history
-
+        unless way.preconditions_ok? # are the segments (and their nodes) visible?
+          render :nothing => true, :status => 412
+          return
+        end
 
-          render :text => way.id
+        if way.save_with_history
+          render :text => way.id.to_s
+          return
         else
           render :nothing => true, :status => 500
+          return
         end
         return
       else
@@ -34,7 +40,7 @@ class WayController < ApplicationController
 
     way = Way.find(params[:id])
     case request.method
-   
+
     when :get
       unless way.visible
         render :nothing => true, :status => 410
@@ -50,9 +56,48 @@ class WayController < ApplicationController
 
       way.visible = false
       way.save_with_history
+      render :nothing => true
+      return
+    when :put
+      way = Way.from_xml(request.raw_post)
+
+      if way
+        way_in_db = Way.find(way.id)
+        if way_in_db
+          way_in_db.user_id = @user.id
+          way_in_db.tags = way.tags
+          way_in_db.segs = way.segs
+          way_in_db.timestamp = way.timestamp
+          way_in_db.visible = true
+          if way_in_db.save_with_history
+            render :text => way.id
+          else
+            render :nothing => true, :status => 500
+          end
+          return
+        else
+          render :nothing => true, :status => 404 # way doesn't exist yet
+        end
+      else
+        render :nothing => true, :status => 400 # if we got here the doc didnt parse
+        return
+      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