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

Fix new rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2018-06-18 09:00:49 +01:00
parent 2f6a583510
commit f7a35c5895
18 changed files with 45 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/amf_controller.rb
View file

@ -672,7 +672,7 @@ class AmfController < ApplicationController
# -- Save revised way
pointlist.collect! do |a|
renumberednodes[a] ? renumberednodes[a] : a
renumberednodes[a] || a
end
new_way = Way.new
new_way.tags = attributes
@ -938,7 +938,7 @@ class AmfController < ApplicationController
INNER JOIN current_relation_members crm ON crm.id=cr.id
INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='Node'
WHERE #{OSM.sql_for_area(bbox, 'cn.')}
SQL
SQL
unless way_ids.empty?
sql += <<-SQL
UNION
@ -947,7 +947,7 @@ class AmfController < ApplicationController
INNER JOIN current_relation_members crm ON crm.id=cr.id
WHERE crm.member_type='Way'
AND crm.member_id IN (#{way_ids.join(',')})
SQL
SQL
end
ActiveRecord::Base.connection.select_all(sql).collect { |a| [a["relid"].to_i, a["version"].to_i] }
end