cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused

Browse source
This commit is contained in:
John Firebaugh 2013-11-06 12:53:45 -08:00
parent baaacfc7c0
commit 15ff7b9843
6 changed files with 1 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/browse_controller.rb
View file

@ -4,11 +4,7 @@ class BrowseController < ApplicationController
before_filter :authorize_web before_filter :authorize_web
before_filter :set_locale before_filter :set_locale
before_filter { |c| c.check_database_readable(true) } before_filter { |c| c.check_database_readable(true) }
around_filter :web_timeout, :except => [:start] around_filter :web_timeout
def start
render :layout => false
end
def relation def relation
@type = "relation" @type = "relation"

3
app/controllers/export_controller.rb
View file

@ -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 #When the user clicks 'Export' we redirect to a URL which generates the export download
def finish def finish
bbox = BoundingBox.from_lon_lat_params(params) bbox = BoundingBox.from_lon_lat_params(params)

7
app/views/browse/start.html.erb
View file

@ -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>

2
config/routes.rb
View file

@ -102,7 +102,6 @@ OpenStreetMap::Application.routes.draw do
end end
# Data browsing # 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' => 'browse#way', :via => :get, :id => /\d+/, :as => :way
match '/browse/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/ 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/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 match '/geocoder/search_geonames_reverse' => 'geocoder#search_geonames_reverse', :via => :get
# export # export
match '/export/start' => 'export#start', :via => :get
match '/export/finish' => 'export#finish', :via => :post match '/export/finish' => 'export#finish', :via => :post
match '/export/embed' => 'export#embed', :via => :get match '/export/embed' => 'export#embed', :via => :get

4
test/functional/browse_controller_test.rb
View file

@ -7,10 +7,6 @@ class BrowseControllerTest < ActionController::TestCase
## ##
# test all routes which lead to this controller # test all routes which lead to this controller
def test_routes def test_routes
assert_routing(
{ :path => "/browse/start", :method => :get },
{ :controller => "browse", :action => "start" }
)
assert_routing( assert_routing(
{ :path => "/browse/node/1", :method => :get }, { :path => "/browse/node/1", :method => :get },
{ :controller => "browse", :action => "node", :id => "1" } { :controller => "browse", :action => "node", :id => "1" }

12
test/functional/export_controller_test.rb
View file

@ -5,10 +5,6 @@ class ExportControllerTest < ActionController::TestCase
## ##
# test all routes which lead to this controller # test all routes which lead to this controller
def test_routes def test_routes
assert_routing(
{ :path => "/export/start", :method => :get },
{ :controller => "export", :action => "start" }
)
assert_routing( assert_routing(
{ :path => "/export/finish", :method => :post }, { :path => "/export/finish", :method => :post },
{ :controller => "export", :action => "finish" } { :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 # test the finish action for raw OSM data
def test_finish_osm def test_finish_osm