From 9cc0fd83a72b6d8cc9b192ba235d447d6c616be2 Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Sun, 22 Jun 2025 18:18:42 +0200
Subject: [PATCH] Move layer definitions to pane controllers

---
 app/controllers/layers_panes_controller.rb | 4 ++++
 app/controllers/share_panes_controller.rb  | 2 ++
 app/views/layers_panes/show.html.erb       | 6 ++----
 app/views/share_panes/show.html.erb        | 4 +---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/layers_panes_controller.rb b/app/controllers/layers_panes_controller.rb
index 5034fd71a..c203d26eb 100644
--- a/app/controllers/layers_panes_controller.rb
+++ b/app/controllers/layers_panes_controller.rb
@@ -4,6 +4,10 @@ class LayersPanesController < ApplicationController
   authorize_resource :class => false
 
   def show
+    @base_layers = MapLayers.full_definitions("config/layers.yml")
+    @overlay_layers = [{ :layer_id => "noteLayer", :name => "notes", :max_area => Settings.max_note_request_area },
+                       { :layer_id => "dataLayer", :name => "data", :max_area => Settings.max_request_area },
+                       { :layer_id => "gpsLayer", :name => "gps" }]
     render :layout => false
   end
 end
diff --git a/app/controllers/share_panes_controller.rb b/app/controllers/share_panes_controller.rb
index 4b1b64bcf..1df9c1597 100644
--- a/app/controllers/share_panes_controller.rb
+++ b/app/controllers/share_panes_controller.rb
@@ -4,6 +4,8 @@ class SharePanesController < ApplicationController
   authorize_resource :class => false
 
   def show
+    @downloadable_layers = MapLayers.full_definitions("config/layers.yml")
+                                    .select { |layer| layer["canDownloadImage"] }
     render :layout => false
   end
 end
diff --git a/app/views/layers_panes/show.html.erb b/app/views/layers_panes/show.html.erb
index 37bc717a6..a1d63c7e1 100644
--- a/app/views/layers_panes/show.html.erb
+++ b/app/views/layers_panes/show.html.erb
@@ -1,5 +1,5 @@
 <div class="base-layers d-grid gap-3 p-3 border-bottom border-secondary-subtle">
-  <% MapLayers.full_definitions("config/layers.yml").each do |layer| %>
+  <% @base_layers.each do |layer| %>
     <div class="position-relative">
       <div class="position-absolute top-0 start-0 bottom-0 end-0 z-0 bg-body-secondary" data-layer="<%= layer["layerId"] %>"></div>
       <input type="radio" class="btn-check" name="layer" id="map-ui-layer-<%= layer["layerId"] %>"></input>
@@ -14,9 +14,7 @@
 <% if Settings.status != "api_offline" && Settings.status != "database_offline" %>
   <div class="overlay-layers p-3">
     <p class="text-body-secondary small mb-2"><%= t "javascripts.map.layers.overlays" %></p>
-    <% [{ :layer_id => "noteLayer", :name => "notes", :max_area => Settings.max_note_request_area },
-        { :layer_id => "dataLayer", :name => "data", :max_area => Settings.max_request_area },
-        { :layer_id => "gpsLayer", :name => "gps" }].each do |layer|
+    <% @overlay_layers.each do |layer|
          options = { :data => layer, :class => "form-check" }
          options[:title] = t(".map_#{layer[:name]}_zoom_in_tooltip") if layer[:max_area] %>
       <%= tag.div(**options) do %>
diff --git a/app/views/share_panes/show.html.erb b/app/views/share_panes/show.html.erb
index c6e117c62..c05fdf829 100644
--- a/app/views/share_panes/show.html.erb
+++ b/app/views/share_panes/show.html.erb
@@ -31,9 +31,7 @@
   <div id="export-warning" class="text-body-secondary">
     <%= t ".only_layers_exported_as_image" %>
     <ul>
-      <% MapLayers.full_definitions("config/layers.yml")
-                  .select { |layer| layer["canDownloadImage"] }
-                  .each do |layer| %>
+      <% @downloadable_layers.each do |layer| %>
         <li><%= t "javascripts.map.base.#{layer['nameId']}" %></li>
       <% end %>
     </ul>
-- 
2.39.5