From 15ff7b9843481dc12a3e1e774c26b1a72dcb7e4b Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 6 Nov 2013 12:53:45 -0800 Subject: [PATCH] Remove unused --- app/controllers/browse_controller.rb | 6 +----- app/controllers/export_controller.rb | 3 --- app/views/browse/start.html.erb | 7 ------- config/routes.rb | 2 -- test/functional/browse_controller_test.rb | 4 ---- test/functional/export_controller_test.rb | 12 ------------ 6 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 app/views/browse/start.html.erb diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 2820e242d..cbb0f2023 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -4,11 +4,7 @@ class BrowseController < ApplicationController before_filter :authorize_web before_filter :set_locale before_filter { |c| c.check_database_readable(true) } - around_filter :web_timeout, :except => [:start] - - def start - render :layout => false - end + around_filter :web_timeout def relation @type = "relation" diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index b37810ca9..00eba741f 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -5,9 +5,6 @@ class ExportController < ApplicationController caches_page :embed - def start - end - #When the user clicks 'Export' we redirect to a URL which generates the export download def finish bbox = BoundingBox.from_lon_lat_params(params) diff --git a/app/views/browse/start.html.erb b/app/views/browse/start.html.erb deleted file mode 100644 index e281a9728..000000000 --- a/app/views/browse/start.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

<%= t 'browse.start_rjs.data_frame_title' %>

-
- <%= t'browse.start_rjs.manually_select' %> - <%= t'browse.start_rjs.hide_areas' %> -
-
-
diff --git a/config/routes.rb b/config/routes.rb index 2bba5cfe0..435cff9eb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -102,7 +102,6 @@ OpenStreetMap::Application.routes.draw do end # Data browsing - match '/browse/start' => 'browse#start', :via => :get match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/, :as => :way match '/browse/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/ match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/, :as => :node @@ -226,7 +225,6 @@ OpenStreetMap::Application.routes.draw do match '/geocoder/search_geonames_reverse' => 'geocoder#search_geonames_reverse', :via => :get # export - match '/export/start' => 'export#start', :via => :get match '/export/finish' => 'export#finish', :via => :post match '/export/embed' => 'export#embed', :via => :get diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index e2937c5d8..0f1ff6855 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -7,10 +7,6 @@ class BrowseControllerTest < ActionController::TestCase ## # test all routes which lead to this controller def test_routes - assert_routing( - { :path => "/browse/start", :method => :get }, - { :controller => "browse", :action => "start" } - ) assert_routing( { :path => "/browse/node/1", :method => :get }, { :controller => "browse", :action => "node", :id => "1" } diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb index 0e7529b77..d36f0cfd8 100644 --- a/test/functional/export_controller_test.rb +++ b/test/functional/export_controller_test.rb @@ -5,10 +5,6 @@ class ExportControllerTest < ActionController::TestCase ## # test all routes which lead to this controller def test_routes - assert_routing( - { :path => "/export/start", :method => :get }, - { :controller => "export", :action => "start" } - ) assert_routing( { :path => "/export/finish", :method => :post }, { :controller => "export", :action => "finish" } @@ -19,14 +15,6 @@ class ExportControllerTest < ActionController::TestCase ) end - ## - # test the start action - def test_start - xhr :get, :start - assert_response :success - assert_template "export/start" - end - ### # test the finish action for raw OSM data def test_finish_osm -- 2.43.2