From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 16 Feb 2022 14:58:30 +0000 (+0000)
Subject: Merge pull request #3440 from mmd-osm/relationmemberlimit
X-Git-Tag: live~2300
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2fabc46421f9e908ef6902ea7c4890a0032af446?ds=sidebyside;hp=-c

Merge pull request #3440 from mmd-osm/relationmemberlimit

Introduce relation member limit
---

2fabc46421f9e908ef6902ea7c4890a0032af446
diff --combined config/initializers/config.rb
index 4edbcad63,e51feecec..e51281e11
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@@ -74,12 -74,10 +74,13 @@@ Config.setup do |config
      required(:max_note_request_area).filled(:number?)
      required(:tracepoints_per_page).filled(:int?)
      required(:max_number_of_way_nodes).filled(:int?)
+     required(:max_number_of_relation_members).filled(:int?)
      required(:api_timeout).filled(:int?)
      required(:imagery_blacklist).maybe(:array?)
      required(:status).filled(:str?, :included_in? => ALLOWED_STATUS)
 -    required(:storage_service).filled(:str?)
 +    required(:avatar_storage).filled(:str?)
 +    required(:trace_file_storage).filled(:str?)
 +    required(:trace_image_storage).filled(:str?)
 +    required(:trace_icon_storage).filled(:str?)
    end
  end
diff --combined config/settings.yml
index e6b156e28,42a911057..639910f4a
--- a/config/settings.yml
+++ b/config/settings.yml
@@@ -31,6 -31,8 +31,8 @@@ tracepoints_per_page: 500
  max_number_of_nodes: 50000
  # Maximum number of nodes that can be in a way (checked on save)
  max_number_of_way_nodes: 2000
+ # Maximum number of members that can be in a relation (checked on save)
+ max_number_of_relation_members: 32000
  # The maximum area you're allowed to request notes from, in square degrees
  max_note_request_area: 25
  # Zoom level to use for postcode results from the geocoder
@@@ -118,15 -120,10 +120,15 @@@ fossgis_osrm_url: "https://routing.open
  csp_enforce: false
  # URL for reporting Content-Security-Policy violations
  #csp_report_url: ""
 -# Storage service to use in production mode
 -storage_service: "local"
 -# Root URL for storage service
 -# storage_url:
 +# Storage services to use in production mode
 +avatar_storage: "local"
 +trace_file_storage: "local"
 +trace_image_storage: "local"
 +trace_icon_storage: "local"
 +# Root URL for storage services
 +# avatar_storage_url:
 +# trace_image_storage_url:
 +# trace_icon_storage_url:
  # URL for tile CDN
  #tile_cdn_url: ""
  # SMTP settings for outbound mail