Fix indentation.

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index b1adf25a2fa5a6656918a969f5ffaccf660597d1..4b52ad3f04829f575e7ecf37c132507ca4f0ba28 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,8 +1,10 @@
 class WayController < ApplicationController
   require 'xml/libxml'
 
 class WayController < ApplicationController
   require 'xml/libxml'
 

+  session :off

   before_filter :authorize, :only => [:create, :update, :delete]
   before_filter :authorize, :only => [:create, :update, :delete]

-  before_filter :check_availability, :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
   after_filter :compress_output
 
   def create


@@ -11,15 +13,12 @@ class WayController < ApplicationController
 
       if way
         if !way.preconditions_ok?
 
       if way
         if !way.preconditions_ok?

-          render :nothing => true, :status => :precondition_failed
+          render :text => "", :status => :precondition_failed

         else
           way.user_id = @user.id
         else
           way.user_id = @user.id

+          way.save_with_history!

 
 

-          if way.save_with_history
-            render :text => way.id.to_s, :content_type => "text/plain"
-          else
-            render :nothing => true, :status => :internal_server_error
-          end
+          render :text => way.id.to_s, :content_type => "text/plain"

         end
       else
         render :nothing => true, :status => :bad_request
         end
       else
         render :nothing => true, :status => :bad_request


@@ -33,75 +32,58 @@ class WayController < ApplicationController
     begin
       way = Way.find(params[:id])
 
     begin
       way = Way.find(params[:id])
 

+      response.headers['Last-Modified'] = way.timestamp.rfc822
+

       if way.visible
         render :text => way.to_xml.to_s, :content_type => "text/xml"
       else
       if way.visible
         render :text => way.to_xml.to_s, :content_type => "text/xml"
       else

-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone

       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found

-    rescue
-      render :nothing => true, :status => :internal_server_error

     end
   end
 
   def update
     begin
       way = Way.find(params[:id])
     end
   end
 
   def update
     begin
       way = Way.find(params[:id])

+      new_way = Way.from_xml(request.raw_post)

 
 

-      if way.visible
-        new_way = Way.from_xml(request.raw_post)
-
-        if new_way and new_way.id == way.id
-          if !new_way.preconditions_ok?
-            render :nothing => true, :status => :precondition_failed
-          else
-            way.user_id = @user.id
-            way.tags = new_way.tags
-            way.segs = new_way.segs
-            way.visible = true
-
-            if way.save_with_history
-              render :nothing => true
-            else
-              render :nothing => true, :status => :internal_server_error
-            end
-          end
+      if new_way and new_way.id == way.id
+        if !new_way.preconditions_ok?
+          render :text => "", :status => :precondition_failed

         else
         else

-          render :nothing => true, :status => :bad_request
+          way.user_id = @user.id
+          way.tags = new_way.tags
+          way.nds = new_way.nds
+          way.visible = true
+          way.save_with_history!
+
+          render :nothing => true

         end
       else
         end
       else

-        render :nothing => true, :status => :gone
+        render :nothing => true, :status => :bad_request

       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found

-    rescue
-      render :nothing => true, :status => :internal_server_error

     end
   end
 
     end
   end
 

+  # This is the API call to delete a way

   def delete
     begin
       way = Way.find(params[:id])
   def delete
     begin
       way = Way.find(params[:id])

-
-      if way.visible
-        way.user_id = @user.id
-        way.tags = []
-        way.segs = []
-        way.visible = false
-
-        if way.save_with_history
-          render :nothing => true
-        else
-          render :nothing => true, :status => :internal_server_error
-        end
-      else
-        render :nothing => true, :status => :gone
-      end
+      way.delete_with_relations_and_history(@user)
+
+      # if we get here, all is fine, otherwise something will catch below.  
+      render :nothing => true
+      return
+    rescue OSM::APIAlreadyDeletedError
+      render :text => "", :status => :gone
+    rescue OSM::APIPreconditionFailedError
+      render :text => "", :status => :precondition_failed

     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found

-    rescue
-      render :nothing => true, :status => :internal_server_error

     end
   end
 
     end
   end
 


@@ -110,38 +92,31 @@ class WayController < ApplicationController
       way = Way.find(params[:id])
 
       if way.visible
       way = Way.find(params[:id])
 
       if way.visible

-        # In future, we might want to do all the data fetch in one step
-        seg_ids = way.segs + [-1]
-        segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})"
-
-        node_ids = segments.collect {|segment| segment.node_a }
-        node_ids += segments.collect {|segment| segment.node_b }
-        node_ids += [-1]
-        nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{node_ids.join(',')})")
+        nd_ids = way.nds + [-1]
+        nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{nd_ids.join(',')})")

 
         # Render
         doc = OSM::API.new.get_xml_doc
         nodes.each do |node|
           doc.root << node.to_xml_node()
         end
 
         # Render
         doc = OSM::API.new.get_xml_doc
         nodes.each do |node|
           doc.root << node.to_xml_node()
         end

-        segments.each do |segment|
-          doc.root << segment.to_xml_node()
-        end

         doc.root << way.to_xml_node()
 
         render :text => doc.to_s, :content_type => "text/xml"
       else
         doc.root << way.to_xml_node()
 
         render :text => doc.to_s, :content_type => "text/xml"
       else

-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone

       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found

-    rescue
-      render :nothing => true, :status => :internal_server_error

     end
   end
 
   def ways
     end
   end
 
   def ways

-    ids = params['ways'].split(',').collect { |w| w.to_i }
+    begin
+      ids = params['ways'].split(',').collect { |w| w.to_i }
+    rescue
+      ids = []
+    end

 
     if ids.length > 0
       doc = OSM::API.new.get_xml_doc
 
     if ids.length > 0
       doc = OSM::API.new.get_xml_doc


@@ -156,19 +131,15 @@ class WayController < ApplicationController
     end
   end
 
     end
   end
 

-  def ways_for_segment
-    wayids = WaySegment.find(:all, :conditions => ['segment_id = ?', params[:id]]).collect { |ws| ws.id }.uniq
+  def ways_for_node
+    wayids = WayNode.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id[0] }.uniq

 
 

-    if wayids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    doc = OSM::API.new.get_xml_doc

 
 

-      Way.find(wayids).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
+    Way.find(wayids).each do |way|
+      doc.root << way.to_xml_node

     end
     end

+
+    render :text => doc.to_s, :content_type => "text/xml"

   end
 end
   end
 end