Resolve conflict

[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 ac1c6cd40805056ae377fefd9517ec960e55c603..f6f2823098d6b51c369852f5e560fb3bc5a2e426 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,32 +1,12 @@
-class OldWayController < ApplicationController
-  require 'xml/libxml'
+class OldWayController < OldController

 
 

-  before_filter :check_api_readable
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
-
-  def history
-    way = Way.find(params[:id])
-    
-    doc = OSM::API.new.get_xml_doc
-    
-    way.old_ways.each do |old_way|
-      doc.root << old_way.to_xml_node
-    end
-    
-    render :text => doc.to_s, :content_type => "text/xml"
-  end
+  private

   
   

-  def version
-    if old_way = OldWay.where(:id => params[:id], :version => params[:version]).first
-      response.headers['Last-Modified'] = old_way.timestamp.rfc822
-
-      doc = OSM::API.new.get_xml_doc
-      doc.root << old_way.to_xml_node
+  def lookup_old_element
+    @old_element = OldWay.find([params[:id], params[:version]])
+  end

 
 

-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :not_found
-    end
+  def lookup_old_element_versions
+    @elements = OldWay.where(:way_id => params[:id]).order(:version)

   end
 end
   end
 end