X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/25936fad050c62e3be1c0fa3912891dca8ecb745..c91b86a1d1271c2bc801ee9dfc3a30fb2758aa9b:/app/controllers/way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index ff568620b..875a29583 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,18 +1,26 @@
-class WayController < ApplicationController
+class WayController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
-
+  after_filter :compress_output
+
   def create
     if request.put?
       way = Way.from_xml(request.raw_post, true)
 
       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
-          render :text => way.id
+          render :text => way.id.to_s
+          return
         else
           render :nothing => true, :status => 500
+          return
         end
         return
       else
@@ -24,7 +32,7 @@ class WayController < ApplicationController
     render :nothing => true, :status => 500 # something went very wrong
   end
 
-  def rest
+  def rest
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return
@@ -32,8 +40,8 @@ class WayController < ApplicationController
 
     way = Way.find(params[:id])
     case request.method
-   
-    when :get
+
+    when :get
       unless way.visible
         render :nothing => true, :status => 410
         return
@@ -78,11 +86,11 @@ class WayController < ApplicationController
   end
 
   def ways
-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'
     ids = params['ways'].split(',').collect {|w| w.to_i }
     if ids.length > 0
       waylist = Way.find(ids)
-      doc = get_xml_doc
+      doc = OSM::API.new.get_xml_doc
       waylist.each do |way|
         doc.root << way.to_xml_node
       end