From 6fec2f0e0fe2605a7c6b4abcec98068ef90c9d48 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Sat, 6 Dec 2025 12:29:44 +0100
Subject: [PATCH] Fix method name to config in SafeSettings and update usages
 accordingly

---
 app/controllers/api/v1/settings_controller.rb |  2 +-
 app/services/users/safe_settings.rb           | 10 ++++++++--
 spec/services/users/safe_settings_spec.rb     |  9 ++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/settings_controller.rb b/app/controllers/api/v1/settings_controller.rb
index f06a04fe..f164bbe1 100644
--- a/app/controllers/api/v1/settings_controller.rb
+++ b/app/controllers/api/v1/settings_controller.rb
@@ -31,7 +31,7 @@ class Api::V1::SettingsController < ApiController
       :preferred_map_layer, :points_rendering_mode, :live_map_enabled,
       :immich_url, :immich_api_key, :photoprism_url, :photoprism_api_key,
       :speed_colored_routes, :speed_color_scale, :fog_of_war_threshold,
-      :maps_v2_style,
+      :maps_v2_style, :maps_maplibre_style,
       enabled_map_layers: []
     )
   end
diff --git a/app/services/users/safe_settings.rb b/app/services/users/safe_settings.rb
index 64c7a8f9..3e01f73c 100644
--- a/app/services/users/safe_settings.rb
+++ b/app/services/users/safe_settings.rb
@@ -20,7 +20,8 @@ class Users::SafeSettings
     'photoprism_api_key' => nil,
     'maps' => { 'distance_unit' => 'km' },
     'visits_suggestions_enabled' => 'true',
-    'enabled_map_layers' => ['Routes', 'Heatmap']
+    'enabled_map_layers' => ['Routes', 'Heatmap'],
+    'maps_maplibre_style' => 'light'
   }.freeze
 
   def initialize(settings = {})
@@ -49,7 +50,8 @@ class Users::SafeSettings
       visits_suggestions_enabled: visits_suggestions_enabled?,
       speed_color_scale: speed_color_scale,
       fog_of_war_threshold: fog_of_war_threshold,
-      enabled_map_layers: enabled_map_layers
+      enabled_map_layers: enabled_map_layers,
+      maps_maplibre_style: maps_maplibre_style
     }
   end
   # rubocop:enable Metrics/MethodLength
@@ -133,4 +135,8 @@ class Users::SafeSettings
   def enabled_map_layers
     settings['enabled_map_layers']
   end
+
+  def maps_maplibre_style
+    settings['maps_maplibre_style']
+  end
 end
diff --git a/spec/services/users/safe_settings_spec.rb b/spec/services/users/safe_settings_spec.rb
index 12484c89..3c1c01e5 100644
--- a/spec/services/users/safe_settings_spec.rb
+++ b/spec/services/users/safe_settings_spec.rb
@@ -30,7 +30,8 @@ RSpec.describe Users::SafeSettings do
             visits_suggestions_enabled: true,
             speed_color_scale: nil,
             fog_of_war_threshold: nil,
-            enabled_map_layers: ['Routes', 'Heatmap']
+            enabled_map_layers: ['Routes', 'Heatmap'],
+            maps_maplibre_style: 'light'
           }
         )
       end
@@ -79,7 +80,8 @@ RSpec.describe Users::SafeSettings do
             "photoprism_api_key" => "photoprism-key",
             "maps" => { "name" => "custom", "url" => "https://custom.example.com" },
             "visits_suggestions_enabled" => false,
-            "enabled_map_layers" => ['Points', 'Routes', 'Areas', 'Photos']
+            "enabled_map_layers" => ['Points', 'Routes', 'Areas', 'Photos'],
+            "maps_maplibre_style" => "light"
           }
         )
       end
@@ -106,7 +108,8 @@ RSpec.describe Users::SafeSettings do
             visits_suggestions_enabled: false,
             speed_color_scale: nil,
             fog_of_war_threshold: nil,
-            enabled_map_layers: ['Points', 'Routes', 'Areas', 'Photos']
+            enabled_map_layers: ['Points', 'Routes', 'Areas', 'Photos'],
+            maps_maplibre_style: 'light'
           }
         )
       end