X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9738e3f6482972ccf68b9b2e92ad498a31ccb6d8..2b7a40069f7af2e72c81f9488411135f286515f9:/app/controllers/way_controller.rb?ds=sidebyside

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index e7d6cf87b..17f166ddc 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -3,7 +3,8 @@ class WayController < ApplicationController
 
   session :off
   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
@@ -11,16 +12,13 @@ class WayController < ApplicationController
       way = Way.from_xml(request.raw_post, true)
 
       if way
-        if !way.preconditions_ok?
-          render :nothing => true, :status => :precondition_failed
+        unless way.preconditions_ok?
+          render :text => "", :status => :precondition_failed
         else
-          way.user_id = @user.id
+          way.version = 0
+          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
@@ -34,75 +32,50 @@ class WayController < ApplicationController
     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
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
+    rescue OSM::APIError => ex
+      render ex.render_opts
     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])
+      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
-        else
-          render :nothing => true, :status => :bad_request
-        end
+      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 => :gone
+        render :nothing => true, :status => :bad_request
       end
+    rescue OSM::APIError => ex
+      render ex.render_opts
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 
+  # This is the API call to delete a way
   def delete
     begin
       way = Way.find(params[:id])
+      way.delete_with_history(@user)
 
-      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
+      # if we get here, all is fine, otherwise something will catch below.  
+      render :nothing => true
+    rescue OSM::APIError => ex
+      render ex.render_opts
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 
@@ -111,33 +84,22 @@ class WayController < ApplicationController
       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
-        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
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 
@@ -161,19 +123,15 @@ class WayController < ApplicationController
     end
   end
 
-  def ways_for_segment
-    wayids = WaySegment.find(:all, :conditions => ['segment_id = ?', params[:id]]).collect { |ws| ws.id }.uniq
-
-    if wayids.length > 0
-      doc = OSM::API.new.get_xml_doc
+  def ways_for_node
+    wayids = WayNode.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id[0] }.uniq
 
-      Way.find(wayids).each do |way|
-        doc.root << way.to_xml_node
-      end
+    doc = OSM::API.new.get_xml_doc
 
-      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
+
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end