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

Merge remote-tracking branch 'upstream/pull/3257'

Browse source
This commit is contained in:
Tom Hughes 2021-07-21 19:24:31 +01:00
commit f1935b1c57
20 changed files with 380 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/user.rb
View file

@ -118,7 +118,6 @@ class User < ApplicationRecord
before_save :encrypt_password
before_save :update_tile
after_save :spam_check
after_save :reset_preferred_languages
def to_param
display_name
@ -179,10 +178,6 @@ class User < ApplicationRecord
@preferred_languages ||= Locale.list(languages)
end
def reset_preferred_languages
@preferred_languages = nil
end
def nearby(radius = Settings.nearby_radius, num = Settings.nearby_users)
if home_lon && home_lat
gc = OSM::GreatCircle.new(home_lat, home_lon)