2025-08-01 12:05:26 -04:00
|
|
|
import { createPopupContent } from "./popups";
|
|
|
|
|
|
2025-08-01 12:39:01 -04:00
|
|
|
const MARKER_DATA_INDICES = {
|
|
|
|
|
LATITUDE: 0,
|
|
|
|
|
LONGITUDE: 1,
|
|
|
|
|
BATTERY: 2,
|
|
|
|
|
ALTITUDE: 3,
|
|
|
|
|
TIMESTAMP: 4,
|
|
|
|
|
VELOCITY: 5,
|
|
|
|
|
ID: 6,
|
|
|
|
|
COUNTRY: 7
|
|
|
|
|
};
|
|
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
/**
|
|
|
|
|
* MarkerFactory - Centralized marker creation with consistent styling
|
2025-08-01 12:39:01 -04:00
|
|
|
*
|
2025-08-01 12:05:26 -04:00
|
|
|
* This module provides reusable marker creation functions to ensure
|
|
|
|
|
* consistent styling and prevent code duplication between different
|
|
|
|
|
* map components.
|
2025-08-01 12:39:01 -04:00
|
|
|
*
|
2025-08-01 12:05:26 -04:00
|
|
|
* Memory-safe: Creates fresh instances, no shared references that could
|
|
|
|
|
* cause memory leaks.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Create a standard divIcon for GPS points
|
|
|
|
|
* @param {string} color - Marker color ('blue', 'orange', etc.)
|
|
|
|
|
* @param {number} size - Icon size in pixels (default: 8)
|
|
|
|
|
* @returns {L.DivIcon} Leaflet divIcon instance
|
|
|
|
|
*/
|
0.37.3 (#2146)
* fix: move foreman to global gems to fix startup crash (#1971)
* Update exporting code to stream points data to file in batches to red… (#1980)
* Update exporting code to stream points data to file in batches to reduce memory usage
* Update changelog
* Update changelog
* Feature/maplibre frontend (#1953)
* Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet
* Implement phase 1
* Phases 1-3 + part of 4
* Fix e2e tests
* Phase 6
* Implement fog of war
* Phase 7
* Next step: fix specs, phase 7 done
* Use our own map tiles
* Extract v2 map logic to separate manager classes
* Update settings panel on v2 map
* Update v2 e2e tests structure
* Reimplement location search in maps v2
* Update speed routes
* Implement visits and places creation in v2
* Fix last failing test
* Implement visits merging
* Fix a routes e2e test and simplify the routes layer styling.
* Extract js to modules from maps_v2_controller.js
* Implement area creation
* Fix spec problem
* Fix some e2e tests
* Implement live mode in v2 map
* Update icons and panel
* Extract some styles
* Remove unused file
* Start adding dark theme to popups on MapLibre maps
* Make popups respect dark theme
* Move v2 maps to maplibre namespace
* Update v2 references to maplibre
* Put place, area and visit info into side panel
* Update API to use safe settings config method
* Fix specs
* Fix method name to config in SafeSettings and update usages accordingly
* Add missing public files
* Add handling for real time points
* Fix remembering enabled/disabled layers of the v2 map
* Fix lots of e2e tests
* Add settings to select map version
* Use maps/v2 as main path for MapLibre maps
* Update routing
* Update live mode
* Update maplibre controller
* Update changelog
* Remove some console.log statements
* Pull only necessary data for map v2 points
* Feature/raw data archive (#2009)
* 0.36.2 (#2007)
* fix: move foreman to global gems to fix startup crash (#1971)
* Update exporting code to stream points data to file in batches to red… (#1980)
* Update exporting code to stream points data to file in batches to reduce memory usage
* Update changelog
* Update changelog
* Feature/maplibre frontend (#1953)
* Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet
* Implement phase 1
* Phases 1-3 + part of 4
* Fix e2e tests
* Phase 6
* Implement fog of war
* Phase 7
* Next step: fix specs, phase 7 done
* Use our own map tiles
* Extract v2 map logic to separate manager classes
* Update settings panel on v2 map
* Update v2 e2e tests structure
* Reimplement location search in maps v2
* Update speed routes
* Implement visits and places creation in v2
* Fix last failing test
* Implement visits merging
* Fix a routes e2e test and simplify the routes layer styling.
* Extract js to modules from maps_v2_controller.js
* Implement area creation
* Fix spec problem
* Fix some e2e tests
* Implement live mode in v2 map
* Update icons and panel
* Extract some styles
* Remove unused file
* Start adding dark theme to popups on MapLibre maps
* Make popups respect dark theme
* Move v2 maps to maplibre namespace
* Update v2 references to maplibre
* Put place, area and visit info into side panel
* Update API to use safe settings config method
* Fix specs
* Fix method name to config in SafeSettings and update usages accordingly
* Add missing public files
* Add handling for real time points
* Fix remembering enabled/disabled layers of the v2 map
* Fix lots of e2e tests
* Add settings to select map version
* Use maps/v2 as main path for MapLibre maps
* Update routing
* Update live mode
* Update maplibre controller
* Update changelog
* Remove some console.log statements
---------
Co-authored-by: Robin Tuszik <mail@robin.gg>
* Remove esbuild scripts from package.json
* Remove sideEffects field from package.json
* Raw data archivation
* Add tests
* Fix tests
* Fix tests
* Update ExceptionReporter
* Add schedule to run raw data archival job monthly
* Change file structure for raw data archival feature
* Update changelog and version for raw data archival feature
---------
Co-authored-by: Robin Tuszik <mail@robin.gg>
* Set raw_data to an empty hash instead of nil when archiving
* Fix storage configuration and file extraction
* Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation (#2018)
* Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation
* Remove raw data from visited cities api endpoint
* Use user timezone to show dates on maps (#2020)
* Fix/pre epoch time (#2019)
* Use user timezone to show dates on maps
* Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates.
* Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates.
* Fix tests failing due to new index on stats table
* Fix failing specs
* Update redis client configuration to support unix socket connection
* Update changelog
* Fix kml kmz import issues (#2023)
* Fix kml kmz import issues
* Refactor KML importer to improve readability and maintainability
* Implement moving points in map v2 and fix route rendering logic to ma… (#2027)
* Implement moving points in map v2 and fix route rendering logic to match map v1.
* Fix route spec
* fix(maplibre): update date format to ISO 8601 (#2029)
* Add verification step to raw data archival process (#2028)
* Add verification step to raw data archival process
* Add actual verification of raw data archives after creation, and only clear raw_data for verified archives.
* Fix failing specs
* Eliminate zip-bomb risk
* Fix potential memory leak in js
* Return .keep files
* Use Toast instead of alert for notifications
* Add help section to navbar dropdown
* Update changelog
* Remove raw_data_archival_job
* Ensure file is being closed properly after reading in Archivable concern
* Add composite index to stats table if not exists
* Update changelog
* Update entrypoint to always sync static assets (not only new ones)
* Add family layer to MapLibre maps (#2055)
* Add family layer to MapLibre maps
* Update migration
* Don't show family toggle if feature is disabled
* Update changelog
* Return changelog
* Update changelog
* Update tailwind file
* Bump sentry-rails from 6.0.0 to 6.1.0 (#1945)
Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/6.0.0...6.1.0)
---
updated-dependencies:
- dependency-name: sentry-rails
dependency-version: 6.1.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump turbo-rails from 2.0.17 to 2.0.20 (#1944)
Bumps [turbo-rails](https://github.com/hotwired/turbo-rails) from 2.0.17 to 2.0.20.
- [Release notes](https://github.com/hotwired/turbo-rails/releases)
- [Commits](https://github.com/hotwired/turbo-rails/compare/v2.0.17...v2.0.20)
---
updated-dependencies:
- dependency-name: turbo-rails
dependency-version: 2.0.20
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com>
* Bump webmock from 3.25.1 to 3.26.1 (#1943)
Bumps [webmock](https://github.com/bblimke/webmock) from 3.25.1 to 3.26.1.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.25.1...v3.26.1)
---
updated-dependencies:
- dependency-name: webmock
dependency-version: 3.26.1
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com>
* Bump brakeman from 7.1.0 to 7.1.1 (#1942)
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v7.1.0...v7.1.1)
---
updated-dependencies:
- dependency-name: brakeman
dependency-version: 7.1.1
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump redis from 5.4.0 to 5.4.1 (#1941)
Bumps [redis](https://github.com/redis/redis-rb) from 5.4.0 to 5.4.1.
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v5.4.0...v5.4.1)
---
updated-dependencies:
- dependency-name: redis
dependency-version: 5.4.1
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Put import deletion into background job (#2045)
* Put import deletion into background job
* Update changelog
* fix null type error and update heatmap styling (#2037)
* fix: use constant weight for maplibre heatmap layer
* fix null type, update heatmap styling
* improve heatmap styling
* fix typo
* Fix stats calculation to recursively reduce H3 resolution when too ma… (#2065)
* Fix stats calculation to recursively reduce H3 resolution when too many hexagons are generated
* Update CHANGELOG.md
* Validate trip start and end dates (#2066)
* Validate trip start and end dates
* Update changelog
* Update migration to clean up duplicate stats before adding unique index
* Fix fog of war radius setting being ignored and applying settings causing errors (#2068)
* Update changelog
* Add Rack::Deflater middleware to config/application.rb to enable gzip compression for responses.
* Add composite index to points on user_id and timestamp
* Deduplicte points based on timestamp brought to unix time
* Fix/stats cache invalidation (#2072)
* Fix family layer toggle in Map v2 settings for non-selfhosted env
* Invalidate cache
* Remove comments
* Remove comment
* Add new indicies to improve performance and remove unused ones to opt… (#2078)
* Add new indicies to improve performance and remove unused ones to optimize database.
* Remove comments
* Update map search suggestions panel styling
* Add yearly digest (#2073)
* Add yearly digest
* Rename YearlyDigests to Users::Digests
* Minor changes
* Update yearly digest layout and styles
* Add flags and chart to email
* Update colors
* Fix layout of stats in yearly digest view
* Remove cron job for yearly digest scheduling
* Update CHANGELOG.md
* Update digest email setting handling
* Allow sharing digest for 1 week or 1 month
* Change Digests Distance to Bigint
* Fix settings page
* Update changelog
* Add RailsPulse (#2079)
* Add RailsPulse
* Add RailsPulse monitoring tool with basic HTTP authentication
* Bring points_count to integer
* Update migration and version
* Update rubocop issues
* Fix migrations and data verification to remove safety_assured blocks and handle missing points gracefully.
* Update version
* Update calculation of time spent in a country for year-end digest email (#2110)
* Update calculation of time spent in a country for year-end digest email
* Add a filter to exclude raw data points when calculating yearly digests.
* Bump trix from 2.1.15 to 2.1.16 in the npm_and_yarn group across 1 directory (#2098)
* 0.37.1 (#2092)
* fix: move foreman to global gems to fix startup crash (#1971)
* Update exporting code to stream points data to file in batches to red… (#1980)
* Update exporting code to stream points data to file in batches to reduce memory usage
* Update changelog
* Update changelog
* Feature/maplibre frontend (#1953)
* Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet
* Implement phase 1
* Phases 1-3 + part of 4
* Fix e2e tests
* Phase 6
* Implement fog of war
* Phase 7
* Next step: fix specs, phase 7 done
* Use our own map tiles
* Extract v2 map logic to separate manager classes
* Update settings panel on v2 map
* Update v2 e2e tests structure
* Reimplement location search in maps v2
* Update speed routes
* Implement visits and places creation in v2
* Fix last failing test
* Implement visits merging
* Fix a routes e2e test and simplify the routes layer styling.
* Extract js to modules from maps_v2_controller.js
* Implement area creation
* Fix spec problem
* Fix some e2e tests
* Implement live mode in v2 map
* Update icons and panel
* Extract some styles
* Remove unused file
* Start adding dark theme to popups on MapLibre maps
* Make popups respect dark theme
* Move v2 maps to maplibre namespace
* Update v2 references to maplibre
* Put place, area and visit info into side panel
* Update API to use safe settings config method
* Fix specs
* Fix method name to config in SafeSettings and update usages accordingly
* Add missing public files
* Add handling for real time points
* Fix remembering enabled/disabled layers of the v2 map
* Fix lots of e2e tests
* Add settings to select map version
* Use maps/v2 as main path for MapLibre maps
* Update routing
* Update live mode
* Update maplibre controller
* Update changelog
* Remove some console.log statements
* Pull only necessary data for map v2 points
* Feature/raw data archive (#2009)
* 0.36.2 (#2007)
* fix: move foreman to global gems to fix startup crash (#1971)
* Update exporting code to stream points data to file in batches to red… (#1980)
* Update exporting code to stream points data to file in batches to reduce memory usage
* Update changelog
* Update changelog
* Feature/maplibre frontend (#1953)
* Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet
* Implement phase 1
* Phases 1-3 + part of 4
* Fix e2e tests
* Phase 6
* Implement fog of war
* Phase 7
* Next step: fix specs, phase 7 done
* Use our own map tiles
* Extract v2 map logic to separate manager classes
* Update settings panel on v2 map
* Update v2 e2e tests structure
* Reimplement location search in maps v2
* Update speed routes
* Implement visits and places creation in v2
* Fix last failing test
* Implement visits merging
* Fix a routes e2e test and simplify the routes layer styling.
* Extract js to modules from maps_v2_controller.js
* Implement area creation
* Fix spec problem
* Fix some e2e tests
* Implement live mode in v2 map
* Update icons and panel
* Extract some styles
* Remove unused file
* Start adding dark theme to popups on MapLibre maps
* Make popups respect dark theme
* Move v2 maps to maplibre namespace
* Update v2 references to maplibre
* Put place, area and visit info into side panel
* Update API to use safe settings config method
* Fix specs
* Fix method name to config in SafeSettings and update usages accordingly
* Add missing public files
* Add handling for real time points
* Fix remembering enabled/disabled layers of the v2 map
* Fix lots of e2e tests
* Add settings to select map version
* Use maps/v2 as main path for MapLibre maps
* Update routing
* Update live mode
* Update maplibre controller
* Update changelog
* Remove some console.log statements
---------
Co-authored-by: Robin Tuszik <mail@robin.gg>
* Remove esbuild scripts from package.json
* Remove sideEffects field from package.json
* Raw data archivation
* Add tests
* Fix tests
* Fix tests
* Update ExceptionReporter
* Add schedule to run raw data archival job monthly
* Change file structure for raw data archival feature
* Update changelog and version for raw data archival feature
---------
Co-authored-by: Robin Tuszik <mail@robin.gg>
* Set raw_data to an empty hash instead of nil when archiving
* Fix storage configuration and file extraction
* Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation (#2018)
* Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation
* Remove raw data from visited cities api endpoint
* Use user timezone to show dates on maps (#2020)
* Fix/pre epoch time (#2019)
* Use user timezone to show dates on maps
* Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates.
* Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates.
* Fix tests failing due to new index on stats table
* Fix failing specs
* Update redis client configuration to support unix socket connection
* Update changelog
* Fix kml kmz import issues (#2023)
* Fix kml kmz import issues
* Refactor KML importer to improve readability and maintainability
* Implement moving points in map v2 and fix route rendering logic to ma… (#2027)
* Implement moving points in map v2 and fix route rendering logic to match map v1.
* Fix route spec
* fix(maplibre): update date format to ISO 8601 (#2029)
* Add verification step to raw data archival process (#2028)
* Add verification step to raw data archival process
* Add actual verification of raw data archives after creation, and only clear raw_data for verified archives.
* Fix failing specs
* Eliminate zip-bomb risk
* Fix potential memory leak in js
* Return .keep files
* Use Toast instead of alert for notifications
* Add help section to navbar dropdown
* Update changelog
* Remove raw_data_archival_job
* Ensure file is being closed properly after reading in Archivable concern
* Add composite index to stats table if not exists
* Update changelog
* Update entrypoint to always sync static assets (not only new ones)
* Add family layer to MapLibre maps (#2055)
* Add family layer to MapLibre maps
* Update migration
* Don't show family toggle if feature is disabled
* Update changelog
* Return changelog
* Update changelog
* Update tailwind file
* Bump sentry-rails from 6.0.0 to 6.1.0 (#1945)
Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/6.0.0...6.1.0)
---
updated-dependencies:
- dependency-name: sentry-rails
dependency-version: 6.1.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump turbo-rails from 2.0.17 to 2.0.20 (#1944)
Bumps [turbo-rails](https://github.com/hotwired/turbo-rails) from 2.0.17 to 2.0.20.
- [Release notes](https://github.com/hotwired/turbo-rails/releases)
- [Commits](https://github.com/hotwired/turbo-rails/compare/v2.0.17...v2.0.20)
---
updated-dependencies:
- dependency-name: turbo-rails
dependency-version: 2.0.20
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com>
* Bump webmock from 3.25.1 to 3.26.1 (#1943)
Bumps [webmock](https://github.com/bblimke/webmock) from 3.25.1 to 3.26.1.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.25.1...v3.26.1)
---
updated-dependencies:
- dependency-name: webmock
dependency-version: 3.26.1
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com>
* Bump brakeman from 7.1.0 to 7.1.1 (#1942)
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v7.1.0...v7.1.1)
---
updated-dependencies:
- dependency-name: brakeman
dependency-version: 7.1.1
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump redis from 5.4.0 to 5.4.1 (#1941)
Bumps [redis](https://github.com/redis/redis-rb) from 5.4.0 to 5.4.1.
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v5.4.0...v5.4.1)
---
updated-dependencies:
- dependency-name: redis
dependency-version: 5.4.1
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Put import deletion into background job (#2045)
* Put import deletion into background job
* Update changelog
* fix null type error and update heatmap styling (#2037)
* fix: use constant weight for maplibre heatmap layer
* fix null type, update heatmap styling
* improve heatmap styling
* fix typo
* Fix stats calculation to recursively reduce H3 resolution when too ma… (#2065)
* Fix stats calculation to recursively reduce H3 resolution when too many hexagons are generated
* Update CHANGELOG.md
* Validate trip start and end dates (#2066)
* Validate trip start and end dates
* Update changelog
* Update migration to clean up duplicate stats before adding unique index
* Fix fog of war radius setting being ignored and applying settings causing errors (#2068)
* Update changelog
* Add Rack::Deflater middleware to config/application.rb to enable gzip compression for responses.
* Add composite index to points on user_id and timestamp
* Deduplicte points based on timestamp brought to unix time
* Fix/stats cache invalidation (#2072)
* Fix family layer toggle in Map v2 settings for non-selfhosted env
* Invalidate cache
* Remove comments
* Remove comment
* Add new indicies to improve performance and remove unused ones to opt… (#2078)
* Add new indicies to improve performance and remove unused ones to optimize database.
* Remove comments
* Update map search suggestions panel styling
* Add yearly digest (#2073)
* Add yearly digest
* Rename YearlyDigests to Users::Digests
* Minor changes
* Update yearly digest layout and styles
* Add flags and chart to email
* Update colors
* Fix layout of stats in yearly digest view
* Remove cron job for yearly digest scheduling
* Update CHANGELOG.md
* Update digest email setting handling
* Allow sharing digest for 1 week or 1 month
* Change Digests Distance to Bigint
* Fix settings page
* Update changelog
* Add RailsPulse (#2079)
* Add RailsPulse
* Add RailsPulse monitoring tool with basic HTTP authentication
* Bring points_count to integer
* Update migration and version
* Update rubocop issues
* Fix migrations and data verification to remove safety_assured blocks and handle missing points gracefully.
* Update version
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Robin Tuszik <mail@robin.gg>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump trix in the npm_and_yarn group across 1 directory
Bumps the npm_and_yarn group with 1 update in the / directory: [trix](https://github.com/basecamp/trix).
Updates `trix` from 2.1.15 to 2.1.16
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.1.15...v2.1.16)
---
updated-dependencies:
- dependency-name: trix
dependency-version: 2.1.16
dependency-type: direct:production
dependency-group: npm_and_yarn
...
Signed-off-by: dependabot[bot] <support@github.com>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com>
Co-authored-by: Robin Tuszik <mail@robin.gg>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Map v2 will no longer block the UI when Immich/Photoprism integration has a bad URL or is unreachable (#2113)
* Bump rubocop-rails from 2.33.4 to 2.34.2 (#2080)
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.33.4 to 2.34.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.33.4...v2.34.2)
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-version: 2.34.2
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump chartkick from 5.2.0 to 5.2.1 (#2081)
Bumps [chartkick](https://github.com/ankane/chartkick) from 5.2.0 to 5.2.1.
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v5.2.0...v5.2.1)
---
updated-dependencies:
- dependency-name: chartkick
dependency-version: 5.2.1
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump rubyzip from 3.2.0 to 3.2.2 (#2082)
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 3.2.0 to 3.2.2.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/main/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v3.2.0...v3.2.2)
---
updated-dependencies:
- dependency-name: rubyzip
dependency-version: 3.2.2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump sentry-ruby from 6.0.0 to 6.2.0 (#2083)
Bumps [sentry-ruby](https://github.com/getsentry/sentry-ruby) from 6.0.0 to 6.2.0.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/6.0.0...6.2.0)
---
updated-dependencies:
- dependency-name: sentry-ruby
dependency-version: 6.2.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com>
* Bump sidekiq from 8.0.8 to 8.1.0 (#2084)
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 8.0.8 to 8.1.0.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v8.0.8...v8.1.0)
---
updated-dependencies:
- dependency-name: sidekiq
dependency-version: 8.1.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com>
* Update digest calculation to use actual time spent in countries based… (#2115)
* 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
* Update Gemfile and Gemfile.lock to pin connection_pool and sidekiq versions
* Rework country tracked days calculation
* Adjust calculate_duration_in_minutes to only count continuous presence within cities, excluding long gaps.
* Move helpers for digest city progress to a helper method
* Implement globe projection option for Map v2 using MapLibre GL JS.
* Update time spent calculation for country minutes in user digests
* Stats are now calculated with more accuracy by storing total minutes spent per country.
* Add globe_projection setting to safe settings
* Remove console.logs from most of map v2
* Implement some performance improvements and caching for various featu… (#2133)
* Implement some performance improvements and caching for various features.
* Fix failing tests
* Implement routes behaviour in map v2 to match map v1
* Fix route highlighting
* Add fallbacks when retrieving full route features to handle cases where source data access methods vary.
* Fix some e2e tests
* Add immediate verification and count validation to raw data archiving (#2138)
* Add immediate verification and count validation to raw data archiving
* Remove verifying job
* Add archive metrics reporting
* Disable RailsPulse in Self-hosted Environments
* Remove user_id and points_count parameters from Metrics::Archives::Operation and related calls.
* Move points creation logic from background jobs to service objects (#2145)
* Move points creation logic from background jobs to service objects
* Remove unused point creation jobs
* Update changelog
* Add tracks to map v2 (#2142)
* Add tracks to map v2
* Remove console log
* Update tracks generation behavior to ignore distance threshold for frontend parity
* Extract logic to services from TracksController#index and add tests
* Move query logic for track listing into a service object.
* Minor changes
* Fix minor issues
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Robin Tuszik <mail@robin.gg>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-01-11 13:51:03 -05:00
|
|
|
export function createStandardIcon(color = 'blue', size = 4) {
|
2025-08-01 12:05:26 -04:00
|
|
|
return L.divIcon({
|
|
|
|
|
className: 'custom-div-icon',
|
|
|
|
|
html: `<div style='background-color: ${color}; width: ${size}px; height: ${size}px; border-radius: 50%;'></div>`,
|
|
|
|
|
iconSize: [size, size],
|
|
|
|
|
iconAnchor: [size / 2, size / 2]
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Create a basic marker for live streaming (no drag handlers, minimal features)
|
|
|
|
|
* Memory-efficient for high-frequency creation/destruction
|
2025-08-01 12:39:01 -04:00
|
|
|
*
|
2025-08-01 12:05:26 -04:00
|
|
|
* @param {Array} point - Point data [lat, lng, battery, altitude, timestamp, velocity, id, country]
|
|
|
|
|
* @param {Object} options - Optional marker configuration
|
|
|
|
|
* @returns {L.Marker} Leaflet marker instance
|
|
|
|
|
*/
|
|
|
|
|
export function createLiveMarker(point, options = {}) {
|
|
|
|
|
const [lat, lng] = point;
|
|
|
|
|
const velocity = point[5] || 0; // velocity is at index 5
|
|
|
|
|
const markerColor = velocity < 0 ? 'orange' : 'blue';
|
|
|
|
|
const size = options.size || 8;
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
return L.marker([lat, lng], {
|
|
|
|
|
icon: createStandardIcon(markerColor, size),
|
|
|
|
|
// Live markers don't need these heavy features
|
|
|
|
|
draggable: false,
|
|
|
|
|
autoPan: false,
|
|
|
|
|
// Store minimal data needed for cleanup
|
|
|
|
|
pointId: point[6], // ID is at index 6
|
|
|
|
|
...options // Allow overriding defaults
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Create a full-featured marker with drag handlers and popups
|
|
|
|
|
* Used for static map display where full interactivity is needed
|
2025-08-01 12:39:01 -04:00
|
|
|
*
|
|
|
|
|
* @param {Array} point - Point data [lat, lng, battery, altitude, timestamp, velocity, id, country]
|
2025-08-01 12:05:26 -04:00
|
|
|
* @param {number} index - Marker index in the array
|
|
|
|
|
* @param {Object} userSettings - User configuration
|
|
|
|
|
* @param {string} apiKey - API key for backend operations
|
|
|
|
|
* @param {L.Renderer} renderer - Optional Leaflet renderer
|
|
|
|
|
* @returns {L.Marker} Fully configured Leaflet marker with event handlers
|
|
|
|
|
*/
|
|
|
|
|
export function createInteractiveMarker(point, index, userSettings, apiKey, renderer = null) {
|
|
|
|
|
const [lat, lng] = point;
|
|
|
|
|
const pointId = point[6]; // ID is at index 6
|
|
|
|
|
const velocity = point[5] || 0; // velocity is at index 5
|
|
|
|
|
const markerColor = velocity < 0 ? 'orange' : 'blue';
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
const marker = L.marker([lat, lng], {
|
|
|
|
|
icon: createStandardIcon(markerColor),
|
|
|
|
|
draggable: true,
|
|
|
|
|
autoPan: true,
|
|
|
|
|
pointIndex: index,
|
|
|
|
|
pointId: pointId,
|
|
|
|
|
originalLat: lat,
|
|
|
|
|
originalLng: lng,
|
|
|
|
|
markerData: point, // Store the complete marker data
|
|
|
|
|
renderer: renderer
|
|
|
|
|
});
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
// Add popup
|
|
|
|
|
marker.bindPopup(createPopupContent(point, userSettings.timezone, userSettings.distanceUnit));
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
// Add drag event handlers
|
|
|
|
|
addDragHandlers(marker, apiKey, userSettings);
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
return marker;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Create a simplified marker with minimal features
|
|
|
|
|
* Used for simplified rendering mode
|
2025-08-01 12:39:01 -04:00
|
|
|
*
|
2025-08-01 12:05:26 -04:00
|
|
|
* @param {Array} point - Point data [lat, lng, battery, altitude, timestamp, velocity, id, country]
|
|
|
|
|
* @param {Object} userSettings - User configuration (optional)
|
|
|
|
|
* @returns {L.Marker} Leaflet marker with basic drag support
|
|
|
|
|
*/
|
|
|
|
|
export function createSimplifiedMarker(point, userSettings = {}) {
|
|
|
|
|
const [lat, lng] = point;
|
|
|
|
|
const velocity = point[5] || 0;
|
|
|
|
|
const markerColor = velocity < 0 ? 'orange' : 'blue';
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
const marker = L.marker([lat, lng], {
|
|
|
|
|
icon: createStandardIcon(markerColor),
|
|
|
|
|
draggable: true,
|
|
|
|
|
autoPan: true
|
|
|
|
|
});
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
// Add popup if user settings provided
|
|
|
|
|
if (userSettings.timezone && userSettings.distanceUnit) {
|
|
|
|
|
marker.bindPopup(createPopupContent(point, userSettings.timezone, userSettings.distanceUnit));
|
|
|
|
|
}
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
// Add simple drag handlers
|
|
|
|
|
marker.on('dragstart', function() {
|
|
|
|
|
this.closePopup();
|
|
|
|
|
});
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
marker.on('dragend', function(e) {
|
|
|
|
|
const newLatLng = e.target.getLatLng();
|
|
|
|
|
this.setLatLng(newLatLng);
|
|
|
|
|
this.openPopup();
|
|
|
|
|
});
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
return marker;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Add comprehensive drag handlers to a marker
|
|
|
|
|
* Handles polyline updates and backend synchronization
|
2025-08-01 12:39:01 -04:00
|
|
|
*
|
2025-08-01 12:05:26 -04:00
|
|
|
* @param {L.Marker} marker - The marker to add handlers to
|
|
|
|
|
* @param {string} apiKey - API key for backend operations
|
|
|
|
|
* @param {Object} userSettings - User configuration
|
|
|
|
|
* @private
|
|
|
|
|
*/
|
|
|
|
|
function addDragHandlers(marker, apiKey, userSettings) {
|
|
|
|
|
marker.on('dragstart', function(e) {
|
|
|
|
|
this.closePopup();
|
|
|
|
|
});
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
marker.on('drag', function(e) {
|
|
|
|
|
const newLatLng = e.target.getLatLng();
|
|
|
|
|
const map = e.target._map;
|
|
|
|
|
const pointIndex = e.target.options.pointIndex;
|
|
|
|
|
const originalLat = e.target.options.originalLat;
|
|
|
|
|
const originalLng = e.target.options.originalLng;
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
// Find polylines by iterating through all map layers
|
|
|
|
|
map.eachLayer((layer) => {
|
|
|
|
|
// Check if this is a LayerGroup containing polylines
|
|
|
|
|
if (layer instanceof L.LayerGroup) {
|
|
|
|
|
layer.eachLayer((featureGroup) => {
|
|
|
|
|
if (featureGroup instanceof L.FeatureGroup) {
|
|
|
|
|
featureGroup.eachLayer((segment) => {
|
|
|
|
|
if (segment instanceof L.Polyline) {
|
|
|
|
|
const coords = segment.getLatLngs();
|
|
|
|
|
const tolerance = 0.0000001;
|
|
|
|
|
let updated = false;
|
|
|
|
|
|
|
|
|
|
// Check and update start point
|
|
|
|
|
if (Math.abs(coords[0].lat - originalLat) < tolerance &&
|
|
|
|
|
Math.abs(coords[0].lng - originalLng) < tolerance) {
|
|
|
|
|
coords[0] = newLatLng;
|
|
|
|
|
updated = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check and update end point
|
|
|
|
|
if (Math.abs(coords[1].lat - originalLat) < tolerance &&
|
|
|
|
|
Math.abs(coords[1].lng - originalLng) < tolerance) {
|
|
|
|
|
coords[1] = newLatLng;
|
|
|
|
|
updated = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Only update if we found a matching endpoint
|
|
|
|
|
if (updated) {
|
|
|
|
|
segment.setLatLngs(coords);
|
|
|
|
|
segment.redraw();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Update the marker's original position for the next drag event
|
|
|
|
|
e.target.options.originalLat = newLatLng.lat;
|
|
|
|
|
e.target.options.originalLng = newLatLng.lng;
|
|
|
|
|
});
|
2025-08-01 12:39:01 -04:00
|
|
|
|
2025-08-01 12:05:26 -04:00
|
|
|
marker.on('dragend', function(e) {
|
|
|
|
|
const newLatLng = e.target.getLatLng();
|
|
|
|
|
const pointId = e.target.options.pointId;
|
|
|
|
|
const pointIndex = e.target.options.pointIndex;
|
|
|
|
|
const originalMarkerData = e.target.options.markerData;
|
|
|
|
|
|
|
|
|
|
fetch(`/api/v1/points/${pointId}`, {
|
|
|
|
|
method: 'PATCH',
|
|
|
|
|
headers: {
|
|
|
|
|
'Content-Type': 'application/json',
|
|
|
|
|
'Accept': 'application/json',
|
|
|
|
|
'Authorization': `Bearer ${apiKey}`
|
|
|
|
|
},
|
|
|
|
|
body: JSON.stringify({
|
|
|
|
|
point: {
|
|
|
|
|
latitude: newLatLng.lat.toString(),
|
|
|
|
|
longitude: newLatLng.lng.toString()
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
.then(response => {
|
|
|
|
|
if (!response.ok) {
|
|
|
|
|
throw new Error(`HTTP error! status: ${response.status}`);
|
|
|
|
|
}
|
|
|
|
|
return response.json();
|
|
|
|
|
})
|
|
|
|
|
.then(data => {
|
|
|
|
|
const map = e.target._map;
|
|
|
|
|
if (map && map.mapsController && map.mapsController.markers) {
|
|
|
|
|
const markers = map.mapsController.markers;
|
|
|
|
|
if (markers[pointIndex]) {
|
|
|
|
|
markers[pointIndex][0] = parseFloat(data.latitude);
|
|
|
|
|
markers[pointIndex][1] = parseFloat(data.longitude);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create updated marker data array
|
|
|
|
|
const updatedMarkerData = [
|
|
|
|
|
parseFloat(data.latitude),
|
|
|
|
|
parseFloat(data.longitude),
|
2025-08-01 12:39:01 -04:00
|
|
|
originalMarkerData[MARKER_DATA_INDICES.BATTERY],
|
|
|
|
|
originalMarkerData[MARKER_DATA_INDICES.ALTITUDE],
|
|
|
|
|
originalMarkerData[MARKER_DATA_INDICES.TIMESTAMP],
|
|
|
|
|
originalMarkerData[MARKER_DATA_INDICES.VELOCITY],
|
|
|
|
|
data.id,
|
|
|
|
|
originalMarkerData[MARKER_DATA_INDICES.COUNTRY]
|
2025-08-01 12:05:26 -04:00
|
|
|
];
|
|
|
|
|
|
|
|
|
|
// Update the marker's stored data
|
|
|
|
|
e.target.options.markerData = updatedMarkerData;
|
|
|
|
|
|
|
|
|
|
// Update the popup content
|
|
|
|
|
if (this._popup) {
|
|
|
|
|
const updatedPopupContent = createPopupContent(
|
|
|
|
|
updatedMarkerData,
|
|
|
|
|
userSettings.timezone,
|
|
|
|
|
userSettings.distanceUnit
|
|
|
|
|
);
|
|
|
|
|
this.setPopupContent(updatedPopupContent);
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(error => {
|
|
|
|
|
console.error('Error updating point:', error);
|
|
|
|
|
this.setLatLng([e.target.options.originalLat, e.target.options.originalLng]);
|
|
|
|
|
alert('Failed to update point position. Please try again.');
|
|
|
|
|
});
|
|
|
|
|
});
|
2025-08-01 12:39:01 -04:00
|
|
|
}
|