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

Merge remote-tracking branch 'upstream/pull/2921' into master

Browse source
This commit is contained in:
Tom Hughes 2020-11-13 10:49:35 +00:00
commit 4347d9d3b0
12 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/bounding_box.rb
View file

@ -72,7 +72,7 @@ class BoundingBox
def check_size(max_area = Settings.max_request_area)
# check the bbox isn't too large
if area > max_area
raise OSM::APIBadBoundingBox, "The maximum bbox size is " + max_area.to_s +
raise OSM::APIBadBoundingBox, "The maximum bbox size is #{max_area}" \
", and your request was too large. Either request a smaller area, or use planet.osm"
end
self

4
lib/osm.rb
View file

@ -497,8 +497,8 @@ module OSM
# Return the terms and conditions text for a given country
def self.legal_text_for_country(country_code)
file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml")
file_name = Rails.root.join("config", "legales", Settings.default_legale + ".yml") unless File.exist? file_name
file_name = Rails.root.join("config", "legales", "#{country_code}.yml")
file_name = Rails.root.join("config", "legales", "#{Settings.default_legale}.yml") unless File.exist? file_name
YAML.load_file(file_name).transform_values!(&:html_safe)
end