X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/be0e33862fedbf02e52a9e126cac31dfb5775b43..80427b3e5e5ebeecbc0a57a1549a2a33e0c92199:/app/controllers/api/map_controller.rb diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb index 47c0aeb36..e1d1a3b37 100644 --- a/app/controllers/api/map_controller.rb +++ b/app/controllers/api/map_controller.rb @@ -1,8 +1,5 @@ module Api - class MapController < ApplicationController - skip_before_action :verify_authenticity_token - before_action :api_deny_access_handler - + class MapController < ApiController authorize_resource :class => false before_action :check_api_readable @@ -25,16 +22,16 @@ module Api bbox = BoundingBox.from_bbox_params(params) bbox.check_boundaries bbox.check_size - rescue StandardError => err - report_error(err.message) + rescue StandardError => e + report_error(e.message) return end - nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(MAX_NUMBER_OF_NODES + 1) + nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(Settings.max_number_of_nodes + 1) node_ids = nodes.collect(&:id) - if node_ids.length > MAX_NUMBER_OF_NODES - report_error("You requested too many nodes (limit is #{MAX_NUMBER_OF_NODES}). Either request a smaller area, or use planet.osm") + if node_ids.length > Settings.max_number_of_nodes + report_error("You requested too many nodes (limit is #{Settings.max_number_of_nodes}). Either request a smaller area, or use planet.osm") return end