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

Rubocop autofixes.

Browse source
This commit is contained in:
Andy Allan 2016-09-07 11:07:42 +01:00
parent e6f06f0515
commit 38e12759ea
16 changed files with 56 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/api/permissions.builder
View file

@ -1,6 +1,6 @@
# create list of permissions
xml.instruct! :xml, :version=>"1.0"
xml.osm("version" => "#{API_VERSION}", "generator" => "OpenStreetMap Server") do
xml.instruct! :xml, :version => "1.0"
xml.osm("version" => API_VERSION.to_s, "generator" => "OpenStreetMap Server") do
xml.permissions do
@permissions.each do |permission|
xml.permission :name => permission

8
app/views/changeset/_comments.rss.builder
View file

@ -1,17 +1,15 @@
comments.each do |comment|
xml.item do
xml.title t("changeset.rss.comment", :author => comment.author.display_name, :changeset_id => comment.changeset.id.to_s)
xml.link url_for(:controller => "browse", :action => "changeset", :id => comment.changeset.id, :anchor => "c#{comment.id}", :only_path => false)
xml.guid url_for(:controller => "browse", :action => "changeset", :id => comment.changeset.id, :anchor => "c#{comment.id}", :only_path => false)
xml.description do
xml.cdata! render(:partial => "comment", :object => comment, :formats => [ :html ])
xml.cdata! render(:partial => "comment", :object => comment, :formats => [:html])
end
if comment.author
xml.dc :creator, comment.author.display_name
end
xml.dc :creator, comment.author.display_name if comment.author
xml.pubDate comment.created_at.to_s(:rfc822)
end

7
app/views/changeset/comments_feed.rss.builder
View file

@ -1,14 +1,13 @@
xml.rss("version" => "2.0",
xml.rss("version" => "2.0",
"xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
xml.channel do
if @changeset
xml.title t('changeset.rss.title_particular', :changeset_id => @changeset.id)
xml.title t("changeset.rss.title_particular", :changeset_id => @changeset.id)
else
xml.title t('changeset.rss.title_all')
xml.title t("changeset.rss.title_all")
end
xml.link url_for(:controller => "site", :action => "index", :only_path => false)
xml << render(:partial => "comments", :object => @comments)
end
end

20
app/views/changeset/list.atom.builder
View file

@ -1,20 +1,20 @@
atom_feed(:language => I18n.locale, :schema_date => 2009,
:id => url_for(params.merge({ :only_path => false })),
:root_url => url_for(params.merge({ :action => :list, :format => nil, :only_path => false })),
:id => url_for(params.merge(:only_path => false)),
:root_url => url_for(params.merge(:action => :list, :format => nil, :only_path => false)),
"xmlns:georss" => "http://www.georss.org/georss") do |feed|
feed.title changeset_list_title(params, @user)
feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max
feed.updated @edits.map { |e| [e.created_at, e.closed_at].max }.max
feed.icon "http://#{SERVER_URL}/favicon.ico"
feed.logo "http://#{SERVER_URL}/images/mag_map-rss2.0.png"
feed.rights :type => 'xhtml' do |xhtml|
feed.rights :type => "xhtml" do |xhtml|
xhtml.a :href => "http://creativecommons.org/licenses/by-sa/2.0/" do |a|
a.img :src => "http://#{SERVER_URL}/images/cc_button.png", :alt => "CC by-sa 2.0"
end
end
for changeset in @edits
@edits.each do |changeset|
feed.entry(changeset, :updated => changeset.closed_at, :id => changeset_url(changeset.id, :only_path => false)) do |entry|
entry.link :rel => "alternate",
:href => changeset_read_url(changeset, :only_path => false),
@ -23,20 +23,20 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
:href => changeset_download_url(changeset, :only_path => false),
:type => "application/osmChange+xml"
if !changeset.tags.empty? and changeset.tags.has_key? "comment"
entry.title t('browse.changeset.feed.title_comment', :id => h(changeset.id), :comment => h(changeset.tags['comment'])), :type => "html"
if !changeset.tags.empty? && changeset.tags.key?("comment")
entry.title t("browse.changeset.feed.title_comment", :id => h(changeset.id), :comment => h(changeset.tags["comment"])), :type => "html"
else
entry.title t('browse.changeset.feed.title', :id => h(changeset.id))
entry.title t("browse.changeset.feed.title", :id => h(changeset.id))
end
if changeset.user.data_public?
entry.author do |author|
author.name changeset.user.display_name
author.uri url_for(:controller => 'user', :action => 'view', :display_name => changeset.user.display_name, :only_path => false)
author.uri url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
end
end
feed.content :type => 'xhtml' do |xhtml|
feed.content :type => "xhtml" do |xhtml|
xhtml.style "th { text-align: left } tr { vertical-align: top }"
xhtml.table do |table|
table.tr do |tr|

8
app/views/changeset/timeout.atom.builder
View file

@ -1,12 +1,12 @@
atom_feed(:language => I18n.locale, :schema_date => 2009,
:id => url_for(params.merge({ :only_path => false })),
:root_url => url_for(params.merge({ :only_path => false, :format => nil })),
:id => url_for(params.merge(:only_path => false)),
:root_url => url_for(params.merge(:only_path => false, :format => nil)),
"xmlns:georss" => "http://www.georss.org/georss") do |feed|
feed.title @title
feed.subtitle :type => 'xhtml' do |xhtml|
feed.subtitle :type => "xhtml" do |xhtml|
xhtml.p do |p|
p << t('changeset.timeout.sorry')
p << t("changeset.timeout.sorry")
end
end
end

12
app/views/diary_entry/rss.rss.builder
View file

@ -1,6 +1,6 @@
xml.instruct!
xml.rss("version" => "2.0",
xml.rss("version" => "2.0",
"xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
"xmlns:georss" => "http://www.georss.org/georss") do
xml.channel do
@ -12,10 +12,10 @@ xml.rss("version" => "2.0",
xml.title "OpenStreetMap"
xml.width "100"
xml.height "100"
xml.link url_for(:action => "list", :host=> SERVER_URL)
xml.link url_for(:action => "list", :host => SERVER_URL)
end
for entry in @entries
@entries.each do |entry|
xml.item do
xml.title h(entry.title)
xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
@ -24,11 +24,11 @@ xml.rss("version" => "2.0",
xml.author entry.user.display_name
xml.pubDate entry.created_at.to_s(:rfc822)
xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL)
if entry.latitude and entry.longitude
if entry.latitude && entry.longitude
xml.geo :lat, entry.latitude.to_s
xml.geo :long, entry.longitude.to_s
xml.georss :point, "#{entry.latitude.to_s} #{entry.longitude.to_s}"
xml.georss :point, "#{entry.latitude} #{entry.longitude}"
end
end
end

6
app/views/notes/_note.gpx.builder
View file

@ -3,7 +3,7 @@ xml.wpt("lon" => note.lon, "lat" => note.lat) do
xml.name t("browse.note.title", :id => note.id)
xml.desc do
xml.cdata! render(:partial => "description", :object => note, :formats => [ :html ])
xml.cdata! render(:partial => "description", :object => note, :formats => [:html])
end
xml.link("href" => browse_note_url(note, :host => SERVER_URL))
@ -22,8 +22,6 @@ xml.wpt("lon" => note.lon, "lat" => note.lat) do
xml.date_created note.created_at
xml.status note.status
if note.closed?
xml.date_closed note.closed_at
end
xml.date_closed note.closed_at if note.closed?
end
end

12
app/views/notes/_note.rss.builder
View file

@ -2,20 +2,18 @@ xml.item do
location = describe_location(note.lat, note.lon, 14, locale)
if note.closed?
xml.title t('note.rss.closed', :place => location)
xml.title t("note.rss.closed", :place => location)
elsif note.comments.length > 1
xml.title t('note.rss.commented', :place => location)
xml.title t("note.rss.commented", :place => location)
else
xml.title t('note.rss.opened', :place => location)
xml.title t("note.rss.opened", :place => location)
end
xml.link browse_note_url(note)
xml.guid note_url(note)
xml.description render(:partial => "description", :object => note, :formats => [ :html ])
xml.description render(:partial => "description", :object => note, :formats => [:html])
if note.author
xml.author note.author.display_name
end
xml.author note.author.display_name if note.author
xml.pubDate note.updated_at.to_s(:rfc822)
xml.geo :lat, note.lat

4
app/views/notes/_note.xml.builder
View file

@ -12,9 +12,7 @@ xml.note("lon" => note.lon, "lat" => note.lat) do
xml.date_created note.created_at
xml.status note.status
if note.closed?
xml.date_closed note.closed_at
end
xml.date_closed note.closed_at if note.closed?
xml.comments do
note.comments.each do |comment|

14
app/views/notes/feed.rss.builder
View file

@ -1,12 +1,12 @@
xml.instruct!
xml.rss("version" => "2.0",
xml.rss("version" => "2.0",
"xmlns:dc" => "http://purl.org/dc/elements/1.1/",
"xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
"xmlns:georss" => "http://www.georss.org/georss") do
xml.channel do
xml.title t('note.rss.title')
xml.description t('note.rss.description_area', :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon )
xml.title t("note.rss.title")
xml.description t("note.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
xml.link url_for(:controller => "site", :action => "index", :only_path => false)
@comments.each do |comment|
@ -14,17 +14,15 @@ xml.rss("version" => "2.0",
xml.item do
xml.title t("note.rss.#{comment.event}", :place => location)
xml.link url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
xml.guid url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
xml.description do
xml.cdata! render(:partial => "entry", :object => comment, :formats => [ :html ])
xml.cdata! render(:partial => "entry", :object => comment, :formats => [:html])
end
if comment.author
xml.dc :creator, comment.author.display_name
end
xml.dc :creator, comment.author.display_name if comment.author
xml.pubDate comment.created_at.to_s(:rfc822)
xml.geo :lat, comment.note.lat

2
app/views/notes/index.gpx.builder
View file

@ -1,6 +1,6 @@
xml.instruct!
xml.gpx("version" => "1.1",
xml.gpx("version" => "1.1",
"creator" => "OpenStreetMap.org",
"xmlns" => "http://www.topografix.com/GPX/1/1",
"xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",

6
app/views/notes/index.rss.builder
View file

@ -1,11 +1,11 @@
xml.instruct!
xml.rss("version" => "2.0",
xml.rss("version" => "2.0",
"xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
"xmlns:georss" => "http://www.georss.org/georss") do
xml.channel do
xml.title t('note.rss.title')
xml.description t('note.rss.description_area', :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon )
xml.title t("note.rss.title")
xml.description t("note.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
xml.link url_for(:controller => "site", :action => "index", :only_path => false)
xml << (render(:partial => "note", :collection => @notes) || "")

2
app/views/notes/show.gpx.builder
View file

@ -1,6 +1,6 @@
xml.instruct!
xml.gpx("version" => "1.1",
xml.gpx("version" => "1.1",
"creator" => "OpenStreetMap.org",
"xmlns" => "http://www.topografix.com/GPX/1/1",
"xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",

6
app/views/notes/show.rss.builder
View file

@ -1,11 +1,11 @@
xml.instruct!
xml.rss("version" => "2.0",
xml.rss("version" => "2.0",
"xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
"xmlns:georss" => "http://www.georss.org/georss") do
xml.channel do
xml.title t('note.rss.title')
xml.description t('note.rss.description_item', :id => @note.id)
xml.title t("note.rss.title")
xml.description t("note.rss.description_item", :id => @note.id)
xml.link url_for(:controller => "site", :action => "index", :only_path => false)
xml << render(:partial => "note", :object => @note)

6
app/views/trace/georss.rss.builder
View file

@ -1,6 +1,6 @@
xml.instruct!
xml.rss("version" => "2.0",
xml.rss("version" => "2.0",
"xmlns:dc" => "http://purl.org/dc/elements/1.1/",
"xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
"xmlns:georss" => "http://www.georss.org/georss") do
@ -25,14 +25,14 @@ xml.rss("version" => "2.0",
xml.guid url_for(:controller => :trace, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
xml.description do
xml.cdata! render(:partial => "description", :object => trace, :formats => [ :html ])
xml.cdata! render(:partial => "description", :object => trace, :formats => [:html])
end
xml.dc :creator, trace.user.display_name
xml.pubDate trace.timestamp.to_s(:rfc822)
if trace.latitude and trace.longitude
if trace.latitude && trace.longitude
xml.geo :lat, trace.latitude
xml.geo :long, trace.longitude
xml.georss :point, "#{trace.latitude} #{trace.longitude}"

8
app/views/user/api_read.builder
View file

@ -3,16 +3,14 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
xml.tag! "user", :id => @this_user.id,
:display_name => @this_user.display_name,
:account_created => @this_user.creation_time.xmlschema do
if @this_user.description
xml.tag! "description", @this_user.description
end
xml.tag! "description", @this_user.description if @this_user.description
if @user && @user == @this_user
xml.tag! "contributor-terms", :agreed => @this_user.terms_agreed.present?,
:pd => @this_user.consider_pd
else
xml.tag! "contributor-terms", :agreed => @this_user.terms_agreed.present?
end
if @this_user.image.file? or @this_user.image_use_gravatar
if @this_user.image.file? || @this_user.image_use_gravatar
xml.tag! "img", :href => user_image_url(@this_user, :size => 256)
end
xml.tag! "roles" do
@ -31,7 +29,7 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
end
end
if @user && @user == @this_user
if @this_user.home_lat and @this_user.home_lon
if @this_user.home_lat && @this_user.home_lon
xml.tag! "home", :lat => @this_user.home_lat,
:lon => @this_user.home_lon,
:zoom => @this_user.home_zoom