Enable/disable some context-menu options conditional on zoom

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 01cdcf23f9fd207f2277f0713d02e237b64af08f..5131629acfd57140e0c3eedf06e0d7cefc87aaaa 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,17 +1,17 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  layout 'site'
+  layout "site"

   layout :map_layout, :only => [:index, :export]
 
   layout :map_layout, :only => [:index, :export]
 

-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :redirect_browse_params, :only => :index
-  before_filter :redirect_map_params, :only => [:index, :edit, :export]
-  before_filter :require_user, :only => [:welcome]
-  before_filter :require_oauth, :only => [:index]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :redirect_browse_params, :only => :index
+  before_action :redirect_map_params, :only => [:index, :edit, :export]
+  before_action :require_user, :only => [:welcome]
+  before_action :require_oauth, :only => [:index]

 
   def index
     unless STATUS == :database_readonly || STATUS == :database_offline
 
   def index
     unless STATUS == :database_readonly || STATUS == :database_offline

-      session[:location] ||= OSM.ip_location(request.env['REMOTE_ADDR'])
+      session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"])

     end
   end
 
     end
   end
 


@@ -26,24 +26,24 @@ class SiteController < ApplicationController
     end
 
     if params.key? :node
     end
 
     if params.key? :node

-      new_params[:controller] = 'browse'
-      new_params[:action] = 'node'
+      new_params[:controller] = "browse"
+      new_params[:action] = "node"

       new_params[:id] = params[:node]
     elsif params.key? :way
       new_params[:id] = params[:node]
     elsif params.key? :way

-      new_params[:controller] = 'browse'
-      new_params[:action] = 'way'
+      new_params[:controller] = "browse"
+      new_params[:action] = "way"

       new_params[:id] = params[:way]
     elsif params.key? :relation
       new_params[:id] = params[:way]
     elsif params.key? :relation

-      new_params[:controller] = 'browse'
-      new_params[:action] = 'relation'
+      new_params[:controller] = "browse"
+      new_params[:action] = "relation"

       new_params[:id] = params[:relation]
     elsif params.key? :changeset
       new_params[:id] = params[:relation]
     elsif params.key? :changeset

-      new_params[:controller] = 'browse'
-      new_params[:action] = 'changeset'
+      new_params[:controller] = "browse"
+      new_params[:action] = "changeset"

       new_params[:id] = params[:changeset]
     else
       new_params[:id] = params[:changeset]
     else

-      new_params[:controller] = 'site'
-      new_params[:action] = 'index'
+      new_params[:controller] = "site"
+      new_params[:action] = "index"

     end
 
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
     end
 
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"


@@ -143,12 +143,12 @@ class SiteController < ApplicationController
 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"
 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"

-    elsif params.delete(:notes) == 'yes'
+    elsif params.delete(:notes) == "yes"

       anchor << "layers=N"
     end
 
     if anchor.present?
       anchor << "layers=N"
     end
 
     if anchor.present?

-      redirect_to Hash[params].merge(:anchor => anchor.join('&'))
+      redirect_to Hash[params].merge(:anchor => anchor.join("&"))

     end
   end
 end
     end
   end
 end