Handle openlayers.js as a template

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

diff --git a/app/controllers/old_way_controller.rb b/app/controllers/old_way_controller.rb
index 6131c9c3fac36f0a019f27ff197c5c41cc10abc8..3836d4ab7c5167f8675d7c11db003521bb69c2d8 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,10 +1,10 @@
 class OldWayController < ApplicationController
   require 'xml/libxml'
 
 class OldWayController < ApplicationController
   require 'xml/libxml'
 

-  session :off
+  skip_before_filter :verify_authenticity_token

   before_filter :check_api_readable
   after_filter :compress_output
   before_filter :check_api_readable
   after_filter :compress_output

-  around_filter :api_call_handle_error
+  around_filter :api_call_handle_error, :api_call_timeout

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


@@ -19,18 +19,15 @@ class OldWayController < ApplicationController
   end
   
   def version
   end
   
   def version

-    old_way = OldWay.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
-    if old_way.nil?
-      # (RecordNotFound is not raised with find :first...)
+    if old_way = OldWay.where(:way_id => params[:id], :version => params[:version]).first
+      response.last_modified = old_way.timestamp
+
+      doc = OSM::API.new.get_xml_doc
+      doc.root << old_way.to_xml_node
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else

       render :nothing => true, :status => :not_found
       render :nothing => true, :status => :not_found

-      return

     end
     end

-    
-    response.headers['Last-Modified'] = old_way.timestamp.rfc822
-    
-    doc = OSM::API.new.get_xml_doc
-    doc.root << old_way.to_xml_node
-    
-    render :text => doc.to_s, :content_type => "text/xml"

   end
 end
   end
 end