X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/be0e33862fedbf02e52a9e126cac31dfb5775b43..e731dd71a77ad4ad1e9db22535e89444bb98e5d9:/app/controllers/api/old_controller.rb diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb index 9a86bded5..862d14716 100644 --- a/app/controllers/api/old_controller.rb +++ b/app/controllers/api/old_controller.rb @@ -2,12 +2,10 @@ # into one place. as it turns out, the API methods for historical # nodes, ways and relations are basically identical. module Api - class OldController < ApplicationController + class OldController < ApiController require "xml/libxml" - skip_before_action :verify_authenticity_token before_action :setup_user_auth, :only => [:history, :version] - before_action :api_deny_access_handler before_action :authorize, :only => [:redact] authorize_resource @@ -24,19 +22,15 @@ module Api # to do that ourselves. raise OSM::APINotFoundError if @elements.empty? - doc = OSM::API.new.get_xml_doc + # determine visible elements + @elems = if show_redactions? + @elements + else + @elements.unredacted + end - visible_elements = if show_redactions? - @elements - else - @elements.unredacted - end - - visible_elements.each do |element| - doc.root << element.to_xml_node - end - - render :xml => doc.to_s + # Render the result + render :formats => [:xml] end def version @@ -46,10 +40,8 @@ module Api else response.last_modified = @old_element.timestamp - doc = OSM::API.new.get_xml_doc - doc.root << @old_element.to_xml_node - - render :xml => doc.to_s + # Render the result + render :formats => [:xml] end end