X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/222d31e435f003ec59e84860d2fa5129449f69de..b7b2b502cf2b119208e3c1f79e4a4e38cc0edcc5:/app/controllers/way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 2c948214e..5b0a632f7 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,29 +1,145 @@
 class WayController < ApplicationController
   require 'xml/libxml'
 
-  before_filter :authorize
+  session :off
+  before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
+  after_filter :compress_output
 
   def create
-    if request.put?
-      way = Way.from_xml(request.raw_post, true)
+    begin
+      if request.put?
+        way = Way.from_xml(request.raw_post, true)
 
-      if way
-        way.user_id = @user.id
-        if way.save_with_history
+        if way
+          way.create_with_history @user
+          render :text => way.id.to_s, :content_type => "text/plain"
+        else
+          render :nothing => true, :status => :bad_request
+        end
+      else
+        render :nothing => true, :status => :method_not_allowed
+      end
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    end
+  end
 
+  def read
+    begin
+      way = Way.find(params[:id])
 
-          render :text => way.id
-        else
-          render :nothing => true, :status => 500
+      response.headers['Last-Modified'] = way.timestamp.rfc822
+
+      if way.visible
+        render :text => way.to_xml.to_s, :content_type => "text/xml"
+      else
+        render :text => "", :status => :gone
+      end
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+
+  def update
+    begin
+      way = Way.find(params[:id])
+      new_way = Way.from_xml(request.raw_post)
+
+      if new_way and new_way.id == way.id
+        way.update_from(new_way, @user)
+        render :text => way.version.to_s, :content_type => "text/plain"
+      else
+        render :nothing => true, :status => :bad_request
+      end
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+
+  # This is the API call to delete a way
+  def delete
+    begin
+      way = Way.find(params[:id])
+      new_way = Way.from_xml(request.raw_post)
+
+      if new_way and new_way.id == way.id
+        way.delete_with_history!(new_way, @user)
+        render :text => way.version.to_s, :content_type => "text/plain"
+      else
+        render :nothing => true, :status => :bad_request
+      end
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+
+  def full
+    begin
+      way = Way.find(params[:id])
+
+      if way.visible
+        nd_ids = way.nds + [-1]
+        nodes = Node.find(:all, :conditions => ["visible = ? AND id IN (#{nd_ids.join(',')})", true])
+
+        # Render
+        doc = OSM::API.new.get_xml_doc
+        nodes.each do |node|
+          doc.root << node.to_xml_node()
         end
-        return
+        doc.root << way.to_xml_node()
+
+        render :text => doc.to_s, :content_type => "text/xml"
       else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :text => "", :status => :gone
       end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+
+  def ways
+    begin
+      ids = params['ways'].split(',').collect { |w| w.to_i }
+    rescue
+      ids = []
     end
 
-    render :nothing => true, :status => 500 # something went very wrong
+    if ids.length > 0
+      doc = OSM::API.new.get_xml_doc
+
+      Way.find(ids).each do |way|
+        doc.root << way.to_xml_node
+      end
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request
+    end
   end
 
+  ##
+  # returns all the ways which are currently using the node given in the 
+  # :id parameter. note that this used to return deleted ways as well, but
+  # this seemed not to be the expected behaviour, so it was removed.
+  def ways_for_node
+    wayids = WayNode.find(:all, 
+                          :conditions => ['node_id = ?', params[:id]]
+                          ).collect { |ws| ws.id[0] }.uniq
+
+    doc = OSM::API.new.get_xml_doc
+
+    Way.find(wayids).each do |way|
+      doc.root << way.to_xml_node if way.visible
+    end
+
+    render :text => doc.to_s, :content_type => "text/xml"
+  end
 end