move the map up to the form

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 2fd4390e49162e7102965921c796f8ec7934b5fd..acc8a5d0cdb3ea38d3b9aee550b915ea6f50fa45 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,18 +1,26 @@
-class WayController < ApplicationController
+class WayController < ApplicationController\r

   require 'xml/libxml'
 
   before_filter :authorize
   require 'xml/libxml'
 
   before_filter :authorize

-
+  after_filter :compress_output
+\r

   def create
     if request.put?
       way = Way.from_xml(request.raw_post, true)
 
       if way
         way.user_id = @user.id
   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
         if way.save_with_history

-          render :text => way.id
+          render :text => way.id.to_s
+          return

         else
           render :nothing => true, :status => 500
         else
           render :nothing => true, :status => 500

+          return

         end
         return
       else
         end
         return
       else


@@ -24,7 +32,42 @@ class WayController < ApplicationController
     render :nothing => true, :status => 500 # something went very wrong
   end
 
     render :nothing => true, :status => 500 # something went very wrong
   end
 

-  def rest
+  def full\r
+    unless Way.exists?(params[:id])
+      render :nothing => true, :status => 404
+      return
+    end
+
+    way = Way.find(params[:id])
+
+    unless way.visible
+        render :nothing => true, :status => 410
+        return
+    end
+
+       # 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(',')})")
+       
+       # 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
+  end
+
+  def rest\r

     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return


@@ -32,8 +75,8 @@ class WayController < ApplicationController
 
     way = Way.find(params[:id])
     case request.method
 
     way = Way.find(params[:id])
     case request.method

-   
-    when :get
+
+    when :get\r

       unless way.visible
         render :nothing => true, :status => 410
         return
       unless way.visible
         render :nothing => true, :status => 410
         return


@@ -48,7 +91,48 @@ class WayController < ApplicationController
 
       way.visible = false
       way.save_with_history
 
       way.visible = false
       way.save_with_history

+      render :nothing => true
+      return
+    when :put
+      way = Way.from_xml(request.raw_post)

 
 

+      if way
+        way_in_db = Way.find(way.id)
+        if way_in_db
+          way_in_db.user_id = @user.id
+          way_in_db.tags = way.tags
+          way_in_db.segs = way.segs
+          way_in_db.timestamp = way.timestamp
+          way_in_db.visible = true
+          if way_in_db.save_with_history
+            render :text => way.id
+          else
+            render :nothing => true, :status => 500
+          end
+          return
+        else
+          render :nothing => true, :status => 404 # way doesn't exist yet
+        end
+      else
+        render :nothing => true, :status => 400 # if we got here the doc didnt parse
+        return
+      end

     end
   end
     end
   end

+
+  def ways
+    response.headers["Content-Type"] = 'text/xml'
+    ids = params['ways'].split(',').collect {|w| w.to_i }
+    if ids.length > 0
+      waylist = Way.find(ids)
+      doc = OSM::API.new.get_xml_doc
+      waylist.each do |way|
+        doc.root << way.to_xml_node
+      end 
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400
+    end
+  end
+

 end
 end