X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1303ba8c7d11b71c0366af4791af1e95f89b0211..d8e3b037d51cd2ac6d2515d4c7a02390f6debf90:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 00b3e78da..3d830c63f 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -7,6 +7,7 @@ class SiteController < ApplicationController before_action :redirect_browse_params, :only => :index before_action :redirect_map_params, :only => [:index, :edit, :export] before_action :require_oauth, :only => [:index] + before_action :require_user, :only => [:id] before_action :update_totp, :only => [:index] authorize_resource :class => false @@ -47,6 +48,15 @@ class SiteController < ApplicationController def key expires_in 7.days, :public => true + @key = YAML.load_file(Rails.root.join("config/key.yml")) + @key.each_value do |layer_data| + layer_data.each do |entry| + entry["name"] = Array(entry["name"]) + end + layer_data.each_cons(2) do |entry, next_entry| + entry["max_zoom"] = next_entry["min_zoom"] - 1 if entry["name"] == next_entry["name"] && !entry["max_zoom"] && next_entry["min_zoom"] + end + end render :layout => false end @@ -106,9 +116,20 @@ class SiteController < ApplicationController @locale = params[:about_locale] || I18n.locale end + def communities + @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF") + end + def export; end - def offline; end + def offline + flash.now[:warning] = if Settings.status == "database_offline" + t("layouts.osm_offline") + else + t("layouts.osm_read_only") + end + render :html => nil, :layout => true + end def preview render :html => RichText.new(params[:type], params[:text]).to_html @@ -135,7 +156,7 @@ class SiteController < ApplicationController elsif params[:relation] redirect_to relation_path(params[:relation]) elsif params[:note] - redirect_to browse_note_path(params[:note]) + redirect_to note_path(params[:note]) elsif params[:query] redirect_to search_path(:query => params[:query]) end