Merge remote-tracking branch 'openstreetmap/pull/1344'

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

diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb
index 514e5befe9198a15d1709ab020ffb9325144613e..a32e299fe6a2481833b901fd3995ceec475809d5 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,32 +1,11 @@
-class OldNodeController < ApplicationController
-  require 'xml/libxml'
+class OldNodeController < OldController
+  private
 
-  before_filter :check_api_readable
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
-
-  def history
-    node = Node.find(params[:id])
-    
-    doc = OSM::API.new.get_xml_doc
-    
-    node.old_nodes.each do |old_node|
-      doc.root << old_node.to_xml_node
-    end
-    
-    render :text => doc.to_s, :content_type => "text/xml"
+  def lookup_old_element
+    @old_element = OldNode.find([params[:id], params[:version]])
   end
-  
-  def version
-    if old_node = OldNode.where(:id => params[:id], :version => params[:version]).first
-      response.last_modified = old_node.timestamp
-
-      doc = OSM::API.new.get_xml_doc
-      doc.root << old_node.to_xml_node
 
-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :not_found
-    end
+  def lookup_old_element_versions
+    @elements = OldNode.where(:node_id => params[:id]).order(:version)
   end
 end