mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-10 01:01:39 -05:00
Compare commits
3 commits
6708d21866
...
30db20081e
| Author | SHA1 | Date | |
|---|---|---|---|
|
30db20081e | ||
|
|
29f81738df | ||
|
|
69705c83de |
42 changed files with 802 additions and 165 deletions
|
|
@ -1 +1 @@
|
||||||
0.37.1
|
0.37.2
|
||||||
|
|
|
||||||
10
CHANGELOG.md
10
CHANGELOG.md
|
|
@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
|
||||||
The format is based on [Keep a Changelog](http://keepachangelog.com/)
|
The format is based on [Keep a Changelog](http://keepachangelog.com/)
|
||||||
and this project adheres to [Semantic Versioning](http://semver.org/).
|
and this project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
|
|
||||||
|
# [0.37.2] - 2026-01-04
|
||||||
|
|
||||||
|
## Fixed
|
||||||
|
|
||||||
|
- Months are now correctly ordered (Jan-Dec) in the year-end digest chart instead of being sorted alphabetically.
|
||||||
|
- 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
|
# [0.37.1] - 2025-12-30
|
||||||
|
|
||||||
## Fixed
|
## Fixed
|
||||||
|
|
|
||||||
3
Gemfile
3
Gemfile
|
|
@ -12,6 +12,7 @@ gem 'aws-sdk-kms', '~> 1.96.0', require: false
|
||||||
gem 'aws-sdk-s3', '~> 1.177.0', require: false
|
gem 'aws-sdk-s3', '~> 1.177.0', require: false
|
||||||
gem 'bootsnap', require: false
|
gem 'bootsnap', require: false
|
||||||
gem 'chartkick'
|
gem 'chartkick'
|
||||||
|
gem 'connection_pool', '< 3' # Pin to 2.x - version 3.0+ has breaking API changes with Rails RedisCacheStore
|
||||||
gem 'data_migrate'
|
gem 'data_migrate'
|
||||||
gem 'devise'
|
gem 'devise'
|
||||||
gem 'foreman'
|
gem 'foreman'
|
||||||
|
|
@ -48,7 +49,7 @@ gem 'rswag-ui'
|
||||||
gem 'rubyzip', '~> 3.2'
|
gem 'rubyzip', '~> 3.2'
|
||||||
gem 'sentry-rails', '>= 5.27.0'
|
gem 'sentry-rails', '>= 5.27.0'
|
||||||
gem 'sentry-ruby'
|
gem 'sentry-ruby'
|
||||||
gem 'sidekiq', '>= 8.0.5'
|
gem 'sidekiq', '8.0.10' # Pin to 8.0.x - sidekiq 8.1+ requires connection_pool 3.0+ which has breaking changes with Rails
|
||||||
gem 'sidekiq-cron', '>= 2.3.1'
|
gem 'sidekiq-cron', '>= 2.3.1'
|
||||||
gem 'sidekiq-limit_fetch'
|
gem 'sidekiq-limit_fetch'
|
||||||
gem 'sprockets-rails'
|
gem 'sprockets-rails'
|
||||||
|
|
|
||||||
48
Gemfile.lock
48
Gemfile.lock
|
|
@ -109,7 +109,7 @@ GEM
|
||||||
base64 (0.3.0)
|
base64 (0.3.0)
|
||||||
bcrypt (3.1.20)
|
bcrypt (3.1.20)
|
||||||
benchmark (0.5.0)
|
benchmark (0.5.0)
|
||||||
bigdecimal (3.3.1)
|
bigdecimal (4.0.1)
|
||||||
bindata (2.5.1)
|
bindata (2.5.1)
|
||||||
bootsnap (1.18.6)
|
bootsnap (1.18.6)
|
||||||
msgpack (~> 1.2)
|
msgpack (~> 1.2)
|
||||||
|
|
@ -129,10 +129,10 @@ GEM
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
regexp_parser (>= 1.5, < 3.0)
|
regexp_parser (>= 1.5, < 3.0)
|
||||||
xpath (~> 3.2)
|
xpath (~> 3.2)
|
||||||
chartkick (5.2.0)
|
chartkick (5.2.1)
|
||||||
chunky_png (1.4.0)
|
chunky_png (1.4.0)
|
||||||
coderay (1.1.3)
|
coderay (1.1.3)
|
||||||
concurrent-ruby (1.3.5)
|
concurrent-ruby (1.3.6)
|
||||||
connection_pool (2.5.5)
|
connection_pool (2.5.5)
|
||||||
crack (1.0.1)
|
crack (1.0.1)
|
||||||
bigdecimal
|
bigdecimal
|
||||||
|
|
@ -215,7 +215,7 @@ GEM
|
||||||
csv
|
csv
|
||||||
mini_mime (>= 1.0.0)
|
mini_mime (>= 1.0.0)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
i18n (1.14.7)
|
i18n (1.14.8)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
importmap-rails (2.2.2)
|
importmap-rails (2.2.2)
|
||||||
actionpack (>= 6.0.0)
|
actionpack (>= 6.0.0)
|
||||||
|
|
@ -227,7 +227,7 @@ GEM
|
||||||
rdoc (>= 4.0.0)
|
rdoc (>= 4.0.0)
|
||||||
reline (>= 0.4.2)
|
reline (>= 0.4.2)
|
||||||
jmespath (1.6.2)
|
jmespath (1.6.2)
|
||||||
json (2.15.0)
|
json (2.18.0)
|
||||||
json-jwt (1.17.0)
|
json-jwt (1.17.0)
|
||||||
activesupport (>= 4.2)
|
activesupport (>= 4.2)
|
||||||
aes_key_wrap
|
aes_key_wrap
|
||||||
|
|
@ -273,11 +273,12 @@ GEM
|
||||||
method_source (1.1.0)
|
method_source (1.1.0)
|
||||||
mini_mime (1.1.5)
|
mini_mime (1.1.5)
|
||||||
mini_portile2 (2.8.9)
|
mini_portile2 (2.8.9)
|
||||||
minitest (5.26.2)
|
minitest (6.0.1)
|
||||||
|
prism (~> 1.5)
|
||||||
msgpack (1.7.3)
|
msgpack (1.7.3)
|
||||||
multi_json (1.15.0)
|
multi_json (1.15.0)
|
||||||
multi_xml (0.7.1)
|
multi_xml (0.8.0)
|
||||||
bigdecimal (~> 3.1)
|
bigdecimal (>= 3.1, < 5)
|
||||||
net-http (0.6.0)
|
net-http (0.6.0)
|
||||||
uri
|
uri
|
||||||
net-imap (0.5.12)
|
net-imap (0.5.12)
|
||||||
|
|
@ -356,7 +357,7 @@ GEM
|
||||||
json
|
json
|
||||||
yaml
|
yaml
|
||||||
parallel (1.27.0)
|
parallel (1.27.0)
|
||||||
parser (3.3.9.0)
|
parser (3.3.10.0)
|
||||||
ast (~> 2.4.1)
|
ast (~> 2.4.1)
|
||||||
racc
|
racc
|
||||||
patience_diff (1.2.0)
|
patience_diff (1.2.0)
|
||||||
|
|
@ -369,7 +370,7 @@ GEM
|
||||||
pp (0.6.3)
|
pp (0.6.3)
|
||||||
prettyprint
|
prettyprint
|
||||||
prettyprint (0.2.0)
|
prettyprint (0.2.0)
|
||||||
prism (1.5.1)
|
prism (1.7.0)
|
||||||
prometheus_exporter (2.2.0)
|
prometheus_exporter (2.2.0)
|
||||||
webrick
|
webrick
|
||||||
pry (0.15.2)
|
pry (0.15.2)
|
||||||
|
|
@ -462,7 +463,7 @@ GEM
|
||||||
tsort
|
tsort
|
||||||
redis (5.4.1)
|
redis (5.4.1)
|
||||||
redis-client (>= 0.22.0)
|
redis-client (>= 0.22.0)
|
||||||
redis-client (0.26.1)
|
redis-client (0.26.2)
|
||||||
connection_pool
|
connection_pool
|
||||||
regexp_parser (2.11.3)
|
regexp_parser (2.11.3)
|
||||||
reline (0.6.3)
|
reline (0.6.3)
|
||||||
|
|
@ -512,7 +513,7 @@ GEM
|
||||||
rswag-ui (2.17.0)
|
rswag-ui (2.17.0)
|
||||||
actionpack (>= 5.2, < 8.2)
|
actionpack (>= 5.2, < 8.2)
|
||||||
railties (>= 5.2, < 8.2)
|
railties (>= 5.2, < 8.2)
|
||||||
rubocop (1.81.1)
|
rubocop (1.82.1)
|
||||||
json (~> 2.3)
|
json (~> 2.3)
|
||||||
language_server-protocol (~> 3.17.0.2)
|
language_server-protocol (~> 3.17.0.2)
|
||||||
lint_roller (~> 1.1.0)
|
lint_roller (~> 1.1.0)
|
||||||
|
|
@ -520,20 +521,20 @@ GEM
|
||||||
parser (>= 3.3.0.2)
|
parser (>= 3.3.0.2)
|
||||||
rainbow (>= 2.2.2, < 4.0)
|
rainbow (>= 2.2.2, < 4.0)
|
||||||
regexp_parser (>= 2.9.3, < 3.0)
|
regexp_parser (>= 2.9.3, < 3.0)
|
||||||
rubocop-ast (>= 1.47.1, < 2.0)
|
rubocop-ast (>= 1.48.0, < 2.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (>= 2.4.0, < 4.0)
|
unicode-display_width (>= 2.4.0, < 4.0)
|
||||||
rubocop-ast (1.47.1)
|
rubocop-ast (1.49.0)
|
||||||
parser (>= 3.3.7.2)
|
parser (>= 3.3.7.2)
|
||||||
prism (~> 1.4)
|
prism (~> 1.7)
|
||||||
rubocop-rails (2.33.4)
|
rubocop-rails (2.34.2)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
lint_roller (~> 1.1)
|
lint_roller (~> 1.1)
|
||||||
rack (>= 1.1)
|
rack (>= 1.1)
|
||||||
rubocop (>= 1.75.0, < 2.0)
|
rubocop (>= 1.75.0, < 2.0)
|
||||||
rubocop-ast (>= 1.44.0, < 2.0)
|
rubocop-ast (>= 1.44.0, < 2.0)
|
||||||
ruby-progressbar (1.13.0)
|
ruby-progressbar (1.13.0)
|
||||||
rubyzip (3.2.0)
|
rubyzip (3.2.2)
|
||||||
securerandom (0.4.1)
|
securerandom (0.4.1)
|
||||||
selenium-webdriver (4.35.0)
|
selenium-webdriver (4.35.0)
|
||||||
base64 (~> 0.2)
|
base64 (~> 0.2)
|
||||||
|
|
@ -541,15 +542,15 @@ GEM
|
||||||
rexml (~> 3.2, >= 3.2.5)
|
rexml (~> 3.2, >= 3.2.5)
|
||||||
rubyzip (>= 1.2.2, < 4.0)
|
rubyzip (>= 1.2.2, < 4.0)
|
||||||
websocket (~> 1.0)
|
websocket (~> 1.0)
|
||||||
sentry-rails (6.1.1)
|
sentry-rails (6.2.0)
|
||||||
railties (>= 5.2.0)
|
railties (>= 5.2.0)
|
||||||
sentry-ruby (~> 6.1.1)
|
sentry-ruby (~> 6.2.0)
|
||||||
sentry-ruby (6.1.1)
|
sentry-ruby (6.2.0)
|
||||||
bigdecimal
|
bigdecimal
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
shoulda-matchers (6.5.0)
|
shoulda-matchers (6.5.0)
|
||||||
activesupport (>= 5.2.0)
|
activesupport (>= 5.2.0)
|
||||||
sidekiq (8.0.8)
|
sidekiq (8.0.10)
|
||||||
connection_pool (>= 2.5.0)
|
connection_pool (>= 2.5.0)
|
||||||
json (>= 2.9.0)
|
json (>= 2.9.0)
|
||||||
logger (>= 1.6.2)
|
logger (>= 1.6.2)
|
||||||
|
|
@ -613,7 +614,7 @@ GEM
|
||||||
unicode (0.4.4.5)
|
unicode (0.4.4.5)
|
||||||
unicode-display_width (3.2.0)
|
unicode-display_width (3.2.0)
|
||||||
unicode-emoji (~> 4.1)
|
unicode-emoji (~> 4.1)
|
||||||
unicode-emoji (4.1.0)
|
unicode-emoji (4.2.0)
|
||||||
uri (1.1.1)
|
uri (1.1.1)
|
||||||
useragent (0.16.11)
|
useragent (0.16.11)
|
||||||
validate_url (1.0.15)
|
validate_url (1.0.15)
|
||||||
|
|
@ -662,6 +663,7 @@ DEPENDENCIES
|
||||||
bundler-audit
|
bundler-audit
|
||||||
capybara
|
capybara
|
||||||
chartkick
|
chartkick
|
||||||
|
connection_pool (< 3)
|
||||||
data_migrate
|
data_migrate
|
||||||
database_consistency (>= 2.0.5)
|
database_consistency (>= 2.0.5)
|
||||||
debug
|
debug
|
||||||
|
|
@ -711,7 +713,7 @@ DEPENDENCIES
|
||||||
sentry-rails (>= 5.27.0)
|
sentry-rails (>= 5.27.0)
|
||||||
sentry-ruby
|
sentry-ruby
|
||||||
shoulda-matchers
|
shoulda-matchers
|
||||||
sidekiq (>= 8.0.5)
|
sidekiq (= 8.0.10)
|
||||||
sidekiq-cron (>= 2.3.1)
|
sidekiq-cron (>= 2.3.1)
|
||||||
sidekiq-limit_fetch
|
sidekiq-limit_fetch
|
||||||
simplecov
|
simplecov
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ class Api::V1::SettingsController < ApiController
|
||||||
:preferred_map_layer, :points_rendering_mode, :live_map_enabled,
|
:preferred_map_layer, :points_rendering_mode, :live_map_enabled,
|
||||||
:immich_url, :immich_api_key, :photoprism_url, :photoprism_api_key,
|
:immich_url, :immich_api_key, :photoprism_url, :photoprism_api_key,
|
||||||
:speed_colored_routes, :speed_color_scale, :fog_of_war_threshold,
|
:speed_colored_routes, :speed_color_scale, :fog_of_war_threshold,
|
||||||
:maps_v2_style, :maps_maplibre_style,
|
:maps_v2_style, :maps_maplibre_style, :globe_projection,
|
||||||
enabled_map_layers: []
|
enabled_map_layers: []
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ class Users::DigestsController < ApplicationController
|
||||||
|
|
||||||
before_action :authenticate_user!
|
before_action :authenticate_user!
|
||||||
before_action :authenticate_active_user!, only: [:create]
|
before_action :authenticate_active_user!, only: [:create]
|
||||||
before_action :set_digest, only: [:show]
|
before_action :set_digest, only: %i[show destroy]
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@digests = current_user.digests.yearly.order(year: :desc)
|
@digests = current_user.digests.yearly.order(year: :desc)
|
||||||
|
|
@ -30,6 +30,12 @@ class Users::DigestsController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def destroy
|
||||||
|
year = @digest.year
|
||||||
|
@digest.destroy!
|
||||||
|
redirect_to users_digests_path, notice: "Year-end digest for #{year} has been deleted", status: :see_other
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def set_digest
|
def set_digest
|
||||||
|
|
@ -42,7 +48,7 @@ class Users::DigestsController < ApplicationController
|
||||||
tracked_years = current_user.stats.select(:year).distinct.pluck(:year)
|
tracked_years = current_user.stats.select(:year).distinct.pluck(:year)
|
||||||
existing_digests = current_user.digests.yearly.pluck(:year)
|
existing_digests = current_user.digests.yearly.pluck(:year)
|
||||||
|
|
||||||
(tracked_years - existing_digests).sort.reverse
|
(tracked_years - existing_digests - [Time.current.year]).sort.reverse
|
||||||
end
|
end
|
||||||
|
|
||||||
def valid_year?(year)
|
def valid_year?(year)
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,27 @@
|
||||||
|
|
||||||
module Users
|
module Users
|
||||||
module DigestsHelper
|
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)
|
def distance_with_unit(distance_meters, unit)
|
||||||
value = Users::Digest.convert_distance(distance_meters, unit).round
|
value = Users::Digest.convert_distance(distance_meters, unit).round
|
||||||
"#{number_with_delimiter(value)} #{unit}"
|
"#{number_with_delimiter(value)} #{unit}"
|
||||||
|
|
|
||||||
|
|
@ -56,22 +56,36 @@ export class DataLoader {
|
||||||
}
|
}
|
||||||
data.visitsGeoJSON = this.visitsToGeoJSON(data.visits)
|
data.visitsGeoJSON = this.visitsToGeoJSON(data.visits)
|
||||||
|
|
||||||
// Fetch photos
|
// Fetch photos - only if photos layer is enabled and integration is configured
|
||||||
try {
|
// Skip API call if photos are disabled to avoid blocking on failed integrations
|
||||||
console.log('[Photos] Fetching photos from:', startDate, 'to', endDate)
|
if (this.settings.photosEnabled) {
|
||||||
data.photos = await this.api.fetchPhotos({
|
try {
|
||||||
start_at: startDate,
|
console.log('[Photos] Fetching photos from:', startDate, 'to', endDate)
|
||||||
end_at: endDate
|
// Use Promise.race to enforce a client-side timeout
|
||||||
})
|
const photosPromise = this.api.fetchPhotos({
|
||||||
console.log('[Photos] Fetched photos:', data.photos.length, 'photos')
|
start_at: startDate,
|
||||||
console.log('[Photos] Sample photo:', data.photos[0])
|
end_at: endDate
|
||||||
} catch (error) {
|
})
|
||||||
console.error('[Photos] Failed to fetch photos:', error)
|
const timeoutPromise = new Promise((_, reject) =>
|
||||||
|
setTimeout(() => reject(new Error('Photo fetch timeout')), 15000) // 15 second timeout
|
||||||
|
)
|
||||||
|
|
||||||
|
data.photos = await Promise.race([photosPromise, timeoutPromise])
|
||||||
|
console.log('[Photos] Fetched photos:', data.photos.length, 'photos')
|
||||||
|
console.log('[Photos] Sample photo:', data.photos[0])
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('[Photos] Failed to fetch photos (non-blocking):', error.message)
|
||||||
|
data.photos = []
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('[Photos] Photos layer disabled, skipping fetch')
|
||||||
data.photos = []
|
data.photos = []
|
||||||
}
|
}
|
||||||
data.photosGeoJSON = this.photosToGeoJSON(data.photos)
|
data.photosGeoJSON = this.photosToGeoJSON(data.photos)
|
||||||
console.log('[Photos] Converted to GeoJSON:', data.photosGeoJSON.features.length, 'features')
|
console.log('[Photos] Converted to GeoJSON:', data.photosGeoJSON.features.length, 'features')
|
||||||
console.log('[Photos] Sample feature:', data.photosGeoJSON.features[0])
|
if (data.photosGeoJSON.features.length > 0) {
|
||||||
|
console.log('[Photos] Sample feature:', data.photosGeoJSON.features[0])
|
||||||
|
}
|
||||||
|
|
||||||
// Fetch areas
|
// Fetch areas
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -16,17 +16,35 @@ export class MapInitializer {
|
||||||
mapStyle = 'streets',
|
mapStyle = 'streets',
|
||||||
center = [0, 0],
|
center = [0, 0],
|
||||||
zoom = 2,
|
zoom = 2,
|
||||||
showControls = true
|
showControls = true,
|
||||||
|
globeProjection = false
|
||||||
} = settings
|
} = settings
|
||||||
|
|
||||||
const style = await getMapStyle(mapStyle)
|
const style = await getMapStyle(mapStyle)
|
||||||
|
|
||||||
const map = new maplibregl.Map({
|
const mapOptions = {
|
||||||
container,
|
container,
|
||||||
style,
|
style,
|
||||||
center,
|
center,
|
||||||
zoom
|
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) {
|
if (showControls) {
|
||||||
map.addControl(new maplibregl.NavigationControl(), 'top-right')
|
map.addControl(new maplibregl.NavigationControl(), 'top-right')
|
||||||
|
|
|
||||||
|
|
@ -91,6 +91,11 @@ export class SettingsController {
|
||||||
mapStyleSelect.value = this.settings.mapStyle || 'light'
|
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
|
// Sync fog of war settings
|
||||||
const fogRadiusInput = controller.element.querySelector('input[name="fogOfWarRadius"]')
|
const fogRadiusInput = controller.element.querySelector('input[name="fogOfWarRadius"]')
|
||||||
if (fogRadiusInput) {
|
if (fogRadiusInput) {
|
||||||
|
|
@ -178,6 +183,22 @@ 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
|
* Update route opacity in real-time
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,8 @@ export default class extends Controller {
|
||||||
'speedColoredToggle',
|
'speedColoredToggle',
|
||||||
'speedColorScaleContainer',
|
'speedColorScaleContainer',
|
||||||
'speedColorScaleInput',
|
'speedColorScaleInput',
|
||||||
|
// Globe projection
|
||||||
|
'globeToggle',
|
||||||
// Family members
|
// Family members
|
||||||
'familyMembersList',
|
'familyMembersList',
|
||||||
'familyMembersContainer',
|
'familyMembersContainer',
|
||||||
|
|
@ -147,7 +149,8 @@ export default class extends Controller {
|
||||||
*/
|
*/
|
||||||
async initializeMap() {
|
async initializeMap() {
|
||||||
this.map = await MapInitializer.initialize(this.containerTarget, {
|
this.map = await MapInitializer.initialize(this.containerTarget, {
|
||||||
mapStyle: this.settings.mapStyle
|
mapStyle: this.settings.mapStyle,
|
||||||
|
globeProjection: this.settings.globeProjection
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -243,6 +246,7 @@ export default class extends Controller {
|
||||||
updateFogThresholdDisplay(event) { return this.settingsController.updateFogThresholdDisplay(event) }
|
updateFogThresholdDisplay(event) { return this.settingsController.updateFogThresholdDisplay(event) }
|
||||||
updateMetersBetweenDisplay(event) { return this.settingsController.updateMetersBetweenDisplay(event) }
|
updateMetersBetweenDisplay(event) { return this.settingsController.updateMetersBetweenDisplay(event) }
|
||||||
updateMinutesBetweenDisplay(event) { return this.settingsController.updateMinutesBetweenDisplay(event) }
|
updateMinutesBetweenDisplay(event) { return this.settingsController.updateMinutesBetweenDisplay(event) }
|
||||||
|
toggleGlobe(event) { return this.settingsController.toggleGlobe(event) }
|
||||||
|
|
||||||
// Area Selection Manager methods
|
// Area Selection Manager methods
|
||||||
startSelectArea() { return this.areaSelectionManager.startSelectArea() }
|
startSelectArea() { return this.areaSelectionManager.startSelectArea() }
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,8 @@ const DEFAULT_SETTINGS = {
|
||||||
minutesBetweenRoutes: 60,
|
minutesBetweenRoutes: 60,
|
||||||
pointsRenderingMode: 'raw',
|
pointsRenderingMode: 'raw',
|
||||||
speedColoredRoutes: false,
|
speedColoredRoutes: false,
|
||||||
speedColorScale: '0:#00ff00|15:#00ffff|30:#ff00ff|50:#ffff00|100:#ff3300'
|
speedColorScale: '0:#00ff00|15:#00ffff|30:#ff00ff|50:#ffff00|100:#ff3300',
|
||||||
|
globeProjection: false
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mapping between v2 layer names and v1 layer names in enabled_map_layers array
|
// Mapping between v2 layer names and v1 layer names in enabled_map_layers array
|
||||||
|
|
@ -41,7 +42,8 @@ const BACKEND_SETTINGS_MAP = {
|
||||||
minutesBetweenRoutes: 'minutes_between_routes',
|
minutesBetweenRoutes: 'minutes_between_routes',
|
||||||
pointsRenderingMode: 'points_rendering_mode',
|
pointsRenderingMode: 'points_rendering_mode',
|
||||||
speedColoredRoutes: 'speed_colored_routes',
|
speedColoredRoutes: 'speed_colored_routes',
|
||||||
speedColorScale: 'speed_color_scale'
|
speedColorScale: 'speed_color_scale',
|
||||||
|
globeProjection: 'globe_projection'
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SettingsManager {
|
export class SettingsManager {
|
||||||
|
|
@ -152,6 +154,8 @@ export class SettingsManager {
|
||||||
value = parseInt(value) || DEFAULT_SETTINGS.minutesBetweenRoutes
|
value = parseInt(value) || DEFAULT_SETTINGS.minutesBetweenRoutes
|
||||||
} else if (frontendKey === 'speedColoredRoutes') {
|
} else if (frontendKey === 'speedColoredRoutes') {
|
||||||
value = value === true || value === 'true'
|
value = value === true || value === 'true'
|
||||||
|
} else if (frontendKey === 'globeProjection') {
|
||||||
|
value = value === true || value === 'true'
|
||||||
}
|
}
|
||||||
|
|
||||||
frontendSettings[frontendKey] = value
|
frontendSettings[frontendKey] = value
|
||||||
|
|
@ -219,6 +223,8 @@ export class SettingsManager {
|
||||||
value = parseInt(value).toString()
|
value = parseInt(value).toString()
|
||||||
} else if (frontendKey === 'speedColoredRoutes') {
|
} else if (frontendKey === 'speedColoredRoutes') {
|
||||||
value = Boolean(value)
|
value = Boolean(value)
|
||||||
|
} else if (frontendKey === 'globeProjection') {
|
||||||
|
value = Boolean(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
backendSettings[backendKey] = value
|
backendSettings[backendKey] = value
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ class Users::Digests::CalculatingJob < ApplicationJob
|
||||||
queue_as :digests
|
queue_as :digests
|
||||||
|
|
||||||
def perform(user_id, year)
|
def perform(user_id, year)
|
||||||
|
recalculate_monthly_stats(user_id, year)
|
||||||
Users::Digests::CalculateYear.new(user_id, year).call
|
Users::Digests::CalculateYear.new(user_id, year).call
|
||||||
rescue StandardError => e
|
rescue StandardError => e
|
||||||
create_digest_failed_notification(user_id, e)
|
create_digest_failed_notification(user_id, e)
|
||||||
|
|
@ -11,6 +12,12 @@ class Users::Digests::CalculatingJob < ApplicationJob
|
||||||
|
|
||||||
private
|
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)
|
def create_digest_failed_notification(user_id, error)
|
||||||
user = User.find(user_id)
|
user = User.find(user_id)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,18 +45,13 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
|
||||||
|
|
||||||
def countries_visited
|
def countries_visited
|
||||||
Rails.cache.fetch("dawarich/user_#{id}_countries_visited", expires_in: 1.day) do
|
Rails.cache.fetch("dawarich/user_#{id}_countries_visited", expires_in: 1.day) do
|
||||||
points
|
countries_visited_uncached
|
||||||
.without_raw_data
|
|
||||||
.where.not(country_name: [nil, ''])
|
|
||||||
.distinct
|
|
||||||
.pluck(:country_name)
|
|
||||||
.compact
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def cities_visited
|
def cities_visited
|
||||||
Rails.cache.fetch("dawarich/user_#{id}_cities_visited", expires_in: 1.day) do
|
Rails.cache.fetch("dawarich/user_#{id}_cities_visited", expires_in: 1.day) do
|
||||||
points.where.not(city: [nil, '']).distinct.pluck(:city).compact
|
cities_visited_uncached
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -139,17 +134,47 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
|
||||||
Time.zone.name
|
Time.zone.name
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Aggregate countries from all stats' toponyms
|
||||||
|
# This is more accurate than raw point queries as it uses processed data
|
||||||
def countries_visited_uncached
|
def countries_visited_uncached
|
||||||
points
|
countries = Set.new
|
||||||
.without_raw_data
|
|
||||||
.where.not(country_name: [nil, ''])
|
stats.find_each do |stat|
|
||||||
.distinct
|
toponyms = stat.toponyms
|
||||||
.pluck(:country_name)
|
next unless toponyms.is_a?(Array)
|
||||||
.compact
|
|
||||||
|
toponyms.each do |toponym|
|
||||||
|
next unless toponym.is_a?(Hash)
|
||||||
|
|
||||||
|
countries.add(toponym['country']) if toponym['country'].present?
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
countries.to_a.sort
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Aggregate cities from all stats' toponyms
|
||||||
|
# This respects MIN_MINUTES_SPENT_IN_CITY since toponyms are already filtered
|
||||||
def cities_visited_uncached
|
def cities_visited_uncached
|
||||||
points.where.not(city: [nil, '']).distinct.pluck(:city).compact
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
def home_place_coordinates
|
def home_place_coordinates
|
||||||
|
|
|
||||||
|
|
@ -132,6 +132,11 @@ class Users::Digest < ApplicationRecord
|
||||||
(all_time_stats['total_distance'] || 0).to_i
|
(all_time_stats['total_distance'] || 0).to_i
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def untracked_days
|
||||||
|
days_in_year = Date.leap?(year) ? 366 : 365
|
||||||
|
[days_in_year - total_tracked_days, 0].max.round(1)
|
||||||
|
end
|
||||||
|
|
||||||
def distance_km
|
def distance_km
|
||||||
distance.to_f / 1000
|
distance.to_f / 1000
|
||||||
end
|
end
|
||||||
|
|
@ -151,4 +156,15 @@ class Users::Digest < ApplicationRecord
|
||||||
def generate_sharing_uuid
|
def generate_sharing_uuid
|
||||||
self.sharing_uuid ||= SecureRandom.uuid
|
self.sharing_uuid ||= SecureRandom.uuid
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def total_tracked_days
|
||||||
|
(total_tracked_minutes / 1440.0).round(1)
|
||||||
|
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 }
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,8 @@ class Api::UserSerializer
|
||||||
photoprism_url: user.safe_settings.photoprism_url,
|
photoprism_url: user.safe_settings.photoprism_url,
|
||||||
visits_suggestions_enabled: user.safe_settings.visits_suggestions_enabled?,
|
visits_suggestions_enabled: user.safe_settings.visits_suggestions_enabled?,
|
||||||
speed_color_scale: user.safe_settings.speed_color_scale,
|
speed_color_scale: user.safe_settings.speed_color_scale,
|
||||||
fog_of_war_threshold: user.safe_settings.fog_of_war_threshold
|
fog_of_war_threshold: user.safe_settings.fog_of_war_threshold,
|
||||||
|
globe_projection: user.safe_settings.globe_projection
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,17 @@ class CountriesAndCities
|
||||||
end
|
end
|
||||||
|
|
||||||
def calculate_duration_in_minutes(timestamps)
|
def calculate_duration_in_minutes(timestamps)
|
||||||
((timestamps.max - timestamps.min).to_i / 60)
|
return 0 if timestamps.size < 2
|
||||||
|
|
||||||
|
sorted = timestamps.sort
|
||||||
|
total_minutes = 0
|
||||||
|
gap_threshold_seconds = ::MIN_MINUTES_SPENT_IN_CITY * 60
|
||||||
|
|
||||||
|
sorted.each_cons(2) do |prev_ts, curr_ts|
|
||||||
|
interval_seconds = curr_ts - prev_ts
|
||||||
|
total_minutes += (interval_seconds / 60) if interval_seconds < gap_threshold_seconds
|
||||||
|
end
|
||||||
|
|
||||||
|
total_minutes
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,10 @@ class Immich::RequestPhotos
|
||||||
while page <= max_pages
|
while page <= max_pages
|
||||||
response = JSON.parse(
|
response = JSON.parse(
|
||||||
HTTParty.post(
|
HTTParty.post(
|
||||||
immich_api_base_url, headers: headers, body: request_body(page)
|
immich_api_base_url,
|
||||||
|
headers: headers,
|
||||||
|
body: request_body(page),
|
||||||
|
timeout: 10
|
||||||
).body
|
).body
|
||||||
)
|
)
|
||||||
Rails.logger.debug('==== IMMICH RESPONSE ====')
|
Rails.logger.debug('==== IMMICH RESPONSE ====')
|
||||||
|
|
@ -46,6 +49,9 @@ class Immich::RequestPhotos
|
||||||
end
|
end
|
||||||
|
|
||||||
data.flatten
|
data.flatten
|
||||||
|
rescue HTTParty::Error, Net::OpenTimeout, Net::ReadTimeout => e
|
||||||
|
Rails.logger.error("Immich photo fetch failed: #{e.message}")
|
||||||
|
[]
|
||||||
end
|
end
|
||||||
|
|
||||||
def headers
|
def headers
|
||||||
|
|
|
||||||
|
|
@ -43,13 +43,17 @@ class Photoprism::RequestPhotos
|
||||||
end
|
end
|
||||||
|
|
||||||
data.flatten
|
data.flatten
|
||||||
|
rescue HTTParty::Error, Net::OpenTimeout, Net::ReadTimeout => e
|
||||||
|
Rails.logger.error("Photoprism photo fetch failed: #{e.message}")
|
||||||
|
[]
|
||||||
end
|
end
|
||||||
|
|
||||||
def fetch_page(offset)
|
def fetch_page(offset)
|
||||||
response = HTTParty.get(
|
response = HTTParty.get(
|
||||||
photoprism_api_base_url,
|
photoprism_api_base_url,
|
||||||
headers: headers,
|
headers: headers,
|
||||||
query: request_params(offset)
|
query: request_params(offset),
|
||||||
|
timeout: 10
|
||||||
)
|
)
|
||||||
|
|
||||||
if response.code != 200
|
if response.code != 200
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@
|
||||||
module Users
|
module Users
|
||||||
module Digests
|
module Digests
|
||||||
class CalculateYear
|
class CalculateYear
|
||||||
|
MINUTES_PER_DAY = 1440
|
||||||
|
|
||||||
def initialize(user_id, year)
|
def initialize(user_id, year)
|
||||||
@user = ::User.find(user_id)
|
@user = ::User.find(user_id)
|
||||||
@year = year.to_i
|
@year = year.to_i
|
||||||
|
|
@ -50,7 +52,7 @@ module Users
|
||||||
next unless toponym.is_a?(Hash)
|
next unless toponym.is_a?(Hash)
|
||||||
|
|
||||||
country = toponym['country']
|
country = toponym['country']
|
||||||
next unless country.present?
|
next if country.blank?
|
||||||
|
|
||||||
if toponym['cities'].is_a?(Array)
|
if toponym['cities'].is_a?(Array)
|
||||||
toponym['cities'].each do |city|
|
toponym['cities'].each do |city|
|
||||||
|
|
@ -64,7 +66,7 @@ module Users
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
country_cities.sort_by { |country, _| country }.map do |country, cities|
|
country_cities.sort_by { |_country, cities| -cities.size }.map do |country, cities|
|
||||||
{
|
{
|
||||||
'country' => country,
|
'country' => country,
|
||||||
'cities' => cities.to_a.sort.map { |city| { 'city' => city } }
|
'cities' => cities.to_a.sort.map { |city| { 'city' => city } }
|
||||||
|
|
@ -88,35 +90,120 @@ module Users
|
||||||
end
|
end
|
||||||
|
|
||||||
def calculate_time_spent
|
def calculate_time_spent
|
||||||
country_time = Hash.new(0)
|
country_minutes = calculate_actual_country_minutes
|
||||||
city_time = Hash.new(0)
|
|
||||||
|
|
||||||
monthly_stats.each do |stat|
|
{
|
||||||
toponyms = stat.toponyms
|
'countries' => format_top_countries(country_minutes),
|
||||||
next unless toponyms.is_a?(Array)
|
'cities' => calculate_city_time_spent,
|
||||||
|
'total_country_minutes' => country_minutes.values.sum
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
toponyms.each do |toponym|
|
def format_top_countries(country_minutes)
|
||||||
next unless toponym.is_a?(Hash)
|
country_minutes
|
||||||
|
.sort_by { |_, minutes| -minutes }
|
||||||
|
.first(10)
|
||||||
|
.map { |name, minutes| { 'name' => name, 'minutes' => minutes } }
|
||||||
|
end
|
||||||
|
|
||||||
country = toponym['country']
|
def calculate_actual_country_minutes
|
||||||
next unless toponym['cities'].is_a?(Array)
|
points_by_date = group_points_by_date
|
||||||
|
country_minutes = Hash.new(0)
|
||||||
|
|
||||||
toponym['cities'].each do |city|
|
points_by_date.each do |_date, day_points|
|
||||||
next unless city.is_a?(Hash)
|
countries_on_day = day_points.map(&:country_name).uniq
|
||||||
|
|
||||||
stayed_for = city['stayed_for'].to_i
|
if countries_on_day.size == 1
|
||||||
city_name = city['city']
|
# Single country day - assign full day
|
||||||
|
country_minutes[countries_on_day.first] += MINUTES_PER_DAY
|
||||||
country_time[country] += stayed_for if country.present?
|
else
|
||||||
city_time[city_name] += stayed_for if city_name.present?
|
# Multi-country day - calculate proportional time
|
||||||
end
|
calculate_proportional_time(day_points, country_minutes)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
{
|
country_minutes
|
||||||
'countries' => country_time.sort_by { |_, v| -v }.first(10).map { |name, minutes| { 'name' => name, 'minutes' => minutes } },
|
end
|
||||||
'cities' => city_time.sort_by { |_, v| -v }.first(10).map { |name, minutes| { 'name' => name, 'minutes' => minutes } }
|
|
||||||
}
|
def group_points_by_date
|
||||||
|
points = fetch_year_points_with_country_ordered
|
||||||
|
|
||||||
|
points.group_by do |point|
|
||||||
|
Time.zone.at(point.timestamp).to_date
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def calculate_proportional_time(day_points, country_minutes)
|
||||||
|
country_spans = Hash.new(0)
|
||||||
|
points_by_country = day_points.group_by(&:country_name)
|
||||||
|
|
||||||
|
points_by_country.each do |country, country_points|
|
||||||
|
timestamps = country_points.map(&:timestamp)
|
||||||
|
span_seconds = timestamps.max - timestamps.min
|
||||||
|
# Minimum 60 seconds (1 min) for single-point countries
|
||||||
|
country_spans[country] = [span_seconds, 60].max
|
||||||
|
end
|
||||||
|
|
||||||
|
total_spans = country_spans.values.sum.to_f
|
||||||
|
|
||||||
|
country_spans.each do |country, span|
|
||||||
|
proportional_minutes = (span / total_spans * MINUTES_PER_DAY).round
|
||||||
|
country_minutes[country] += proportional_minutes
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def fetch_year_points_with_country_ordered
|
||||||
|
start_of_year = Time.zone.local(year, 1, 1, 0, 0, 0)
|
||||||
|
end_of_year = start_of_year.end_of_year
|
||||||
|
|
||||||
|
user.points
|
||||||
|
.without_raw_data
|
||||||
|
.where('timestamp >= ? AND timestamp <= ?', start_of_year.to_i, end_of_year.to_i)
|
||||||
|
.where.not(country_name: [nil, ''])
|
||||||
|
.select(:country_name, :timestamp)
|
||||||
|
.order(timestamp: :asc)
|
||||||
|
end
|
||||||
|
|
||||||
|
def calculate_city_time_spent
|
||||||
|
city_time = aggregate_city_time_from_monthly_stats
|
||||||
|
|
||||||
|
city_time
|
||||||
|
.sort_by { |_, minutes| -minutes }
|
||||||
|
.first(10)
|
||||||
|
.map { |name, minutes| { 'name' => name, 'minutes' => minutes } }
|
||||||
|
end
|
||||||
|
|
||||||
|
def aggregate_city_time_from_monthly_stats
|
||||||
|
city_time = Hash.new(0)
|
||||||
|
|
||||||
|
monthly_stats.each do |stat|
|
||||||
|
process_stat_toponyms(stat, city_time)
|
||||||
|
end
|
||||||
|
|
||||||
|
city_time
|
||||||
|
end
|
||||||
|
|
||||||
|
def process_stat_toponyms(stat, city_time)
|
||||||
|
toponyms = stat.toponyms
|
||||||
|
return unless toponyms.is_a?(Array)
|
||||||
|
|
||||||
|
toponyms.each do |toponym|
|
||||||
|
process_toponym_cities(toponym, city_time)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def process_toponym_cities(toponym, city_time)
|
||||||
|
return unless toponym.is_a?(Hash)
|
||||||
|
return unless toponym['cities'].is_a?(Array)
|
||||||
|
|
||||||
|
toponym['cities'].each do |city|
|
||||||
|
next unless city.is_a?(Hash)
|
||||||
|
|
||||||
|
stayed_for = city['stayed_for'].to_i
|
||||||
|
city_name = city['city']
|
||||||
|
|
||||||
|
city_time[city_name] += stayed_for if city_name.present?
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def calculate_first_time_visits
|
def calculate_first_time_visits
|
||||||
|
|
@ -129,8 +216,8 @@ module Users
|
||||||
|
|
||||||
def calculate_all_time_stats
|
def calculate_all_time_stats
|
||||||
{
|
{
|
||||||
'total_countries' => user.countries_visited.count,
|
'total_countries' => user.countries_visited_uncached.size,
|
||||||
'total_cities' => user.cities_visited.count,
|
'total_cities' => user.cities_visited_uncached.size,
|
||||||
'total_distance' => user.stats.sum(:distance).to_s
|
'total_distance' => user.stats.sum(:distance).to_s
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ class Users::ExportData::Points
|
||||||
|
|
||||||
output_file.write('[')
|
output_file.write('[')
|
||||||
|
|
||||||
user.points.find_in_batches(batch_size: BATCH_SIZE).with_index do |batch, batch_index|
|
user.points.find_in_batches(batch_size: BATCH_SIZE).with_index do |batch, _batch_index|
|
||||||
batch_sql = build_batch_query(batch.map(&:id))
|
batch_sql = build_batch_query(batch.map(&:id))
|
||||||
result = ActiveRecord::Base.connection.exec_query(batch_sql, 'Points Export Batch')
|
result = ActiveRecord::Base.connection.exec_query(batch_sql, 'Points Export Batch')
|
||||||
|
|
||||||
|
|
@ -188,13 +188,13 @@ class Users::ExportData::Points
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
if row['visit_name']
|
return unless row['visit_name']
|
||||||
point_hash['visit_reference'] = {
|
|
||||||
'name' => row['visit_name'],
|
point_hash['visit_reference'] = {
|
||||||
'started_at' => row['visit_started_at'],
|
'name' => row['visit_name'],
|
||||||
'ended_at' => row['visit_ended_at']
|
'started_at' => row['visit_started_at'],
|
||||||
}
|
'ended_at' => row['visit_ended_at']
|
||||||
end
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
def log_progress(processed, total)
|
def log_progress(processed, total)
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,8 @@ class Users::SafeSettings
|
||||||
'visits_suggestions_enabled' => 'true',
|
'visits_suggestions_enabled' => 'true',
|
||||||
'enabled_map_layers' => %w[Routes Heatmap],
|
'enabled_map_layers' => %w[Routes Heatmap],
|
||||||
'maps_maplibre_style' => 'light',
|
'maps_maplibre_style' => 'light',
|
||||||
'digest_emails_enabled' => true
|
'digest_emails_enabled' => true,
|
||||||
|
'globe_projection' => false
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
def initialize(settings = {})
|
def initialize(settings = {})
|
||||||
|
|
@ -52,7 +53,8 @@ class Users::SafeSettings
|
||||||
speed_color_scale: speed_color_scale,
|
speed_color_scale: speed_color_scale,
|
||||||
fog_of_war_threshold: fog_of_war_threshold,
|
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
|
maps_maplibre_style: maps_maplibre_style,
|
||||||
|
globe_projection: globe_projection
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
# rubocop:enable Metrics/MethodLength
|
# rubocop:enable Metrics/MethodLength
|
||||||
|
|
@ -141,6 +143,10 @@ class Users::SafeSettings
|
||||||
settings['maps_maplibre_style']
|
settings['maps_maplibre_style']
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def globe_projection
|
||||||
|
ActiveModel::Type::Boolean.new.cast(settings['globe_projection'])
|
||||||
|
end
|
||||||
|
|
||||||
def digest_emails_enabled?
|
def digest_emails_enabled?
|
||||||
value = settings['digest_emails_enabled']
|
value = settings['digest_emails_enabled']
|
||||||
return true if value.nil?
|
return true if value.nil?
|
||||||
|
|
|
||||||
|
|
@ -365,6 +365,19 @@
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</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>
|
<div class="divider"></div>
|
||||||
|
|
||||||
<!-- Route Opacity -->
|
<!-- Route Opacity -->
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@
|
||||||
</h2>
|
</h2>
|
||||||
<div class="w-full h-48 bg-base-200 rounded-lg p-4 relative">
|
<div class="w-full h-48 bg-base-200 rounded-lg p-4 relative">
|
||||||
<%= column_chart(
|
<%= column_chart(
|
||||||
@digest.monthly_distances.sort.map { |month, distance_meters|
|
@digest.monthly_distances.sort_by { |month, _| month.to_i }.map { |month, distance_meters|
|
||||||
[Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters.to_i, @distance_unit).round]
|
[Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters.to_i, @distance_unit).round]
|
||||||
},
|
},
|
||||||
height: '200px',
|
height: '200px',
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@
|
||||||
</h2>
|
</h2>
|
||||||
<div class="w-full h-64 bg-base-100 rounded-lg p-4">
|
<div class="w-full h-64 bg-base-100 rounded-lg p-4">
|
||||||
<%= column_chart(
|
<%= column_chart(
|
||||||
@digest.monthly_distances.sort.map { |month, distance_meters|
|
@digest.monthly_distances.sort_by { |month, _| month.to_i }.map { |month, distance_meters|
|
||||||
[Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters.to_i, @distance_unit).round]
|
[Date::ABBR_MONTHNAMES[month.to_i], Users::Digest.convert_distance(distance_meters.to_i, @distance_unit).round]
|
||||||
},
|
},
|
||||||
height: '250px',
|
height: '250px',
|
||||||
|
|
@ -142,6 +142,19 @@
|
||||||
<span class="text-gray-600"><%= format_time_spent(country['minutes']) %></span>
|
<span class="text-gray-600"><%= format_time_spent(country['minutes']) %></span>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
<% if @digest.untracked_days > 0 %>
|
||||||
|
<div class="flex justify-between items-center p-3 bg-base-100 rounded-lg border-2 border-dashed border-gray-200">
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
<span class="badge badge-lg badge-ghost">?</span>
|
||||||
|
<span class="text-gray-500 italic">No tracking data</span>
|
||||||
|
</div>
|
||||||
|
<span class="text-gray-500"><%= pluralize(@digest.untracked_days.round, 'day') %></span>
|
||||||
|
</div>
|
||||||
|
<p class="text-sm text-gray-500 mt-2 flex items-center justify-center gap-2">
|
||||||
|
<%= icon 'lightbulb' %> Track more in <%= @digest.year + 1 %> to see a fuller picture of your travels!
|
||||||
|
</p>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -155,14 +168,7 @@
|
||||||
</h2>
|
</h2>
|
||||||
<div class="space-y-4 w-full">
|
<div class="space-y-4 w-full">
|
||||||
<% if @digest.toponyms.present? %>
|
<% 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| %>
|
<% @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="space-y-2">
|
||||||
<div class="flex justify-between items-center">
|
<div class="flex justify-between items-center">
|
||||||
<span class="font-semibold">
|
<span class="font-semibold">
|
||||||
|
|
@ -170,10 +176,10 @@
|
||||||
<%= country['country'] %>
|
<%= country['country'] %>
|
||||||
</span>
|
</span>
|
||||||
<span class="text-sm">
|
<span class="text-sm">
|
||||||
<%= pluralize(cities_count, 'city') %>
|
<%= pluralize(country['cities']&.length || 0, 'city') %>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<progress class="progress <%= color_class %> w-full" value="<%= progress_value %>" max="100"></progress>
|
<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>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else %>
|
<% else %>
|
||||||
|
|
@ -214,6 +220,12 @@
|
||||||
<button class="btn btn-outline" onclick="sharing_modal.showModal()">
|
<button class="btn btn-outline" onclick="sharing_modal.showModal()">
|
||||||
<%= icon 'share' %> Share
|
<%= icon 'share' %> Share
|
||||||
</button>
|
</button>
|
||||||
|
<%= button_to users_digest_path(year: @digest.year),
|
||||||
|
method: :delete,
|
||||||
|
class: 'btn btn-outline btn-error',
|
||||||
|
data: { turbo_confirm: "Are you sure you want to delete the #{@digest.year} digest? This cannot be undone." } do %>
|
||||||
|
<%= icon 'trash-2' %> Delete
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -250,13 +250,24 @@
|
||||||
<div class="stat-card">
|
<div class="stat-card">
|
||||||
<div class="stat-label">Where You Spent the Most Time</div>
|
<div class="stat-label">Where You Spent the Most Time</div>
|
||||||
<ul class="location-list">
|
<ul class="location-list">
|
||||||
<% @digest.top_countries_by_time.take(3).each do |country| %>
|
<% @digest.top_countries_by_time.take(5).each do |country| %>
|
||||||
<li>
|
<li>
|
||||||
<span><%= country_flag(country['name']) %> <%= country['name'] %></span>
|
<span><%= country_flag(country['name']) %> <%= country['name'] %></span>
|
||||||
<span><%= format_time_spent(country['minutes']) %></span>
|
<span><%= format_time_spent(country['minutes']) %></span>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% if @digest.untracked_days > 0 %>
|
||||||
|
<li style="border-top: 2px dashed #e2e8f0; padding-top: 12px; margin-top: 4px;">
|
||||||
|
<span style="color: #94a3b8; font-style: italic;">No tracking data</span>
|
||||||
|
<span style="color: #94a3b8;"><%= pluralize(@digest.untracked_days.round, 'day') %></span>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
|
<% if @digest.untracked_days > 0 %>
|
||||||
|
<p style="color: #64748b; font-size: 13px; margin-top: 12px;">
|
||||||
|
💡 Track more in <%= @digest.year + 1 %> to see a fuller picture of your travels!
|
||||||
|
</p>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -101,8 +101,8 @@ Rails.application.routes.draw do
|
||||||
|
|
||||||
# User digests routes (yearly/monthly digest reports)
|
# User digests routes (yearly/monthly digest reports)
|
||||||
scope module: 'users' do
|
scope module: 'users' do
|
||||||
resources :digests, only: %i[index create], param: :year, as: :users_digests
|
resources :digests, only: %i[index create show destroy], param: :year, as: :users_digests,
|
||||||
get 'digests/:year', to: 'digests#show', as: :users_digest, constraints: { year: /\d{4}/ }
|
constraints: { year: /\d{4}/ }
|
||||||
end
|
end
|
||||||
get 'shared/digest/:uuid', to: 'shared/digests#show', as: :shared_users_digest
|
get 'shared/digest/:uuid', to: 'shared/digests#show', as: :shared_users_digest
|
||||||
patch 'digests/:year/sharing',
|
patch 'digests/:year/sharing',
|
||||||
|
|
|
||||||
|
|
@ -3,21 +3,19 @@ class InstallRailsPulseTables < ActiveRecord::Migration[8.0]
|
||||||
def change
|
def change
|
||||||
# Load and execute the Rails Pulse schema directly
|
# Load and execute the Rails Pulse schema directly
|
||||||
# This ensures the migration is always in sync with the schema file
|
# This ensures the migration is always in sync with the schema file
|
||||||
schema_file = File.join(::Rails.root.to_s, "db/rails_pulse_schema.rb")
|
schema_file = Rails.root.join('db/rails_pulse_schema.rb').to_s
|
||||||
|
|
||||||
if File.exist?(schema_file)
|
raise 'Rails Pulse schema file not found at db/rails_pulse_schema.rb' unless File.exist?(schema_file)
|
||||||
say "Loading Rails Pulse schema from db/rails_pulse_schema.rb"
|
|
||||||
|
|
||||||
# Load the schema file to define RailsPulse::Schema
|
say 'Loading Rails Pulse schema from db/rails_pulse_schema.rb'
|
||||||
load schema_file
|
|
||||||
|
|
||||||
# Execute the schema in the context of this migration
|
# Load the schema file to define RailsPulse::Schema
|
||||||
RailsPulse::Schema.call(connection)
|
load schema_file
|
||||||
|
|
||||||
say "Rails Pulse tables created successfully"
|
# Execute the schema in the context of this migration
|
||||||
say "The schema file db/rails_pulse_schema.rb remains as your single source of truth"
|
RailsPulse::Schema.call(connection)
|
||||||
else
|
|
||||||
raise "Rails Pulse schema file not found at db/rails_pulse_schema.rb"
|
say 'Rails Pulse tables created successfully'
|
||||||
end
|
say 'The schema file db/rails_pulse_schema.rb remains as your single source of truth'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
class AddIndexesToPointsForStatsQuery < ActiveRecord::Migration[8.0]
|
||||||
|
disable_ddl_transaction!
|
||||||
|
|
||||||
|
def change
|
||||||
|
# Index for counting reverse geocoded points
|
||||||
|
# This speeds up: COUNT(reverse_geocoded_at)
|
||||||
|
add_index :points, [:user_id, :reverse_geocoded_at],
|
||||||
|
where: "reverse_geocoded_at IS NOT NULL",
|
||||||
|
algorithm: :concurrently,
|
||||||
|
if_not_exists: true,
|
||||||
|
name: 'index_points_on_user_id_and_reverse_geocoded_at'
|
||||||
|
|
||||||
|
# Index for finding points with empty geodata
|
||||||
|
# This speeds up: COUNT(CASE WHEN geodata = '{}'::jsonb THEN 1 END)
|
||||||
|
add_index :points, [:user_id, :geodata],
|
||||||
|
where: "geodata = '{}'::jsonb",
|
||||||
|
algorithm: :concurrently,
|
||||||
|
if_not_exists: true,
|
||||||
|
name: 'index_points_on_user_id_and_empty_geodata'
|
||||||
|
end
|
||||||
|
end
|
||||||
4
db/schema.rb
generated
4
db/schema.rb
generated
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[8.0].define(version: 2025_12_28_163703) do
|
ActiveRecord::Schema[8.0].define(version: 2026_01_03_114630) do
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "pg_catalog.plpgsql"
|
enable_extension "pg_catalog.plpgsql"
|
||||||
enable_extension "postgis"
|
enable_extension "postgis"
|
||||||
|
|
@ -260,6 +260,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_28_163703) do
|
||||||
t.index ["track_id"], name: "index_points_on_track_id"
|
t.index ["track_id"], name: "index_points_on_track_id"
|
||||||
t.index ["user_id", "city"], name: "idx_points_user_city"
|
t.index ["user_id", "city"], name: "idx_points_user_city"
|
||||||
t.index ["user_id", "country_name"], name: "idx_points_user_country_name"
|
t.index ["user_id", "country_name"], name: "idx_points_user_country_name"
|
||||||
|
t.index ["user_id", "geodata"], name: "index_points_on_user_id_and_empty_geodata", where: "(geodata = '{}'::jsonb)"
|
||||||
t.index ["user_id", "reverse_geocoded_at"], name: "index_points_on_user_id_and_reverse_geocoded_at", where: "(reverse_geocoded_at IS NOT NULL)"
|
t.index ["user_id", "reverse_geocoded_at"], name: "index_points_on_user_id_and_reverse_geocoded_at", where: "(reverse_geocoded_at IS NOT NULL)"
|
||||||
t.index ["user_id", "timestamp", "track_id"], name: "idx_points_track_generation"
|
t.index ["user_id", "timestamp", "track_id"], name: "idx_points_track_generation"
|
||||||
t.index ["user_id", "timestamp"], name: "idx_points_user_visit_null_timestamp", where: "(visit_id IS NULL)"
|
t.index ["user_id", "timestamp"], name: "idx_points_user_visit_null_timestamp", where: "(visit_id IS NULL)"
|
||||||
|
|
@ -521,6 +522,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_28_163703) do
|
||||||
add_foreign_key "notifications", "users"
|
add_foreign_key "notifications", "users"
|
||||||
add_foreign_key "place_visits", "places"
|
add_foreign_key "place_visits", "places"
|
||||||
add_foreign_key "place_visits", "visits"
|
add_foreign_key "place_visits", "visits"
|
||||||
|
add_foreign_key "points", "points_raw_data_archives", column: "raw_data_archive_id", name: "fk_rails_points_raw_data_archives", on_delete: :nullify, validate: false
|
||||||
add_foreign_key "points", "points_raw_data_archives", column: "raw_data_archive_id", on_delete: :nullify
|
add_foreign_key "points", "points_raw_data_archives", column: "raw_data_archive_id", on_delete: :nullify
|
||||||
add_foreign_key "points", "users"
|
add_foreign_key "points", "users"
|
||||||
add_foreign_key "points", "visits"
|
add_foreign_key "points", "visits"
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ If you don't want to use dedicated share for projects installed by docker skip i
|
||||||
### Dawarich root folder
|
### Dawarich root folder
|
||||||
1. Open your [Docker root folder](#docker-root-share) in **File station**.
|
1. Open your [Docker root folder](#docker-root-share) in **File station**.
|
||||||
2. Create new folder **dawarich** and open it.
|
2. Create new folder **dawarich** and open it.
|
||||||
3. Create folders **redis**, **db_data**, **db_shared** and **public** in **dawarich** folder.
|
3. Create folders **app_storage**, **db_data**, **db_shared**, **public** and **redis** in **dawarich** folder.
|
||||||
4. Copy [docker compose](synology/docker-compose.yml) and [.env](synology/.env) files form **synology** repo folder into **dawarich** folder on your synology.
|
4. Copy [docker compose](synology/docker-compose.yml) and [.env](synology/.env) files form **synology** repo folder into **dawarich** folder on your synology.
|
||||||
|
|
||||||
# Installation
|
# Installation
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import { test as setup, expect } from '@playwright/test';
|
import { test as setup, expect } from '@playwright/test';
|
||||||
|
import { disableGlobeProjection } from '../v2/helpers/setup.js';
|
||||||
|
|
||||||
const authFile = 'e2e/temp/.auth/user.json';
|
const authFile = 'e2e/temp/.auth/user.json';
|
||||||
|
|
||||||
|
|
@ -19,6 +20,9 @@ setup('authenticate', async ({ page }) => {
|
||||||
// Wait for successful navigation to map (v1 or v2 depending on user preference)
|
// Wait for successful navigation to map (v1 or v2 depending on user preference)
|
||||||
await page.waitForURL(/\/map(\/v[12])?/, { timeout: 10000 });
|
await page.waitForURL(/\/map(\/v[12])?/, { timeout: 10000 });
|
||||||
|
|
||||||
|
// Disable globe projection to ensure consistent E2E test behavior
|
||||||
|
await disableGlobeProjection(page);
|
||||||
|
|
||||||
// Save authentication state
|
// Save authentication state
|
||||||
await page.context().storageState({ path: authFile });
|
await page.context().storageState({ path: authFile });
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,33 @@
|
||||||
* Helper functions for Maps V2 E2E tests
|
* 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
|
* Navigate to Maps V2 page
|
||||||
* @param {Page} page - Playwright page object
|
* @param {Page} page - Playwright page object
|
||||||
|
|
|
||||||
18
package-lock.json
generated
18
package-lock.json
generated
|
|
@ -11,7 +11,7 @@
|
||||||
"leaflet": "^1.9.4",
|
"leaflet": "^1.9.4",
|
||||||
"maplibre-gl": "^5.13.0",
|
"maplibre-gl": "^5.13.0",
|
||||||
"postcss": "^8.4.49",
|
"postcss": "^8.4.49",
|
||||||
"trix": "^2.1.15"
|
"trix": "^2.1.16"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@playwright/test": "^1.56.1",
|
"@playwright/test": "^1.56.1",
|
||||||
|
|
@ -575,12 +575,14 @@
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/trix": {
|
"node_modules/trix": {
|
||||||
"version": "2.1.15",
|
"version": "2.1.16",
|
||||||
"resolved": "https://registry.npmjs.org/trix/-/trix-2.1.15.tgz",
|
"resolved": "https://registry.npmjs.org/trix/-/trix-2.1.16.tgz",
|
||||||
"integrity": "sha512-LoaXWczdTUV8+3Box92B9b1iaDVbxD14dYemZRxi3PwY+AuDm97BUJV2aHLBUFPuDABhxp0wzcbf0CxHCVmXiw==",
|
"integrity": "sha512-XtZgWI+oBvLzX7CWnkIf+ZWC+chL+YG/TkY43iMTV0Zl+CJjn18B1GJUCEWJ8qgfpcyMBuysnNAfPWiv2sV14A==",
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"dompurify": "^3.2.5"
|
"dompurify": "^3.2.5"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 18"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/undici-types": {
|
"node_modules/undici-types": {
|
||||||
|
|
@ -986,9 +988,9 @@
|
||||||
"integrity": "sha512-gRa9gwYU3ECmQYv3lslts5hxuIa90veaEcxDYuu3QGOIAEM2mOZkVHp48ANJuu1CURtRdHKUBY5Lm1tHV+sD4g=="
|
"integrity": "sha512-gRa9gwYU3ECmQYv3lslts5hxuIa90veaEcxDYuu3QGOIAEM2mOZkVHp48ANJuu1CURtRdHKUBY5Lm1tHV+sD4g=="
|
||||||
},
|
},
|
||||||
"trix": {
|
"trix": {
|
||||||
"version": "2.1.15",
|
"version": "2.1.16",
|
||||||
"resolved": "https://registry.npmjs.org/trix/-/trix-2.1.15.tgz",
|
"resolved": "https://registry.npmjs.org/trix/-/trix-2.1.16.tgz",
|
||||||
"integrity": "sha512-LoaXWczdTUV8+3Box92B9b1iaDVbxD14dYemZRxi3PwY+AuDm97BUJV2aHLBUFPuDABhxp0wzcbf0CxHCVmXiw==",
|
"integrity": "sha512-XtZgWI+oBvLzX7CWnkIf+ZWC+chL+YG/TkY43iMTV0Zl+CJjn18B1GJUCEWJ8qgfpcyMBuysnNAfPWiv2sV14A==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"dompurify": "^3.2.5"
|
"dompurify": "^3.2.5"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
"leaflet": "^1.9.4",
|
"leaflet": "^1.9.4",
|
||||||
"maplibre-gl": "^5.13.0",
|
"maplibre-gl": "^5.13.0",
|
||||||
"postcss": "^8.4.49",
|
"postcss": "^8.4.49",
|
||||||
"trix": "^2.1.15"
|
"trix": "^2.1.16"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "18.17.1",
|
"node": "18.17.1",
|
||||||
|
|
|
||||||
|
|
@ -163,12 +163,16 @@ RSpec.describe User, type: :model do
|
||||||
describe '#countries_visited' do
|
describe '#countries_visited' do
|
||||||
subject { user.countries_visited }
|
subject { user.countries_visited }
|
||||||
|
|
||||||
let!(:point1) { create(:point, user:, country_name: 'Germany') }
|
let!(:stat) do
|
||||||
let!(:point2) { create(:point, user:, country_name: 'France') }
|
create(:stat, user:, toponyms: [
|
||||||
let!(:point3) { create(:point, user:, country_name: nil) }
|
{ 'country' => 'Germany', 'cities' => [{ 'city' => 'Berlin', 'stayed_for' => 120 }] },
|
||||||
let!(:point4) { create(:point, user:, country_name: '') }
|
{ 'country' => 'France', 'cities' => [{ 'city' => 'Paris', 'stayed_for' => 90 }] },
|
||||||
|
{ 'country' => nil, 'cities' => [] },
|
||||||
|
{ 'country' => '', 'cities' => [] }
|
||||||
|
])
|
||||||
|
end
|
||||||
|
|
||||||
it 'returns array of countries' do
|
it 'returns array of countries from stats toponyms' do
|
||||||
expect(subject).to include('Germany', 'France')
|
expect(subject).to include('Germany', 'France')
|
||||||
expect(subject.count).to eq(2)
|
expect(subject.count).to eq(2)
|
||||||
end
|
end
|
||||||
|
|
@ -181,12 +185,18 @@ RSpec.describe User, type: :model do
|
||||||
describe '#cities_visited' do
|
describe '#cities_visited' do
|
||||||
subject { user.cities_visited }
|
subject { user.cities_visited }
|
||||||
|
|
||||||
let!(:point1) { create(:point, user:, city: 'Berlin') }
|
let!(:stat) do
|
||||||
let!(:point2) { create(:point, user:, city: 'Paris') }
|
create(:stat, user:, toponyms: [
|
||||||
let!(:point3) { create(:point, user:, city: nil) }
|
{ 'country' => 'Germany', 'cities' => [
|
||||||
let!(:point4) { create(:point, user:, city: '') }
|
{ 'city' => 'Berlin', 'stayed_for' => 120 },
|
||||||
|
{ 'city' => nil, 'stayed_for' => 60 },
|
||||||
|
{ 'city' => '', 'stayed_for' => 60 }
|
||||||
|
] },
|
||||||
|
{ 'country' => 'France', 'cities' => [{ 'city' => 'Paris', 'stayed_for' => 90 }] }
|
||||||
|
])
|
||||||
|
end
|
||||||
|
|
||||||
it 'returns array of cities' do
|
it 'returns array of cities from stats toponyms' do
|
||||||
expect(subject).to include('Berlin', 'Paris')
|
expect(subject).to include('Berlin', 'Paris')
|
||||||
expect(subject.count).to eq(2)
|
expect(subject.count).to eq(2)
|
||||||
end
|
end
|
||||||
|
|
@ -210,11 +220,15 @@ RSpec.describe User, type: :model do
|
||||||
describe '#total_countries' do
|
describe '#total_countries' do
|
||||||
subject { user.total_countries }
|
subject { user.total_countries }
|
||||||
|
|
||||||
let!(:point1) { create(:point, user:, country_name: 'Germany') }
|
let!(:stat) do
|
||||||
let!(:point2) { create(:point, user:, country_name: 'France') }
|
create(:stat, user:, toponyms: [
|
||||||
let!(:point3) { create(:point, user:, country_name: nil) }
|
{ 'country' => 'Germany', 'cities' => [] },
|
||||||
|
{ 'country' => 'France', 'cities' => [] },
|
||||||
|
{ 'country' => nil, 'cities' => [] }
|
||||||
|
])
|
||||||
|
end
|
||||||
|
|
||||||
it 'returns number of countries' do
|
it 'returns number of countries from stats toponyms' do
|
||||||
expect(subject).to eq(2)
|
expect(subject).to eq(2)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -222,11 +236,17 @@ RSpec.describe User, type: :model do
|
||||||
describe '#total_cities' do
|
describe '#total_cities' do
|
||||||
subject { user.total_cities }
|
subject { user.total_cities }
|
||||||
|
|
||||||
let!(:point1) { create(:point, user:, city: 'Berlin') }
|
let!(:stat) do
|
||||||
let!(:point2) { create(:point, user:, city: 'Paris') }
|
create(:stat, user:, toponyms: [
|
||||||
let!(:point3) { create(:point, user:, city: nil) }
|
{ 'country' => 'Germany', 'cities' => [
|
||||||
|
{ 'city' => 'Berlin', 'stayed_for' => 120 },
|
||||||
|
{ 'city' => 'Paris', 'stayed_for' => 90 },
|
||||||
|
{ 'city' => nil, 'stayed_for' => 60 }
|
||||||
|
] }
|
||||||
|
])
|
||||||
|
end
|
||||||
|
|
||||||
it 'returns number of cities' do
|
it 'returns number of cities from stats toponyms' do
|
||||||
expect(subject).to eq(2)
|
expect(subject).to eq(2)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,14 @@ RSpec.describe '/digests', type: :request do
|
||||||
expect(response.status).to eq(302)
|
expect(response.status).to eq(302)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'DELETE /destroy' do
|
||||||
|
it 'redirects to the sign in page' do
|
||||||
|
delete users_digest_url(year: 2024)
|
||||||
|
|
||||||
|
expect(response).to redirect_to(new_user_session_path)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when user is signed in' do
|
context 'when user is signed in' do
|
||||||
|
|
@ -137,5 +145,40 @@ RSpec.describe '/digests', type: :request do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'DELETE /destroy' do
|
||||||
|
let!(:digest) { create(:users_digest, user:, year: 2024) }
|
||||||
|
|
||||||
|
it 'deletes the digest' do
|
||||||
|
expect do
|
||||||
|
delete users_digest_url(year: 2024)
|
||||||
|
end.to change(Users::Digest, :count).by(-1)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'redirects with success notice' do
|
||||||
|
delete users_digest_url(year: 2024)
|
||||||
|
|
||||||
|
expect(response).to redirect_to(users_digests_path)
|
||||||
|
expect(flash[:notice]).to eq('Year-end digest for 2024 has been deleted')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns not found for non-existent digest' do
|
||||||
|
delete users_digest_url(year: 2020)
|
||||||
|
|
||||||
|
expect(response).to redirect_to(users_digests_path)
|
||||||
|
expect(flash[:alert]).to eq('Digest not found')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'cannot delete another user digest' do
|
||||||
|
other_user = create(:user)
|
||||||
|
other_digest = create(:users_digest, user: other_user, year: 2023)
|
||||||
|
|
||||||
|
delete users_digest_url(year: 2023)
|
||||||
|
|
||||||
|
expect(response).to redirect_to(users_digests_path)
|
||||||
|
expect(flash[:alert]).to eq('Digest not found')
|
||||||
|
expect(other_digest.reload).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,58 @@ RSpec.describe CountriesAndCities do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when points have a gap larger than threshold (passing through)' do
|
||||||
|
let(:points) do
|
||||||
|
[
|
||||||
|
# User in Berlin at 9:00, leaves, returns at 11:00
|
||||||
|
create(:point, city: 'Berlin', country: 'Germany', timestamp:),
|
||||||
|
create(:point, city: 'Berlin', country: 'Germany', timestamp: timestamp + 15.minutes),
|
||||||
|
# 105-minute gap here (user left the city)
|
||||||
|
create(:point, city: 'Berlin', country: 'Germany', timestamp: timestamp + 120.minutes),
|
||||||
|
create(:point, city: 'Berlin', country: 'Germany', timestamp: timestamp + 130.minutes)
|
||||||
|
]
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'only counts time between consecutive points within threshold' do
|
||||||
|
# Old logic would count 130 minutes (span from first to last)
|
||||||
|
# New logic counts: 15 min (0->15) + 10 min (120->130) = 25 minutes
|
||||||
|
# Since 25 < 60, Berlin should be filtered out
|
||||||
|
expect(countries_and_cities).to eq(
|
||||||
|
[
|
||||||
|
CountriesAndCities::CountryData.new(
|
||||||
|
country: 'Germany',
|
||||||
|
cities: []
|
||||||
|
)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when points span a long time but have continuous presence' do
|
||||||
|
let(:points) do
|
||||||
|
# Points every 30 minutes for 2.5 hours = continuous presence
|
||||||
|
(0..5).map do |i|
|
||||||
|
create(:point, city: 'Berlin', country: 'Germany', timestamp: timestamp + (i * 30).minutes)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'counts the full duration when all intervals are within threshold' do
|
||||||
|
# 5 intervals of 30 minutes each = 150 minutes total
|
||||||
|
expect(countries_and_cities).to eq(
|
||||||
|
[
|
||||||
|
CountriesAndCities::CountryData.new(
|
||||||
|
country: 'Germany',
|
||||||
|
cities: [
|
||||||
|
CountriesAndCities::CityData.new(
|
||||||
|
city: 'Berlin', points: 6, timestamp: (timestamp + 150.minutes).to_i, stayed_for: 150
|
||||||
|
)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -61,16 +61,18 @@ RSpec.describe Points::RawData::Verifier do
|
||||||
end.not_to change { archive.reload.verified_at }
|
end.not_to change { archive.reload.verified_at }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'detects deleted points' do
|
it 'still verifies successfully when points are deleted from database' do
|
||||||
# Force archive creation first
|
# Force archive creation first
|
||||||
archive_id = archive.id
|
archive_id = archive.id
|
||||||
|
|
||||||
# Then delete one point from database
|
# Then delete one point from database
|
||||||
points.first.destroy
|
points.first.destroy
|
||||||
|
|
||||||
|
# Verification should still succeed - deleted points are acceptable
|
||||||
|
# (users should be able to delete their data without failing archive verification)
|
||||||
expect do
|
expect do
|
||||||
verifier.verify_specific_archive(archive_id)
|
verifier.verify_specific_archive(archive_id)
|
||||||
end.not_to change { archive.reload.verified_at }
|
end.to change { archive.reload.verified_at }.from(nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'detects raw_data mismatch between archive and database' do
|
it 'detects raw_data mismatch between archive and database' do
|
||||||
|
|
|
||||||
|
|
@ -155,10 +155,14 @@ RSpec.describe Stats::CalculateMonth do
|
||||||
context 'when user visited multiple cities with mixed durations' do
|
context 'when user visited multiple cities with mixed durations' do
|
||||||
let!(:mixed_points) do
|
let!(:mixed_points) do
|
||||||
[
|
[
|
||||||
# Berlin: 70 minutes (should be included)
|
# Berlin: 70 minutes with continuous presence (should be included)
|
||||||
|
# Points every 35 minutes: 0, 35, 70 = 70 min total
|
||||||
create(:point, user:, import:, timestamp: timestamp_base,
|
create(:point, user:, import:, timestamp: timestamp_base,
|
||||||
city: 'Berlin', country_name: 'Germany',
|
city: 'Berlin', country_name: 'Germany',
|
||||||
lonlat: 'POINT(13.404954 52.520008)'),
|
lonlat: 'POINT(13.404954 52.520008)'),
|
||||||
|
create(:point, user:, import:, timestamp: timestamp_base + 35.minutes,
|
||||||
|
city: 'Berlin', country_name: 'Germany',
|
||||||
|
lonlat: 'POINT(13.404954 52.520008)'),
|
||||||
create(:point, user:, import:, timestamp: timestamp_base + 70.minutes,
|
create(:point, user:, import:, timestamp: timestamp_base + 70.minutes,
|
||||||
city: 'Berlin', country_name: 'Germany',
|
city: 'Berlin', country_name: 'Germany',
|
||||||
lonlat: 'POINT(13.404954 52.520008)'),
|
lonlat: 'POINT(13.404954 52.520008)'),
|
||||||
|
|
@ -171,10 +175,17 @@ RSpec.describe Stats::CalculateMonth do
|
||||||
city: 'Prague', country_name: 'Czech Republic',
|
city: 'Prague', country_name: 'Czech Republic',
|
||||||
lonlat: 'POINT(14.4378 50.0755)'),
|
lonlat: 'POINT(14.4378 50.0755)'),
|
||||||
|
|
||||||
# Vienna: 90 minutes (should be included)
|
# Vienna: 90 minutes with continuous presence (should be included)
|
||||||
|
# Points every 30 minutes: 150, 180, 210, 240 = 90 min total
|
||||||
create(:point, user:, import:, timestamp: timestamp_base + 150.minutes,
|
create(:point, user:, import:, timestamp: timestamp_base + 150.minutes,
|
||||||
city: 'Vienna', country_name: 'Austria',
|
city: 'Vienna', country_name: 'Austria',
|
||||||
lonlat: 'POINT(16.3738 48.2082)'),
|
lonlat: 'POINT(16.3738 48.2082)'),
|
||||||
|
create(:point, user:, import:, timestamp: timestamp_base + 180.minutes,
|
||||||
|
city: 'Vienna', country_name: 'Austria',
|
||||||
|
lonlat: 'POINT(16.3738 48.2082)'),
|
||||||
|
create(:point, user:, import:, timestamp: timestamp_base + 210.minutes,
|
||||||
|
city: 'Vienna', country_name: 'Austria',
|
||||||
|
lonlat: 'POINT(16.3738 48.2082)'),
|
||||||
create(:point, user:, import:, timestamp: timestamp_base + 240.minutes,
|
create(:point, user:, import:, timestamp: timestamp_base + 240.minutes,
|
||||||
city: 'Vienna', country_name: 'Austria',
|
city: 'Vienna', country_name: 'Austria',
|
||||||
lonlat: 'POINT(16.3738 48.2082)')
|
lonlat: 'POINT(16.3738 48.2082)')
|
||||||
|
|
|
||||||
|
|
@ -76,19 +76,169 @@ RSpec.describe Users::Digests::CalculateYear do
|
||||||
expect(calculate_digest.monthly_distances['3']).to eq('0') # Missing month
|
expect(calculate_digest.monthly_distances['3']).to eq('0') # Missing month
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'calculates time spent by location' do
|
it 'calculates time spent by location using hybrid day-based approach' do
|
||||||
|
# Create points to test hybrid calculation
|
||||||
|
# Jan 1: single country day (Germany) -> full 1440 minutes
|
||||||
|
jan_1_10am = Time.zone.local(2024, 1, 1, 10, 0, 0).to_i
|
||||||
|
jan_1_11am = Time.zone.local(2024, 1, 1, 11, 0, 0).to_i
|
||||||
|
jan_1_12pm = Time.zone.local(2024, 1, 1, 12, 0, 0).to_i
|
||||||
|
# Feb 1: single country day (France) -> full 1440 minutes
|
||||||
|
feb_1_10am = Time.zone.local(2024, 2, 1, 10, 0, 0).to_i
|
||||||
|
|
||||||
|
create(:point, user: user, timestamp: jan_1_10am, country_name: 'Germany', city: 'Berlin')
|
||||||
|
create(:point, user: user, timestamp: jan_1_11am, country_name: 'Germany', city: 'Berlin')
|
||||||
|
create(:point, user: user, timestamp: jan_1_12pm, country_name: 'Germany', city: 'Munich')
|
||||||
|
create(:point, user: user, timestamp: feb_1_10am, country_name: 'France', city: 'Paris')
|
||||||
|
|
||||||
countries = calculate_digest.time_spent_by_location['countries']
|
countries = calculate_digest.time_spent_by_location['countries']
|
||||||
cities = calculate_digest.time_spent_by_location['cities']
|
cities = calculate_digest.time_spent_by_location['cities']
|
||||||
|
|
||||||
expect(countries.first['name']).to eq('Germany')
|
# Germany: 1 full day = 1440 minutes
|
||||||
expect(countries.first['minutes']).to eq(720) # 480 + 240
|
germany_country = countries.find { |c| c['name'] == 'Germany' }
|
||||||
|
expect(germany_country['minutes']).to eq(1440)
|
||||||
|
|
||||||
|
# France: 1 full day = 1440 minutes
|
||||||
|
france_country = countries.find { |c| c['name'] == 'France' }
|
||||||
|
expect(france_country['minutes']).to eq(1440)
|
||||||
|
|
||||||
|
# Cities: based on stayed_for from monthly stats (sum across months)
|
||||||
expect(cities.first['name']).to eq('Berlin')
|
expect(cities.first['name']).to eq('Berlin')
|
||||||
|
expect(cities.first['minutes']).to eq(480)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'calculates all time stats' do
|
it 'calculates all time stats' do
|
||||||
expect(calculate_digest.all_time_stats['total_distance']).to eq('125000')
|
expect(calculate_digest.all_time_stats['total_distance']).to eq('125000')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when user visits same country across multiple months' do
|
||||||
|
it 'counts each day as a full day for single-country days' do
|
||||||
|
# Create hourly points across multiple days in March and July
|
||||||
|
mar_start = Time.zone.local(2024, 3, 1, 10, 0, 0).to_i
|
||||||
|
jul_start = Time.zone.local(2024, 7, 1, 10, 0, 0).to_i
|
||||||
|
|
||||||
|
# Create 3 days of hourly points in March
|
||||||
|
3.times do |day|
|
||||||
|
3.times do |hour|
|
||||||
|
timestamp = mar_start + (day * 24 * 60 * 60) + (hour * 60 * 60)
|
||||||
|
create(:point, user: user, timestamp: timestamp, country_name: 'Germany', city: 'Berlin')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Create 3 days of hourly points in July
|
||||||
|
3.times do |day|
|
||||||
|
3.times do |hour|
|
||||||
|
timestamp = jul_start + (day * 24 * 60 * 60) + (hour * 60 * 60)
|
||||||
|
create(:point, user: user, timestamp: timestamp, country_name: 'Germany', city: 'Munich')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Create the monthly stats
|
||||||
|
create(:stat, user: user, year: 2024, month: 3, distance: 10_000, toponyms: [
|
||||||
|
{ 'country' => 'Germany', 'cities' => [
|
||||||
|
{ 'city' => 'Berlin', 'stayed_for' => 14_400 }
|
||||||
|
] }
|
||||||
|
])
|
||||||
|
|
||||||
|
create(:stat, user: user, year: 2024, month: 7, distance: 15_000, toponyms: [
|
||||||
|
{ 'country' => 'Germany', 'cities' => [
|
||||||
|
{ 'city' => 'Munich', 'stayed_for' => 14_400 }
|
||||||
|
] }
|
||||||
|
])
|
||||||
|
|
||||||
|
digest = calculate_digest
|
||||||
|
countries = digest.time_spent_by_location['countries']
|
||||||
|
germany = countries.find { |c| c['name'] == 'Germany' }
|
||||||
|
|
||||||
|
# Each single-country day = 1440 minutes
|
||||||
|
# 6 days total (3 in March + 3 in July) = 6 * 1440 = 8640 minutes
|
||||||
|
expect(germany['minutes']).to eq(6 * 1440)
|
||||||
|
|
||||||
|
# Total should equal exactly 6 days
|
||||||
|
total_days = germany['minutes'] / 1440.0
|
||||||
|
expect(total_days).to eq(6)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when there are large gaps between points on same day' do
|
||||||
|
it 'still counts the full day for single-country day' do
|
||||||
|
point_1 = Time.zone.local(2024, 1, 1, 10, 0, 0).to_i
|
||||||
|
point_2 = Time.zone.local(2024, 1, 1, 12, 0, 0).to_i # 2 hours later
|
||||||
|
point_3 = Time.zone.local(2024, 1, 1, 18, 0, 0).to_i # 6 hours later
|
||||||
|
|
||||||
|
create(:point, user: user, timestamp: point_1, country_name: 'Germany')
|
||||||
|
create(:point, user: user, timestamp: point_2, country_name: 'Germany')
|
||||||
|
create(:point, user: user, timestamp: point_3, country_name: 'Germany')
|
||||||
|
|
||||||
|
digest = calculate_digest
|
||||||
|
germany = digest.time_spent_by_location['countries'].find { |c| c['name'] == 'Germany' }
|
||||||
|
|
||||||
|
# Hybrid approach: single-country day = full 1440 minutes
|
||||||
|
# regardless of gaps between points
|
||||||
|
expect(germany['minutes']).to eq(1440)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when transitioning between countries on same day' do
|
||||||
|
it 'calculates proportional time based on time spans' do
|
||||||
|
# Multi-country day: Germany 10:00-10:30, France 11:00-11:30
|
||||||
|
point_1 = Time.zone.local(2024, 1, 1, 10, 0, 0).to_i
|
||||||
|
point_2 = Time.zone.local(2024, 1, 1, 10, 30, 0).to_i # In Germany
|
||||||
|
point_3 = Time.zone.local(2024, 1, 1, 11, 0, 0).to_i # Now in France
|
||||||
|
point_4 = Time.zone.local(2024, 1, 1, 11, 30, 0).to_i # Still in France
|
||||||
|
|
||||||
|
create(:point, user: user, timestamp: point_1, country_name: 'Germany')
|
||||||
|
create(:point, user: user, timestamp: point_2, country_name: 'Germany')
|
||||||
|
create(:point, user: user, timestamp: point_3, country_name: 'France')
|
||||||
|
create(:point, user: user, timestamp: point_4, country_name: 'France')
|
||||||
|
|
||||||
|
digest = calculate_digest
|
||||||
|
countries = digest.time_spent_by_location['countries']
|
||||||
|
|
||||||
|
germany = countries.find { |c| c['name'] == 'Germany' }
|
||||||
|
france = countries.find { |c| c['name'] == 'France' }
|
||||||
|
|
||||||
|
# Germany span: 10:30 - 10:00 = 30 min = 1800 seconds
|
||||||
|
# France span: 11:30 - 11:00 = 30 min = 1800 seconds
|
||||||
|
# Total spans = 3600 seconds
|
||||||
|
# Each country gets 50% of 1440 = 720 minutes
|
||||||
|
expect(germany['minutes']).to eq(720)
|
||||||
|
expect(france['minutes']).to eq(720)
|
||||||
|
# Total = 1440 (exactly one day)
|
||||||
|
expect(germany['minutes'] + france['minutes']).to eq(1440)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when visiting multiple countries on same day' do
|
||||||
|
it 'calculates proportional time and never exceeds one day total' do
|
||||||
|
# This tests the fix for the original bug: border crossing should not count double
|
||||||
|
# France: 8am-9am (1 hour span = 3600 seconds)
|
||||||
|
# Germany: 10am-11am (1 hour span = 3600 seconds)
|
||||||
|
jan_1_8am = Time.zone.local(2024, 1, 1, 8, 0, 0).to_i
|
||||||
|
jan_1_9am = Time.zone.local(2024, 1, 1, 9, 0, 0).to_i
|
||||||
|
jan_1_10am = Time.zone.local(2024, 1, 1, 10, 0, 0).to_i # Border crossing
|
||||||
|
jan_1_11am = Time.zone.local(2024, 1, 1, 11, 0, 0).to_i
|
||||||
|
|
||||||
|
create(:point, user: user, timestamp: jan_1_8am, country_name: 'France')
|
||||||
|
create(:point, user: user, timestamp: jan_1_9am, country_name: 'France')
|
||||||
|
create(:point, user: user, timestamp: jan_1_10am, country_name: 'Germany')
|
||||||
|
create(:point, user: user, timestamp: jan_1_11am, country_name: 'Germany')
|
||||||
|
|
||||||
|
digest = calculate_digest
|
||||||
|
countries = digest.time_spent_by_location['countries']
|
||||||
|
|
||||||
|
france = countries.find { |c| c['name'] == 'France' }
|
||||||
|
germany = countries.find { |c| c['name'] == 'Germany' }
|
||||||
|
|
||||||
|
# France span: 3600 seconds, Germany span: 3600 seconds
|
||||||
|
# Total spans: 7200 seconds
|
||||||
|
# Each gets 50% of 1440 = 720 minutes
|
||||||
|
expect(france['minutes']).to eq(720)
|
||||||
|
expect(germany['minutes']).to eq(720)
|
||||||
|
# Total = 1440 (exactly one day) - NOT 2 days as the bug would have caused
|
||||||
|
expect(france['minutes'] + germany['minutes']).to eq(1440)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context 'when digest already exists' do
|
context 'when digest already exists' do
|
||||||
let!(:existing_digest) do
|
let!(:existing_digest) do
|
||||||
create(:users_digest, user: user, year: 2024, period_type: :yearly, distance: 10_000)
|
create(:users_digest, user: user, year: 2024, period_type: :yearly, distance: 10_000)
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,8 @@ RSpec.describe Users::SafeSettings do
|
||||||
speed_color_scale: nil,
|
speed_color_scale: nil,
|
||||||
fog_of_war_threshold: nil,
|
fog_of_war_threshold: nil,
|
||||||
enabled_map_layers: %w[Routes Heatmap],
|
enabled_map_layers: %w[Routes Heatmap],
|
||||||
maps_maplibre_style: 'light'
|
maps_maplibre_style: 'light',
|
||||||
|
globe_projection: false
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
@ -82,7 +83,8 @@ RSpec.describe Users::SafeSettings do
|
||||||
'visits_suggestions_enabled' => false,
|
'visits_suggestions_enabled' => false,
|
||||||
'enabled_map_layers' => %w[Points Routes Areas Photos],
|
'enabled_map_layers' => %w[Points Routes Areas Photos],
|
||||||
'maps_maplibre_style' => 'light',
|
'maps_maplibre_style' => 'light',
|
||||||
'digest_emails_enabled' => true
|
'digest_emails_enabled' => true,
|
||||||
|
'globe_projection' => false
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
@ -110,7 +112,8 @@ RSpec.describe Users::SafeSettings do
|
||||||
speed_color_scale: nil,
|
speed_color_scale: nil,
|
||||||
fog_of_war_threshold: nil,
|
fog_of_war_threshold: nil,
|
||||||
enabled_map_layers: %w[Points Routes Areas Photos],
|
enabled_map_layers: %w[Points Routes Areas Photos],
|
||||||
maps_maplibre_style: 'light'
|
maps_maplibre_style: 'light',
|
||||||
|
globe_projection: false
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue