X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dcad29dad0d29e22ffa0c34a8d9b43cbf5d64f12..0fd29dc003000f8ee22d6310e5fc4ebdbeebbb28:/app/controllers/way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 42219d9b0..20e22bb0f 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,7 +1,10 @@
 class WayController < ApplicationController
   require 'xml/libxml'
 
-  before_filter :authorize, :only => [:create, :update, :destroy]
+  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
@@ -10,15 +13,12 @@ class WayController < ApplicationController
 
       if way
         if !way.preconditions_ok?
-          render :nothing => true, :status => :precondition_failed
+          render :text => "", :status => :precondition_failed
         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
@@ -35,12 +35,10 @@ class WayController < ApplicationController
       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
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 
@@ -53,30 +51,24 @@ class WayController < ApplicationController
 
         if new_way and new_way.id == way.id
           if !new_way.preconditions_ok?
-            render :nothing => true, :status => :precondition_failed
+            render :text => "", :status => :precondition_failed
           else
             way.user_id = @user.id
             way.tags = new_way.tags
-            way.segs = new_way.segs
-            way.timestamp = new_way.timestamp
+            way.nds = new_way.nds
             way.visible = true
+            way.save_with_history!
 
-            if way.save_with_history
-              render :nothing => true
-            else
-              render :nothing => true, :status => :internal_server_error
-            end
+            render :nothing => true
           end
         else
           render :nothing => true, :status => :bad_request
         end
       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
 
@@ -85,21 +77,24 @@ class WayController < ApplicationController
       way = Way.find(params[:id])
 
       if way.visible
-        way.user_id = @user.id
-        way.visible = false
-
-        if way.save_with_history
-          render :nothing => true
+        if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='way' and member_id=?", params[:id]])
+          render :text => "", :status => :precondition_failed
         else
-          render :nothing => true, :status => :internal_server_error
+          way.user_id = @user.id
+          way.tags = []
+          way.nds = []
+          way.visible = false
+	  way.save_with_history!
+
+	  render :nothing => true
         end
       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
+    rescue => ex
+      puts ex
     end
   end
 
@@ -108,38 +103,31 @@ 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
 
   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
@@ -154,8 +142,8 @@ class WayController < ApplicationController
     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 }.uniq
 
     if wayids.length > 0
       doc = OSM::API.new.get_xml_doc