X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/317b8f9d45b25c4060bda337edfb73594834d275..0baa293699cf6efaea979b342ec877af522213ca:/app/controllers/api/tracepoints_controller.rb diff --git a/app/controllers/api/tracepoints_controller.rb b/app/controllers/api/tracepoints_controller.rb index 56cd36138..5fbece05b 100644 --- a/app/controllers/api/tracepoints_controller.rb +++ b/app/controllers/api/tracepoints_controller.rb @@ -1,8 +1,5 @@ module Api - class TracepointsController < ApplicationController - skip_before_action :verify_authenticity_token - before_action :api_deny_access_handler - + class TracepointsController < ApiController authorize_resource before_action :check_api_readable @@ -19,7 +16,7 @@ module Api return end - offset = page * TRACEPOINTS_PER_PAGE + offset = page * Settings.tracepoints_per_page # Figure out the bbox # check boundary is sane and area within defined @@ -28,15 +25,15 @@ 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 # get all the points ordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[trackable identifiable] }).order("gpx_id DESC, trackid ASC, timestamp ASC") unordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[public private] }).order("gps_points.latitude", "gps_points.longitude", "gps_points.timestamp") - points = ordered_points.union_all(unordered_points).offset(offset).limit(TRACEPOINTS_PER_PAGE) + points = ordered_points.union_all(unordered_points).offset(offset).limit(Settings.tracepoints_per_page) doc = XML::Document.new doc.encoding = XML::Encoding::UTF_8