Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[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 f10e0d2f0193e0550932e0d15396369fa2939f52..1daab997ae2c4f72899e9d9276df89880d1af423 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,24 +1,11 @@
-class OldWayController < ApplicationController
-  require 'xml/libxml'
+class OldWayController < OldController
+  private
 
-  session :off
-  after_filter :compress_output
-
-  def history
-    begin
-      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
+  def lookup_old_element
+    @old_element = OldWay.find([params[:id], params[:version]])
+  end
 
-      render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
-    end
+  def lookup_old_element_versions
+    @elements = OldWay.where(:way_id => params[:id]).order(:version)
   end
 end