From 3326b99e4b921255c5d3e0cb9de57b471464949b Mon Sep 17 00:00:00 2001 From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com> Date: Tue, 17 Jun 2025 07:08:25 +0200 Subject: [PATCH] Move legend images from key --- .../images/{key => legend}/cyclemap/beach.png | Bin .../{key => legend}/cyclemap/bicycle_parking.png | Bin .../cyclemap/bicycle_parking_small.svg | 0 .../{key => legend}/cyclemap/bicycle_rental.png | Bin .../cyclemap/bicycle_rental_small.svg | 0 .../{key => legend}/cyclemap/bicycle_shop.png | Bin .../images/{key => legend}/cyclemap/toilets.png | Bin app/assets/images/{key => legend}/mapnik/cable.png | Bin .../images/{key => legend}/mapnik/capital4.svg | 0 .../images/{key => legend}/mapnik/capital7.svg | 0 app/assets/images/{key => legend}/mapnik/city4.svg | 0 app/assets/images/{key => legend}/mapnik/city6.svg | 0 .../images/{key => legend}/mapnik/construction.png | Bin .../images/{key => legend}/mapnik/destination.png | Bin .../{key => legend}/mapnik/intermittent_water.svg | 0 .../images/{key => legend}/mapnik/mainroad12.svg | 0 .../images/{key => legend}/mapnik/mainroad15.svg | 0 .../images/{key => legend}/mapnik/mainroad8.svg | 0 .../images/{key => legend}/mapnik/mainroad9.svg | 0 .../images/{key => legend}/mapnik/military.svg | 0 .../images/{key => legend}/mapnik/private.png | Bin app/assets/images/{key => legend}/mapnik/reef.png | Bin .../images/{key => legend}/mapnik/reserve.svg | 0 .../images/{key => legend}/mapnik/runway11.svg | 0 .../images/{key => legend}/mapnik/runway12.svg | 0 .../images/{key => legend}/mapnik/runway13.svg | 0 .../images/{key => legend}/mapnik/runway14.svg | 0 app/assets/images/{key => legend}/mapnik/school.svg | 0 app/assets/images/{key => legend}/mapnik/summit.svg | 0 .../images/{key => legend}/mapnik/wetland.png | Bin app/views/legend_panes/show.html.erb | 2 +- 31 files changed, 1 insertion(+), 1 deletion(-) rename app/assets/images/{key => legend}/cyclemap/beach.png (100%) rename app/assets/images/{key => legend}/cyclemap/bicycle_parking.png (100%) rename app/assets/images/{key => legend}/cyclemap/bicycle_parking_small.svg (100%) rename app/assets/images/{key => legend}/cyclemap/bicycle_rental.png (100%) rename app/assets/images/{key => legend}/cyclemap/bicycle_rental_small.svg (100%) rename app/assets/images/{key => legend}/cyclemap/bicycle_shop.png (100%) rename app/assets/images/{key => legend}/cyclemap/toilets.png (100%) rename app/assets/images/{key => legend}/mapnik/cable.png (100%) rename app/assets/images/{key => legend}/mapnik/capital4.svg (100%) rename app/assets/images/{key => legend}/mapnik/capital7.svg (100%) rename app/assets/images/{key => legend}/mapnik/city4.svg (100%) rename app/assets/images/{key => legend}/mapnik/city6.svg (100%) rename app/assets/images/{key => legend}/mapnik/construction.png (100%) rename app/assets/images/{key => legend}/mapnik/destination.png (100%) rename app/assets/images/{key => legend}/mapnik/intermittent_water.svg (100%) rename app/assets/images/{key => legend}/mapnik/mainroad12.svg (100%) rename app/assets/images/{key => legend}/mapnik/mainroad15.svg (100%) rename app/assets/images/{key => legend}/mapnik/mainroad8.svg (100%) rename app/assets/images/{key => legend}/mapnik/mainroad9.svg (100%) rename app/assets/images/{key => legend}/mapnik/military.svg (100%) rename app/assets/images/{key => legend}/mapnik/private.png (100%) rename app/assets/images/{key => legend}/mapnik/reef.png (100%) rename app/assets/images/{key => legend}/mapnik/reserve.svg (100%) rename app/assets/images/{key => legend}/mapnik/runway11.svg (100%) rename app/assets/images/{key => legend}/mapnik/runway12.svg (100%) rename app/assets/images/{key => legend}/mapnik/runway13.svg (100%) rename app/assets/images/{key => legend}/mapnik/runway14.svg (100%) rename app/assets/images/{key => legend}/mapnik/school.svg (100%) rename app/assets/images/{key => legend}/mapnik/summit.svg (100%) rename app/assets/images/{key => legend}/mapnik/wetland.png (100%) diff --git a/app/assets/images/key/cyclemap/beach.png b/app/assets/images/legend/cyclemap/beach.png similarity index 100% rename from app/assets/images/key/cyclemap/beach.png rename to app/assets/images/legend/cyclemap/beach.png diff --git a/app/assets/images/key/cyclemap/bicycle_parking.png b/app/assets/images/legend/cyclemap/bicycle_parking.png similarity index 100% rename from app/assets/images/key/cyclemap/bicycle_parking.png rename to app/assets/images/legend/cyclemap/bicycle_parking.png diff --git a/app/assets/images/key/cyclemap/bicycle_parking_small.svg b/app/assets/images/legend/cyclemap/bicycle_parking_small.svg similarity index 100% rename from app/assets/images/key/cyclemap/bicycle_parking_small.svg rename to app/assets/images/legend/cyclemap/bicycle_parking_small.svg diff --git a/app/assets/images/key/cyclemap/bicycle_rental.png b/app/assets/images/legend/cyclemap/bicycle_rental.png similarity index 100% rename from app/assets/images/key/cyclemap/bicycle_rental.png rename to app/assets/images/legend/cyclemap/bicycle_rental.png diff --git a/app/assets/images/key/cyclemap/bicycle_rental_small.svg b/app/assets/images/legend/cyclemap/bicycle_rental_small.svg similarity index 100% rename from app/assets/images/key/cyclemap/bicycle_rental_small.svg rename to app/assets/images/legend/cyclemap/bicycle_rental_small.svg diff --git a/app/assets/images/key/cyclemap/bicycle_shop.png b/app/assets/images/legend/cyclemap/bicycle_shop.png similarity index 100% rename from app/assets/images/key/cyclemap/bicycle_shop.png rename to app/assets/images/legend/cyclemap/bicycle_shop.png diff --git a/app/assets/images/key/cyclemap/toilets.png b/app/assets/images/legend/cyclemap/toilets.png similarity index 100% rename from app/assets/images/key/cyclemap/toilets.png rename to app/assets/images/legend/cyclemap/toilets.png diff --git a/app/assets/images/key/mapnik/cable.png b/app/assets/images/legend/mapnik/cable.png similarity index 100% rename from app/assets/images/key/mapnik/cable.png rename to app/assets/images/legend/mapnik/cable.png diff --git a/app/assets/images/key/mapnik/capital4.svg b/app/assets/images/legend/mapnik/capital4.svg similarity index 100% rename from app/assets/images/key/mapnik/capital4.svg rename to app/assets/images/legend/mapnik/capital4.svg diff --git a/app/assets/images/key/mapnik/capital7.svg b/app/assets/images/legend/mapnik/capital7.svg similarity index 100% rename from app/assets/images/key/mapnik/capital7.svg rename to app/assets/images/legend/mapnik/capital7.svg diff --git a/app/assets/images/key/mapnik/city4.svg b/app/assets/images/legend/mapnik/city4.svg similarity index 100% rename from app/assets/images/key/mapnik/city4.svg rename to app/assets/images/legend/mapnik/city4.svg diff --git a/app/assets/images/key/mapnik/city6.svg b/app/assets/images/legend/mapnik/city6.svg similarity index 100% rename from app/assets/images/key/mapnik/city6.svg rename to app/assets/images/legend/mapnik/city6.svg diff --git a/app/assets/images/key/mapnik/construction.png b/app/assets/images/legend/mapnik/construction.png similarity index 100% rename from app/assets/images/key/mapnik/construction.png rename to app/assets/images/legend/mapnik/construction.png diff --git a/app/assets/images/key/mapnik/destination.png b/app/assets/images/legend/mapnik/destination.png similarity index 100% rename from app/assets/images/key/mapnik/destination.png rename to app/assets/images/legend/mapnik/destination.png diff --git a/app/assets/images/key/mapnik/intermittent_water.svg b/app/assets/images/legend/mapnik/intermittent_water.svg similarity index 100% rename from app/assets/images/key/mapnik/intermittent_water.svg rename to app/assets/images/legend/mapnik/intermittent_water.svg diff --git a/app/assets/images/key/mapnik/mainroad12.svg b/app/assets/images/legend/mapnik/mainroad12.svg similarity index 100% rename from app/assets/images/key/mapnik/mainroad12.svg rename to app/assets/images/legend/mapnik/mainroad12.svg diff --git a/app/assets/images/key/mapnik/mainroad15.svg b/app/assets/images/legend/mapnik/mainroad15.svg similarity index 100% rename from app/assets/images/key/mapnik/mainroad15.svg rename to app/assets/images/legend/mapnik/mainroad15.svg diff --git a/app/assets/images/key/mapnik/mainroad8.svg b/app/assets/images/legend/mapnik/mainroad8.svg similarity index 100% rename from app/assets/images/key/mapnik/mainroad8.svg rename to app/assets/images/legend/mapnik/mainroad8.svg diff --git a/app/assets/images/key/mapnik/mainroad9.svg b/app/assets/images/legend/mapnik/mainroad9.svg similarity index 100% rename from app/assets/images/key/mapnik/mainroad9.svg rename to app/assets/images/legend/mapnik/mainroad9.svg diff --git a/app/assets/images/key/mapnik/military.svg b/app/assets/images/legend/mapnik/military.svg similarity index 100% rename from app/assets/images/key/mapnik/military.svg rename to app/assets/images/legend/mapnik/military.svg diff --git a/app/assets/images/key/mapnik/private.png b/app/assets/images/legend/mapnik/private.png similarity index 100% rename from app/assets/images/key/mapnik/private.png rename to app/assets/images/legend/mapnik/private.png diff --git a/app/assets/images/key/mapnik/reef.png b/app/assets/images/legend/mapnik/reef.png similarity index 100% rename from app/assets/images/key/mapnik/reef.png rename to app/assets/images/legend/mapnik/reef.png diff --git a/app/assets/images/key/mapnik/reserve.svg b/app/assets/images/legend/mapnik/reserve.svg similarity index 100% rename from app/assets/images/key/mapnik/reserve.svg rename to app/assets/images/legend/mapnik/reserve.svg diff --git a/app/assets/images/key/mapnik/runway11.svg b/app/assets/images/legend/mapnik/runway11.svg similarity index 100% rename from app/assets/images/key/mapnik/runway11.svg rename to app/assets/images/legend/mapnik/runway11.svg diff --git a/app/assets/images/key/mapnik/runway12.svg b/app/assets/images/legend/mapnik/runway12.svg similarity index 100% rename from app/assets/images/key/mapnik/runway12.svg rename to app/assets/images/legend/mapnik/runway12.svg diff --git a/app/assets/images/key/mapnik/runway13.svg b/app/assets/images/legend/mapnik/runway13.svg similarity index 100% rename from app/assets/images/key/mapnik/runway13.svg rename to app/assets/images/legend/mapnik/runway13.svg diff --git a/app/assets/images/key/mapnik/runway14.svg b/app/assets/images/legend/mapnik/runway14.svg similarity index 100% rename from app/assets/images/key/mapnik/runway14.svg rename to app/assets/images/legend/mapnik/runway14.svg diff --git a/app/assets/images/key/mapnik/school.svg b/app/assets/images/legend/mapnik/school.svg similarity index 100% rename from app/assets/images/key/mapnik/school.svg rename to app/assets/images/legend/mapnik/school.svg diff --git a/app/assets/images/key/mapnik/summit.svg b/app/assets/images/legend/mapnik/summit.svg similarity index 100% rename from app/assets/images/key/mapnik/summit.svg rename to app/assets/images/legend/mapnik/summit.svg diff --git a/app/assets/images/key/mapnik/wetland.png b/app/assets/images/legend/mapnik/wetland.png similarity index 100% rename from app/assets/images/key/mapnik/wetland.png rename to app/assets/images/legend/mapnik/wetland.png diff --git a/app/views/legend_panes/show.html.erb b/app/views/legend_panes/show.html.erb index 194877cd8..9c4315c9f 100644 --- a/app/views/legend_panes/show.html.erb +++ b/app/views/legend_panes/show.html.erb @@ -5,7 +5,7 @@ <%= tag.tr :data => { :layer => layer_name, :zoom_min => entry["min_zoom"], :zoom_max => entry["max_zoom"] } do %> <% if entry["image"] %> - <%= image_tag "key/#{layer_name}/#{entry['image']}", :class => "filtered-image d-block mx-auto" %> + <%= image_tag "legend/#{layer_name}/#{entry['image']}", :class => "filtered-image d-block mx-auto" %> <% else %> <%= legend_svg_tag :class => "filtered-image d-block mx-auto", **entry %> <% end %> -- 2.39.5