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

Back out the changeset RSS stuff from the head for now.

Browse source
This commit is contained in:
Tom Hughes 2009-06-07 08:03:07 +00:00
parent e9ab43cd30
commit e1cb17faa6
9 changed files with 1 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

63
app/controllers/changeset_controller.rb
View file

@ -1,7 +1,7 @@
# The ChangesetController is the RESTful interface to Changeset objects
class ChangesetController < ApplicationController
layout 'site', :except => [ :list_rss, :list_user_rss, :list_bbox_rss ]
layout 'site'
require 'xml/libxml'
before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
@ -273,18 +273,6 @@ class ChangesetController < ApplicationController
:limit => 20)
end
##
# list edits (open changesets) in reverse chronological order
def list_rss
conditions = conditions_nonempty
@edits = Changeset.find(:all,
:order => "changesets.created_at DESC",
:conditions => conditions,
:limit => 20)
end
##
# list edits (changesets) belonging to a user
@ -310,31 +298,6 @@ class ChangesetController < ApplicationController
render :template => 'user/no_such_user', :status => :not_found
end
end
##
# list edits (changesets) belonging to a user
def list_user_rss
user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
if user
@display_name = user.display_name
if not user.data_public? and @user != user
@edits = nil
render
else
conditions = cond_merge conditions, ['user_id = ?', user.id]
conditions = cond_merge conditions, conditions_nonempty
@edit_pages, @edits = paginate(:changesets,
:include => [:user, :changeset_tags],
:conditions => conditions,
:order => "changesets.created_at DESC",
:per_page => 20)
end
else
@not_found_user = params[:display_name]
render :template => 'user/no_such_user', :status => :not_found
end
end
##
# list changesets in a bbox
@ -364,30 +327,6 @@ class ChangesetController < ApplicationController
@bbox = sanitise_boundaries(bbox.split(/,/)) unless bbox==nil
end
##
# list changesets in a bbox
def list_bbox_rss
# support 'bbox' param or alternatively 'minlon', 'minlat' etc
if params['bbox']
bbox = params['bbox']
elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
bbox = h(params['minlon']) + ',' + h(params['minlat']) + ',' + h(params['maxlon']) + ',' + h(params['maxlat'])
else
raise OSM::APIBadUserInput.new("Bounding box must be supplied for /history/rss")
end
conditions = conditions_bbox(bbox);
conditions = cond_merge conditions, conditions_nonempty
@edit_pages, @edits = paginate(:changesets,
:include => [:user, :changeset_tags],
:conditions => conditions,
:order => "changesets.created_at DESC",
:per_page => 20)
@bbox = sanitise_boundaries(bbox.split(/,/)) unless bbox==nil
end
private
#------------------------------------------------------------