Adjust calculate_duration_in_minutes to only count continuous presence within cities, excluding long gaps.

* Update digest calculation to use actual time spent in countries based on consecutive points, avoiding double-counting days when crossing borders.

* Move methods to private

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-# [0.37.2] - 2026-01-04
+# [0.37.2] - 2026-01-03
 
 ## Fixed
 
@@ -12,7 +12,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Time spent in a country and city is now calculated correctly for the year-end digest email. #2104
 - Updated Trix to fix a XSS vulnerability. #2102
 - Map v2 UI no longer blocks when Immich/Photoprism integration has a bad URL or is unreachable. Added 10-second timeout to photo API requests and improved error handling to prevent UI freezing during initial load. #2085
-- In Map v2 settings, you can now enable map to be rendered as a globe.
 
 # [0.37.1] - 2025-12-30
 

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_maplibre_style, :globe_projection,
+      :maps_v2_style, :maps_maplibre_style,
       enabled_map_layers: []
     )
   end

app/helpers/users/digests_helper.rb

@@ -2,27 +2,6 @@
 
 module Users
   module DigestsHelper
-    PROGRESS_COLORS = %w[
-      progress-primary progress-secondary progress-accent
-      progress-info progress-success progress-warning
-    ].freeze
-
-    def progress_color_for_index(index)
-      PROGRESS_COLORS[index % PROGRESS_COLORS.length]
-    end
-
-    def city_progress_value(city_count, max_cities)
-      return 0 unless max_cities&.positive?
-
-      (city_count.to_f / max_cities * 100).round
-    end
-
-    def max_cities_count(toponyms)
-      return 0 if toponyms.blank?
-
-      toponyms.map { |country| country['cities']&.length || 0 }.max
-    end
-
     def distance_with_unit(distance_meters, unit)
       value = Users::Digest.convert_distance(distance_meters, unit).round
       "#{number_with_delimiter(value)} #{unit}"

app/javascript/controllers/maps/maplibre/map_initializer.js

@@ -16,35 +16,17 @@ export class MapInitializer {
       mapStyle = 'streets',
       center = [0, 0],
       zoom = 2,
-      showControls = true,
-      globeProjection = false
+      showControls = true
     } = settings
 
     const style = await getMapStyle(mapStyle)
 
-    const mapOptions = {
+    const map = new maplibregl.Map({
       container,
       style,
       center,
       zoom
-    }
-
-    const map = new maplibregl.Map(mapOptions)
-
-    // Set globe projection after map loads
-    if (globeProjection === true || globeProjection === 'true') {
-      map.on('load', () => {
-        map.setProjection({ type: 'globe' })
-
-        // Add atmosphere effect
-        map.setSky({
-          'atmosphere-blend': [
-            'interpolate', ['linear'], ['zoom'],
-            0, 1, 5, 1, 7, 0
-          ]
-        })
-      })
-    }
+    })
 
     if (showControls) {
       map.addControl(new maplibregl.NavigationControl(), 'top-right')

app/javascript/controllers/maps/maplibre/settings_manager.js

@@ -91,11 +91,6 @@ export class SettingsController {
       mapStyleSelect.value = this.settings.mapStyle || 'light'
     }
 
-    // Sync globe projection toggle
-    if (controller.hasGlobeToggleTarget) {
-      controller.globeToggleTarget.checked = this.settings.globeProjection || false
-    }
-
     // Sync fog of war settings
     const fogRadiusInput = controller.element.querySelector('input[name="fogOfWarRadius"]')
     if (fogRadiusInput) {
@@ -183,22 +178,6 @@ export class SettingsController {
     }
   }
 
-  /**
-   * Toggle globe projection
-   * Requires page reload to apply since projection is set at map initialization
-   */
-  async toggleGlobe(event) {
-    const enabled = event.target.checked
-    await SettingsManager.updateSetting('globeProjection', enabled)
-
-    Toast.info('Globe view will be applied after page reload')
-
-    // Prompt user to reload
-    if (confirm('Globe view requires a page reload to take effect. Reload now?')) {
-      window.location.reload()
-    }
-  }
-
   /**
    * Update route opacity in real-time
    */

app/javascript/controllers/maps/maplibre_controller.js

@@ -64,8 +64,6 @@ export default class extends Controller {
     'speedColoredToggle',
     'speedColorScaleContainer',
     'speedColorScaleInput',
-    // Globe projection
-    'globeToggle',
     // Family members
     'familyMembersList',
     'familyMembersContainer',
@@ -149,8 +147,7 @@ export default class extends Controller {
    */
   async initializeMap() {
     this.map = await MapInitializer.initialize(this.containerTarget, {
-      mapStyle: this.settings.mapStyle,
-      globeProjection: this.settings.globeProjection
+      mapStyle: this.settings.mapStyle
     })
   }
 
@@ -246,7 +243,6 @@ export default class extends Controller {
   updateFogThresholdDisplay(event) { return this.settingsController.updateFogThresholdDisplay(event) }
   updateMetersBetweenDisplay(event) { return this.settingsController.updateMetersBetweenDisplay(event) }
   updateMinutesBetweenDisplay(event) { return this.settingsController.updateMinutesBetweenDisplay(event) }
-  toggleGlobe(event) { return this.settingsController.toggleGlobe(event) }
 
   // Area Selection Manager methods
   startSelectArea() { return this.areaSelectionManager.startSelectArea() }

app/javascript/maps_maplibre/utils/settings_manager.js

@@ -14,8 +14,7 @@ const DEFAULT_SETTINGS = {
   minutesBetweenRoutes: 60,
   pointsRenderingMode: 'raw',
   speedColoredRoutes: false,
-  speedColorScale: '0:#00ff00|15:#00ffff|30:#ff00ff|50:#ffff00|100:#ff3300',
-  globeProjection: false
+  speedColorScale: '0:#00ff00|15:#00ffff|30:#ff00ff|50:#ffff00|100:#ff3300'
 }
 
 // Mapping between v2 layer names and v1 layer names in enabled_map_layers array
@@ -42,8 +41,7 @@ const BACKEND_SETTINGS_MAP = {
   minutesBetweenRoutes: 'minutes_between_routes',
   pointsRenderingMode: 'points_rendering_mode',
   speedColoredRoutes: 'speed_colored_routes',
-  speedColorScale: 'speed_color_scale',
-  globeProjection: 'globe_projection'
+  speedColorScale: 'speed_color_scale'
 }
 
 export class SettingsManager {
@@ -154,8 +152,6 @@ export class SettingsManager {
             value = parseInt(value) || DEFAULT_SETTINGS.minutesBetweenRoutes
           } else if (frontendKey === 'speedColoredRoutes') {
             value = value === true || value === 'true'
-          } else if (frontendKey === 'globeProjection') {
-            value = value === true || value === 'true'
           }
 
           frontendSettings[frontendKey] = value
@@ -223,8 +219,6 @@ export class SettingsManager {
             value = parseInt(value).toString()
           } else if (frontendKey === 'speedColoredRoutes') {
             value = Boolean(value)
-          } else if (frontendKey === 'globeProjection') {
-            value = Boolean(value)
           }
 
           backendSettings[backendKey] = value

app/jobs/users/digests/calculating_job.rb

@@ -4,7 +4,6 @@ class Users::Digests::CalculatingJob < ApplicationJob
   queue_as :digests
 
   def perform(user_id, year)
-    recalculate_monthly_stats(user_id, year)
     Users::Digests::CalculateYear.new(user_id, year).call
   rescue StandardError => e
     create_digest_failed_notification(user_id, e)
@@ -12,12 +11,6 @@ class Users::Digests::CalculatingJob < ApplicationJob
 
   private
 
-  def recalculate_monthly_stats(user_id, year)
-    (1..12).each do |month|
-      Stats::CalculateMonth.new(user_id, year, month).call
-    end
-  end
-
   def create_digest_failed_notification(user_id, error)
     user = User.find(user_id)
 

app/models/user.rb

@@ -45,13 +45,18 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
 
   def countries_visited
     Rails.cache.fetch("dawarich/user_#{id}_countries_visited", expires_in: 1.day) do
-      countries_visited_uncached
+      points
+        .without_raw_data
+        .where.not(country_name: [nil, ''])
+        .distinct
+        .pluck(:country_name)
+        .compact
     end
   end
 
   def cities_visited
     Rails.cache.fetch("dawarich/user_#{id}_cities_visited", expires_in: 1.day) do
-      cities_visited_uncached
+      points.where.not(city: [nil, '']).distinct.pluck(:city).compact
     end
   end
 
@@ -134,47 +139,17 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
     Time.zone.name
   end
 
-  # Aggregate countries from all stats' toponyms
-  # This is more accurate than raw point queries as it uses processed data
   def countries_visited_uncached
-    countries = Set.new
-
-    stats.find_each do |stat|
-      toponyms = stat.toponyms
-      next unless toponyms.is_a?(Array)
-
-      toponyms.each do |toponym|
-        next unless toponym.is_a?(Hash)
-
-        countries.add(toponym['country']) if toponym['country'].present?
-      end
-    end
-
-    countries.to_a.sort
+    points
+      .without_raw_data
+      .where.not(country_name: [nil, ''])
+      .distinct
+      .pluck(:country_name)
+      .compact
   end
 
-  # Aggregate cities from all stats' toponyms
-  # This respects MIN_MINUTES_SPENT_IN_CITY since toponyms are already filtered
   def cities_visited_uncached
-    cities = Set.new
-
-    stats.find_each do |stat|
-      toponyms = stat.toponyms
-      next unless toponyms.is_a?(Array)
-
-      toponyms.each do |toponym|
-        next unless toponym.is_a?(Hash)
-        next unless toponym['cities'].is_a?(Array)
-
-        toponym['cities'].each do |city|
-          next unless city.is_a?(Hash)
-
-          cities.add(city['city']) if city['city'].present?
-        end
-      end
-    end
-
-    cities.to_a.sort
+    points.where.not(city: [nil, '']).distinct.pluck(:city).compact
   end
 
   def home_place_coordinates

app/models/users/digest.rb

@@ -162,9 +162,6 @@ class Users::Digest < ApplicationRecord
   end
 
   def total_tracked_minutes
-    # Use total_country_minutes if available (new digests),
-    # fall back to summing top_countries_by_time (existing digests)
-    time_spent_by_location['total_country_minutes'] ||
-      top_countries_by_time.sum { |country| country['minutes'].to_i }
+    top_countries_by_time.sum { |country| country['minutes'].to_i }
   end
 end

app/serializers/api/user_serializer.rb

@@ -42,8 +42,7 @@ class Api::UserSerializer
       photoprism_url: user.safe_settings.photoprism_url,
       visits_suggestions_enabled: user.safe_settings.visits_suggestions_enabled?,
       speed_color_scale: user.safe_settings.speed_color_scale,
-      fog_of_war_threshold: user.safe_settings.fog_of_war_threshold,
-      globe_projection: user.safe_settings.globe_projection
+      fog_of_war_threshold: user.safe_settings.fog_of_war_threshold
     }
   end
 

app/services/users/digests/calculate_year.rb

@@ -66,7 +66,7 @@ module Users
           end
         end
 
-        country_cities.sort_by { |_country, cities| -cities.size }.map do |country, cities|
+        country_cities.sort_by { |country, _| country }.map do |country, cities|
           {
             'country' => country,
             'cities' => cities.to_a.sort.map { |city| { 'city' => city } }
@@ -90,16 +90,15 @@ module Users
       end
 
       def calculate_time_spent
-        country_minutes = calculate_actual_country_minutes
-
         {
-          'countries' => format_top_countries(country_minutes),
-          'cities' => calculate_city_time_spent,
-          'total_country_minutes' => country_minutes.values.sum
+          'countries' => calculate_country_time_spent,
+          'cities' => calculate_city_time_spent
         }
       end
 
-      def format_top_countries(country_minutes)
+      def calculate_country_time_spent
+        country_minutes = calculate_actual_country_minutes
+
         country_minutes
           .sort_by { |_, minutes| -minutes }
           .first(10)
@@ -216,8 +215,8 @@ module Users
 
       def calculate_all_time_stats
         {
-          'total_countries' => user.countries_visited_uncached.size,
-          'total_cities' => user.cities_visited_uncached.size,
+          'total_countries' => user.countries_visited.count,
+          'total_cities' => user.cities_visited.count,
           'total_distance' => user.stats.sum(:distance).to_s
         }
       end

app/services/users/safe_settings.rb

@@ -22,8 +22,7 @@ class Users::SafeSettings
     'visits_suggestions_enabled' => 'true',
     'enabled_map_layers' => %w[Routes Heatmap],
     'maps_maplibre_style' => 'light',
-    'digest_emails_enabled' => true,
-    'globe_projection' => false
+    'digest_emails_enabled' => true
   }.freeze
 
   def initialize(settings = {})
@@ -53,8 +52,7 @@ class Users::SafeSettings
       speed_color_scale: speed_color_scale,
       fog_of_war_threshold: fog_of_war_threshold,
       enabled_map_layers: enabled_map_layers,
-      maps_maplibre_style: maps_maplibre_style,
-      globe_projection: globe_projection
+      maps_maplibre_style: maps_maplibre_style
     }
   end
   # rubocop:enable Metrics/MethodLength
@@ -143,10 +141,6 @@ class Users::SafeSettings
     settings['maps_maplibre_style']
   end
 
-  def globe_projection
-    ActiveModel::Type::Boolean.new.cast(settings['globe_projection'])
-  end
-
   def digest_emails_enabled?
     value = settings['digest_emails_enabled']
     return true if value.nil?

app/views/map/maplibre/_settings_panel.html.erb

@@ -365,19 +365,6 @@
             </select>
           </div>
 
-          <!-- Globe Projection -->
-          <div class="form-control">
-            <label class="label cursor-pointer justify-start gap-3">
-              <input type="checkbox"
-                     name="globeProjection"
-                     class="toggle toggle-primary"
-                     data-maps--maplibre-target="globeToggle"
-                     data-action="change->maps--maplibre#toggleGlobe" />
-              <span class="label-text font-medium">Globe View</span>
-            </label>
-            <p class="text-sm text-base-content/60 mt-1">Render map as a 3D globe (requires page reload)</p>
-          </div>
-
           <div class="divider"></div>
 
           <!-- Route Opacity -->

app/views/users/digests/show.html.erb

@@ -168,7 +168,14 @@
       </h2>
       <div class="space-y-4 w-full">
         <% if @digest.toponyms.present? %>
+          <% max_cities = @digest.toponyms.map { |country| country['cities']&.length || 0 }.max %>
+          <% progress_colors = ['progress-primary', 'progress-secondary', 'progress-accent', 'progress-info', 'progress-success', 'progress-warning'] %>
+
           <% @digest.toponyms.each_with_index do |country, index| %>
+            <% cities_count = country['cities']&.length || 0 %>
+            <% progress_value = max_cities&.positive? ? (cities_count.to_f / max_cities * 100).round : 0 %>
+            <% color_class = progress_colors[index % progress_colors.length] %>
+
             <div class="space-y-2">
               <div class="flex justify-between items-center">
                 <span class="font-semibold">
@@ -176,10 +183,10 @@
                   <%= country['country'] %>
                 </span>
                 <span class="text-sm">
-                  <%= pluralize(country['cities']&.length || 0, 'city') %>
+                  <%= pluralize(cities_count, 'city') %>
                 </span>
               </div>
-              <progress class="progress <%= progress_color_for_index(index) %> w-full" value="<%= city_progress_value(country['cities']&.length || 0, max_cities_count(@digest.toponyms)) %>" max="100"></progress>
+              <progress class="progress <%= color_class %> w-full" value="<%= progress_value %>" max="100"></progress>
             </div>
           <% end %>
         <% else %>

e2e/setup/auth.setup.js

@@ -1,5 +1,4 @@
 import { test as setup, expect } from '@playwright/test';
-import { disableGlobeProjection } from '../v2/helpers/setup.js';
 
 const authFile = 'e2e/temp/.auth/user.json';
 
@@ -20,9 +19,6 @@ setup('authenticate', async ({ page }) => {
   // Wait for successful navigation to map (v1 or v2 depending on user preference)
   await page.waitForURL(/\/map(\/v[12])?/, { timeout: 10000 });
 
-  // Disable globe projection to ensure consistent E2E test behavior
-  await disableGlobeProjection(page);
-
   // Save authentication state
   await page.context().storageState({ path: authFile });
 });

e2e/v2/helpers/setup.js

@@ -2,33 +2,6 @@
  * Helper functions for Maps V2 E2E tests
  */
 
-/**
- * Disable globe projection setting via API
- * This ensures consistent map rendering for E2E tests
- * @param {Page} page - Playwright page object
- */
-export async function disableGlobeProjection(page) {
-  // Get API key from the page (requires being logged in)
-  const apiKey = await page.evaluate(() => {
-    const metaTag = document.querySelector('meta[name="api-key"]');
-    return metaTag?.content;
-  });
-
-  if (apiKey) {
-    await page.request.patch('/api/v1/settings', {
-      headers: {
-        'Authorization': `Bearer ${apiKey}`,
-        'Content-Type': 'application/json'
-      },
-      data: {
-        settings: {
-          globe_projection: false
-        }
-      }
-    });
-  }
-}
-
 /**
  * Navigate to Maps V2 page
  * @param {Page} page - Playwright page object

spec/models/user_spec.rb

@@ -163,16 +163,12 @@ RSpec.describe User, type: :model do
     describe '#countries_visited' do
       subject { user.countries_visited }
 
-      let!(:stat) do
-        create(:stat, user:, toponyms: [
-                 { 'country' => 'Germany', 'cities' => [{ 'city' => 'Berlin', 'stayed_for' => 120 }] },
-                 { 'country' => 'France', 'cities' => [{ 'city' => 'Paris', 'stayed_for' => 90 }] },
-                 { 'country' => nil, 'cities' => [] },
-                 { 'country' => '', 'cities' => [] }
-               ])
-      end
+      let!(:point1) { create(:point, user:, country_name: 'Germany') }
+      let!(:point2) { create(:point, user:, country_name: 'France') }
+      let!(:point3) { create(:point, user:, country_name: nil) }
+      let!(:point4) { create(:point, user:, country_name: '') }
 
-      it 'returns array of countries from stats toponyms' do
+      it 'returns array of countries' do
         expect(subject).to include('Germany', 'France')
         expect(subject.count).to eq(2)
       end
@@ -185,18 +181,12 @@ RSpec.describe User, type: :model do
     describe '#cities_visited' do
       subject { user.cities_visited }
 
-      let!(:stat) do
-        create(:stat, user:, toponyms: [
-                 { 'country' => 'Germany', 'cities' => [
-                   { 'city' => 'Berlin', 'stayed_for' => 120 },
-                   { 'city' => nil, 'stayed_for' => 60 },
-                   { 'city' => '', 'stayed_for' => 60 }
-                 ] },
-                 { 'country' => 'France', 'cities' => [{ 'city' => 'Paris', 'stayed_for' => 90 }] }
-               ])
-      end
+      let!(:point1) { create(:point, user:, city: 'Berlin') }
+      let!(:point2) { create(:point, user:, city: 'Paris') }
+      let!(:point3) { create(:point, user:, city: nil) }
+      let!(:point4) { create(:point, user:, city: '') }
 
-      it 'returns array of cities from stats toponyms' do
+      it 'returns array of cities' do
         expect(subject).to include('Berlin', 'Paris')
         expect(subject.count).to eq(2)
       end
@@ -220,15 +210,11 @@ RSpec.describe User, type: :model do
     describe '#total_countries' do
       subject { user.total_countries }
 
-      let!(:stat) do
-        create(:stat, user:, toponyms: [
-                 { 'country' => 'Germany', 'cities' => [] },
-                 { 'country' => 'France', 'cities' => [] },
-                 { 'country' => nil, 'cities' => [] }
-               ])
-      end
+      let!(:point1) { create(:point, user:, country_name: 'Germany') }
+      let!(:point2) { create(:point, user:, country_name: 'France') }
+      let!(:point3) { create(:point, user:, country_name: nil) }
 
-      it 'returns number of countries from stats toponyms' do
+      it 'returns number of countries' do
         expect(subject).to eq(2)
       end
     end
@@ -236,17 +222,11 @@ RSpec.describe User, type: :model do
     describe '#total_cities' do
       subject { user.total_cities }
 
-      let!(:stat) do
-        create(:stat, user:, toponyms: [
-                 { 'country' => 'Germany', 'cities' => [
-                   { 'city' => 'Berlin', 'stayed_for' => 120 },
-                   { 'city' => 'Paris', 'stayed_for' => 90 },
-                   { 'city' => nil, 'stayed_for' => 60 }
-                 ] }
-               ])
-      end
+      let!(:point1) { create(:point, user:, city: 'Berlin') }
+      let!(:point2) { create(:point, user:, city: 'Paris') }
+      let!(:point3) { create(:point, user:, city: nil) }
 
-      it 'returns number of cities from stats toponyms' do
+      it 'returns number of cities' do
         expect(subject).to eq(2)
       end
     end

spec/services/users/safe_settings_spec.rb

@@ -31,8 +31,7 @@ RSpec.describe Users::SafeSettings do
             speed_color_scale: nil,
             fog_of_war_threshold: nil,
             enabled_map_layers: %w[Routes Heatmap],
-            maps_maplibre_style: 'light',
-            globe_projection: false
+            maps_maplibre_style: 'light'
           }
         )
       end
@@ -83,8 +82,7 @@ RSpec.describe Users::SafeSettings do
             'visits_suggestions_enabled' => false,
             'enabled_map_layers' => %w[Points Routes Areas Photos],
             'maps_maplibre_style' => 'light',
-            'digest_emails_enabled' => true,
-            'globe_projection' => false
+            'digest_emails_enabled' => true
           }
         )
       end
@@ -112,8 +110,7 @@ RSpec.describe Users::SafeSettings do
             speed_color_scale: nil,
             fog_of_war_threshold: nil,
             enabled_map_layers: %w[Points Routes Areas Photos],
-            maps_maplibre_style: 'light',
-            globe_projection: false
+            maps_maplibre_style: 'light'
           }
         )
       end