From: Anton Khorev Date: Thu, 20 Mar 2025 23:40:31 +0000 (+0300) Subject: Create map key resource X-Git-Tag: live~23^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a5a2d297fc1c4afed643dd5458a338ad63f39d44 Create map key resource --- diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index 36f3b89dc..b1c99a3f1 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -4,11 +4,11 @@ class Ability include CanCan::Ability def initialize(user) - can :read, :feature_query + can :read, [:feature_query, :map_key] can :read, [Node, Way, Relation, OldNode, OldWay, OldRelation] can [:show, :create], Note can :search, :direction - can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :communities, :preview, :copyright, :key, :id], :site + can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :communities, :preview, :copyright, :id], :site can [:finish, :embed], :export can [:search, :search_latlon, :search_osm_nominatim, :search_osm_nominatim_reverse], :geocoder diff --git a/app/controllers/map_keys_controller.rb b/app/controllers/map_keys_controller.rb new file mode 100644 index 000000000..48fe8d1bc --- /dev/null +++ b/app/controllers/map_keys_controller.rb @@ -0,0 +1,19 @@ +class MapKeysController < ApplicationController + before_action :authorize_web + before_action :set_locale + authorize_resource :class => false + + def show + 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 +end diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 5110be019..6fa4db5e9 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -57,20 +57,6 @@ class SiteController < ApplicationController redirect_to path end - 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 - def edit editor = preferred_editor diff --git a/app/views/site/key.html.erb b/app/views/map_keys/show.html.erb similarity index 87% rename from app/views/site/key.html.erb rename to app/views/map_keys/show.html.erb index 82105097e..2453f1492 100644 --- a/app/views/site/key.html.erb +++ b/app/views/map_keys/show.html.erb @@ -11,7 +11,7 @@ <% end %> - <%= entry["name"].map { |feature_name| t ".table.entry.#{feature_name}" }.join(" · ") %> + <%= entry["name"].map { |feature_name| t ".entries.#{feature_name}" }.join(" · ") %> <% end %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index bc2f3b1b3..230d9242c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2436,95 +2436,6 @@ en: fossgis_osrm: "OSRM" graphhopper: "GraphHopper" fossgis_valhalla: "Valhalla" - key: - table: - entry: - motorway: "Motorway" - main_road: "Main road" - trunk: "Trunk road" - primary: "Primary road" - secondary: "Secondary road" - unclassified: "Unclassified road" - pedestrian: "Pedestrian way" - track: "Track" - bridleway: "Bridleway" - cycleway: "Cycleway" - cycleway_national: "National cycleway" - cycleway_regional: "Regional cycleway" - cycleway_local: "Local cycleway" - cycleway_mtb: "Mountain bike route" - footway: "Footway" - rail: "Railway" - train: "Train" - subway: "Subway" - ferry: "Ferry" - light_rail: "Light rail" - tram: "Tram" - trolleybus: "Trolleybus" - bus: "Bus" - cable_car: "Cable car" - chair_lift: "Chair lift" - runway: "Airport Runway" - taxiway: "Taxiway" - apron: "Airport apron" - admin: "Administrative boundary" - capital: "Capital" - city: "City" - orchard: "Orchard" - vineyard: "Vineyard" - forest: "Forest" - wood: "Wood" - farmland: "Farmland" - grass: "Grass" - meadow: "Meadow" - bare_rock: "Bare rock" - sand: "Sand" - golf: "Golf course" - park: "Park" - common: "Common" - built_up: "Built-up area" - resident: "Residential area" - retail: "Retail area" - industrial: "Industrial area" - commercial: "Commercial area" - heathland: "Heathland" - scrubland: "Scrubland" - lake: "Lake" - reservoir: "Reservoir" - intermittent_water: "Intermittent waterbody" - glacier: "Glacier" - reef: "Reef" - wetland: "Wetland" - farm: "Farm" - brownfield: "Brownfield site" - cemetery: "Cemetery" - allotments: "Allotments" - pitch: "Sports pitch" - centre: "Sports centre" - beach: "Beach" - reserve: "Nature reserve" - military: "Military area" - school: "School" - university: "University" - hospital: "Hospital" - building: "Significant building" - station: "Railway station" - railway_halt: "Railway halt" - subway_station: "Subway station" - tram_stop: "Tram stop" - summit: "Summit" - peak: "Peak" - tunnel: "Dashed casing = tunnel" - bridge: "Black casing = bridge" - private: "Private access" - destination: "Destination access" - construction: "Roads under construction" - bus_stop: "Bus stop" - bicycle_shop: "Bicycle shop" - bicycle_rental: "Bicycle rental" - bicycle_parking: "Bicycle parking" - bicycle_parking_small: "Small bicycle parking" - toilets: "Toilets" welcome: title: Welcome! introduction: | @@ -2603,6 +2514,95 @@ en: community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}. communities_wiki: Communities wiki page communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group + map_keys: + show: + entries: + motorway: "Motorway" + main_road: "Main road" + trunk: "Trunk road" + primary: "Primary road" + secondary: "Secondary road" + unclassified: "Unclassified road" + pedestrian: "Pedestrian way" + track: "Track" + bridleway: "Bridleway" + cycleway: "Cycleway" + cycleway_national: "National cycleway" + cycleway_regional: "Regional cycleway" + cycleway_local: "Local cycleway" + cycleway_mtb: "Mountain bike route" + footway: "Footway" + rail: "Railway" + train: "Train" + subway: "Subway" + ferry: "Ferry" + light_rail: "Light rail" + tram: "Tram" + trolleybus: "Trolleybus" + bus: "Bus" + cable_car: "Cable car" + chair_lift: "Chair lift" + runway: "Airport Runway" + taxiway: "Taxiway" + apron: "Airport apron" + admin: "Administrative boundary" + capital: "Capital" + city: "City" + orchard: "Orchard" + vineyard: "Vineyard" + forest: "Forest" + wood: "Wood" + farmland: "Farmland" + grass: "Grass" + meadow: "Meadow" + bare_rock: "Bare rock" + sand: "Sand" + golf: "Golf course" + park: "Park" + common: "Common" + built_up: "Built-up area" + resident: "Residential area" + retail: "Retail area" + industrial: "Industrial area" + commercial: "Commercial area" + heathland: "Heathland" + scrubland: "Scrubland" + lake: "Lake" + reservoir: "Reservoir" + intermittent_water: "Intermittent waterbody" + glacier: "Glacier" + reef: "Reef" + wetland: "Wetland" + farm: "Farm" + brownfield: "Brownfield site" + cemetery: "Cemetery" + allotments: "Allotments" + pitch: "Sports pitch" + centre: "Sports centre" + beach: "Beach" + reserve: "Nature reserve" + military: "Military area" + school: "School" + university: "University" + hospital: "Hospital" + building: "Significant building" + station: "Railway station" + railway_halt: "Railway halt" + subway_station: "Subway station" + tram_stop: "Tram stop" + summit: "Summit" + peak: "Peak" + tunnel: "Dashed casing = tunnel" + bridge: "Black casing = bridge" + private: "Private access" + destination: "Destination access" + construction: "Roads under construction" + bus_stop: "Bus stop" + bicycle_shop: "Bicycle shop" + bicycle_rental: "Bicycle rental" + bicycle_parking: "Bicycle parking" + bicycle_parking_small: "Small bicycle parking" + toilets: "Toilets" traces: visibility: private: "Private (only shared as anonymous, unordered points)" diff --git a/config/routes.rb b/config/routes.rb index e329a4b01..89e64b900 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -203,7 +203,7 @@ OpenStreetMap::Application.routes.draw do post "/login" => "sessions#create" match "/logout" => "sessions#destroy", :via => [:get, :post] get "/offline" => "site#offline" - get "/key" => "site#key" + resource :map_key, :path => "key", :only => :show get "/id" => "site#id" resource :feature_query, :path => "query", :only => :show post "/user/:display_name/confirm/resend" => "confirmations#confirm_resend", :as => :user_confirm_resend diff --git a/test/controllers/map_keys_controller_test.rb b/test/controllers/map_keys_controller_test.rb new file mode 100644 index 000000000..fdf8ee1f7 --- /dev/null +++ b/test/controllers/map_keys_controller_test.rb @@ -0,0 +1,20 @@ +require "test_helper" + +class MapKeysControllerTest < ActionDispatch::IntegrationTest + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/key", :method => :get }, + { :controller => "map_keys", :action => "show" } + ) + end + + def test_show + get map_key_path, :xhr => true + + assert_response :success + assert_template "map_keys/show" + assert_template :layout => false + end +end diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb index 5a1399e2d..9246dcc1b 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -60,10 +60,6 @@ class SiteControllerTest < ActionDispatch::IntegrationTest { :path => "/offline", :method => :get }, { :controller => "site", :action => "offline" } ) - assert_routing( - { :path => "/key", :method => :get }, - { :controller => "site", :action => "key" } - ) assert_routing( { :path => "/go/shortcode", :method => :get }, { :controller => "site", :action => "permalink", :code => "shortcode" } @@ -143,15 +139,6 @@ class SiteControllerTest < ActionDispatch::IntegrationTest assert_redirected_to changeset_path(4, :anchor => "map=3/4.8779296875/3.955078125") end - # Test the key page - def test_key - get key_path, :xhr => true - - assert_response :success - assert_template "key" - assert_template :layout => false - end - # Test the edit page redirects when you aren't logged in def test_edit get edit_path