Remove unused

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 2820e242d5f44d450507c9654367627f9c483f9c..cbb0f202395e92e1eabbd453a7e7f14f675247ca 100644 (file)
--- 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) }
   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"
 
   def relation
     @type = "relation"

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index b37810ca90df2f616ce58a418021ad96a1f90a90..00eba741f578b5acbfa79d57045b4d1d88c3db31 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -5,9 +5,6 @@ class ExportController < ApplicationController
 
   caches_page :embed
 
 
   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)
   #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 (file)
index e281a97..0000000
--- a/app/views/browse/start.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<h2><%= t 'browse.start_rjs.data_frame_title' %></h2>
-<div id="browse_controls" class='inner12'>
-  <a id="browse_filter_toggle" class="button" href="#"><%= t'browse.start_rjs.manually_select' %></a>
-  <a id="browse_hide_areas_box" class="button" href="#"><%= t'browse.start_rjs.hide_areas' %></a>
-</div>
-<div id="browse_status" class='inner12'></div>
-<div id="browse_content"></div>

diff --git a/config/routes.rb b/config/routes.rb
index 2bba5cfe00b3e26f64174836a2f27e7420f6c63f..435cff9eb01aaeef28bf72af3dbbb83f4f518625 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -102,7 +102,6 @@ OpenStreetMap::Application.routes.draw do
   end
 
   # Data browsing
   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
   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 '/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
 
   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 e2937c5d8465c9f0619842dc524ecc7eb1386625..0f1ff68559fca73ac45f4c823ade86925a79b6c1 100644 (file)
--- 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
   ##
   # 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" }
     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 0e7529b778264bf73d07e1862fb9e6c72f5ea27b..d36f0cfd807e61fa5b78aaf7456213438652a36a 100644 (file)
--- 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
   ##
   # 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" }
     assert_routing(
       { :path => "/export/finish", :method => :post },
       { :controller => "export", :action => "finish" }


@@ -19,14 +15,6 @@ class ExportControllerTest < ActionController::TestCase
     )
   end
 
     )
   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
   ###
   # test the finish action for raw OSM data
   def test_finish_osm