Simplify deny_access handling

[rails.git] / app / controllers / api / map_controller.rb

diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb
index 47c0aeb36af38295cd88e5b63ece3a47556457d9..27d6f3667410b13504851e0298e1eb67257c4154 100644 (file)
--- a/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@ -1,8 +1,5 @@
 module Api
 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
     authorize_resource :class => false
 
     before_action :check_api_readable


@@ -30,11 +27,11 @@ module Api
         return
       end
 
         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)
 
       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
 
         return
       end