Merge 0394b31630 into 49d1e7014b

0.29.1

.app_version

@@ -1 +1 @@
-0.26.0
+0.29.1

.circleci/config.yml

@@ -7,34 +7,55 @@ orbs:
 jobs:
   test:
     docker:
-      - image: cimg/ruby:3.4.1
+      - image: cimg/ruby:3.4.1-browsers
         environment:
           RAILS_ENV: test
+          CI: true
+          DATABASE_HOST: localhost
+          DATABASE_NAME: dawarich_test
+          DATABASE_USERNAME: postgres
+          DATABASE_PASSWORD: mysecretpassword
+          DATABASE_PORT: 5432
       - image: cimg/postgres:13.3-postgis
         environment:
           POSTGRES_USER: postgres
-          POSTGRES_DB: test_database
+          POSTGRES_DB: dawarich_test
           POSTGRES_PASSWORD: mysecretpassword
       - image: redis:7.0
+      - image: selenium/standalone-chrome:latest
+        name: chrome
+        environment:
+          START_XVFB: 'false'
+          JAVA_OPTS: -Dwebdriver.chrome.whitelistedIps=
 
     steps:
       - checkout
+      - browser-tools/install-chrome
+      - browser-tools/install-chromedriver
       - run:
           name: Install Bundler
           command: gem install bundler
       - run:
           name: Bundle Install
           command: bundle install --jobs=4 --retry=3
+      - run:
+          name: Wait for Selenium Chrome
+          command: |
+            dockerize -wait tcp://chrome:4444 -timeout 1m
       - run:
           name: Database Setup
           command: |
-            bundle exec rails db:create
+            bundle exec rails db:create RAILS_ENV=test
-            bundle exec rails db:schema:load
+            bundle exec rails db:schema:load RAILS_ENV=test
+            # Create the queue database manually if it doesn't exist
+            PGPASSWORD=mysecretpassword createdb -h localhost -U postgres dawarich_test_queue || true
       - run:
           name: Run RSpec tests
           command: bundle exec rspec
       - store_artifacts:
           path: coverage
+      - store_artifacts:
+          path: tmp/capybara
 
 workflows:
   rspec:

.devcontainer/docker-compose.yml

@@ -19,7 +19,7 @@ services:
     tty: true
     environment:
       RAILS_ENV: development
-      REDIS_URL: redis://dawarich_redis:6379/0
+      REDIS_URL: redis://dawarich_redis:6379
       DATABASE_HOST: dawarich_db
       DATABASE_USERNAME: postgres
       DATABASE_PASSWORD: password
@@ -28,7 +28,6 @@ services:
       APPLICATION_HOSTS: localhost
       TIME_ZONE: Europe/London
       APPLICATION_PROTOCOL: http
-      DISTANCE_UNIT: km
       PROMETHEUS_EXPORTER_ENABLED: false
       PROMETHEUS_EXPORTER_HOST: 0.0.0.0
       PROMETHEUS_EXPORTER_PORT: 9394

.env.development

@@ -3,5 +3,4 @@ DATABASE_USERNAME=postgres
 DATABASE_PASSWORD=password
 DATABASE_NAME=dawarich_development
 DATABASE_PORT=5432
-REDIS_URL=redis://localhost:6379/1
+REDIS_URL=redis://localhost:6379
-DISTANCE_UNIT='km'

.env.test

@@ -3,4 +3,4 @@ DATABASE_USERNAME=postgres
 DATABASE_PASSWORD=password
 DATABASE_NAME=dawarich_test
 DATABASE_PORT=5432
-REDIS_URL=redis://localhost:6379/1
+REDIS_URL=redis://localhost:6379

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,7 +30,7 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Logs**
-If applicable, add logs from containers `dawarich_app` and `dawarich_sidekiq` to help explain your problem.
+If applicable, add logs from the `dawarich_app` container to help explain your problem.
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/build_and_push.yml

@@ -51,12 +51,34 @@ jobs:
       - name: Set Docker tags
         id: docker_meta
         run: |
-          VERSION=${GITHUB_REF#refs/tags/}
+          # Debug output
+          echo "GITHUB_REF: $GITHUB_REF"
+          echo "GITHUB_REF_NAME: $GITHUB_REF_NAME"
+
+          # Extract version from GITHUB_REF or use GITHUB_REF_NAME
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          else
+            VERSION=$GITHUB_REF_NAME
+          fi
+
+          # Additional safety check - if VERSION is empty, use a default
+          if [ -z "$VERSION" ]; then
+            VERSION="rc"
+          fi
+
+          echo "Using VERSION: $VERSION"
+
           TAGS="freikin/dawarich:${VERSION}"
 
+          # Set platforms based on release type
+          PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7,linux/arm/v6"
+
           # Add :rc tag for pre-releases
           if [ "${{ github.event.release.prerelease }}" = "true" ]; then
             TAGS="${TAGS},freikin/dawarich:rc"
+            # For RC builds, only use amd64
+            PLATFORMS="linux/amd64"
           fi
 
           # Add :latest tag only if release is not a pre-release
@@ -64,7 +86,11 @@ jobs:
             TAGS="${TAGS},freikin/dawarich:latest"
           fi
 
+          echo "Final TAGS: $TAGS"
+          echo "PLATFORMS: $PLATFORMS"
+
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
+          echo "platforms=${PLATFORMS}" >> $GITHUB_OUTPUT
 
       - name: Build and push
         uses: docker/build-push-action@v5
@@ -74,6 +100,6 @@ jobs:
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          platforms: ${{ steps.docker_meta.outputs.platforms }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/ci.yml

@@ -19,7 +19,6 @@ jobs:
         ports:
           - 5432:5432
         options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
-
       redis:
         image: redis
         ports:
@@ -49,14 +48,33 @@ jobs:
       - name: Install Ruby dependencies
         run: bundle install
 
-      - name: Run tests
+      - name: Run bundler audit
+        run: |
+          gem install bundler-audit
+          bundle audit --update
+
+      - name: Setup database
+        env:
+          RAILS_ENV: test
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432
+          REDIS_URL: redis://localhost:6379/1
+        run: bin/rails db:setup
+
+      - name: Run main tests (excluding system tests)
         env:
           RAILS_ENV: test
           DATABASE_URL: postgres://postgres:postgres@localhost:5432
           REDIS_URL: redis://localhost:6379/1
         run: |
-          bin/rails db:setup
+          bundle exec rspec --exclude-pattern "spec/system/**/*_spec.rb" || (cat log/test.log && exit 1)
-          bin/rails spec || (cat log/test.log && exit 1)
+
+      - name: Run system tests
+        env:
+          RAILS_ENV: test
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432
+          REDIS_URL: redis://localhost:6379/1
+        run: |
+          bundle exec rspec spec/system/ || (cat log/test.log && exit 1)
 
       - name: Keep screenshots from failed system tests
         uses: actions/upload-artifact@v4

.gitignore

@@ -72,3 +72,7 @@
 /config/credentials/staging.yml.enc
 
 Makefile
+
+/db/*.sqlite3
+/db/*.sqlite3-shm
+/db/*.sqlite3-wal

.rspec

@@ -1 +1,2 @@
 --require spec_helper
+--profile

CHANGELOG.md

@@ -4,6 +4,537 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+# [0.29.1] - 2025-07-02
+
+## Fixed
+
+- Buttons on the imports page now looks better in both light and dark mode. #1481
+- The PROMETHEUS_EXPORTER_ENABLED environment variable default value is now "false", in quotes.
+- The RAILS_CACHE_DB, RAILS_JOB_QUEUE_DB and RAILS_WS_DB environment variables can be used to set the Redis database number for caching, background jobs and websocket connections respectively. Default values are now 0, 1 and 2 respectively. #1420
+
+## Changed
+
+- Skip DNS rebinding protection for the health check endpoint.
+- Added health check to app.json.
+
+# [0.29.0] - 2025-07-02
+
+You can now move your user data between Dawarich instances. Simply go to your Account settings and click on the "Export my data" button under the password section. An export will be created and you will be able to download it on Exports page once it's ready.
+
+To import your data on a new Dawarich instance, create a new user and upload the exported zip file. You can import your data also on the Account page, by clicking "Import my data" button under the password section.
+
+The feature is experimental and not yet aimed to replace a proper backup solution. Please use at your own risk.
+
+## Added
+
+- In the User Settings, you can now export your user data as a zip file. It will contain the following:
+  - All your points
+  - All your places
+  - All your visits
+  - All your areas
+  - All your imports with files
+  - All your exports with files
+  - All your trips
+  - All your notifications
+  - All your stats
+
+- In the User Settings, you can now import your user data from a zip file. It will import all the data from the zip file, listed above. It will also start stats recalculation.
+- Export file size is now displayed in the exports and imports lists.
+- A button to download an import file is now displayed in the imports list. It may not work properly for imports created before the 0.25.4 release.
+- Imports now have statuses.
+
+## Changed
+
+- Oj is now being used for JSON serialization.
+
+## Fixed
+
+- Email links now use the SMTP domain if set. #1469
+
+
+
+# 0.28.1 - 2025-06-11
+
+## Fixed
+
+- Limit notifications in navbar to 10. Fresh one will replace the oldest one. #1184
+
+## Changed
+
+- No osm point types are being ignored anymore.
+
+# 0.28.0 - 2025-06-09
+
+⚠️ This release includes a breaking change. ⚠️
+
+_yet another, yay!_
+
+Well, we're moving back to Sidekiq and Redis for background jobs and caching. Unfortunately, SolidQueue and SolidCache brought more problems than they solved. Please update your `docker-compose.yml` to use Redis and Sidekiq.
+
+Before updating, you can remove `dawarich_development_queue` database from your postgres. All *.sqlite3 files in `dawarich_sqlite_data` volume can be removed as well.
+
+```diff
+networks:
+  dawarich:
+services:
++ dawarich_redis:
++   image: redis:7.4-alpine
++   container_name: dawarich_redis
++   command: redis-server
++   networks:
++     - dawarich
++   volumes:
++     - dawarich_shared:/data
++   restart: always
++   healthcheck:
++     test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
++     interval: 10s
++     retries: 5
++     start_period: 30s
++     timeout: 10s
+...
+  dawarich_app:
+    image: freikin/dawarich:latest
+    container_name: dawarich_app
+    volumes:
+      - dawarich_public:/var/app/public
+      - dawarich_watched:/var/app/tmp/imports/watched
+      - dawarich_storage:/var/app/storage
+      - dawarich_db_data:/dawarich_db_data
+-     - dawarich_sqlite_data:/dawarich_sqlite_data
+    ...
+    restart: on-failure
+    environment:
+      RAILS_ENV: development
++     REDIS_URL: redis://dawarich_redis:6379
+      DATABASE_HOST: dawarich_db
+      DATABASE_USERNAME: postgres
+      DATABASE_PASSWORD: password
+      DATABASE_NAME: dawarich_development
+-     # PostgreSQL database name for solid_queue
+-     QUEUE_DATABASE_NAME: dawarich_development_queue
+-     QUEUE_DATABASE_PASSWORD: password
+-     QUEUE_DATABASE_USERNAME: postgres
+-     QUEUE_DATABASE_HOST: dawarich_db
+-     QUEUE_DATABASE_PORT: 5432
+-     # SQLite database paths for cache and cable databases
+-     CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3
+-     CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3
+...
+    depends_on:
+      dawarich_db:
+        condition: service_healthy
+        restart: true
++     dawarich_redis:
++       condition: service_healthy
++       restart: true
+...
++ dawarich_sidekiq:
++   image: freikin/dawarich:latest
++   container_name: dawarich_sidekiq
++   volumes:
++     - dawarich_public:/var/app/public
++     - dawarich_watched:/var/app/tmp/imports/watched
++     - dawarich_storage:/var/app/storage
++   networks:
++     - dawarich
++   stdin_open: true
++   tty: true
++   entrypoint: sidekiq-entrypoint.sh
++   command: ['sidekiq']
++   restart: on-failure
++   environment:
++     RAILS_ENV: development
++     REDIS_URL: redis://dawarich_redis:6379
++     DATABASE_HOST: dawarich_db
++     DATABASE_USERNAME: postgres
++     DATABASE_PASSWORD: password
++     DATABASE_NAME: dawarich_development
++     APPLICATION_HOSTS: localhost
++     BACKGROUND_PROCESSING_CONCURRENCY: 10
++     APPLICATION_PROTOCOL: http
++     PROMETHEUS_EXPORTER_ENABLED: false
++     PROMETHEUS_EXPORTER_HOST: dawarich_app
++     PROMETHEUS_EXPORTER_PORT: 9394
++     SELF_HOSTED: "true"
++     STORE_GEODATA: "true"
++   logging:
++     driver: "json-file"
++     options:
++       max-size: "100m"
++       max-file: "5"
++   healthcheck:
++     test: [ "CMD-SHELL", "pgrep -f sidekiq" ]
++     interval: 10s
++     retries: 30
++     start_period: 30s
++     timeout: 10s
++   depends_on:
++     dawarich_db:
++       condition: service_healthy
++       restart: true
++     dawarich_redis:
++       condition: service_healthy
++       restart: true
++     dawarich_app:
++       condition: service_healthy
++       restart: true
+...
+volumes:
+  dawarich_db_data:
+- dawarich_sqlite_data:
+  dawarich_shared:
+  dawarich_public:
+  dawarich_watched:
+  dawarich_storage:
+```
+
+_I understand the confusion, probably even anger, caused by so many breaking changes in the recent days._
+
+_I'm sorry._
+
+## Fixed
+
+- Fixed a bug where points from Immich and Photoprism did not have lonlat attribute set. #1318
+- Added minimum password length to 6 characters. #1373
+- Text size of countries being calculated is now smaller. #1371
+
+## Changed
+
+- Geocoder is now being installed from a private fork for debugging purposes.
+- Redis is now being used for caching.
+- Sidekiq is now being used for background jobs.
+
+## Removed
+- SolidQueue, SolidCache and SolidCable are now removed.
+
+
+# 0.27.4 - 2025-06-06
+
+⚠️ This release includes a breaking change. ⚠️
+
+## Changed
+
+- SolidQueue is now using PostgreSQL instead of SQLite. Provide `QUEUE_DATABASE_NAME`, `QUEUE_DATABASE_PASSWORD`, `QUEUE_DATABASE_USERNAME`, `QUEUE_DATABASE_PORT` and `QUEUE_DATABASE_HOST` environment variables to configure it. #1331
+- SQLite databases are now being stored in the `dawarich_sqlite_data` volume. #1361 #1357
+
+```diff
+...
+  dawarich_app:
+    image: freikin/dawarich:latest
+    container_name: dawarich_app
+    volumes:
+      - dawarich_public:/var/app/public
+      - dawarich_watched:/var/app/tmp/imports/watched
+      - dawarich_storage:/var/app/storage
+      - dawarich_db_data:/dawarich_db_data
++     - dawarich_sqlite_data:/dawarich_sqlite_data
+    ...
+    restart: on-failure
+    environment:
+    ...
+      DATABASE_NAME: dawarich_development
++     # PostgreSQL database name for solid_queue
++     QUEUE_DATABASE_NAME: dawarich_development_queue
++     QUEUE_DATABASE_PASSWORD: password
++     QUEUE_DATABASE_USERNAME: postgres
++     QUEUE_DATABASE_PORT: 5432
++     QUEUE_DATABASE_HOST: dawarich_db
+      # SQLite database paths for cache and cable databases
+-     QUEUE_DATABASE_PATH: /dawarich_db_data/dawarich_development_queue.sqlite3
+-     CACHE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cache.sqlite3
+-     CABLE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cable.sqlite3
++     CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3
++     CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3
+
+volumes:
+  dawarich_db_data:
++ dawarich_sqlite_data:
+  dawarich_shared:
+  dawarich_public:
+  dawarich_watched:
+  dawarich_storage:
+...
+```
+
+# 0.27.3 - 2025-06-05
+
+## Changed
+
+- Added `PGSSENCMODE=disable` to the development environment to resolve sqlite3 error. #1326 #1331
+
+## Fixed
+
+- Fixed rake tasks to be run with `bundle exec`. #1320
+- Fixed import name not being set when updating an import. #1269
+
+## Added
+
+- LocationIQ can now be used as a geocoding service. Set `LOCATIONIQ_API_KEY` to configure it. #1334
+
+
+# 0.27.2 - 2025-06-02
+
+You can now safely remove Redis and Sidekiq from your `docker-compose.yml` file, both containers, related volumes, environment variables and container dependencies.
+
+```diff
+services:
+- dawarich_redis:
+-   image: redis:7.0-alpine
+-   container_name: dawarich_redis
+-   command: redis-server
+-   networks:
+-     - dawarich
+-   volumes:
+-     - dawarich_shared:/data
+-   restart: always
+-   healthcheck:
+-     test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+-     interval: 10s
+-     retries: 5
+-     start_period: 30s
+-     timeout: 10s
+...
+  dawarich_app:
+    image: freikin/dawarich:latest
+    environment:
+      RAILS_ENV: development
+-     REDIS_URL: redis://dawarich_redis:6379/0
+...
+    depends_on:
+      dawarich_db:
+        condition: service_healthy
+        restart: true
+-     dawarich_redis:
+-       condition: service_healthy
+-       restart: true
+...
+- dawarich_sidekiq:
+-   image: freikin/dawarich:latest
+-   container_name: dawarich_sidekiq
+-   volumes:
+-     - dawarich_public:/var/app/public
+-     - dawarich_watched:/var/app/tmp/imports/watched
+-     - dawarich_storage:/var/app/storage
+-   networks:
+-     - dawarich
+-   stdin_open: true
+-   tty: true
+-   entrypoint: sidekiq-entrypoint.sh
+-   command: ['sidekiq']
+-   restart: on-failure
+-   environment:
+-     RAILS_ENV: development
+-     REDIS_URL: redis://dawarich_redis:6379/0
+-     DATABASE_HOST: dawarich_db
+-     DATABASE_USERNAME: postgres
+-     DATABASE_PASSWORD: password
+-     DATABASE_NAME: dawarich_development
+-     APPLICATION_HOSTS: localhost
+-     BACKGROUND_PROCESSING_CONCURRENCY: 10
+-     APPLICATION_PROTOCOL: http
+-     PROMETHEUS_EXPORTER_ENABLED: false
+-     PROMETHEUS_EXPORTER_HOST: dawarich_app
+-     PROMETHEUS_EXPORTER_PORT: 9394
+-     SELF_HOSTED: "true"
+-     STORE_GEODATA: "true"
+-   logging:
+-     driver: "json-file"
+-     options:
+-       max-size: "100m"
+-       max-file: "5"
+-   healthcheck:
+-     test: [ "CMD-SHELL", "bundle exec sidekiqmon processes | grep $${HOSTNAME}" ]
+-     interval: 10s
+-     retries: 30
+-     start_period: 30s
+-     timeout: 10s
+-   depends_on:
+-     dawarich_db:
+-       condition: service_healthy
+-       restart: true
+-     dawarich_redis:
+-       condition: service_healthy
+-       restart: true
+-     dawarich_app:
+-       condition: service_healthy
+-       restart: true
+```
+
+## Removed
+
+- Redis and Sidekiq.
+
+
+
+# 0.27.1 - 2025-06-01
+
+## Fixed
+
+- Cache jobs are now being scheduled correctly after app start.
+- `countries.geojson` now have fixed alpha codes for France and Norway
+
+
+
+# 0.27.0 - 2025-06-01
+
+⚠️ This release includes a breaking change. ⚠️
+
+Starting 0.27.0, Dawarich is using SolidQueue and SolidCache to run background jobs and cache data. Before updating, make sure your Sidekiq queues (https://your_dawarich_app/sidekiq) are empty.
+
+Moving to SolidQueue and SolidCache will require creating new SQLite databases, which will be created automatically when you start the app. They will be stored in the `dawarich_db_data` volume.
+
+Background jobs interface is now available at `/jobs` page.
+
+Please, update your `docker-compose.yml` and add the following:
+
+```diff
+  dawarich_app:
+    image: freikin/dawarich:latest
+    container_name: dawarich_app
+    volumes:
+      - dawarich_public:/var/app/public
+      - dawarich_watched:/var/app/tmp/imports/watched
+      - dawarich_storage:/var/app/storage
++     - dawarich_db_data:/dawarich_db_data
+...
+    environment:
+      ...
+      DATABASE_NAME: dawarich_development
+      # SQLite database paths for secondary databases
++     QUEUE_DATABASE_PATH: /dawarich_db_data/dawarich_development_queue.sqlite3
++     CACHE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cache.sqlite3
++     CABLE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cable.sqlite3
+```
+
+
+## Fixed
+
+- Enable caching in development for the docker image to improve performance.
+
+## Changed
+
+- SolidCache is now being used for caching instead of Redis.
+- SolidQueue is now being used for background jobs instead of Sidekiq.
+- SolidCable is now being used as ActionCable adapter.
+- Background jobs are now being run as Puma plugin instead of separate Docker container.
+- The `rc` docker image is now being built for amd64 architecture only to speed up the build process.
+- Deleting an import with many points now works significantly faster.
+
+
+
+# 0.26.7 - 2025-05-29
+
+## Fixed
+
+- Popups now showing distance in the correct distance unit. #1258
+
+## Added
+
+- Bunch of system tests to cover map interactions.
+
+
+# 0.26.6 - 2025-05-22
+
+## Added
+
+- armv8 to docker build. #1249
+
+## Changed
+
+- Points are now being created in the `points` queue. #1243
+- Route opacity is now being displayed as percentage in the map settings. #462 #1224
+- Exported GeoJSON file now contains coordinates as floats instead of strings, as per RFC 7946. #762
+- Fog of war now can be set to 200 meter per point. #630
+# 0.26.5 - 2025-05-20
+
+## Fixed
+
+- Wget is back to fix healthchecks. #1241 #1231
+- Dockerfile.prod is now using slim image. #1245
+- Dockerfiles now use jemalloc with check for architecture. #1235
+
+# 0.26.4 - 2025-05-19
+
+## Changed
+
+- Docker image is now using slim image to introduce some memory optimizations.
+- The trip page now looks a bit nicer.
+- The "Yesterday" button on the map page was changed to "Today". #1215
+- The "Create Import" button now disabled until files are uploaded.
+
+# 0.26.3 - 2025-05-18
+
+## Fixed
+
+- Fixed a bug where default distance unit was not being set for users. #1206
+
+
+# 0.26.2 - 2025-05-18
+
+## Fixed
+
+- Seeds are now working properly. #1207
+- Fixed a bug where France flag was not being displayed correctly. #1204
+- Fix blank map page caused by empty default distance unit. Default distance unit is now kilometers and can be changed in Settings -> Maps. #1206
+
+
+# 0.26.1 - 2025-05-18
+
+## Geodata on demand
+
+This release introduces a new environment variable `STORE_GEODATA` with default value `true` to control whether to store geodata in the database or not. Currently, geodata is being used when:
+
+- Fetching places geodata
+- Fetching countries for a trip
+- Suggesting place name for a visit
+
+Opting out of storing geodata will make each feature that uses geodata to make a direct request to the geocoding service to calculate required data instead of using existing geodata from the database. Setting `STORE_GEODATA` to `false` can also use you some database space.
+
+If you decide to opt out, you can safely delete your existing geodata from the database:
+
+1. Get into the [console](https://dawarich.app/docs/FAQ/#how-to-enter-dawarich-console)
+2. Run the following commands:
+
+```ruby
+Point.update_all(geodata: {}) # to remove existing geodata
+
+ActiveRecord::Base.connection.execute("VACUUM FULL") # to free up some space
+```
+
+Note, that this will take some time to complete, depending on the number of points you have. This is not a required step.
+
+If you're running your own Photon instance, you can safely set `STORE_GEODATA` to `false`, otherwise it'd be better to keep it enabled, because that way Dawarich will be using existing geodata for its calculations.
+
+Also, after updating to this version, Dawarich will start a huge background job to calculate countries for all your points. Just let it work.
+
+## Added
+
+- Map page now has a button to go to the previous and next day. #296 #631 #904
+- Clicking on number of countries and cities in stats cards now opens a modal with a list of countries and cities visited in that year.
+
+## Changed
+
+- Reverse geocoding is now working as on-demand job instead of storing the result in the database. #619
+- Stats cards now show the last update time. #733
+- Visit card now shows buttons to confirm or decline a visit only if it's not confirmed or declined yet.
+- Distance unit is now being stored in the user settings. You can choose between kilometers and miles, default is kilometers. The setting is accessible in the user settings -> Maps -> Distance Unit. You might want to recalculate your stats after changing the unit. #1126
+- Fog of war is now being displayed as lines instead of dots. Thanks to @MeijiRestored!
+
+## Fixed
+
+- Fixed a bug with an attempt to write points with same lonlat and timestamp from iOS app. #1170
+- Importing GeoJSON files now saves velocity if it was stored in either `velocity` or `speed` property.
+- `bundle exec rake points:migrate_to_lonlat` should work properly now. #1083 #1161
+- PostGIS extension is now being enabled only if it's not already enabled. #1186
+- Fixed a bug where visits were returning into Suggested state after being confirmed or declined. #848
+- If no points are found for a month during stats calculation, stats are now being deleted instead of being left empty. #1066 #406
+
+## Removed
+
+- Removed `DISTANCE_UNIT` constant. It can be safely removed from your environment variables in docker-compose.yml.
+
+
 # 0.26.0 - 2025-05-08
 
 ⚠️ This release includes a breaking change. ⚠️
@@ -19,7 +550,6 @@ If you have encountered problems with moving to a PostGIS image while still on P
 - Dawarich now uses PostgreSQL 17 with PostGIS 3.5 by default.
 
 
-
 # 0.25.10 - 2025-05-08
 
 ## Added
@@ -42,7 +572,7 @@ If you have encountered problems with moving to a PostGIS image while still on P
 
 ## Fixed
 
-- `rake points:migrate_to_lonlat` task now works properly.
+- `bundle exec rake points:migrate_to_lonlat` task now works properly.
 
 # 0.25.8 - 2025-04-24
 
@@ -97,7 +627,7 @@ This is optional feature and is not required for the app to work.
 
 ## Changed
 
-- `rake points:migrate_to_lonlat` task now also tries to extract latitude and longitude from `raw_data` column before using `longitude` and `latitude` columns to fill `lonlat` column.
+- `bundle exec rake points:migrate_to_lonlat` task now also tries to extract latitude and longitude from `raw_data` column before using `longitude` and `latitude` columns to fill `lonlat` column.
 - Docker entrypoints are now using `DATABASE_NAME` environment variable to check if Postgres is existing/available.
 - Sidekiq web UI is now protected by basic auth. Use `SIDEKIQ_USERNAME` and `SIDEKIQ_PASSWORD` environment variables to set the credentials.
 
@@ -154,12 +684,12 @@ volumes:
 ```
 
 
-In this release we're changing the way import files are being stored. Previously, they were being stored in the `raw_data` column of the `imports` table. Now, they are being attached to the import record. All new imports will be using the new storage, to migrate existing imports, you can use the `rake imports:migrate_to_new_storage` task. Run it in the container shell.
+In this release we're changing the way import files are being stored. Previously, they were being stored in the `raw_data` column of the `imports` table. Now, they are being attached to the import record. All new imports will be using the new storage, to migrate existing imports, you can use the `bundle exec rake imports:migrate_to_new_storage` task. Run it in the container shell.
 
 This is an optional task, that will not affect your points or other data.
 Big imports might take a while to migrate, so be patient.
 
-Also, you can now migrate existing exports to the new storage using the `rake exports:migrate_to_new_storage` task (in the container shell) or just delete them.
+Also, you can now migrate existing exports to the new storage using the `bundle exec rake exports:migrate_to_new_storage` task (in the container shell) or just delete them.
 
 If your hardware doesn't have enough memory to migrate the imports, you can delete your imports and re-import them.
 
@@ -180,7 +710,7 @@ If your hardware doesn't have enough memory to migrate the imports, you can dele
 ## Fixed
 
 - Moving points on the map now works correctly. #957
-- `rake points:migrate_to_lonlat` task now also reindexes the points table.
+- `bundle exec rake points:migrate_to_lonlat` task now also reindexes the points table.
 - Fixed filling `lonlat` column for old places after reverse geocoding.
 - Deleting an import now correctly recalculates stats.
 - Datetime across the app is now being displayed in human readable format, i.e 26 Dec 2024, 13:49. Hover over the datetime to see the ISO 8601 timestamp.
@@ -190,7 +720,7 @@ If your hardware doesn't have enough memory to migrate the imports, you can dele
 
 ## Fixed
 
-- Fixed missing `rake points:migrate_to_lonlat` task.
+- Fixed missing `bundle exec rake points:migrate_to_lonlat` task.
 
 # 0.25.2 - 2025-03-21
 
@@ -201,9 +731,9 @@ If your hardware doesn't have enough memory to migrate the imports, you can dele
 
 ## Added
 
-- `rake data_cleanup:remove_duplicate_points` task added to remove duplicate points from the database and export them to a CSV file.
+- `bundle exec rake data_cleanup:remove_duplicate_points` task added to remove duplicate points from the database and export them to a CSV file.
-- `rake points:migrate_to_lonlat` task added for convenient manual migration of points to the new `lonlat` column.
+- `bundle exec rake points:migrate_to_lonlat` task added for convenient manual migration of points to the new `lonlat` column.
-- `rake users:activate` task added to activate all users.
+- `bundle exec rake users:activate` task added to activate all users.
 
 ## Changed
 

Gemfile

@@ -13,7 +13,7 @@ gem 'bootsnap', require: false
 gem 'chartkick'
 gem 'data_migrate'
 gem 'devise'
-gem 'geocoder'
+gem 'geocoder', github: 'Freika/geocoder', branch: 'master'
 gem 'gpx'
 gem 'groupdate'
 gem 'httparty'
@@ -21,19 +21,24 @@ gem 'importmap-rails'
 gem 'kaminari'
 gem 'lograge'
 gem 'oj'
+gem 'parallel'
 gem 'pg'
 gem 'prometheus_exporter'
 gem 'activerecord-postgis-adapter'
 gem 'puma'
 gem 'pundit'
 gem 'rails', '~> 8.0'
+gem 'redis'
 gem 'rexml'
 gem 'rgeo'
 gem 'rgeo-activerecord'
+gem 'rgeo-geojson'
 gem 'rswag-api'
 gem 'rswag-ui'
+gem 'rubyzip', '~> 2.4'
 gem 'sentry-ruby'
 gem 'sentry-rails'
+gem 'stackprof'
 gem 'sidekiq'
 gem 'sidekiq-cron'
 gem 'sidekiq-limit_fetch'
@@ -47,6 +52,7 @@ gem 'jwt'
 
 group :development, :test do
   gem 'brakeman', require: false
+  gem 'bundler-audit', require: false
   gem 'debug', platforms: %i[mri mingw x64_mingw]
   gem 'dotenv-rails'
   gem 'factory_bot_rails'
@@ -58,7 +64,9 @@ group :development, :test do
 end
 
 group :test do
+  gem 'capybara'
   gem 'fakeredis'
+  gem 'selenium-webdriver'
   gem 'shoulda-matchers'
   gem 'simplecov', require: false
   gem 'super_diff'
@@ -70,6 +78,3 @@ group :development do
   gem 'foreman'
   gem 'rubocop-rails', require: false
 end
-
-# Use Redis for Action Cable
-gem 'redis'

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/Freika/geocoder.git
+  revision: 12ac3e659fc5b57c1ffd12f04b8cad2f73d0939c
+  branch: master
+  specs:
+    geocoder (1.8.5)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -95,17 +104,29 @@ GEM
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.20)
-    benchmark (0.4.0)
+    benchmark (0.4.1)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
-    bootsnap (1.18.4)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
     brakeman (7.0.2)
       racc
     builder (3.3.0)
+    bundler-audit (0.9.2)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
     byebug (12.0.0)
-    chartkick (5.1.4)
+    capybara (3.40.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.11)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
+    chartkick (5.1.5)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
@@ -117,7 +138,7 @@ GEM
       tzinfo
       unicode (>= 0.4.4.5)
     csv (3.3.4)
-    data_migrate (11.2.0)
+    data_migrate (11.3.0)
       activerecord (>= 6.1)
       railties (>= 6.1)
     database_consistency (2.0.4)
@@ -132,37 +153,36 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.2)
     docile (1.4.1)
-    dotenv (3.1.7)
+    dotenv (3.1.8)
-    dotenv-rails (3.1.7)
+    dotenv-rails (3.1.8)
-      dotenv (= 3.1.7)
+      dotenv (= 3.1.8)
       railties (>= 6.1)
-    drb (2.2.1)
+    drb (2.2.3)
+    erb (5.0.1)
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
-    factory_bot (6.5.0)
+    factory_bot (6.5.4)
-      activesupport (>= 5.0.0)
+      activesupport (>= 6.1.0)
-    factory_bot_rails (6.4.4)
+    factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
-      railties (>= 5.0.0)
+      railties (>= 6.1.0)
     fakeredis (0.1.4)
     ffaker (2.24.0)
     foreman (0.88.1)
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
-    geocoder (1.8.5)
-      base64 (>= 0.1.0)
-      csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    gpx (1.2.0)
+    gpx (1.2.1)
+      csv
       nokogiri (~> 1.7)
       rake
-    groupdate (6.5.1)
+    groupdate (6.7.0)
-      activesupport (>= 7)
+      activesupport (>= 7.1)
     hashdiff (1.1.2)
     httparty (0.23.1)
       csv
@@ -180,7 +200,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.10.2)
+    json (2.12.0)
     json-schema (5.0.1)
       addressable (~> 2.8)
     jwt (2.10.1)
@@ -197,7 +217,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
     lograge (0.14.0)
@@ -205,7 +225,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.24.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -214,11 +234,13 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
+    matrix (0.4.2)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.25.5)
     msgpack (1.7.3)
+    multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     net-imap (0.5.8)
@@ -244,14 +266,14 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    oj (3.16.9)
+    oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     optimist (3.2.0)
     orm_adapter (0.5.0)
     ostruct (0.6.1)
-    parallel (1.26.3)
+    parallel (1.27.0)
-    parser (3.3.7.4)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
@@ -271,7 +293,7 @@ GEM
       pry (>= 0.13, < 0.16)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
-    psych (5.2.4)
+    psych (5.2.6)
       date
       stringio
     public_suffix (6.0.1)
@@ -281,8 +303,8 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.13)
+    rack (3.1.16)
-    rack-session (2.1.0)
+    rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -303,7 +325,7 @@ GEM
       activesupport (= 8.0.2)
       bundler (>= 1.15.0)
       railties (= 8.0.2)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -319,8 +341,9 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
-    rdoc (6.13.1)
+    rdoc (6.14.1)
+      erb
       psych (>= 4.0.0)
     redis (5.4.0)
       redis-client (>= 0.22.0)
@@ -339,23 +362,26 @@ GEM
     rgeo-activerecord (8.0.0)
       activerecord (>= 7.0)
       rgeo (>= 3.0)
+    rgeo-geojson (2.2.0)
+      multi_json (~> 1.15)
+      rgeo (>= 1.0.0)
     rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.1.1)
+    rspec-rails (8.0.0)
-      actionpack (>= 7.0)
+      actionpack (>= 7.2)
-      activesupport (>= 7.0)
+      activesupport (>= 7.2)
-      railties (>= 7.0)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.2)
+    rspec-support (3.13.3)
     rswag-api (2.16.0)
       activesupport (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
@@ -367,7 +393,7 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.75.2)
+    rubocop (1.75.6)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -378,32 +404,39 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.0)
+    rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    rubocop-rails (2.31.0)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
     ruby-progressbar (1.13.0)
+    rubyzip (2.4.1)
     securerandom (0.4.1)
-    sentry-rails (5.23.0)
+    selenium-webdriver (4.33.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
+    sentry-rails (5.26.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.23.0)
+      sentry-ruby (~> 5.26.0)
-    sentry-ruby (5.23.0)
+    sentry-ruby (5.26.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    shoulda-matchers (6.4.0)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.3.9)
+    sidekiq (8.0.4)
-      base64
+      connection_pool (>= 2.5.0)
-      connection_pool (>= 2.3.0)
+      json (>= 2.9.0)
-      logger
+      logger (>= 1.6.2)
-      rack (>= 2.2.4)
+      rack (>= 3.1.0)
-      redis-client (>= 0.22.2)
+      redis-client (>= 0.23.2)
-    sidekiq-cron (2.2.0)
+    sidekiq-cron (2.3.0)
       cronex (>= 0.13.0)
       fugit (~> 1.8, >= 1.11.1)
       globalid (>= 1.0.1)
@@ -423,6 +456,7 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
+    stackprof (0.2.27)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.7)
@@ -443,7 +477,7 @@ GEM
     tailwindcss-ruby (3.4.17-x86_64-linux)
     thor (1.3.2)
     timeout (0.4.3)
-    turbo-rails (2.0.13)
+    turbo-rails (2.0.16)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
@@ -461,11 +495,14 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
+    websocket (1.2.11)
     websocket-driver (0.7.7)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.7.2)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   aarch64-linux
@@ -482,6 +519,8 @@ DEPENDENCIES
   aws-sdk-s3 (~> 1.177.0)
   bootsnap
   brakeman
+  bundler-audit
+  capybara
   chartkick
   data_migrate
   database_consistency
@@ -492,7 +531,7 @@ DEPENDENCIES
   fakeredis
   ffaker
   foreman
-  geocoder
+  geocoder!
   gpx
   groupdate
   httparty
@@ -501,6 +540,7 @@ DEPENDENCIES
   kaminari
   lograge
   oj
+  parallel
   pg
   prometheus_exporter
   pry-byebug
@@ -512,11 +552,14 @@ DEPENDENCIES
   rexml
   rgeo
   rgeo-activerecord
+  rgeo-geojson
   rspec-rails
   rswag-api
   rswag-specs
   rswag-ui
   rubocop-rails
+  rubyzip (~> 2.4)
+  selenium-webdriver
   sentry-rails
   sentry-ruby
   shoulda-matchers
@@ -525,6 +568,7 @@ DEPENDENCIES
   sidekiq-limit_fetch
   simplecov
   sprockets-rails
+  stackprof
   stimulus-rails
   strong_migrations
   super_diff

README.md

@@ -1,7 +1,6 @@
 # 🌍 Dawarich: Your Self-Hosted Location History Tracker
 
 [![Discord](https://dcbadge.limes.pink/api/server/pHsBjpt5J8)](https://discord.gg/pHsBjpt5J8) | [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/H2H3IDYDD) | [![Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dfreika%26type%3Dpatrons&style=for-the-badge)](https://www.patreon.com/freika)
-Donate using crypto: [0x6bAd13667692632f1bF926cA9B421bEe7EaEB8D4](https://etherscan.io/address/0x6bAd13667692632f1bF926cA9B421bEe7EaEB8D4)
 
 [![CircleCI](https://circleci.com/gh/Freika/dawarich.svg?style=svg)](https://app.circleci.com/pipelines/github/Freika/dawarich)
 
@@ -39,6 +38,7 @@ Donate using crypto: [0x6bAd13667692632f1bF926cA9B421bEe7EaEB8D4](https://ethers
 - ❌ **Do not delete your original data** after importing into Dawarich.
 - 📦 **Backup before updates**: Always [backup your data](https://dawarich.app/docs/tutorials/backup-and-restore) before upgrading.
 - 🔄 **Stay up-to-date**: Make sure you're running the latest version for the best experience.
+- ⚠️ **DO NOT USE PRODUCTION ENVIRONMENT**: Dawarich is not yet ready for production.
 
 ---
 
@@ -50,7 +50,8 @@ You can track your location with the following apps:
 - 🌍 [Overland](https://dawarich.app/docs/tutorials/track-your-location#overland)
 - 🛰️ [OwnTracks](https://dawarich.app/docs/tutorials/track-your-location#owntracks)
 - 🗺️ [GPSLogger](https://dawarich.app/docs/tutorials/track-your-location#gps-logger)
-- 🏡 [Home Assistant](https://dawarich.app/docs/tutorials/track-your-location#homeassistant)
+- 📱 [PhoneTrack](https://dawarich.app/docs/tutorials/track-your-location#phonetrack)
+- 🏡 [Home Assistant](https://dawarich.app/docs/tutorials/track-your-location#home-assistant)
 
 Simply install one of the supported apps on your device and configure it to send location updates to your Dawarich instance.
 

app.json

@@ -5,17 +5,21 @@
     { "url": "https://github.com/heroku/heroku-buildpack-nodejs.git" },
     { "url": "https://github.com/heroku/heroku-buildpack-ruby.git" }
   ],
-  "formation": {
-    "web": {
-      "quantity": 1
-    },
-    "worker": {
-      "quantity": 1
-    }
-  },
   "scripts": {
     "dokku": {
       "predeploy": "bundle exec rails db:migrate"
     }
+  },
+  "healthchecks": {
+    "web": [
+      {
+        "type":        "startup",
+        "name":        "web check",
+        "description": "Checking if the app responds to the /api/v1/health endpoint",
+        "path":        "/api/v1/health",
+        "attempts": 10,
+        "interval": 10
+      }
+    ]
   }
 }

app/controllers/api/v1/countries/borders_controller.rb

@@ -3,7 +3,7 @@
 class Api::V1::Countries::BordersController < ApplicationController
   def index
     countries = Rails.cache.fetch('dawarich/countries_codes', expires_in: 1.day) do
-      Oj.load(File.read(Rails.root.join('lib/assets/countries.json')))
+      Oj.load(File.read(Rails.root.join('lib/assets/countries.geojson')))
     end
 
     render json: countries

app/controllers/api/v1/maps/tile_usage_controller.rb

@@ -2,7 +2,7 @@
 
 class Api::V1::Maps::TileUsageController < ApiController
   def create
-    Maps::TileUsage::Track.new(current_api_user.id, tile_usage_params[:count].to_i).call
+    Metrics::Maps::TileUsage::Track.new(current_api_user.id, tile_usage_params[:count].to_i).call
 
     head :ok
   end

app/controllers/api/v1/overland/batches_controller.rb

@@ -2,6 +2,7 @@
 
 class Api::V1::Overland::BatchesController < ApiController
   before_action :authenticate_active_api_user!, only: %i[create]
+  before_action :validate_points_limit, only: %i[create]
 
   def create
     Overland::BatchCreatingJob.perform_later(batch_params, current_api_user.id)

app/controllers/api/v1/owntracks/points_controller.rb

@@ -2,6 +2,7 @@
 
 class Api::V1::Owntracks::PointsController < ApiController
   before_action :authenticate_active_api_user!, only: %i[create]
+  before_action :validate_points_limit, only: %i[create]
 
   def create
     Owntracks::PointCreatingJob.perform_later(point_params, current_api_user.id)

app/controllers/api/v1/points_controller.rb

@@ -2,6 +2,7 @@
 
 class Api::V1::PointsController < ApiController
   before_action :authenticate_active_api_user!, only: %i[create update destroy]
+  before_action :validate_points_limit, only: %i[create]
 
   def index
     start_at = params[:start_at]&.to_datetime&.to_i

app/controllers/api/v1/settings_controller.rb

@@ -30,7 +30,7 @@ class Api::V1::SettingsController < ApiController
       :time_threshold_minutes, :merge_threshold_minutes, :route_opacity,
       :preferred_map_layer, :points_rendering_mode, :live_map_enabled,
       :immich_url, :immich_api_key, :photoprism_url, :photoprism_api_key,
-      :speed_colored_routes, :speed_color_scale
+      :speed_colored_routes, :speed_color_scale, :fog_of_war_threshold
     )
   end
 end

app/controllers/api/v1/subscriptions_controller.rb

@@ -2,6 +2,7 @@
 
 class Api::V1::SubscriptionsController < ApiController
   skip_before_action :authenticate_api_key, only: %i[callback]
+
   def callback
     decoded_token = Subscription::DecodeJwtToken.new(params[:token]).call
 

app/controllers/api_controller.rb

@@ -41,4 +41,10 @@ class ApiController < ApplicationController
   def required_params
     []
   end
+
+  def validate_points_limit
+    limit_exceeded = PointsLimitExceeded.new(current_api_user).call
+
+    render json: { error: 'Points limit exceeded' }, status: :unauthorized if limit_exceeded
+  end
 end

app/controllers/imports_controller.rb

@@ -6,12 +6,12 @@ class ImportsController < ApplicationController
   before_action :authenticate_user!
   before_action :authenticate_active_user!, only: %i[new create]
   before_action :set_import, only: %i[show edit update destroy]
-
+  before_action :validate_points_limit, only: %i[new create]
   def index
     @imports =
       current_user
       .imports
-      .select(:id, :name, :source, :created_at, :processed)
+      .select(:id, :name, :source, :created_at, :processed, :status)
       .order(created_at: :desc)
       .page(params[:page])
   end
@@ -83,7 +83,7 @@ class ImportsController < ApplicationController
   end
 
   def import_params
-    params.require(:import).permit(:source, files: [])
+    params.require(:import).permit(:name, :source, files: [])
   end
 
   def create_import_from_signed_id(signed_id)
@@ -102,4 +102,10 @@ class ImportsController < ApplicationController
 
     import
   end
+
+  def validate_points_limit
+    limit_exceeded = PointsLimitExceeded.new(current_user).call
+
+    redirect_to imports_path, alert: 'Points limit exceeded', status: :unprocessable_entity if limit_exceeded
+  end
 end

app/controllers/map_controller.rb

@@ -36,7 +36,9 @@ class MapController < ApplicationController
     @distance ||= 0
 
     @coordinates.each_cons(2) do
-      @distance += Geocoder::Calculations.distance_between([_1[0], _1[1]], [_2[0], _2[1]], units: DISTANCE_UNIT)
+      @distance += Geocoder::Calculations.distance_between(
+        [_1[0], _1[1]], [_2[0], _2[1]], units: current_user.safe_settings.distance_unit.to_sym
+      )
     end
 
     @distance.round(1)

app/controllers/settings/background_jobs_controller.rb

@@ -6,9 +6,7 @@ class Settings::BackgroundJobsController < ApplicationController
     %w[start_immich_import start_photoprism_import].include?(params[:job_name])
   }
 
-  def index
+  def index;end
-    @queues = Sidekiq::Queue.all
-  end
 
   def create
     EnqueueBackgroundJob.perform_later(params[:job_name], current_user.id)
@@ -25,14 +23,4 @@ class Settings::BackgroundJobsController < ApplicationController
 
     redirect_to redirect_path, notice: 'Job was successfully created.'
   end
-
-  def destroy
-    # Clear all jobs in the queue, params[:id] contains queue name
-    queue = Sidekiq::Queue.new(params[:id])
-
-    queue.clear
-
-    flash.now[:notice] = 'Queue was successfully cleared.'
-    redirect_to settings_background_jobs_path, notice: 'Queue was successfully cleared.'
-  end
 end

app/controllers/settings/maps_controller.rb

@@ -24,6 +24,6 @@ class Settings::MapsController < ApplicationController
   private
 
   def settings_params
-    params.require(:maps).permit(:name, :url)
+    params.require(:maps).permit(:name, :url, :distance_unit)
   end
 end

app/controllers/settings/users_controller.rb

@@ -2,7 +2,8 @@
 
 class Settings::UsersController < ApplicationController
   before_action :authenticate_self_hosted!
-  before_action :authenticate_admin!
+  before_action :authenticate_admin!, except: [:export, :import]
+  before_action :authenticate_user!, only: [:export, :import]
 
   def index
     @users = User.order(created_at: :desc)
@@ -46,9 +47,54 @@ class Settings::UsersController < ApplicationController
     end
   end
 
+  def export
+    current_user.export_data
+
+    redirect_to exports_path, notice: 'Your data is being exported. You will receive a notification when it is ready.'
+  end
+
+  def import
+    unless params[:archive].present?
+      redirect_to edit_user_registration_path, alert: 'Please select a ZIP archive to import.'
+      return
+    end
+
+    archive_file = params[:archive]
+
+    validate_archive_file(archive_file)
+
+    import = current_user.imports.build(
+      name: archive_file.original_filename,
+      source: :user_data_archive
+    )
+
+    import.file.attach(archive_file)
+
+    if import.save
+      redirect_to edit_user_registration_path,
+                  notice: 'Your data import has been started. You will receive a notification when it completes.'
+    else
+      redirect_to edit_user_registration_path,
+                  alert: 'Failed to start import. Please try again.'
+    end
+  rescue StandardError => e
+    ExceptionReporter.call(e, 'User data import failed to start')
+    redirect_to edit_user_registration_path,
+                alert: 'An error occurred while starting the import. Please try again.'
+  end
+
   private
 
   def user_params
     params.require(:user).permit(:email, :password)
   end
+
+  def validate_archive_file(archive_file)
+    unless archive_file.content_type == 'application/zip' ||
+           archive_file.content_type == 'application/x-zip-compressed' ||
+           File.extname(archive_file.original_filename).downcase == '.zip'
+
+      redirect_to edit_user_registration_path, alert: 'Please upload a valid ZIP file.' and return
+    end
+  end
 end

app/controllers/stats_controller.rb

@@ -5,7 +5,7 @@ class StatsController < ApplicationController
   before_action :authenticate_active_user!, only: %i[update update_all]
 
   def index
-    @stats = current_user.stats.group_by(&:year).sort.reverse
+    @stats = current_user.stats.group_by(&:year).transform_values { |stats| stats.sort_by(&:updated_at).reverse }.sort.reverse
     @points_total = current_user.tracked_points.count
     @points_reverse_geocoded = current_user.total_reverse_geocoded_points
     @points_reverse_geocoded_without_data = current_user.total_reverse_geocoded_points_without_data

app/controllers/trips_controller.rb

@@ -15,6 +15,10 @@ class TripsController < ApplicationController
       @trip.photo_previews
     end
     @photo_sources = @trip.photo_sources
+
+    if @trip.path.blank? || @trip.distance.blank? || @trip.visited_countries.blank?
+      Trips::CalculateAllJob.perform_later(@trip.id, current_user.safe_settings.distance_unit)
+    end
   end
 
   def new
@@ -28,7 +32,7 @@ class TripsController < ApplicationController
     @trip = current_user.trips.build(trip_params)
 
     if @trip.save
-      redirect_to @trip, notice: 'Trip was successfully created.'
+      redirect_to @trip, notice: 'Trip was successfully created. Data is being calculated in the background.'
     else
       render :new, status: :unprocessable_entity
     end

app/helpers/application_helper.rb

@@ -40,7 +40,32 @@ module ApplicationHelper
     data[:cities].flatten!.uniq!
     data[:countries].flatten!.uniq!
 
-    "#{data[:countries].count} countries, #{data[:cities].count} cities"
+    grouped_by_country = {}
+    stats.select { _1.year == year }.each do |stat|
+      stat.toponyms.flatten.each do |toponym|
+        country = toponym['country']
+        next unless country.present?
+
+        grouped_by_country[country] ||= []
+
+        if toponym['cities'].present?
+          toponym['cities'].each do |city_data|
+            city = city_data['city']
+            grouped_by_country[country] << city if city.present?
+          end
+        end
+      end
+    end
+
+    grouped_by_country.transform_values!(&:uniq)
+
+    {
+      countries_count: data[:countries].count,
+      cities_count: data[:cities].count,
+      grouped_by_country: grouped_by_country.transform_values(&:sort).sort.to_h,
+      year: year,
+      modal_id: "countries_cities_modal_#{year}"
+    }
   end
 
   def countries_and_cities_stat_for_month(stat)
@@ -51,7 +76,7 @@ module ApplicationHelper
   end
 
   def year_distance_stat(year, user)
-    # In km or miles, depending on the application settings (DISTANCE_UNIT)
+    # In km or miles, depending on the user.safe_settings.distance_unit
     Stat.year_distance(year, user).sum { _1[1] }
   end
 
@@ -76,7 +101,7 @@ module ApplicationHelper
   def sidebar_distance(distance)
     return unless distance
 
-    "#{distance} #{DISTANCE_UNIT}"
+    "#{distance} #{current_user.safe_settings.distance_unit}"
   end
 
   def sidebar_points(points)

app/helpers/country_flag_helper.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module CountryFlagHelper
+  def country_flag(country_name)
+    country_code = country_to_code(country_name)
+    return "" unless country_code
+
+    # Convert country code to regional indicator symbols (flag emoji)
+    country_code.upcase.each_char.map { |c| (c.ord + 127397).chr(Encoding::UTF_8) }.join
+  end
+
+
+  private
+
+  def country_to_code(country_name)
+    mapping = Country.names_to_iso_a2
+
+    return mapping[country_name] if mapping[country_name]
+
+    mapping.each do |name, code|
+      return code if country_name.downcase == name.downcase
+      return code if country_name.downcase.include?(name.downcase) || name.downcase.include?(country_name.downcase)
+    end
+
+    nil
+  end
+end

app/helpers/trips_helper.rb

@@ -23,4 +23,38 @@ module TripsHelper
       photoprism_search_url(settings['photoprism_url'], start_date, end_date)
     end
   end
+
+  def trip_duration(trip)
+    start_time = trip.started_at.to_time
+    end_time = trip.ended_at.to_time
+
+    # Calculate the difference
+    years = end_time.year - start_time.year
+    months = end_time.month - start_time.month
+    days = end_time.day - start_time.day
+    hours = end_time.hour - start_time.hour
+
+    # Adjust for negative values
+    if hours < 0
+      hours += 24
+      days -= 1
+    end
+    if days < 0
+      prev_month = end_time.prev_month
+      days += (end_time - prev_month).to_i / 1.day
+      months -= 1
+    end
+    if months < 0
+      months += 12
+      years -= 1
+    end
+
+    parts = []
+    parts << "#{years} year#{'s' if years != 1}" if years > 0
+    parts << "#{months} month#{'s' if months != 1}" if months > 0
+    parts << "#{days} day#{'s' if days != 1}" if days > 0
+    parts << "#{hours} hour#{'s' if hours != 1}" if hours > 0
+    parts = ["0 hours"] if parts.empty?
+    parts.join(', ')
+  end
 end

app/javascript/controllers/direct_upload_controller.js

@@ -1,5 +1,6 @@
 import { Controller } from "@hotwired/stimulus"
 import { DirectUpload } from "@rails/activestorage"
+import { showFlashMessage } from "../maps/helpers"
 
 export default class extends Controller {
   static targets = ["input", "progress", "progressBar", "submit", "form"]
@@ -14,6 +15,12 @@ export default class extends Controller {
     if (this.hasFormTarget) {
       this.formTarget.addEventListener("submit", this.onSubmit.bind(this))
     }
+
+    // Initially disable submit button if no files are uploaded
+    if (this.hasSubmitTarget) {
+      const hasUploadedFiles = this.element.querySelectorAll('input[name="import[files][]"][type="hidden"]').length > 0
+      this.submitTarget.disabled = !hasUploadedFiles
+    }
   }
 
   onSubmit(event) {
@@ -48,6 +55,10 @@ export default class extends Controller {
 
     // Disable submit button during upload
     this.submitTarget.disabled = true
+    this.submitTarget.classList.add("opacity-50", "cursor-not-allowed")
+
+    // Show uploading message using flash
+    showFlashMessage('notice', `Uploading ${files.length} files, please wait...`)
 
     // Always remove any existing progress bar to ensure we create a fresh one
     if (this.hasProgressTarget) {
@@ -103,6 +114,8 @@ export default class extends Controller {
 
         if (error) {
           console.error("Error uploading file:", error)
+          // Show error to user using flash
+          showFlashMessage('error', `Error uploading ${file.name}: ${error.message || 'Unknown error'}`)
         } else {
           console.log(`Successfully uploaded ${file.name} with ID: ${blob.signed_id}`)
 
@@ -118,16 +131,26 @@ export default class extends Controller {
 
         // Enable submit button when all uploads are complete
         if (uploadCount === totalFiles) {
-          this.submitTarget.disabled = false
+          // Only enable submit if we have at least one successful upload
+          const successfulUploads = this.element.querySelectorAll('input[name="import[files][]"][type="hidden"]').length
+          this.submitTarget.disabled = successfulUploads === 0
+          this.submitTarget.classList.toggle("opacity-50", successfulUploads === 0)
+          this.submitTarget.classList.toggle("cursor-not-allowed", successfulUploads === 0)
+
+          if (successfulUploads === 0) {
+            showFlashMessage('error', 'No files were successfully uploaded. Please try again.')
+          } else {
+            showFlashMessage('notice', `${successfulUploads} file(s) uploaded successfully. Ready to submit.`)
+          }
           this.isUploading = false
           console.log("All uploads completed")
-          console.log(`Ready to submit with ${this.element.querySelectorAll('input[name="import[files][]"][type="hidden"]').length} files`)
+          console.log(`Ready to submit with ${successfulUploads} files`)
         }
       })
     })
   }
 
-  directUploadWillStoreFileWithXHR(request) {
+    directUploadWillStoreFileWithXHR(request) {
     request.upload.addEventListener("progress", event => {
       if (!this.hasProgressBarTarget) {
         console.warn("Progress bar target not found")

app/javascript/controllers/imports_controller.js

@@ -31,6 +31,11 @@ export default class extends BaseController {
             if (pointsCell) {
               pointsCell.textContent = new Intl.NumberFormat().format(data.import.points_count);
             }
+
+            const statusCell = row.querySelector('[data-status-display]');
+            if (statusCell && data.import.status) {
+              statusCell.textContent = data.import.status;
+            }
           }
         }
       }

app/javascript/controllers/maps_controller.js

@@ -45,8 +45,10 @@ export default class extends BaseController {
     this.timezone = this.element.dataset.timezone;
     this.userSettings = JSON.parse(this.element.dataset.user_settings);
     this.clearFogRadius = parseInt(this.userSettings.fog_of_war_meters) || 50;
+    this.fogLinethreshold = parseInt(this.userSettings.fog_of_war_threshold) || 90;
+    // Store route opacity as decimal (0-1) internally
     this.routeOpacity = parseFloat(this.userSettings.route_opacity) || 0.6;
-    this.distanceUnit = this.element.dataset.distance_unit || "km";
+    this.distanceUnit = this.userSettings.maps?.distance_unit || "km";
     this.pointsRenderingMode = this.userSettings.points_rendering_mode || "raw";
     this.liveMapEnabled = this.userSettings.live_map_enabled || false;
     this.countryCodesMap = countryCodesMap();
@@ -175,13 +177,13 @@ export default class extends BaseController {
     // Update event handlers
     this.map.on('moveend', () => {
       if (document.getElementById('fog')) {
-        this.updateFog(this.markers, this.clearFogRadius);
+        this.updateFog(this.markers, this.clearFogRadius, this.fogLinethreshold);
       }
     });
 
     this.map.on('zoomend', () => {
       if (document.getElementById('fog')) {
-        this.updateFog(this.markers, this.clearFogRadius);
+        this.updateFog(this.markers, this.clearFogRadius, this.fogLinethreshold);
       }
     });
 
@@ -198,7 +200,7 @@ export default class extends BaseController {
       if (e.name === 'Fog of War') {
         fogEnabled = true;
         document.getElementById('fog').style.display = 'block';
-        this.updateFog(this.markers, this.clearFogRadius);
+        this.updateFog(this.markers, this.clearFogRadius, this.fogLinethreshold);
       }
     });
 
@@ -212,7 +214,7 @@ export default class extends BaseController {
     // Update fog circles on zoom and move
     this.map.on('zoomend moveend', () => {
       if (fogEnabled) {
-        this.updateFog(this.markers, this.clearFogRadius);
+        this.updateFog(this.markers, this.clearFogRadius, this.fogLinethreshold);
       }
     });
 
@@ -350,7 +352,7 @@ export default class extends BaseController {
 
     // Update fog of war if enabled
     if (this.map.hasLayer(this.fogOverlay)) {
-      this.updateFog(this.markers, this.clearFogRadius);
+      this.updateFog(this.markers, this.clearFogRadius, this.fogLinethreshold);
     }
 
     // Update the last marker
@@ -390,7 +392,7 @@ export default class extends BaseController {
 
       const visitedCountries = this.getVisitedCountries(countryCodesMap)
       const filteredFeatures = worldData.features.filter(feature =>
-        visitedCountries.includes(feature.properties.ISO_A2)
+        visitedCountries.includes(feature.properties["ISO3166-1-Alpha-2"])
       )
 
       this.scratchLayer.addData({
@@ -587,7 +589,7 @@ export default class extends BaseController {
 
       // Update fog if enabled
       if (this.map.hasLayer(this.fogOverlay)) {
-        this.updateFog(this.markers, this.clearFogRadius);
+        this.updateFog(this.markers, this.clearFogRadius, this.fogLinethreshold);
       }
     })
     .catch(error => {
@@ -623,12 +625,12 @@ export default class extends BaseController {
     }
   }
 
-  updateFog(markers, clearFogRadius) {
+  updateFog(markers, clearFogRadius, fogLinethreshold) {
     const fog = document.getElementById('fog');
     if (!fog) {
       initializeFogCanvas(this.map);
     }
-    requestAnimationFrame(() => drawFogCanvas(this.map, markers, clearFogRadius));
+    requestAnimationFrame(() => drawFogCanvas(this.map, markers, clearFogRadius, fogLinethreshold));
   }
 
   initializeDrawControl() {
@@ -724,20 +726,26 @@ export default class extends BaseController {
 
       // Form HTML
       div.innerHTML = `
-        <form id="settings-form" class="w-48 h-144 overflow-y-auto">
+        <form id="settings-form" style="overflow-y: auto; height: 36rem; width: 12rem;">
-          <label for="route-opacity">Route Opacity</label>
+          <label for="route-opacity">Route Opacity, %</label>
           <div class="join">
-            <input type="number" class="input input-ghost join-item focus:input-ghost input-xs input-bordered w-full max-w-xs" id="route-opacity" name="route_opacity" min="0" max="1" step="0.1" value="${this.routeOpacity}">
+            <input type="number" class="input input-ghost join-item focus:input-ghost input-xs input-bordered w-full max-w-xs" id="route-opacity" name="route_opacity" min="10" max="100" step="10" value="${Math.round(this.routeOpacity * 100)}">
             <label for="route_opacity_info" class="btn-xs join-item ">?</label>
 
           </div>
 
           <label for="fog_of_war_meters">Fog of War radius</label>
           <div class="join">
-            <input type="number" class="join-item input input-ghost focus:input-ghost input-xs input-bordered w-full max-w-xs" id="fog_of_war_meters" name="fog_of_war_meters" min="5" max="100" step="1" value="${this.clearFogRadius}">
+            <input type="number" class="join-item input input-ghost focus:input-ghost input-xs input-bordered w-full max-w-xs" id="fog_of_war_meters" name="fog_of_war_meters" min="5" max="200" step="1" value="${this.clearFogRadius}">
             <label for="fog_of_war_meters_info" class="btn-xs join-item">?</label>
           </div>
 
+          <label for="fog_of_war_threshold">Seconds between Fog of War lines</label>
+          <div class="join">
+            <input type="number" class="join-item input input-ghost focus:input-ghost input-xs input-bordered w-full max-w-xs" id="fog_of_war_threshold" name="fog_of_war_threshold" step="1" value="${this.userSettings.fog_of_war_threshold}">
+            <label for="fog_of_war_threshold_info" class="btn-xs join-item">?</label>
+          </div>
+
 
           <label for="meters_between_routes">Meters between routes</label>
           <div class="join">
@@ -856,13 +864,18 @@ export default class extends BaseController {
     event.preventDefault();
     console.log('Form submitted');
 
+    // Convert percentage to decimal for route_opacity
+    const opacityValue = event.target.route_opacity.value.replace('%', '');
+    const decimalOpacity = parseFloat(opacityValue) / 100;
+
     fetch(`/api/v1/settings?api_key=${this.apiKey}`, {
       method: 'PATCH',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         settings: {
-          route_opacity: event.target.route_opacity.value,
+          route_opacity: decimalOpacity.toString(),
           fog_of_war_meters: event.target.fog_of_war_meters.value,
+          fog_of_war_threshold: event.target.fog_of_war_threshold.value,
           meters_between_routes: event.target.meters_between_routes.value,
           minutes_between_routes: event.target.minutes_between_routes.value,
           time_threshold_minutes: event.target.time_threshold_minutes.value,
@@ -932,6 +945,7 @@ export default class extends BaseController {
 
       // Update the local settings
       this.userSettings = { ...this.userSettings, ...newSettings };
+      // Store the value as decimal internally, but display as percentage in UI
       this.routeOpacity = parseFloat(newSettings.route_opacity) || 0.6;
       this.clearFogRadius = parseInt(newSettings.fog_of_war_meters) || 50;
 

app/javascript/controllers/notifications_controller.js

@@ -48,17 +48,53 @@ export default class extends BaseController {
       return
     }
 
+    // Create divider and notification item to match server-side structure
+    const divider = this.createDivider()
     const li = this.createNotificationListItem(notification)
-    const divider = this.listTarget.querySelector(".divider")
+
-    if (divider) {
+    // Find the "See all" link to determine where to insert
-      divider.parentNode.insertBefore(li, divider.nextSibling)
+    const seeAllLink = this.listTarget.querySelector('li:first-child')
+    if (seeAllLink) {
+      // Insert after the "See all" link
+      seeAllLink.insertAdjacentElement('afterend', divider)
+      divider.insertAdjacentElement('afterend', li)
     } else {
+      // Fallback: prepend to list
+      this.listTarget.prepend(divider)
       this.listTarget.prepend(li)
     }
 
+    // Enforce limit of 10 notification items (excluding the "See all" link)
+    this.enforceNotificationLimit()
+
     this.updateBadge()
   }
 
+  createDivider() {
+    const divider = document.createElement("div")
+    divider.className = "divider p-0 m-0"
+    return divider
+  }
+
+  enforceNotificationLimit() {
+    const limit = 10
+    const notificationItems = this.listTarget.querySelectorAll('.notification-item')
+
+    // Remove excess notifications if we exceed the limit
+    if (notificationItems.length > limit) {
+      // Remove the oldest notifications (from the end of the list)
+      for (let i = limit; i < notificationItems.length; i++) {
+        const itemToRemove = notificationItems[i]
+        // Also remove the divider that comes before it
+        const previousSibling = itemToRemove.previousElementSibling
+        if (previousSibling && previousSibling.classList.contains('divider')) {
+          previousSibling.remove()
+        }
+        itemToRemove.remove()
+      }
+    }
+  }
+
   createNotificationListItem(notification) {
     const li = document.createElement("li")
     li.className = "notification-item"

app/javascript/controllers/trip_map_controller.js

@@ -3,6 +3,7 @@
 
 import BaseController from "./base_controller"
 import L from "leaflet"
+import { createAllMapLayers } from "../maps/layers"
 
 export default class extends BaseController {
   static values = {
@@ -31,11 +32,13 @@ export default class extends BaseController {
       attributionControl: true
     })
 
-    // Add the tile layer
+    // Add base map layer
-    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    const selectedLayerName = this.hasUserSettingsValue ?
-      maxZoom: 19,
+      this.userSettingsValue.preferred_map_layer || "OpenStreetMap" :
-      attribution: "&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a>"
+      "OpenStreetMap";
-    }).addTo(this.map)
+    const maps = this.baseMaps();
+    const defaultLayer = maps[selectedLayerName] || Object.values(maps)[0];
+    defaultLayer.addTo(this.map);
 
     // If we have coordinates, show the route
     if (this.hasPathValue && this.pathValue) {
@@ -45,8 +48,39 @@ export default class extends BaseController {
     }
   }
 
+  baseMaps() {
+    const selectedLayerName = this.hasUserSettingsValue ?
+      this.userSettingsValue.preferred_map_layer || "OpenStreetMap" :
+      "OpenStreetMap";
+
+    let maps = createAllMapLayers(this.map, selectedLayerName);
+
+    // Add custom map if it exists in settings
+    if (this.hasUserSettingsValue && this.userSettingsValue.maps && this.userSettingsValue.maps.url) {
+      const customLayer = L.tileLayer(this.userSettingsValue.maps.url, {
+        maxZoom: 19,
+        attribution: "&copy; OpenStreetMap contributors"
+      });
+
+      // If this is the preferred layer, add it to the map immediately
+      if (selectedLayerName === this.userSettingsValue.maps.name) {
+        customLayer.addTo(this.map);
+        // Remove any other base layers that might be active
+        Object.values(maps).forEach(layer => {
+          if (this.map.hasLayer(layer)) {
+            this.map.removeLayer(layer);
+          }
+        });
+      }
+
+      maps[this.userSettingsValue.maps.name] = customLayer;
+    }
+
+    return maps;
+  }
+
   showRoute() {
-    const points = this.parseLineString(this.pathValue)
+    const points = this.getCoordinates(this.pathValue)
 
     // Only create polyline if we have points
     if (points.length > 0) {
@@ -69,37 +103,34 @@ export default class extends BaseController {
     }
   }
 
-  parseLineString(linestring) {
+  getCoordinates(pathData) {
     try {
-      // Remove 'LINESTRING (' from start and ')' from end
+      // Parse the path data if it's a string
-      const coordsString = linestring
+      let coordinates = pathData;
-        .replace(/LINESTRING\s*\(/, '')  // Remove LINESTRING and opening parenthesis
+      if (typeof pathData === 'string') {
-        .replace(/\)$/, '')              // Remove closing parenthesis
+        try {
-        .trim()                          // Remove any leading/trailing whitespace
+          coordinates = JSON.parse(pathData);
+        } catch (e) {
+          console.error("Error parsing path data as JSON:", e);
+          return [];
+        }
+      }
 
-      // Split into coordinate pairs and parse
+      // Handle array format - convert from [lng, lat] to [lat, lng] for Leaflet
-      const points = coordsString.split(',').map(pair => {
+      return coordinates.map(coord => {
-        // Clean up any extra whitespace and remove any special characters
+        const [lng, lat] = coord;
-        const cleanPair = pair.trim().replace(/[()"\s]+/g, ' ')
-        const [lng, lat] = cleanPair.split(' ').filter(Boolean).map(Number)
 
         // Validate the coordinates
         if (isNaN(lat) || isNaN(lng) || !lat || !lng) {
-          console.error("Invalid coordinates:", cleanPair)
+          console.error("Invalid coordinates:", coord);
-          return null
+          return null;
         }
 
-        return [lat, lng] // Leaflet uses [lat, lng] order
+        return [lat, lng]; // Leaflet uses [lat, lng] order
-      }).filter(point => point !== null) // Remove any invalid points
+      }).filter(point => point !== null);
-
-      // Validate we have points before returning
-      if (points.length === 0) {
-        return []
-      }
-
-      return points
     } catch (error) {
-      return []
+      console.error("Error processing coordinates:", error);
+      return [];
     }
   }
 

app/javascript/controllers/trips_controller.js

@@ -26,7 +26,7 @@ export default class extends BaseController {
     this.apiKey = this.containerTarget.dataset.api_key
     this.userSettings = JSON.parse(this.containerTarget.dataset.user_settings || '{}')
     this.timezone = this.containerTarget.dataset.timezone
-    this.distanceUnit = this.containerTarget.dataset.distance_unit
+    this.distanceUnit = this.userSettings.maps.distance_unit || "km"
 
     // Initialize map and layers
     this.initializeMap()
@@ -133,22 +133,31 @@ export default class extends BaseController {
 
     // After map initialization, add the path if it exists
     if (this.containerTarget.dataset.path) {
-      const pathData = this.containerTarget.dataset.path.replace(/^"|"$/g, ''); // Remove surrounding quotes
+      try {
-      const coordinates = this.parseLineString(pathData);
+        let coordinates;
+        const pathData = this.containerTarget.dataset.path.replace(/^"|"$/g, ''); // Remove surrounding quotes
 
-      const polyline = L.polyline(coordinates, {
+        // Try to parse as JSON first (new format)
-        color: 'blue',
+        coordinates = JSON.parse(pathData);
-        opacity: 0.8,
+        // Convert from [lng, lat] to [lat, lng] for Leaflet
-        weight: 3,
+        coordinates = coordinates.map(coord => [coord[1], coord[0]]);
-        zIndexOffset: 400
-      });
 
-      polyline.addTo(this.polylinesLayer);
+        const polyline = L.polyline(coordinates, {
-      this.polylinesLayer.addTo(this.map);
+          color: 'blue',
+          opacity: 0.8,
+          weight: 3,
+          zIndexOffset: 400
+        });
 
-      // Fit the map to the polyline bounds
+        polyline.addTo(this.polylinesLayer);
-      if (coordinates.length > 0) {
+        this.polylinesLayer.addTo(this.map);
-        this.map.fitBounds(polyline.getBounds(), { padding: [50, 50] });
+
+        // Fit the map to the polyline bounds
+        if (coordinates.length > 0) {
+          this.map.fitBounds(polyline.getBounds(), { padding: [50, 50] });
+        }
+      } catch (error) {
+        console.error("Error processing path data:", error);
       }
     }
   }
@@ -246,17 +255,4 @@ export default class extends BaseController {
       this.fitMapToBounds()
     }
   }
-
-  // Add this method to parse the LineString format
-  parseLineString(lineString) {
-    // Remove LINESTRING and parentheses, then split into coordinate pairs
-    const coordsString = lineString.replace('LINESTRING (', '').replace(')', '');
-    const coords = coordsString.split(', ');
-
-    // Convert each coordinate pair to [lat, lng] format
-    return coords.map(coord => {
-      const [lng, lat] = coord.split(' ').map(Number);
-      return [lat, lng]; // Swap to lat, lng for Leaflet
-    });
-  }
 }

app/javascript/maps/fog_of_war.js

@@ -23,7 +23,7 @@ export function initializeFogCanvas(map) {
   return fog;
 }
 
-export function drawFogCanvas(map, markers, clearFogRadius) {
+export function drawFogCanvas(map, markers, clearFogRadius, fogLinethreshold) {
   const fog = document.getElementById('fog');
   // Return early if fog element doesn't exist or isn't a canvas
   if (!fog || !(fog instanceof HTMLCanvasElement)) return;
@@ -33,38 +33,60 @@ export function drawFogCanvas(map, markers, clearFogRadius) {
 
   const size = map.getSize();
 
-  // Clear the canvas
+  // 1) Paint base fog
   ctx.clearRect(0, 0, size.x, size.y);
-
-  // Keep the light fog for unexplored areas
   ctx.fillStyle = 'rgba(0, 0, 0, 0.4)';
   ctx.fillRect(0, 0, size.x, size.y);
 
-  // Set up for "cutting" holes
+  // 2) Cut out holes
   ctx.globalCompositeOperation = 'destination-out';
 
-  // Draw clear circles for each point
+  // 3) Build & sort points
-  markers.forEach(point => {
+  const pts = markers
-    const latLng = L.latLng(point[0], point[1]);
+    .map(pt => {
-    const pixelPoint = map.latLngToContainerPoint(latLng);
+      const pixel = map.latLngToContainerPoint(L.latLng(pt[0], pt[1]));
-    const radiusInPixels = metersToPixels(map, clearFogRadius);
+      return { pixel, time: parseInt(pt[4], 10) };
+    })
+    .sort((a, b) => a.time - b.time);
 
-    // Make explored areas completely transparent
+  const radiusPx = Math.max(metersToPixels(map, clearFogRadius), 2);
-    const gradient = ctx.createRadialGradient(
+  console.log(radiusPx);
-      pixelPoint.x, pixelPoint.y, 0,
-      pixelPoint.x, pixelPoint.y, radiusInPixels
-    );
-    gradient.addColorStop(0, 'rgba(255, 255, 255, 1)');      // 100% transparent
-    gradient.addColorStop(0.85, 'rgba(255, 255, 255, 1)');   // Still 100% transparent
-    gradient.addColorStop(1, 'rgba(255, 255, 255, 0)');      // Fade to fog at edge
 
-    ctx.fillStyle = gradient;
+  // 4) Mark which pts are part of a line
-    ctx.beginPath();
+  const connected = new Array(pts.length).fill(false);
-    ctx.arc(pixelPoint.x, pixelPoint.y, radiusInPixels, 0, Math.PI * 2);
+  for (let i = 0; i < pts.length - 1; i++) {
-    ctx.fill();
+    if (pts[i + 1].time - pts[i].time <= fogLinethreshold) {
+      connected[i]     = true;
+      connected[i + 1] = true;
+    }
+  }
+
+  // 5) Draw circles only for “alone” points
+  pts.forEach((pt, i) => {
+    if (!connected[i]) {
+      ctx.fillStyle = 'rgba(255,255,255,1)';
+      ctx.beginPath();
+      ctx.arc(pt.pixel.x, pt.pixel.y, radiusPx, 0, Math.PI * 2);
+      ctx.fill();
+    }
   });
 
-  // Reset composite operation
+  // 6) Draw rounded lines
+  ctx.lineWidth = radiusPx * 2;
+  ctx.lineCap   = 'round';
+  ctx.lineJoin  = 'round';
+  ctx.strokeStyle = 'rgba(255,255,255,1)';
+
+  for (let i = 0; i < pts.length - 1; i++) {
+    if (pts[i + 1].time - pts[i].time <= fogLinethreshold) {
+      ctx.beginPath();
+      ctx.moveTo(pts[i].pixel.x, pts[i].pixel.y);
+      ctx.lineTo(pts[i + 1].pixel.x, pts[i + 1].pixel.y);
+      ctx.stroke();
+    }
+  }
+
+  // 7) Reset composite operation
   ctx.globalCompositeOperation = 'source-over';
 }
 

app/javascript/maps/helpers.js

@@ -66,6 +66,15 @@ export function formatDate(timestamp, timezone) {
   return date.toLocaleString(locale, { timeZone: timezone });
 }
 
+export function formatSpeed(speedKmh, unit = 'km') {
+  if (unit === 'km') {
+    return `${Math.round(speedKmh)} km/h`;
+  } else {
+    const speedMph = speedKmh * 0.621371; // Convert km/h to mph
+    return `${Math.round(speedMph)} mph`;
+  }
+}
+
 export function haversineDistance(lat1, lon1, lat2, lon2, unit = 'km') {
   // Haversine formula to calculate the distance between two points
   const toRad = (x) => (x * Math.PI) / 180;

app/javascript/maps/polylines.js

@@ -1,5 +1,6 @@
 import { formatDate } from "../maps/helpers";
 import { formatDistance } from "../maps/helpers";
+import { formatSpeed } from "../maps/helpers";
 import { minutesToDaysHoursMinutes } from "../maps/helpers";
 import { haversineDistance } from "../maps/helpers";
 
@@ -224,7 +225,7 @@ export function addHighlightOnHover(polylineGroup, map, polylineCoordinates, use
             <strong>End:</strong> ${lastTimestamp}<br>
             <strong>Duration:</strong> ${timeOnRoute}<br>
             <strong>Total Distance:</strong> ${formatDistance(totalDistance, distanceUnit)}<br>
-            <strong>Current Speed:</strong> ${Math.round(speed)} km/h
+            <strong>Current Speed:</strong> ${formatSpeed(speed, distanceUnit)}
         `;
 
         if (hoverPopup) {
@@ -234,7 +235,7 @@ export function addHighlightOnHover(polylineGroup, map, polylineCoordinates, use
         hoverPopup = L.popup()
             .setLatLng(e.latlng)
             .setContent(popupContent)
-            .openOn(map);
+            .addTo(map);
     }
   }
 
@@ -318,7 +319,7 @@ export function addHighlightOnHover(polylineGroup, map, polylineCoordinates, use
       <strong>End:</strong> ${lastTimestamp}<br>
       <strong>Duration:</strong> ${timeOnRoute}<br>
       <strong>Total Distance:</strong> ${formatDistance(totalDistance, distanceUnit)}<br>
-      <strong>Current Speed:</strong> ${Math.round(clickedLayer.options.speed || 0)} km/h
+      <strong>Current Speed:</strong> ${formatSpeed(clickedLayer.options.speed || 0, distanceUnit)}
     `;
 
     if (hoverPopup) {
@@ -328,7 +329,7 @@ export function addHighlightOnHover(polylineGroup, map, polylineCoordinates, use
     hoverPopup = L.popup()
         .setLatLng(e.latlng)
         .setContent(popupContent)
-        .openOn(map);
+        .addTo(map);
 
     // Prevent the click event from propagating to the map
     L.DomEvent.stopPropagation(e);

app/javascript/maps/popups.js

@@ -1,22 +1,32 @@
 import { formatDate } from "./helpers";
 
 export function createPopupContent(marker, timezone, distanceUnit) {
+  let speed = marker[5];
+  let altitude = marker[3];
+  let speedUnit = 'km/h';
+  let altitudeUnit = 'm';
+
+  // convert marker[5] from m/s to km/h first
+  speed = speed * 3.6;
+
   if (distanceUnit === "mi") {
-    // convert marker[5] from km/h to mph
+    // convert speed from km/h to mph
-    marker[5] = marker[5] * 0.621371;
+    speed = speed * 0.621371;
-    // convert marker[3] from meters to feet
+    speedUnit = 'mph';
-    marker[3] = marker[3] * 3.28084;
+    // convert altitude from meters to feet
+    altitude = altitude * 3.28084;
+    altitudeUnit = 'ft';
   }
 
-  // convert marker[5] from m/s to km/h and round to nearest integer
+  speed = Math.round(speed);
-  marker[5] = Math.round(marker[5] * 3.6);
+  altitude = Math.round(altitude);
 
   return `
     <strong>Timestamp:</strong> ${formatDate(marker[4], timezone)}<br>
     <strong>Latitude:</strong> ${marker[0]}<br>
     <strong>Longitude:</strong> ${marker[1]}<br>
-    <strong>Altitude:</strong> ${marker[3]}m<br>
+    <strong>Altitude:</strong> ${altitude}${altitudeUnit}<br>
-    <strong>Speed:</strong> ${marker[5]}km/h<br>
+    <strong>Speed:</strong> ${speed}${speedUnit}<br>
     <strong>Battery:</strong> ${marker[2]}%<br>
     <strong>Id:</strong> ${marker[6]}<br>
     <a href="#" data-id="${marker[6]}" class="delete-point">[Delete]</a>

app/jobs/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
   # Automatically retry jobs that encountered a deadlock
   # retry_on ActiveRecord::Deadlocked

app/jobs/data_migrations/set_points_country_ids_job.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DataMigrations::SetPointsCountryIdsJob < ApplicationJob
+  queue_as :default
+
+  def perform(point_id)
+    point = Point.find(point_id)
+    country = Country.containing_point(point.lon, point.lat)
+
+    if country.present?
+      point.country_id = country.id
+      point.save!
+    else
+      Rails.logger.info("No country found for point #{point.id}")
+    end
+  end
+end

app/jobs/data_migrations/start_settings_points_country_ids_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class DataMigrations::StartSettingsPointsCountryIdsJob < ApplicationJob
+  queue_as :default
+
+  def perform
+    Point.where(country_id: nil).find_each do |point|
+      DataMigrations::SetPointsCountryIdsJob.perform_later(point.id)
+    end
+  end
+end

app/jobs/import/immich_geodata_job.rb

@@ -2,7 +2,6 @@
 
 class Import::ImmichGeodataJob < ApplicationJob
   queue_as :imports
-  sidekiq_options retry: false
 
   def perform(user_id)
     user = User.find(user_id)

app/jobs/overland/batch_creating_job.rb

@@ -3,12 +3,13 @@
 class Overland::BatchCreatingJob < ApplicationJob
   include PointValidation
 
-  queue_as :default
+  queue_as :points
 
   def perform(params, user_id)
     data = Overland::Params.new(params).call
 
     data.each do |location|
+      next if location[:lonlat].nil?
       next if point_exists?(location, user_id)
 
       Point.create!(location.merge(user_id:))

app/jobs/owntracks/point_creating_job.rb

@@ -3,11 +3,12 @@
 class Owntracks::PointCreatingJob < ApplicationJob
   include PointValidation
 
-  queue_as :default
+  queue_as :points
 
   def perform(point_params, user_id)
     parsed_params = OwnTracks::Params.new(point_params).call
 
+    return if parsed_params[:timestamp].nil? || parsed_params[:lonlat].nil?
     return if point_exists?(parsed_params, user_id)
 
     Point.create!(parsed_params.merge(user_id:))

app/jobs/points/create_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Points::CreateJob < ApplicationJob
-  queue_as :default
+  queue_as :points
 
   def perform(params, user_id)
     data = Points::Params.new(params, user_id).call

app/jobs/trips/calculate_all_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Trips::CalculateAllJob < ApplicationJob
+  queue_as :default
+
+  def perform(trip_id, distance_unit = 'km')
+    Trips::CalculatePathJob.perform_later(trip_id)
+    Trips::CalculateDistanceJob.perform_later(trip_id, distance_unit)
+    Trips::CalculateCountriesJob.perform_later(trip_id, distance_unit)
+  end
+end

app/jobs/trips/calculate_countries_job.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Trips::CalculateCountriesJob < ApplicationJob
+  queue_as :default
+
+  def perform(trip_id, distance_unit)
+    trip = Trip.find(trip_id)
+
+    trip.calculate_countries
+    trip.save!
+
+    broadcast_update(trip, distance_unit)
+  end
+
+  private
+
+  def broadcast_update(trip, distance_unit)
+    Turbo::StreamsChannel.broadcast_update_to(
+      "trip_#{trip.id}",
+      target: "trip_countries",
+      partial: "trips/countries",
+      locals: { trip: trip, distance_unit: distance_unit }
+    )
+  end
+end

app/jobs/trips/calculate_distance_job.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Trips::CalculateDistanceJob < ApplicationJob
+  queue_as :default
+
+  def perform(trip_id, distance_unit)
+    trip = Trip.find(trip_id)
+
+    trip.calculate_distance
+    trip.save!
+
+    broadcast_update(trip, distance_unit)
+  end
+
+  private
+
+  def broadcast_update(trip, distance_unit)
+    Turbo::StreamsChannel.broadcast_update_to(
+      "trip_#{trip.id}",
+      target: "trip_distance",
+      partial: "trips/distance",
+      locals: { trip: trip, distance_unit: distance_unit }
+    )
+  end
+end

app/jobs/trips/calculate_path_job.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Trips::CalculatePathJob < ApplicationJob
+  queue_as :default
+
+  def perform(trip_id)
+    trip = Trip.find(trip_id)
+
+    trip.calculate_path
+    trip.save!
+
+    broadcast_update(trip)
+  end
+
+  private
+
+  def broadcast_update(trip)
+    Turbo::StreamsChannel.broadcast_update_to(
+      "trip_#{trip.id}",
+      target: "trip_path",
+      partial: "trips/path",
+      locals: { trip: trip }
+    )
+  end
+end

app/jobs/trips/create_path_job.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class Trips::CreatePathJob < ApplicationJob
-  queue_as :default
-
-  def perform(trip_id)
-    trip = Trip.find(trip_id)
-
-    trip.calculate_path_and_distance
-
-    trip.save!
-  end
-end

app/jobs/users/export_data_job.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Users::ExportDataJob < ApplicationJob
+  queue_as :exports
+
+  sidekiq_options retry: false
+
+  def perform(user_id)
+    user = User.find(user_id)
+
+    Users::ExportData.new(user).export
+  end
+end

app/jobs/users/import_data_job.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+class Users::ImportDataJob < ApplicationJob
+  queue_as :imports
+
+  sidekiq_options retry: false
+
+  def perform(import_id)
+    import = Import.find(import_id)
+    user = import.user
+
+    archive_path = download_import_archive(import)
+
+    unless File.exist?(archive_path)
+      raise StandardError, "Archive file not found: #{archive_path}"
+    end
+
+    import_stats = Users::ImportData.new(user, archive_path).import
+
+    Rails.logger.info "Import completed successfully for user #{user.email}: #{import_stats}"
+  rescue ActiveRecord::RecordNotFound => e
+    ExceptionReporter.call(e, "Import job failed for import_id #{import_id} - import not found")
+
+    raise e
+  rescue StandardError => e
+    user_id = user&.id || import&.user_id || 'unknown'
+    ExceptionReporter.call(e, "Import job failed for user #{user_id}")
+
+    create_import_failed_notification(user, e)
+
+    raise e
+  ensure
+    if archive_path && File.exist?(archive_path)
+      File.delete(archive_path)
+
+      Rails.logger.info "Cleaned up archive file: #{archive_path}"
+    end
+  end
+
+  private
+
+  def download_import_archive(import)
+    require 'tmpdir'
+
+    timestamp = Time.current.to_i
+    filename = "user_import_#{import.user_id}_#{import.id}_#{timestamp}.zip"
+    temp_path = File.join(Dir.tmpdir, filename)
+
+    File.open(temp_path, 'wb') do |file_handle|
+      import.file.download do |chunk|
+        file_handle.write(chunk)
+      end
+    end
+
+    temp_path
+  end
+
+  def create_import_failed_notification(user, error)
+    ::Notifications::Create.new(
+      user: user,
+      title: 'Data import failed',
+      content: "Your data import failed with error: #{error.message}. Please check the archive format and try again.",
+      kind: :error
+    ).call
+  end
+end

app/models/concerns/distanceable.rb

@@ -3,14 +3,6 @@
 module Distanceable
   extend ActiveSupport::Concern
 
-  DISTANCE_UNITS = {
-    km: 1000, # to meters
-    mi: 1609.34, # to meters
-    m: 1, # already in meters
-    ft: 0.3048, # to meters
-    yd: 0.9144 # to meters
-  }.freeze
-
   module ClassMethods
     def total_distance(points = nil, unit = :km)
       # Handle method being called directly on relation vs with array
@@ -24,8 +16,8 @@ module Distanceable
     private
 
     def calculate_distance_for_relation(unit)
-      unless DISTANCE_UNITS.key?(unit.to_sym)
+      unless ::DISTANCE_UNITS.key?(unit.to_sym)
-        raise ArgumentError, "Invalid unit. Supported units are: #{DISTANCE_UNITS.keys.join(', ')}"
+        raise ArgumentError, "Invalid unit. Supported units are: #{::DISTANCE_UNITS.keys.join(', ')}"
       end
 
       distance_in_meters = connection.select_value(<<-SQL.squish)
@@ -48,12 +40,12 @@ module Distanceable
         WHERE prev_lonlat IS NOT NULL
       SQL
 
-      distance_in_meters.to_f / DISTANCE_UNITS[unit.to_sym]
+      distance_in_meters.to_f / ::DISTANCE_UNITS[unit.to_sym]
     end
 
     def calculate_distance_for_array(points, unit = :km)
-      unless DISTANCE_UNITS.key?(unit.to_sym)
+      unless ::DISTANCE_UNITS.key?(unit.to_sym)
-        raise ArgumentError, "Invalid unit. Supported units are: #{DISTANCE_UNITS.keys.join(', ')}"
+        raise ArgumentError, "Invalid unit. Supported units are: #{::DISTANCE_UNITS.keys.join(', ')}"
       end
 
       return 0 if points.length < 2
@@ -66,13 +58,13 @@ module Distanceable
         )
       end
 
-      total_meters.to_f / DISTANCE_UNITS[unit.to_sym]
+      total_meters.to_f / ::DISTANCE_UNITS[unit.to_sym]
     end
   end
 
   def distance_to(other_point, unit = :km)
-    unless DISTANCE_UNITS.key?(unit.to_sym)
+    unless ::DISTANCE_UNITS.key?(unit.to_sym)
-      raise ArgumentError, "Invalid unit. Supported units are: #{DISTANCE_UNITS.keys.join(', ')}"
+      raise ArgumentError, "Invalid unit. Supported units are: #{::DISTANCE_UNITS.keys.join(', ')}"
     end
 
     # Extract coordinates based on what type other_point is
@@ -88,7 +80,7 @@ module Distanceable
     SQL
 
     # Convert to requested unit
-    distance_in_meters.to_f / DISTANCE_UNITS[unit.to_sym]
+    distance_in_meters.to_f / ::DISTANCE_UNITS[unit.to_sym]
   end
 
   private

app/models/concerns/nearable.rb

@@ -3,14 +3,6 @@
 module Nearable
   extend ActiveSupport::Concern
 
-  DISTANCE_UNITS = {
-    km: 1000, # to meters
-    mi: 1609.34, # to meters
-    m: 1, # already in meters
-    ft: 0.3048, # to meters
-    yd: 0.9144 # to meters
-  }.freeze
-
   class_methods do
     # It accepts an array of coordinates [latitude, longitude]
     # and an optional radius and distance unit
@@ -19,12 +11,12 @@ module Nearable
     def near(*args)
       latitude, longitude, radius, unit = extract_coordinates_and_options(*args)
 
-      unless DISTANCE_UNITS.key?(unit.to_sym)
+      unless ::DISTANCE_UNITS.key?(unit.to_sym)
-        raise ArgumentError, "Invalid unit. Supported units are: #{DISTANCE_UNITS.keys.join(', ')}"
+        raise ArgumentError, "Invalid unit. Supported units are: #{::DISTANCE_UNITS.keys.join(', ')}"
       end
 
       # Convert radius to meters for ST_DWithin
-      radius_in_meters = radius * DISTANCE_UNITS[unit.to_sym]
+      radius_in_meters = radius * ::DISTANCE_UNITS[unit.to_sym]
 
       # Create a point from the given coordinates
       point = "SRID=4326;POINT(#{longitude} #{latitude})"
@@ -41,12 +33,12 @@ module Nearable
     def with_distance(*args)
       latitude, longitude, unit = extract_coordinates_and_options(*args)
 
-      unless DISTANCE_UNITS.key?(unit.to_sym)
+      unless ::DISTANCE_UNITS.key?(unit.to_sym)
-        raise ArgumentError, "Invalid unit. Supported units are: #{DISTANCE_UNITS.keys.join(', ')}"
+        raise ArgumentError, "Invalid unit. Supported units are: #{::DISTANCE_UNITS.keys.join(', ')}"
       end
 
       point = "SRID=4326;POINT(#{longitude} #{latitude})"
-      conversion_factor = 1.0 / DISTANCE_UNITS[unit.to_sym]
+      conversion_factor = 1.0 / ::DISTANCE_UNITS[unit.to_sym]
 
       select(<<-SQL.squish)
         #{table_name}.*,

app/models/country.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Country < ApplicationRecord
+  has_many :points, dependent: :nullify
+
+  validates :name, :iso_a2, :iso_a3, :geom, presence: true
+
+  def self.containing_point(lon, lat)
+    where("ST_Contains(geom, ST_SetSRID(ST_MakePoint(?, ?), 4326))", lon, lat)
+    .select(:id, :name, :iso_a2, :iso_a3)
+    .first
+  end
+
+  def self.names_to_iso_a2
+    pluck(:name, :iso_a2).to_h
+  end
+end

app/models/export.rb

@@ -4,13 +4,14 @@ class Export < ApplicationRecord
   belongs_to :user
 
   enum :status, { created: 0, processing: 1, completed: 2, failed: 3 }
-  enum :file_format, { json: 0, gpx: 1 }
+  enum :file_format, { json: 0, gpx: 1, archive: 2 }
+  enum :file_type, { points: 0, user_data: 1 }
 
   validates :name, presence: true
 
   has_one_attached :file
 
-  after_commit -> { ExportJob.perform_later(id) }, on: :create
+  after_commit -> { ExportJob.perform_later(id) }, on: :create, unless: -> { user_data? || archive? }
   after_commit -> { remove_attached_file }, on: :destroy
 
   def process!

app/models/import.rb

@@ -6,16 +6,32 @@ class Import < ApplicationRecord
 
   has_one_attached :file
 
-  after_commit -> { Import::ProcessJob.perform_later(id) }, on: :create
+  # Flag to skip background processing during user data import
+  attr_accessor :skip_background_processing
+
+  after_commit -> { Import::ProcessJob.perform_later(id) unless skip_background_processing }, on: :create
   after_commit :remove_attached_file, on: :destroy
 
+  validates :name, presence: true, uniqueness: { scope: :user_id }
+
+  enum :status, { created: 0, processing: 1, completed: 2, failed: 3 }
+
   enum :source, {
     google_semantic_history: 0, owntracks: 1, google_records: 2,
-    google_phone_takeout: 3, gpx: 4, immich_api: 5, geojson: 6, photoprism_api: 7
+    google_phone_takeout: 3, gpx: 4, immich_api: 5, geojson: 6, photoprism_api: 7,
+    user_data_archive: 8
   }
 
   def process!
-    Imports::Create.new(user, self).call
+    if user_data_archive?
+      process_user_data_archive!
+    else
+      Imports::Create.new(user, self).call
+    end
+  end
+
+  def process_user_data_archive!
+    Users::ImportDataJob.perform_later(id)
   end
 
   def reverse_geocoded_points_count

app/models/place.rb

@@ -22,29 +22,19 @@ class Place < ApplicationRecord
     lonlat.y
   end
 
-  def async_reverse_geocode
-    return unless DawarichSettings.reverse_geocoding_enabled?
-
-    ReverseGeocodingJob.perform_later(self.class.to_s, id)
-  end
-
-  def reverse_geocoded?
-    geodata.present?
-  end
-
   def osm_id
-    geodata['properties']['osm_id']
+    geodata.dig('properties', 'osm_id')
   end
 
   def osm_key
-    geodata['properties']['osm_key']
+    geodata.dig('properties', 'osm_key')
   end
 
   def osm_value
-    geodata['properties']['osm_value']
+    geodata.dig('properties', 'osm_value')
   end
 
   def osm_type
-    geodata['properties']['osm_type']
+    geodata.dig('properties', 'osm_type')
   end
 end

app/models/point.rb

@@ -7,6 +7,7 @@ class Point < ApplicationRecord
   belongs_to :import, optional: true, counter_cache: true
   belongs_to :visit, optional: true
   belongs_to :user
+  belongs_to :country, optional: true
 
   validates :timestamp, :lonlat, presence: true
   validates :lonlat, uniqueness: {
@@ -28,7 +29,8 @@ class Point < ApplicationRecord
   scope :visited, -> { where.not(visit_id: nil) }
   scope :not_visited, -> { where(visit_id: nil) }
 
-  after_create :async_reverse_geocode
+  after_create :async_reverse_geocode, if: -> { DawarichSettings.store_geodata? && !reverse_geocoded? }
+  after_create :set_country
   after_create_commit :broadcast_coordinates
 
   def self.without_raw_data
@@ -57,6 +59,10 @@ class Point < ApplicationRecord
     lonlat.y
   end
 
+  def found_in_country
+    Country.containing_point(lon, lat)
+  end
+
   private
 
   # rubocop:disable Metrics/MethodLength Metrics/AbcSize
@@ -71,9 +77,19 @@ class Point < ApplicationRecord
         timestamp.to_s,
         velocity.to_s,
         id.to_s,
-        country.to_s
+        country_name.to_s
       ]
     )
   end
   # rubocop:enable Metrics/MethodLength
+
+  def set_country
+    self.country_id = found_in_country&.id
+    save! if changed?
+  end
+
+  def country_name
+    # Safely get country name from association or attribute
+    self.country&.name || read_attribute(:country) || ''
+  end
 end

app/models/stat.rb

@@ -37,7 +37,7 @@ class Stat < ApplicationRecord
   def calculate_daily_distances(monthly_points)
     timespan.to_a.map.with_index(1) do |day, index|
       daily_points = filter_points_for_day(monthly_points, day)
-      distance = Point.total_distance(daily_points, DISTANCE_UNIT)
+      distance = Point.total_distance(daily_points, user.safe_settings.distance_unit)
       [index, distance.round(2)]
     end
   end

app/models/trip.rb

@@ -7,11 +7,11 @@ class Trip < ApplicationRecord
 
   validates :name, :started_at, :ended_at, presence: true
 
-  before_save :calculate_path_and_distance
+  after_create :enqueue_calculation_jobs
+  after_update :enqueue_calculation_jobs, if: -> { saved_change_to_started_at? || saved_change_to_ended_at? }
 
-  def calculate_path_and_distance
+  def enqueue_calculation_jobs
-    calculate_path
+    Trips::CalculateAllJob.perform_later(id, user.safe_settings.distance_unit)
-    calculate_distance
   end
 
   def points
@@ -19,7 +19,9 @@ class Trip < ApplicationRecord
   end
 
   def countries
-    points.pluck(:country).uniq.compact
+    return points.pluck(:country).uniq.compact if DawarichSettings.store_geodata?
+
+    visited_countries
   end
 
   def photo_previews
@@ -30,6 +32,25 @@ class Trip < ApplicationRecord
     @photo_sources ||= photos.map { _1[:source] }.uniq
   end
 
+  def calculate_path
+    trip_path = Tracks::BuildPath.new(points.pluck(:lonlat)).call
+
+    self.path = trip_path
+  end
+
+  def calculate_distance
+    distance = Point.total_distance(points, user.safe_settings.distance_unit)
+
+    self.distance = distance.round
+  end
+
+  def calculate_countries
+    countries =
+      Country.where(id: points.pluck(:country_id).compact.uniq).pluck(:name)
+
+    self.visited_countries = countries
+  end
+
   private
 
   def photos
@@ -44,16 +65,4 @@ class Trip < ApplicationRecord
     # to show all photos in the same height
     vertical_photos.count > horizontal_photos.count ? vertical_photos : horizontal_photos
   end
-
-  def calculate_path
-    trip_path = Tracks::BuildPath.new(points.pluck(:lonlat)).call
-
-    self.path = trip_path
-  end
-
-  def calculate_distance
-    distance = Point.total_distance(points, DISTANCE_UNIT)
-
-    self.distance = distance.round
-  end
 end

app/models/user.rb

@@ -49,7 +49,7 @@ class User < ApplicationRecord
   end
 
   def total_distance
-    # In km or miles, depending on the application settings (DISTANCE_UNIT)
+    # In km or miles, depending on user.safe_settings.distance_unit
     stats.sum(:distance)
   end
 
@@ -115,6 +115,10 @@ class User < ApplicationRecord
     JWT.encode(payload, secret_key, 'HS256')
   end
 
+  def export_data
+    Users::ExportDataJob.perform_later(id)
+  end
+
   private
 
   def create_api_key

app/models/visit.rb

@@ -12,10 +12,6 @@ class Visit < ApplicationRecord
 
   enum :status, { suggested: 0, confirmed: 1, declined: 2 }
 
-  def reverse_geocoded?
-    place.geodata.present?
-  end
-
   def coordinates
     points.pluck(:latitude, :longitude).map { [_1[0].to_f, _1[1].to_f] }
   end
@@ -29,7 +25,9 @@ class Visit < ApplicationRecord
     return area&.radius if area.present?
 
     radius = points.map do |point|
-      Geocoder::Calculations.distance_between(center, [point.lat, point.lon])
+      Geocoder::Calculations.distance_between(
+        center, [point.lat, point.lon], units: user.safe_settings.distance_unit.to_sym
+      )
     end.max
 
     radius && radius >= 15 ? radius : 15

app/serializers/api/place_serializer.rb

@@ -7,14 +7,16 @@ class Api::PlaceSerializer
 
   def call
     {
-      id: place.id,
+      id:         place.id,
-      name: place.name,
+      name:       place.name,
-      longitude: place.lon,
+      longitude:  place.lon,
-      latitude: place.lat,
+      latitude:   place.lat,
-      city: place.city,
+      city:       place.city,
-      country: place.country,
+      country:    place.country,
-      source: place.source,
+      source:     place.source,
-      geodata: place.geodata,
+      geodata:    place.geodata,
+      created_at: place.created_at,
+      updated_at: place.updated_at,
       reverse_geocoded_at: place.reverse_geocoded_at
     }
   end

app/serializers/api/point_serializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::PointSerializer < PointSerializer
-  EXCLUDED_ATTRIBUTES = %w[created_at updated_at visit_id import_id user_id raw_data].freeze
+  EXCLUDED_ATTRIBUTES = %w[created_at updated_at visit_id import_id user_id raw_data country_id].freeze
 
   def call
     point.attributes.except(*EXCLUDED_ATTRIBUTES)

app/serializers/point_serializer.rb

@@ -3,7 +3,7 @@
 class PointSerializer
   EXCLUDED_ATTRIBUTES = %w[
     created_at updated_at visit_id id import_id user_id raw_data lonlat
-    reverse_geocoded_at
+    reverse_geocoded_at country_id
   ].freeze
 
   def initialize(point)

app/serializers/points/geojson_serializer.rb

@@ -14,7 +14,7 @@ class Points::GeojsonSerializer
           type: 'Feature',
           geometry: {
             type: 'Point',
-            coordinates: [point.lon.to_s, point.lat.to_s]
+            coordinates: [point.lon, point.lat]
           },
           properties: PointSerializer.new(point).call
         }

app/services/areas/visits/create.rb

@@ -31,14 +31,14 @@ class Areas::Visits::Create
 
   def area_points(area)
     area_radius =
-      if ::DISTANCE_UNIT == :km
+      if user.safe_settings.distance_unit == :km
-        area.radius / 1000.0
+        area.radius / ::DISTANCE_UNITS[:km]
       else
-        area.radius / 1609.344
+        area.radius / ::DISTANCE_UNITS[user.safe_settings.distance_unit.to_sym]
       end
 
     points = Point.where(user_id: user.id)
-                  .near([area.latitude, area.longitude], area_radius, DISTANCE_UNIT)
+                  .near([area.latitude, area.longitude], area_radius, user.safe_settings.distance_unit)
                   .order(timestamp: :asc)
 
     # check if all points within the area are assigned to a visit

app/services/countries/iso_code_mapper.rb

@@ -0,0 +1,397 @@
+# frozen_string_literal: true
+
+class Countries::IsoCodeMapper
+  # Comprehensive country data with name, ISO codes, and flag emoji
+  # Based on ISO 3166-1 standard
+  COUNTRIES = {
+    'AF' => { name: 'Afghanistan', iso2: 'AF', iso3: 'AFG', flag: '🇦🇫' },
+    'AL' => { name: 'Albania', iso2: 'AL', iso3: 'ALB', flag: '🇦🇱' },
+    'DZ' => { name: 'Algeria', iso2: 'DZ', iso3: 'DZA', flag: '🇩🇿' },
+    'AS' => { name: 'American Samoa', iso2: 'AS', iso3: 'ASM', flag: '🇦🇸' },
+    'AD' => { name: 'Andorra', iso2: 'AD', iso3: 'AND', flag: '🇦🇩' },
+    'AO' => { name: 'Angola', iso2: 'AO', iso3: 'AGO', flag: '🇦🇴' },
+    'AI' => { name: 'Anguilla', iso2: 'AI', iso3: 'AIA', flag: '🇦🇮' },
+    'AQ' => { name: 'Antarctica', iso2: 'AQ', iso3: 'ATA', flag: '🇦🇶' },
+    'AG' => { name: 'Antigua and Barbuda', iso2: 'AG', iso3: 'ATG', flag: '🇦🇬' },
+    'AR' => { name: 'Argentina', iso2: 'AR', iso3: 'ARG', flag: '🇦🇷' },
+    'AM' => { name: 'Armenia', iso2: 'AM', iso3: 'ARM', flag: '🇦🇲' },
+    'AW' => { name: 'Aruba', iso2: 'AW', iso3: 'ABW', flag: '🇦🇼' },
+    'AU' => { name: 'Australia', iso2: 'AU', iso3: 'AUS', flag: '🇦🇺' },
+    'AT' => { name: 'Austria', iso2: 'AT', iso3: 'AUT', flag: '🇦🇹' },
+    'AZ' => { name: 'Azerbaijan', iso2: 'AZ', iso3: 'AZE', flag: '🇦🇿' },
+    'BS' => { name: 'Bahamas', iso2: 'BS', iso3: 'BHS', flag: '🇧🇸' },
+    'BH' => { name: 'Bahrain', iso2: 'BH', iso3: 'BHR', flag: '🇧🇭' },
+    'BD' => { name: 'Bangladesh', iso2: 'BD', iso3: 'BGD', flag: '🇧🇩' },
+    'BB' => { name: 'Barbados', iso2: 'BB', iso3: 'BRB', flag: '🇧🇧' },
+    'BY' => { name: 'Belarus', iso2: 'BY', iso3: 'BLR', flag: '🇧🇾' },
+    'BE' => { name: 'Belgium', iso2: 'BE', iso3: 'BEL', flag: '🇧🇪' },
+    'BZ' => { name: 'Belize', iso2: 'BZ', iso3: 'BLZ', flag: '🇧🇿' },
+    'BJ' => { name: 'Benin', iso2: 'BJ', iso3: 'BEN', flag: '🇧🇯' },
+    'BM' => { name: 'Bermuda', iso2: 'BM', iso3: 'BMU', flag: '🇧🇲' },
+    'BT' => { name: 'Bhutan', iso2: 'BT', iso3: 'BTN', flag: '🇧🇹' },
+    'BO' => { name: 'Bolivia', iso2: 'BO', iso3: 'BOL', flag: '🇧🇴' },
+    'BA' => { name: 'Bosnia and Herzegovina', iso2: 'BA', iso3: 'BIH', flag: '🇧🇦' },
+    'BW' => { name: 'Botswana', iso2: 'BW', iso3: 'BWA', flag: '🇧🇼' },
+    'BR' => { name: 'Brazil', iso2: 'BR', iso3: 'BRA', flag: '🇧🇷' },
+    'BN' => { name: 'Brunei Darussalam', iso2: 'BN', iso3: 'BRN', flag: '🇧🇳' },
+    'BG' => { name: 'Bulgaria', iso2: 'BG', iso3: 'BGR', flag: '🇧🇬' },
+    'BF' => { name: 'Burkina Faso', iso2: 'BF', iso3: 'BFA', flag: '🇧🇫' },
+    'BI' => { name: 'Burundi', iso2: 'BI', iso3: 'BDI', flag: '🇧🇮' },
+    'KH' => { name: 'Cambodia', iso2: 'KH', iso3: 'KHM', flag: '🇰🇭' },
+    'CM' => { name: 'Cameroon', iso2: 'CM', iso3: 'CMR', flag: '🇨🇲' },
+    'CA' => { name: 'Canada', iso2: 'CA', iso3: 'CAN', flag: '🇨🇦' },
+    'CV' => { name: 'Cape Verde', iso2: 'CV', iso3: 'CPV', flag: '🇨🇻' },
+    'KY' => { name: 'Cayman Islands', iso2: 'KY', iso3: 'CYM', flag: '🇰🇾' },
+    'CF' => { name: 'Central African Republic', iso2: 'CF', iso3: 'CAF', flag: '🇨🇫' },
+    'TD' => { name: 'Chad', iso2: 'TD', iso3: 'TCD', flag: '🇹🇩' },
+    'CL' => { name: 'Chile', iso2: 'CL', iso3: 'CHL', flag: '🇨🇱' },
+    'CN' => { name: 'China', iso2: 'CN', iso3: 'CHN', flag: '🇨🇳' },
+    'CO' => { name: 'Colombia', iso2: 'CO', iso3: 'COL', flag: '🇨🇴' },
+    'KM' => { name: 'Comoros', iso2: 'KM', iso3: 'COM', flag: '🇰🇲' },
+    'CG' => { name: 'Congo', iso2: 'CG', iso3: 'COG', flag: '🇨🇬' },
+    'CD' => { name: 'Congo, Democratic Republic of the', iso2: 'CD', iso3: 'COD', flag: '🇨🇩' },
+    'CK' => { name: 'Cook Islands', iso2: 'CK', iso3: 'COK', flag: '🇨🇰' },
+    'CR' => { name: 'Costa Rica', iso2: 'CR', iso3: 'CRI', flag: '🇨🇷' },
+    'CI' => { name: 'Côte d\'Ivoire', iso2: 'CI', iso3: 'CIV', flag: '🇨🇮' },
+    'HR' => { name: 'Croatia', iso2: 'HR', iso3: 'HRV', flag: '🇭🇷' },
+    'CU' => { name: 'Cuba', iso2: 'CU', iso3: 'CUB', flag: '🇨🇺' },
+    'CY' => { name: 'Cyprus', iso2: 'CY', iso3: 'CYP', flag: '🇨🇾' },
+    'CZ' => { name: 'Czech Republic', iso2: 'CZ', iso3: 'CZE', flag: '🇨🇿' },
+    'DK' => { name: 'Denmark', iso2: 'DK', iso3: 'DNK', flag: '🇩🇰' },
+    'DJ' => { name: 'Djibouti', iso2: 'DJ', iso3: 'DJI', flag: '🇩🇯' },
+    'DM' => { name: 'Dominica', iso2: 'DM', iso3: 'DMA', flag: '🇩🇲' },
+    'DO' => { name: 'Dominican Republic', iso2: 'DO', iso3: 'DOM', flag: '🇩🇴' },
+    'EC' => { name: 'Ecuador', iso2: 'EC', iso3: 'ECU', flag: '🇪🇨' },
+    'EG' => { name: 'Egypt', iso2: 'EG', iso3: 'EGY', flag: '🇪🇬' },
+    'SV' => { name: 'El Salvador', iso2: 'SV', iso3: 'SLV', flag: '🇸🇻' },
+    'GQ' => { name: 'Equatorial Guinea', iso2: 'GQ', iso3: 'GNQ', flag: '🇬🇶' },
+    'ER' => { name: 'Eritrea', iso2: 'ER', iso3: 'ERI', flag: '🇪🇷' },
+    'EE' => { name: 'Estonia', iso2: 'EE', iso3: 'EST', flag: '🇪🇪' },
+    'ET' => { name: 'Ethiopia', iso2: 'ET', iso3: 'ETH', flag: '🇪🇹' },
+    'FK' => { name: 'Falkland Islands (Malvinas)', iso2: 'FK', iso3: 'FLK', flag: '🇫🇰' },
+    'FO' => { name: 'Faroe Islands', iso2: 'FO', iso3: 'FRO', flag: '🇫🇴' },
+    'FJ' => { name: 'Fiji', iso2: 'FJ', iso3: 'FJI', flag: '🇫🇯' },
+    'FI' => { name: 'Finland', iso2: 'FI', iso3: 'FIN', flag: '🇫🇮' },
+    'FR' => { name: 'France', iso2: 'FR', iso3: 'FRA', flag: '🇫🇷' },
+    'GF' => { name: 'French Guiana', iso2: 'GF', iso3: 'GUF', flag: '🇬🇫' },
+    'PF' => { name: 'French Polynesia', iso2: 'PF', iso3: 'PYF', flag: '🇵🇫' },
+    'GA' => { name: 'Gabon', iso2: 'GA', iso3: 'GAB', flag: '🇬🇦' },
+    'GM' => { name: 'Gambia', iso2: 'GM', iso3: 'GMB', flag: '🇬🇲' },
+    'GE' => { name: 'Georgia', iso2: 'GE', iso3: 'GEO', flag: '🇬🇪' },
+    'DE' => { name: 'Germany', iso2: 'DE', iso3: 'DEU', flag: '🇩🇪' },
+    'GH' => { name: 'Ghana', iso2: 'GH', iso3: 'GHA', flag: '🇬🇭' },
+    'GI' => { name: 'Gibraltar', iso2: 'GI', iso3: 'GIB', flag: '🇬🇮' },
+    'GR' => { name: 'Greece', iso2: 'GR', iso3: 'GRC', flag: '🇬🇷' },
+    'GL' => { name: 'Greenland', iso2: 'GL', iso3: 'GRL', flag: '🇬🇱' },
+    'GD' => { name: 'Grenada', iso2: 'GD', iso3: 'GRD', flag: '🇬🇩' },
+    'GP' => { name: 'Guadeloupe', iso2: 'GP', iso3: 'GLP', flag: '🇬🇵' },
+    'GU' => { name: 'Guam', iso2: 'GU', iso3: 'GUM', flag: '🇬🇺' },
+    'GT' => { name: 'Guatemala', iso2: 'GT', iso3: 'GTM', flag: '🇬🇹' },
+    'GG' => { name: 'Guernsey', iso2: 'GG', iso3: 'GGY', flag: '🇬🇬' },
+    'GN' => { name: 'Guinea', iso2: 'GN', iso3: 'GIN', flag: '🇬🇳' },
+    'GW' => { name: 'Guinea-Bissau', iso2: 'GW', iso3: 'GNB', flag: '🇬🇼' },
+    'GY' => { name: 'Guyana', iso2: 'GY', iso3: 'GUY', flag: '🇬🇾' },
+    'HT' => { name: 'Haiti', iso2: 'HT', iso3: 'HTI', flag: '🇭🇹' },
+    'VA' => { name: 'Holy See (Vatican City State)', iso2: 'VA', iso3: 'VAT', flag: '🇻🇦' },
+    'HN' => { name: 'Honduras', iso2: 'HN', iso3: 'HND', flag: '🇭🇳' },
+    'HK' => { name: 'Hong Kong', iso2: 'HK', iso3: 'HKG', flag: '🇭🇰' },
+    'HU' => { name: 'Hungary', iso2: 'HU', iso3: 'HUN', flag: '🇭🇺' },
+    'IS' => { name: 'Iceland', iso2: 'IS', iso3: 'ISL', flag: '🇮🇸' },
+    'IN' => { name: 'India', iso2: 'IN', iso3: 'IND', flag: '🇮🇳' },
+    'ID' => { name: 'Indonesia', iso2: 'ID', iso3: 'IDN', flag: '🇮🇩' },
+    'IR' => { name: 'Iran, Islamic Republic of', iso2: 'IR', iso3: 'IRN', flag: '🇮🇷' },
+    'IQ' => { name: 'Iraq', iso2: 'IQ', iso3: 'IRQ', flag: '🇮🇶' },
+    'IE' => { name: 'Ireland', iso2: 'IE', iso3: 'IRL', flag: '🇮🇪' },
+    'IM' => { name: 'Isle of Man', iso2: 'IM', iso3: 'IMN', flag: '🇮🇲' },
+    'IL' => { name: 'Israel', iso2: 'IL', iso3: 'ISR', flag: '🇮🇱' },
+    'IT' => { name: 'Italy', iso2: 'IT', iso3: 'ITA', flag: '🇮🇹' },
+    'JM' => { name: 'Jamaica', iso2: 'JM', iso3: 'JAM', flag: '🇯🇲' },
+    'JP' => { name: 'Japan', iso2: 'JP', iso3: 'JPN', flag: '🇯🇵' },
+    'JE' => { name: 'Jersey', iso2: 'JE', iso3: 'JEY', flag: '🇯🇪' },
+    'JO' => { name: 'Jordan', iso2: 'JO', iso3: 'JOR', flag: '🇯🇴' },
+    'KZ' => { name: 'Kazakhstan', iso2: 'KZ', iso3: 'KAZ', flag: '🇰🇿' },
+    'KE' => { name: 'Kenya', iso2: 'KE', iso3: 'KEN', flag: '🇰🇪' },
+    'KI' => { name: 'Kiribati', iso2: 'KI', iso3: 'KIR', flag: '🇰🇮' },
+    'KP' => { name: 'Korea, Democratic People\'s Republic of', iso2: 'KP', iso3: 'PRK', flag: '🇰🇵' },
+    'KR' => { name: 'Korea, Republic of', iso2: 'KR', iso3: 'KOR', flag: '🇰🇷' },
+    'KW' => { name: 'Kuwait', iso2: 'KW', iso3: 'KWT', flag: '🇰🇼' },
+    'KG' => { name: 'Kyrgyzstan', iso2: 'KG', iso3: 'KGZ', flag: '🇰🇬' },
+    'LA' => { name: 'Lao People\'s Democratic Republic', iso2: 'LA', iso3: 'LAO', flag: '🇱🇦' },
+    'LV' => { name: 'Latvia', iso2: 'LV', iso3: 'LVA', flag: '🇱🇻' },
+    'LB' => { name: 'Lebanon', iso2: 'LB', iso3: 'LBN', flag: '🇱🇧' },
+    'LS' => { name: 'Lesotho', iso2: 'LS', iso3: 'LSO', flag: '🇱🇸' },
+    'LR' => { name: 'Liberia', iso2: 'LR', iso3: 'LBR', flag: '🇱🇷' },
+    'LY' => { name: 'Libya', iso2: 'LY', iso3: 'LBY', flag: '🇱🇾' },
+    'LI' => { name: 'Liechtenstein', iso2: 'LI', iso3: 'LIE', flag: '🇱🇮' },
+    'LT' => { name: 'Lithuania', iso2: 'LT', iso3: 'LTU', flag: '🇱🇹' },
+    'LU' => { name: 'Luxembourg', iso2: 'LU', iso3: 'LUX', flag: '🇱🇺' },
+    'MO' => { name: 'Macao', iso2: 'MO', iso3: 'MAC', flag: '🇲🇴' },
+    'MK' => { name: 'North Macedonia', iso2: 'MK', iso3: 'MKD', flag: '🇲🇰' },
+    'MG' => { name: 'Madagascar', iso2: 'MG', iso3: 'MDG', flag: '🇲🇬' },
+    'MW' => { name: 'Malawi', iso2: 'MW', iso3: 'MWI', flag: '🇲🇼' },
+    'MY' => { name: 'Malaysia', iso2: 'MY', iso3: 'MYS', flag: '🇲🇾' },
+    'MV' => { name: 'Maldives', iso2: 'MV', iso3: 'MDV', flag: '🇲🇻' },
+    'ML' => { name: 'Mali', iso2: 'ML', iso3: 'MLI', flag: '🇲🇱' },
+    'MT' => { name: 'Malta', iso2: 'MT', iso3: 'MLT', flag: '🇲🇹' },
+    'MH' => { name: 'Marshall Islands', iso2: 'MH', iso3: 'MHL', flag: '🇲🇭' },
+    'MQ' => { name: 'Martinique', iso2: 'MQ', iso3: 'MTQ', flag: '🇲🇶' },
+    'MR' => { name: 'Mauritania', iso2: 'MR', iso3: 'MRT', flag: '🇲🇷' },
+    'MU' => { name: 'Mauritius', iso2: 'MU', iso3: 'MUS', flag: '🇲🇺' },
+    'YT' => { name: 'Mayotte', iso2: 'YT', iso3: 'MYT', flag: '🇾🇹' },
+    'MX' => { name: 'Mexico', iso2: 'MX', iso3: 'MEX', flag: '🇲🇽' },
+    'FM' => { name: 'Micronesia, Federated States of', iso2: 'FM', iso3: 'FSM', flag: '🇫🇲' },
+    'MD' => { name: 'Moldova, Republic of', iso2: 'MD', iso3: 'MDA', flag: '🇲🇩' },
+    'MC' => { name: 'Monaco', iso2: 'MC', iso3: 'MCO', flag: '🇲🇨' },
+    'MN' => { name: 'Mongolia', iso2: 'MN', iso3: 'MNG', flag: '🇲🇳' },
+    'ME' => { name: 'Montenegro', iso2: 'ME', iso3: 'MNE', flag: '🇲🇪' },
+    'MS' => { name: 'Montserrat', iso2: 'MS', iso3: 'MSR', flag: '🇲🇸' },
+    'MA' => { name: 'Morocco', iso2: 'MA', iso3: 'MAR', flag: '🇲🇦' },
+    'MZ' => { name: 'Mozambique', iso2: 'MZ', iso3: 'MOZ', flag: '🇲🇿' },
+    'MM' => { name: 'Myanmar', iso2: 'MM', iso3: 'MMR', flag: '🇲🇲' },
+    'NA' => { name: 'Namibia', iso2: 'NA', iso3: 'NAM', flag: '🇳🇦' },
+    'NR' => { name: 'Nauru', iso2: 'NR', iso3: 'NRU', flag: '🇳🇷' },
+    'NP' => { name: 'Nepal', iso2: 'NP', iso3: 'NPL', flag: '🇳🇵' },
+    'NL' => { name: 'Netherlands', iso2: 'NL', iso3: 'NLD', flag: '🇳🇱' },
+    'NC' => { name: 'New Caledonia', iso2: 'NC', iso3: 'NCL', flag: '🇳🇨' },
+    'NZ' => { name: 'New Zealand', iso2: 'NZ', iso3: 'NZL', flag: '🇳🇿' },
+    'NI' => { name: 'Nicaragua', iso2: 'NI', iso3: 'NIC', flag: '🇳🇮' },
+    'NE' => { name: 'Niger', iso2: 'NE', iso3: 'NER', flag: '🇳🇪' },
+    'NG' => { name: 'Nigeria', iso2: 'NG', iso3: 'NGA', flag: '🇳🇬' },
+    'NU' => { name: 'Niue', iso2: 'NU', iso3: 'NIU', flag: '🇳🇺' },
+    'NF' => { name: 'Norfolk Island', iso2: 'NF', iso3: 'NFK', flag: '🇳🇫' },
+    'MP' => { name: 'Northern Mariana Islands', iso2: 'MP', iso3: 'MNP', flag: '🇲🇵' },
+    'NO' => { name: 'Norway', iso2: 'NO', iso3: 'NOR', flag: '🇳🇴' },
+    'OM' => { name: 'Oman', iso2: 'OM', iso3: 'OMN', flag: '🇴🇲' },
+    'PK' => { name: 'Pakistan', iso2: 'PK', iso3: 'PAK', flag: '🇵🇰' },
+    'PW' => { name: 'Palau', iso2: 'PW', iso3: 'PLW', flag: '🇵🇼' },
+    'PS' => { name: 'Palestine, State of', iso2: 'PS', iso3: 'PSE', flag: '🇵🇸' },
+    'PA' => { name: 'Panama', iso2: 'PA', iso3: 'PAN', flag: '🇵🇦' },
+    'PG' => { name: 'Papua New Guinea', iso2: 'PG', iso3: 'PNG', flag: '🇵🇬' },
+    'PY' => { name: 'Paraguay', iso2: 'PY', iso3: 'PRY', flag: '🇵🇾' },
+    'PE' => { name: 'Peru', iso2: 'PE', iso3: 'PER', flag: '🇵🇪' },
+    'PH' => { name: 'Philippines', iso2: 'PH', iso3: 'PHL', flag: '🇵🇭' },
+    'PN' => { name: 'Pitcairn', iso2: 'PN', iso3: 'PCN', flag: '🇵🇳' },
+    'PL' => { name: 'Poland', iso2: 'PL', iso3: 'POL', flag: '🇵🇱' },
+    'PT' => { name: 'Portugal', iso2: 'PT', iso3: 'PRT', flag: '🇵🇹' },
+    'PR' => { name: 'Puerto Rico', iso2: 'PR', iso3: 'PRI', flag: '🇵🇷' },
+    'QA' => { name: 'Qatar', iso2: 'QA', iso3: 'QAT', flag: '🇶🇦' },
+    'RE' => { name: 'Réunion', iso2: 'RE', iso3: 'REU', flag: '🇷🇪' },
+    'RO' => { name: 'Romania', iso2: 'RO', iso3: 'ROU', flag: '🇷🇴' },
+    'RU' => { name: 'Russian Federation', iso2: 'RU', iso3: 'RUS', flag: '🇷🇺' },
+    'RW' => { name: 'Rwanda', iso2: 'RW', iso3: 'RWA', flag: '🇷🇼' },
+    'BL' => { name: 'Saint Barthélemy', iso2: 'BL', iso3: 'BLM', flag: '🇧🇱' },
+    'SH' => { name: 'Saint Helena, Ascension and Tristan da Cunha', iso2: 'SH', iso3: 'SHN', flag: '🇸🇭' },
+    'KN' => { name: 'Saint Kitts and Nevis', iso2: 'KN', iso3: 'KNA', flag: '🇰🇳' },
+    'LC' => { name: 'Saint Lucia', iso2: 'LC', iso3: 'LCA', flag: '🇱🇨' },
+    'MF' => { name: 'Saint Martin (French part)', iso2: 'MF', iso3: 'MAF', flag: '🇲🇫' },
+    'PM' => { name: 'Saint Pierre and Miquelon', iso2: 'PM', iso3: 'SPM', flag: '🇵🇲' },
+    'VC' => { name: 'Saint Vincent and the Grenadines', iso2: 'VC', iso3: 'VCT', flag: '🇻🇨' },
+    'WS' => { name: 'Samoa', iso2: 'WS', iso3: 'WSM', flag: '🇼🇸' },
+    'SM' => { name: 'San Marino', iso2: 'SM', iso3: 'SMR', flag: '🇸🇲' },
+    'ST' => { name: 'Sao Tome and Principe', iso2: 'ST', iso3: 'STP', flag: '🇸🇹' },
+    'SA' => { name: 'Saudi Arabia', iso2: 'SA', iso3: 'SAU', flag: '🇸🇦' },
+    'SN' => { name: 'Senegal', iso2: 'SN', iso3: 'SEN', flag: '🇸🇳' },
+    'RS' => { name: 'Serbia', iso2: 'RS', iso3: 'SRB', flag: '🇷🇸' },
+    'SC' => { name: 'Seychelles', iso2: 'SC', iso3: 'SYC', flag: '🇸🇨' },
+    'SL' => { name: 'Sierra Leone', iso2: 'SL', iso3: 'SLE', flag: '🇸🇱' },
+    'SG' => { name: 'Singapore', iso2: 'SG', iso3: 'SGP', flag: '🇸🇬' },
+    'SX' => { name: 'Sint Maarten (Dutch part)', iso2: 'SX', iso3: 'SXM', flag: '🇸🇽' },
+    'SK' => { name: 'Slovakia', iso2: 'SK', iso3: 'SVK', flag: '🇸🇰' },
+    'SI' => { name: 'Slovenia', iso2: 'SI', iso3: 'SVN', flag: '🇸🇮' },
+    'SB' => { name: 'Solomon Islands', iso2: 'SB', iso3: 'SLB', flag: '🇸🇧' },
+    'SO' => { name: 'Somalia', iso2: 'SO', iso3: 'SOM', flag: '🇸🇴' },
+    'ZA' => { name: 'South Africa', iso2: 'ZA', iso3: 'ZAF', flag: '🇿🇦' },
+    'GS' => { name: 'South Georgia and the South Sandwich Islands', iso2: 'GS', iso3: 'SGS', flag: '🇬🇸' },
+    'SS' => { name: 'South Sudan', iso2: 'SS', iso3: 'SSD', flag: '🇸🇸' },
+    'ES' => { name: 'Spain', iso2: 'ES', iso3: 'ESP', flag: '🇪🇸' },
+    'LK' => { name: 'Sri Lanka', iso2: 'LK', iso3: 'LKA', flag: '🇱🇰' },
+    'SD' => { name: 'Sudan', iso2: 'SD', iso3: 'SDN', flag: '🇸🇩' },
+    'SR' => { name: 'Suriname', iso2: 'SR', iso3: 'SUR', flag: '🇸🇷' },
+    'SJ' => { name: 'Svalbard and Jan Mayen', iso2: 'SJ', iso3: 'SJM', flag: '🇸🇯' },
+    'SE' => { name: 'Sweden', iso2: 'SE', iso3: 'SWE', flag: '🇸🇪' },
+    'CH' => { name: 'Switzerland', iso2: 'CH', iso3: 'CHE', flag: '🇨🇭' },
+    'SY' => { name: 'Syrian Arab Republic', iso2: 'SY', iso3: 'SYR', flag: '🇸🇾' },
+    'TW' => { name: 'Taiwan, Province of China', iso2: 'TW', iso3: 'TWN', flag: '🇹🇼' },
+    'TJ' => { name: 'Tajikistan', iso2: 'TJ', iso3: 'TJK', flag: '🇹🇯' },
+    'TZ' => { name: 'Tanzania, United Republic of', iso2: 'TZ', iso3: 'TZA', flag: '🇹🇿' },
+    'TH' => { name: 'Thailand', iso2: 'TH', iso3: 'THA', flag: '🇹🇭' },
+    'TL' => { name: 'Timor-Leste', iso2: 'TL', iso3: 'TLS', flag: '🇹🇱' },
+    'TG' => { name: 'Togo', iso2: 'TG', iso3: 'TGO', flag: '🇹🇬' },
+    'TK' => { name: 'Tokelau', iso2: 'TK', iso3: 'TKL', flag: '🇹🇰' },
+    'TO' => { name: 'Tonga', iso2: 'TO', iso3: 'TON', flag: '🇹🇴' },
+    'TT' => { name: 'Trinidad and Tobago', iso2: 'TT', iso3: 'TTO', flag: '🇹🇹' },
+    'TN' => { name: 'Tunisia', iso2: 'TN', iso3: 'TUN', flag: '🇹🇳' },
+    'TR' => { name: 'Turkey', iso2: 'TR', iso3: 'TUR', flag: '🇹🇷' },
+    'TM' => { name: 'Turkmenistan', iso2: 'TM', iso3: 'TKM', flag: '🇹🇲' },
+    'TC' => { name: 'Turks and Caicos Islands', iso2: 'TC', iso3: 'TCA', flag: '🇹🇨' },
+    'TV' => { name: 'Tuvalu', iso2: 'TV', iso3: 'TUV', flag: '🇹🇻' },
+    'UG' => { name: 'Uganda', iso2: 'UG', iso3: 'UGA', flag: '🇺🇬' },
+    'UA' => { name: 'Ukraine', iso2: 'UA', iso3: 'UKR', flag: '🇺🇦' },
+    'AE' => { name: 'United Arab Emirates', iso2: 'AE', iso3: 'ARE', flag: '🇦🇪' },
+    'GB' => { name: 'United Kingdom', iso2: 'GB', iso3: 'GBR', flag: '🇬🇧' },
+    'US' => { name: 'United States', iso2: 'US', iso3: 'USA', flag: '🇺🇸' },
+    'UM' => { name: 'United States Minor Outlying Islands', iso2: 'UM', iso3: 'UMI', flag: '🇺🇲' },
+    'UY' => { name: 'Uruguay', iso2: 'UY', iso3: 'URY', flag: '🇺🇾' },
+    'UZ' => { name: 'Uzbekistan', iso2: 'UZ', iso3: 'UZB', flag: '🇺🇿' },
+    'VU' => { name: 'Vanuatu', iso2: 'VU', iso3: 'VUT', flag: '🇻🇺' },
+    'VE' => { name: 'Venezuela, Bolivarian Republic of', iso2: 'VE', iso3: 'VEN', flag: '🇻🇪' },
+    'VN' => { name: 'Viet Nam', iso2: 'VN', iso3: 'VNM', flag: '🇻🇳' },
+    'VG' => { name: 'Virgin Islands, British', iso2: 'VG', iso3: 'VGB', flag: '🇻🇬' },
+    'VI' => { name: 'Virgin Islands, U.S.', iso2: 'VI', iso3: 'VIR', flag: '🇻🇮' },
+    'WF' => { name: 'Wallis and Futuna', iso2: 'WF', iso3: 'WLF', flag: '🇼🇫' },
+    'EH' => { name: 'Western Sahara', iso2: 'EH', iso3: 'ESH', flag: '🇪🇭' },
+    'YE' => { name: 'Yemen', iso2: 'YE', iso3: 'YEM', flag: '🇾🇪' },
+    'ZM' => { name: 'Zambia', iso2: 'ZM', iso3: 'ZMB', flag: '🇿🇲' },
+    'ZW' => { name: 'Zimbabwe', iso2: 'ZW', iso3: 'ZWE', flag: '🇿🇼' }
+  }.freeze
+
+  # Country name aliases and variations for better matching
+  COUNTRY_ALIASES = {
+    'Russia' => 'Russian Federation',
+    'South Korea' => 'Korea, Republic of',
+    'North Korea' => 'Korea, Democratic People\'s Republic of',
+    'United States of America' => 'United States',
+    'USA' => 'United States',
+    'UK' => 'United Kingdom',
+    'Britain' => 'United Kingdom',
+    'Great Britain' => 'United Kingdom',
+    'England' => 'United Kingdom',
+    'Scotland' => 'United Kingdom',
+    'Wales' => 'United Kingdom',
+    'Northern Ireland' => 'United Kingdom',
+    'Macedonia' => 'North Macedonia',
+    'Czech Republic' => 'Czech Republic',
+    'Czechia' => 'Czech Republic',
+    'Vatican' => 'Holy See (Vatican City State)',
+    'Vatican City' => 'Holy See (Vatican City State)',
+    'Taiwan' => 'Taiwan, Province of China',
+    'Hong Kong SAR' => 'Hong Kong',
+    'Macao SAR' => 'Macao',
+    'Moldova' => 'Moldova, Republic of',
+    'Bolivia' => 'Bolivia',
+    'Venezuela' => 'Venezuela, Bolivarian Republic of',
+    'Iran' => 'Iran, Islamic Republic of',
+    'Syria' => 'Syrian Arab Republic',
+    'Tanzania' => 'Tanzania, United Republic of',
+    'Laos' => 'Lao People\'s Democratic Republic',
+    'Vietnam' => 'Viet Nam',
+    'Palestine' => 'Palestine, State of',
+    'Congo' => 'Congo',
+    'Democratic Republic of Congo' => 'Congo, Democratic Republic of the',
+    'DRC' => 'Congo, Democratic Republic of the',
+    'Ivory Coast' => 'Côte d\'Ivoire',
+    'Cape Verde' => 'Cape Verde',
+    'East Timor' => 'Timor-Leste',
+    'Burma' => 'Myanmar',
+    'Swaziland' => 'Eswatini'
+  }.freeze
+
+  def self.iso_a3_from_a2(iso_a2)
+    return nil if iso_a2.blank?
+
+    country_data = COUNTRIES[iso_a2.upcase]
+    country_data&.dig(:iso3)
+  end
+
+  def self.iso_codes_from_country_name(country_name)
+    return [nil, nil] if country_name.blank?
+
+    # Try exact match first
+    country_data = find_country_by_name(country_name)
+    return [country_data[:iso2], country_data[:iso3]] if country_data
+
+    # Try aliases
+    standard_name = COUNTRY_ALIASES[country_name]
+    if standard_name
+      country_data = find_country_by_name(standard_name)
+      return [country_data[:iso2], country_data[:iso3]] if country_data
+    end
+
+    # Try case-insensitive match
+    country_data = COUNTRIES.values.find { |data| data[:name].downcase == country_name.downcase }
+    return [country_data[:iso2], country_data[:iso3]] if country_data
+
+    # Try partial match (country name contains or is contained in a known name)
+    country_data = COUNTRIES.values.find do |data|
+      data[:name].downcase.include?(country_name.downcase) ||
+        country_name.downcase.include?(data[:name].downcase)
+    end
+    return [country_data[:iso2], country_data[:iso3]] if country_data
+
+    # No match found
+    [nil, nil]
+  end
+
+  def self.fallback_codes_from_country_name(country_name)
+    return [nil, nil] if country_name.blank?
+
+    # First try to find proper ISO codes from country name
+    iso_a2, iso_a3 = iso_codes_from_country_name(country_name)
+    return [iso_a2, iso_a3] if iso_a2 && iso_a3
+
+    # Only use character-based fallback as a last resort
+    # This is still not ideal but better than nothing
+    fallback_a2 = country_name[0..1].upcase
+    fallback_a3 = country_name[0..2].upcase
+
+    [fallback_a2, fallback_a3]
+  end
+
+  def self.standardize_country_name(country_name)
+    return nil if country_name.blank?
+
+    # Try exact match first
+    country_data = find_country_by_name(country_name)
+    return country_data[:name] if country_data
+
+    # Try aliases
+    standard_name = COUNTRY_ALIASES[country_name]
+    return standard_name if standard_name
+
+    # Try case-insensitive match
+    country_data = COUNTRIES.values.find { |data| data[:name].downcase == country_name.downcase }
+    return country_data[:name] if country_data
+
+    # Try partial match
+    country_data = COUNTRIES.values.find do |data|
+      data[:name].downcase.include?(country_name.downcase) ||
+        country_name.downcase.include?(data[:name].downcase)
+    end
+    return country_data[:name] if country_data
+
+    nil
+  end
+
+  def self.country_flag(iso_a2)
+    return nil if iso_a2.blank?
+
+    country_data = COUNTRIES[iso_a2.upcase]
+    country_data&.dig(:flag)
+  end
+
+  def self.country_by_iso2(iso_a2)
+    return nil if iso_a2.blank?
+
+    COUNTRIES[iso_a2.upcase]
+  end
+
+  def self.country_by_name(country_name)
+    return nil if country_name.blank?
+
+    find_country_by_name(country_name) ||
+      find_country_by_name(COUNTRY_ALIASES[country_name]) ||
+      COUNTRIES.values.find { |data| data[:name].downcase == country_name.downcase }
+  end
+
+  def self.all_countries
+    COUNTRIES.values
+  end
+
+  private
+
+  def self.find_country_by_name(name)
+    return nil if name.blank?
+
+    COUNTRIES.values.find { |data| data[:name] == name }
+  end
+end

app/services/countries_and_cities.rb

@@ -10,8 +10,8 @@ class CountriesAndCities
 
   def call
     points
-      .reject { |point| point.country.nil? || point.city.nil? }
+      .reject { |point| point.read_attribute(:country).nil? || point.city.nil? }
-      .group_by(&:country)
+      .group_by { |point| point.read_attribute(:country) }
       .transform_values { |country_points| process_country_points(country_points) }
       .map { |country, cities| CountryData.new(country: country, cities: cities) }
   end

app/services/exception_reporter.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 class ExceptionReporter
-  def self.call(exception)
+  def self.call(exception, human_message = 'Exception reported')
     return unless DawarichSettings.self_hosted?
 
+    Rails.logger.error "#{human_message}: #{exception.message}"
+
     Sentry.capture_exception(exception)
   end
 end

app/services/geojson/importer.rb

@@ -18,6 +18,7 @@ class Geojson::Importer
     data = Geojson::Params.new(json).call
 
     data.each.with_index(1) do |point, index|
+      next if point[:lonlat].nil?
       next if point_exists?(point, user_id)
 
       Point.create!(point.merge(user_id:, import_id: import.id))

app/services/geojson/params.rb

@@ -95,7 +95,9 @@ class Geojson::Params
   end
 
   def speed(feature)
-    feature.dig(:properties, :speed).to_f.round(1)
+    value = feature.dig(:properties, :speed) || feature.dig(:properties, :velocity)
+
+    value.to_f.round(1)
   end
 
   def accuracy(feature)

app/services/google_maps/records_storage_importer.rb

@@ -13,7 +13,7 @@ class GoogleMaps::RecordsStorageImporter
 
   def call
     process_file_in_batches
-  rescue Oj::ParseError => e
+  rescue Oj::ParseError, JSON::ParserError => e
     Rails.logger.error("JSON parsing error: #{e.message}")
     raise
   end

app/services/immich/import_geodata.rb

@@ -53,9 +53,10 @@ class Immich::ImportGeodata
 
   def extract_geodata(asset)
     {
-      latitude: asset.dig('exifInfo', 'latitude'),
+      latitude: asset['exifInfo']['latitude'],
-      longitude: asset.dig('exifInfo', 'longitude'),
+      longitude: asset['exifInfo']['longitude'],
-      timestamp: Time.zone.parse(asset.dig('exifInfo', 'dateTimeOriginal')).to_i
+      lonlat: "SRID=4326;POINT(#{asset['exifInfo']['longitude']} #{asset['exifInfo']['latitude']})",
+      timestamp: Time.zone.parse(asset['exifInfo']['dateTimeOriginal']).to_i
     }
   end
 

app/services/imports/broadcaster.rb

@@ -8,7 +8,21 @@ module Imports::Broadcaster
         action: 'update',
         import: {
           id: import.id,
-          points_count: index
+          points_count: index,
+          status: import.status
+        }
+      }
+    )
+  end
+
+  def broadcast_status_update
+    ImportsChannel.broadcast_to(
+      import.user,
+      {
+        action: 'status_update',
+        import: {
+          id: import.id,
+          status: import.status
         }
       }
     )

app/services/imports/create.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Imports::Create
+  include Imports::Broadcaster
+
   attr_reader :user, :import
 
   def initialize(user, import)
@@ -9,19 +11,29 @@ class Imports::Create
   end
 
   def call
-    parser(import.source).new(import, user.id).call
+    import.update!(status: :processing)
+    broadcast_status_update
+
+    importer(import.source).new(import, user.id).call
 
     schedule_stats_creating(user.id)
     schedule_visit_suggesting(user.id, import)
     update_import_points_count(import)
   rescue StandardError => e
+    import.update!(status: :failed)
+    broadcast_status_update
+
     create_import_failed_notification(import, user, e)
+  ensure
+    if import.processing?
+      import.update!(status: :completed)
+      broadcast_status_update
+    end
   end
 
   private
 
-  def parser(source)
+  def importer(source)
-    # Bad classes naming by the way, they are not parsers, they are point creators
     case source
     when 'google_semantic_history'      then GoogleMaps::SemanticHistoryImporter
     when 'google_phone_takeout'         then GoogleMaps::PhoneTakeoutImporter

app/services/imports/destroy.rb

@@ -9,7 +9,10 @@ class Imports::Destroy
   end
 
   def call
-    @import.destroy!
+    ActiveRecord::Base.transaction do
+      @import.points.delete_all
+      @import.destroy!
+    end
 
     Stats::BulkCalculator.new(@user.id).call
   end

app/services/jobs/create.rb

@@ -21,8 +21,7 @@ class Jobs::Create
         raise InvalidJobName, 'Invalid job name'
       end
 
-    points.find_each(batch_size: 1_000) do |point|
+    # TODO: bulk enqueue reverse geocoding with ActiveJob
-      point.async_reverse_geocode
+    points.find_each(&:async_reverse_geocode)
-    end
   end
 end

app/services/metrics/maps/tile_usage/track.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Maps::TileUsage::Track
+class Metrics::Maps::TileUsage::Track
   def initialize(user_id, count = 1)
     @user_id = user_id
     @count = count

app/services/notifications.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Notifications
+  class Create
+    attr_reader :user, :kind, :title, :content
+
+    def initialize(user:, kind:, title:, content:)
+      @user     = user
+      @kind     = kind
+      @title    = title
+      @content  = content
+    end
+
+    def call
+      Notification.create!(user:, kind:, title:, content:)
+    end
+  end
+end

app/services/notifications/create.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class Notifications::Create
-  attr_reader :user, :kind, :title, :content
-
-  def initialize(user:, kind:, title:, content:)
-    @user     = user
-    @kind     = kind
-    @title    = title
-    @content  = content
-  end
-
-  def call
-    Notification.create!(user:, kind:, title:, content:)
-  end
-end

app/services/photoprism/import_geodata.rb

@@ -65,6 +65,7 @@ class Photoprism::ImportGeodata
     {
       latitude: asset['Lat'],
       longitude: asset['Lng'],
+      lonlat: "SRID=4326;POINT(#{asset['Lng']} #{asset['Lat']})",
       timestamp: Time.zone.parse(asset['TakenAt']).to_i
     }
   end

app/services/photos/importer.rb

@@ -18,17 +18,25 @@ class Photos::Importer
   end
 
   def create_point(point, index)
-    return 0 if point['latitude'].blank? || point['longitude'].blank? || point['timestamp'].blank?
+    return 0 unless valid?(point)
     return 0 if point_exists?(point, point['timestamp'])
 
     Point.create(
-      lonlat: "POINT(#{point['longitude']} #{point['latitude']})",
+      lonlat:    point['lonlat'],
-      timestamp:  point['timestamp'],
+      longitude: point['longitude'],
-      raw_data:   point,
+      latitude:  point['latitude'],
-      import_id:  import.id,
+      timestamp: point['timestamp'].to_i,
+      raw_data:  point,
+      import_id: import.id,
       user_id:
     )
 
     broadcast_import_progress(import, index)
   end
+
+  def valid?(point)
+    point['latitude'].present? &&
+      point['longitude'].present? &&
+      point['timestamp'].present?
+  end
 end

app/services/points/create.rb

@@ -11,9 +11,12 @@ class Points::Create
   def call
     data = Points::Params.new(params, user.id).call
 
+    # Deduplicate points based on unique constraint
+    deduplicated_data = data.uniq { |point| [point[:lonlat], point[:timestamp], point[:user_id]] }
+
     created_points = []
 
-    data.each_slice(1000) do |location_batch|
+    deduplicated_data.each_slice(1000) do |location_batch|
       # rubocop:disable Rails/SkipsModelValidations
       result = Point.upsert_all(
         location_batch,

app/services/points_limit_exceeded.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class PointsLimitExceeded
+  def initialize(user)
+    @user = user
+  end
+
+  def call
+    return false if DawarichSettings.self_hosted?
+    return true if @user.points.count >= points_limit
+
+    false
+  end
+
+  private
+
+  def points_limit
+    DawarichSettings::BASIC_PAID_PLAN_LIMIT
+  end
+end

app/services/reverse_geocoding/places/fetch_data.rb

@@ -4,9 +4,6 @@
 class ReverseGeocoding::Places::FetchData
   attr_reader :place
 
-  IGNORED_OSM_VALUES = %w[house residential yes detached].freeze
-  IGNORED_OSM_KEYS = %w[highway railway].freeze
-
   def initialize(place_id)
     @place = Place.find(place_id)
   end
@@ -14,13 +11,26 @@ class ReverseGeocoding::Places::FetchData
   def call
     unless DawarichSettings.reverse_geocoding_enabled?
       Rails.logger.warn('Reverse geocoding is not enabled')
+
       return
     end
 
-    first_place = reverse_geocoded_places.shift
+    places = reverse_geocoded_places
+    first_place = places.shift
     update_place(first_place)
 
-    reverse_geocoded_places.each { |reverse_geocoded_place| fetch_and_create_place(reverse_geocoded_place) }
+    osm_ids = places.map { |place| place.data['properties']['osm_id'].to_s }
+
+    return if osm_ids.empty?
+
+    existing_places =
+      Place.where("geodata->'properties'->>'osm_id' IN (?)", osm_ids)
+        .index_by { |p| p.geodata.dig('properties', 'osm_id').to_s }
+        .compact
+
+    places.each do |reverse_geocoded_place|
+      fetch_and_create_place(reverse_geocoded_place, existing_places)
+    end
   end
 
   private
@@ -41,13 +51,13 @@ class ReverseGeocoding::Places::FetchData
     )
   end
 
-  def fetch_and_create_place(reverse_geocoded_place)
+  def fetch_and_create_place(reverse_geocoded_place, existing_places)
     data = reverse_geocoded_place.data
-    new_place = find_place(data)
+    new_place = find_place(data, existing_places)
 
     new_place.name = place_name(data)
     new_place.city = data['properties']['city']
-    new_place.country = data['properties']['country']
+    new_place.country = data['properties']['country'] # TODO: Use country id
     new_place.geodata = data
     new_place.source = :photon
     if new_place.lonlat.blank?
@@ -57,18 +67,14 @@ class ReverseGeocoding::Places::FetchData
     new_place.save!
   end
 
-  def reverse_geocoded?
+  def find_place(place_data, existing_places)
-    place.geodata.present?
+    osm_id = place_data['properties']['osm_id'].to_s
-  end
 
-  def find_place(place_data)
+    existing_place = existing_places[osm_id]
-    found_place = Place.where(
+    return existing_place if existing_place.present?
-      "geodata->'properties'->>'osm_id' = ?", place_data['properties']['osm_id'].to_s
-    ).first
 
-    return found_place if found_place.present?
+    # If not found in existing places, initialize a new one
-
+    Place.new(
-    Place.find_or_initialize_by(
       lonlat: "POINT(#{place_data['geometry']['coordinates'][0].to_f.round(5)} #{place_data['geometry']['coordinates'][1].to_f.round(5)})",
       latitude: place_data['geometry']['coordinates'][1].to_f.round(5),
       longitude: place_data['geometry']['coordinates'][0].to_f.round(5)
@@ -92,12 +98,7 @@ class ReverseGeocoding::Places::FetchData
       limit: 10,
       distance_sort: true,
       radius: 1,
-      units: ::DISTANCE_UNIT
+      units: :km
     )
-
-    data.reject do |place|
-      place.data['properties']['osm_value'].in?(IGNORED_OSM_VALUES) ||
-        place.data['properties']['osm_key'].in?(IGNORED_OSM_KEYS)
-    end
   end
 end

app/services/reverse_geocoding/points/fetch_data.rb

@@ -6,6 +6,8 @@ class ReverseGeocoding::Points::FetchData
   def initialize(point_id)
     @point = Point.find(point_id)
   rescue ActiveRecord::RecordNotFound => e
+    ExceptionReporter.call(e)
+
     Rails.logger.error("Point with id #{point_id} not found: #{e.message}")
   end
 
@@ -21,9 +23,11 @@ class ReverseGeocoding::Points::FetchData
     response = Geocoder.search([point.lat, point.lon]).first
     return if response.blank? || response.data['error'].present?
 
+    country_record = Country.find_by(name: response.country) if response.country
+
     point.update!(
       city: response.city,
-      country: response.country,
+      country_id: country_record&.id,
       geodata: response.data,
       reverse_geocoded_at: Time.current
     )

app/services/stats/calculate_month.rb

@@ -8,7 +8,11 @@ class Stats::CalculateMonth
   end
 
   def call
-    return if points.empty?
+    if points.empty?
+      destroy_month_stats(year, month)
+
+      return
+    end
 
     update_month_stats(year, month)
   rescue StandardError => e
@@ -66,4 +70,8 @@ class Stats::CalculateMonth
       content: "#{error.message}, stacktrace: #{error.backtrace.join("\n")}"
     ).call
   end
+
+  def destroy_month_stats(year, month)
+    Stat.where(year:, month:, user:).destroy_all
+  end
 end

app/services/users/export_data.rb

@@ -0,0 +1,388 @@
+# frozen_string_literal: true
+
+require 'zip'
+
+# Users::ExportData - Exports complete user data with preserved relationships
+#
+# Output JSON Structure Example:
+# {
+#   "counts": {
+#     "areas": 5,
+#     "imports": 12,
+#     "exports": 3,
+#     "trips": 8,
+#     "stats": 24,
+#     "notifications": 10,
+#     "points": 15000,
+#     "visits": 45,
+#     "places": 20
+#   },
+#   "settings": {
+#     "distance_unit": "km",
+#     "timezone": "UTC",
+#     "immich_url": "https://immich.example.com",
+#     // ... other user settings (exported via user.safe_settings.settings)
+#   },
+#   "areas": [
+#     {
+#       "name": "Home",
+#       "latitude": "40.7128",
+#       "longitude": "-74.0060",
+#       "radius": 100,
+#       "created_at": "2024-01-01T00:00:00Z",
+#       "updated_at": "2024-01-01T00:00:00Z"
+#     }
+#   ],
+#   "imports": [
+#     {
+#       "name": "2023_MARCH.json",
+#       "source": "google_semantic_history",
+#       "created_at": "2024-01-01T00:00:00Z",
+#       "updated_at": "2024-01-01T00:00:00Z",
+#       "raw_points": 15432,
+#       "doubles": 23,
+#       "processed": 15409,
+#       "points_count": 15409,
+#       "status": "completed",
+#       "file_name": "import_1_2023_MARCH.json",
+#       "original_filename": "2023_MARCH.json",
+#       "file_size": 2048576,
+#       "content_type": "application/json"
+#       // Note: file_error may be present if file download fails
+#       // Note: file_name and original_filename will be null if no file attached
+#     }
+#   ],
+#   "exports": [
+#     {
+#       "name": "export_2024-01-01_to_2024-01-31.json",
+#       "url": null,
+#       "status": "completed",
+#       "file_format": "json",
+#       "file_type": "points",
+#       "start_at": "2024-01-01T00:00:00Z",
+#       "end_at": "2024-01-31T23:59:59Z",
+#       "created_at": "2024-02-01T00:00:00Z",
+#       "updated_at": "2024-02-01T00:00:00Z",
+#       "file_name": "export_1_export_2024-01-01_to_2024-01-31.json",
+#       "original_filename": "export_2024-01-01_to_2024-01-31.json",
+#       "file_size": 1048576,
+#       "content_type": "application/json"
+#       // Note: file_error may be present if file download fails
+#       // Note: file_name and original_filename will be null if no file attached
+#     }
+#   ],
+#   "trips": [
+#     {
+#       "name": "Business Trip to NYC",
+#       "started_at": "2024-01-15T08:00:00Z",
+#       "ended_at": "2024-01-18T20:00:00Z",
+#       "distance": 1245,
+#       "path": null, // PostGIS LineString geometry
+#       "visited_countries": {"US": "United States", "CA": "Canada"},
+#       "created_at": "2024-01-19T00:00:00Z",
+#       "updated_at": "2024-01-19T00:00:00Z"
+#     }
+#   ],
+#   "stats": [
+#     {
+#       "year": 2024,
+#       "month": 1,
+#       "distance": 456, // Note: integer, not float
+#       "daily_distance": {"1": 15.2, "2": 23.5}, // jsonb object
+#       "toponyms": [
+#         {"country": "United States", "cities": [{"city": "New York"}]}
+#       ],
+#       "created_at": "2024-02-01T00:00:00Z",
+#       "updated_at": "2024-02-01T00:00:00Z"
+#     }
+#   ],
+#   "notifications": [
+#     {
+#       "kind": "info",
+#       "title": "Import completed",
+#       "content": "Your data import has been processed successfully",
+#       "read_at": "2024-01-01T12:30:00Z", // null if unread
+#       "created_at": "2024-01-01T12:00:00Z",
+#       "updated_at": "2024-01-01T12:30:00Z"
+#     }
+#   ],
+#   "points": [
+#     {
+#       "battery_status": "charging",
+#       "battery": 85,
+#       "timestamp": 1704067200,
+#       "altitude": 15.5,
+#       "velocity": 25.5,
+#       "accuracy": 5.0,
+#       "ping": "test-ping",
+#       "tracker_id": "tracker-123",
+#       "topic": "owntracks/user/device",
+#       "trigger": "manual_event",
+#       "bssid": "aa:bb:cc:dd:ee:ff",
+#       "ssid": "TestWiFi",
+#       "connection": "wifi",
+#       "vertical_accuracy": 3.0,
+#       "mode": 2,
+#       "inrids": ["region1", "region2"],
+#       "in_regions": ["home", "work"],
+#       "raw_data": {"test": "data"},
+#       "city": "New York",
+#       "country": "United States",
+#       "geodata": {"address": "123 Main St"},
+#       "reverse_geocoded_at": "2024-01-01T00:00:00Z",
+#       "course": 45.5,
+#       "course_accuracy": 2.5,
+#       "external_track_id": "ext-123",
+#       "lonlat": "POINT(-74.006 40.7128)",
+#       "longitude": -74.006,
+#       "latitude": 40.7128,
+#       "created_at": "2024-01-01T00:00:00Z",
+#       "updated_at": "2024-01-01T00:00:00Z",
+#       "import_reference": {
+#         "name": "2023_MARCH.json",
+#         "source": "google_semantic_history",
+#         "created_at": "2024-01-01T00:00:00Z"
+#       },
+#       "country_info": {
+#         "name": "United States",
+#         "iso_a2": "US",
+#         "iso_a3": "USA"
+#       },
+#       "visit_reference": {
+#         "name": "Work Visit",
+#         "started_at": "2024-01-01T08:00:00Z",
+#         "ended_at": "2024-01-01T17:00:00Z"
+#       }
+#     },
+#     {
+#       // Example of point without relationships (edge cases)
+#       "timestamp": 1704070800,
+#       "altitude": 10.0,
+#       "longitude": -73.9857,
+#       "latitude": 40.7484,
+#       "lonlat": "POINT(-73.9857 40.7484)",
+#       "created_at": "2024-01-01T00:05:00Z",
+#       "updated_at": "2024-01-01T00:05:00Z",
+#       "import_reference": null,     // Orphaned point
+#       "country_info": null,         // No country data
+#       "visit_reference": null       // Not part of a visit
+#       // ... other point fields may be null
+#     }
+#   ],
+#   "visits": [
+#     {
+#       "area_id": 123,
+#       "started_at": "2024-01-01T08:00:00Z",
+#       "ended_at": "2024-01-01T17:00:00Z",
+#       "duration": 32400,
+#       "name": "Work Visit",
+#       "status": "suggested",
+#       "created_at": "2024-01-01T00:00:00Z",
+#       "updated_at": "2024-01-01T00:00:00Z",
+#       "place_reference": {
+#         "name": "Office Building",
+#         "latitude": "40.7589",
+#         "longitude": "-73.9851",
+#         "source": "manual"
+#       }
+#     },
+#     {
+#       // Example of visit without place
+#       "area_id": null,
+#       "started_at": "2024-01-02T10:00:00Z",
+#       "ended_at": "2024-01-02T12:00:00Z",
+#       "duration": 7200,
+#       "name": "Unknown Location",
+#       "status": "confirmed",
+#       "created_at": "2024-01-02T00:00:00Z",
+#       "updated_at": "2024-01-02T00:00:00Z",
+#       "place_reference": null       // No associated place
+#     }
+#   ],
+#   "places": [
+#     {
+#       "name": "Office Building",
+#       "longitude": "-73.9851",
+#       "latitude": "40.7589",
+#       "city": "New York",
+#       "country": "United States",
+#       "source": "manual",
+#       "geodata": {"properties": {"name": "Office Building"}},
+#       "reverse_geocoded_at": "2024-01-01T00:00:00Z",
+#       "lonlat": "POINT(-73.9851 40.7589)",
+#       "created_at": "2024-01-01T00:00:00Z",
+#       "updated_at": "2024-01-01T00:00:00Z"
+#     }
+#   ]
+# }
+#
+# Import Strategy Notes:
+# 1. Countries: Look up by name/ISO codes, create if missing
+# 2. Imports: Match by name + source + created_at, create new import records
+# 3. Places: Match by name + coordinates, create if missing
+# 4. Visits: Match by name + timestamps + place_reference, create if missing
+# 5. Points: Import with reconstructed foreign keys from references
+# 6. Files: Import files are available in the files/ directory with names from file_name fields
+
+class Users::ExportData
+  def initialize(user)
+    @user = user
+  end
+
+  def export
+    timestamp = Time.current.strftime('%Y%m%d_%H%M%S')
+    @export_directory = Rails.root.join('tmp', "#{user.email.gsub(/[^0-9A-Za-z._-]/, '_')}_#{timestamp}")
+    @files_directory = @export_directory.join('files')
+
+    FileUtils.mkdir_p(@files_directory)
+
+    export_record = user.exports.create!(
+      name: "user_data_export_#{timestamp}.zip",
+      file_format: :archive,
+      file_type: :user_data,
+      status: :processing
+    )
+
+    begin
+      json_file_path = @export_directory.join('data.json')
+
+      # Stream JSON writing instead of building in memory
+      File.open(json_file_path, 'w') do |file|
+        file.write('{"counts":')
+        file.write(calculate_entity_counts.to_json)
+
+        file.write(',"settings":')
+        file.write(user.safe_settings.settings.to_json)
+
+        file.write(',"areas":')
+        file.write(Users::ExportData::Areas.new(user).call.to_json)
+
+        file.write(',"imports":')
+        file.write(Users::ExportData::Imports.new(user, @files_directory).call.to_json)
+
+        file.write(',"exports":')
+        file.write(Users::ExportData::Exports.new(user, @files_directory).call.to_json)
+
+        file.write(',"trips":')
+        file.write(Users::ExportData::Trips.new(user).call.to_json)
+
+        file.write(',"stats":')
+        file.write(Users::ExportData::Stats.new(user).call.to_json)
+
+        file.write(',"notifications":')
+        file.write(Users::ExportData::Notifications.new(user).call.to_json)
+
+        file.write(',"points":')
+        file.write(Users::ExportData::Points.new(user).call.to_json)
+
+        file.write(',"visits":')
+        file.write(Users::ExportData::Visits.new(user).call.to_json)
+
+        file.write(',"places":')
+        file.write(Users::ExportData::Places.new(user).call.to_json)
+
+        file.write('}')
+      end
+
+      zip_file_path = @export_directory.join('export.zip')
+      create_zip_archive(@export_directory, zip_file_path)
+
+      export_record.file.attach(
+        io: File.open(zip_file_path),
+        filename: export_record.name,
+        content_type: 'application/zip'
+      )
+
+      export_record.update!(status: :completed)
+
+      create_success_notification
+
+      export_record
+    rescue StandardError => e
+      export_record.update!(status: :failed) if export_record
+
+      ExceptionReporter.call(e, 'Export failed')
+
+      raise e
+    ensure
+      cleanup_temporary_files(@export_directory) if @export_directory&.exist?
+    end
+  end
+
+  private
+
+  attr_reader :user
+
+  def export_directory
+    @export_directory
+  end
+
+  def files_directory
+    @files_directory
+  end
+
+  def calculate_entity_counts
+    Rails.logger.info "Calculating entity counts for export"
+
+    counts = {
+      areas: user.areas.count,
+      imports: user.imports.count,
+      exports: user.exports.count,
+      trips: user.trips.count,
+      stats: user.stats.count,
+      notifications: user.notifications.count,
+      points: user.tracked_points.count,
+      visits: user.visits.count,
+      places: user.places.count
+    }
+
+    Rails.logger.info "Entity counts: #{counts}"
+    counts
+  end
+
+    def create_zip_archive(export_directory, zip_file_path)
+    original_compression = Zip.default_compression
+    Zip.default_compression = Zip::Entry::DEFLATED
+
+    Zip::File.open(zip_file_path, Zip::File::CREATE) do |zipfile|
+      Dir.glob(export_directory.join('**', '*')).each do |file|
+        next if File.directory?(file) || file == zip_file_path.to_s
+
+        relative_path = file.sub(export_directory.to_s + '/', '')
+
+        zipfile.add(relative_path, file)
+      end
+    end
+  ensure
+    Zip.default_compression = original_compression if original_compression
+  end
+
+  def cleanup_temporary_files(export_directory)
+    return unless File.directory?(export_directory)
+
+    Rails.logger.info "Cleaning up temporary export directory: #{export_directory}"
+    FileUtils.rm_rf(export_directory)
+  rescue StandardError => e
+    ExceptionReporter.call(e, 'Failed to cleanup temporary files')
+  end
+
+  def create_success_notification
+    counts = calculate_entity_counts
+    summary = "#{counts[:points]} points, " \
+    "#{counts[:visits]} visits, " \
+    "#{counts[:places]} places, " \
+    "#{counts[:trips]} trips, " \
+    "#{counts[:areas]} areas, " \
+    "#{counts[:imports]} imports, " \
+    "#{counts[:exports]} exports, " \
+    "#{counts[:stats]} stats, " \
+    "#{counts[:notifications]} notifications"
+
+    ::Notifications::Create.new(
+      user: user,
+      title: 'Export completed',
+      content: "Your data export has been processed successfully (#{summary}). You can download it from the exports page.",
+      kind: :info
+    ).call
+  end
+end

app/services/users/export_data/areas.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Users::ExportData::Areas
+  def initialize(user)
+    @user = user
+  end
+
+  def call
+    user.areas.as_json(except: %w[user_id id])
+  end
+
+  private
+
+  attr_reader :user
+end

app/services/users/export_data/exports.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'parallel'
+
+class Users::ExportData::Exports
+  def initialize(user, files_directory)
+    @user = user
+    @files_directory = files_directory
+  end
+
+  def call
+    exports_with_files = user.exports.includes(:file_attachment).to_a
+
+    if exports_with_files.size > 1
+      results = Parallel.map(exports_with_files, in_threads: 2) do |export|
+        process_export(export)
+      end
+      results
+    else
+      exports_with_files.map { |export| process_export(export) }
+    end
+  end
+
+  private
+
+  attr_reader :user, :files_directory
+
+  def process_export(export)
+    Rails.logger.info "Processing export #{export.name}"
+
+    export_hash = export.as_json(except: %w[user_id id])
+
+    if export.file.attached?
+      add_file_data_to_export(export, export_hash)
+    else
+      add_empty_file_data_to_export(export_hash)
+    end
+
+    Rails.logger.info "Export #{export.name} processed"
+
+    export_hash
+  end
+
+  def add_file_data_to_export(export, export_hash)
+    sanitized_filename = generate_sanitized_export_filename(export)
+    file_path = files_directory.join(sanitized_filename)
+
+    begin
+      download_and_save_export_file(export, file_path)
+      add_file_metadata_to_export(export, export_hash, sanitized_filename)
+    rescue StandardError => e
+      ExceptionReporter.call(e)
+
+      export_hash['file_error'] = "Failed to download: #{e.message}"
+    end
+  end
+
+  def add_empty_file_data_to_export(export_hash)
+    export_hash['file_name'] = nil
+    export_hash['original_filename'] = nil
+  end
+
+  def generate_sanitized_export_filename(export)
+    "export_#{export.id}_#{export.file.blob.filename}".gsub(/[^0-9A-Za-z._-]/, '_')
+  end
+
+  def download_and_save_export_file(export, file_path)
+    file_content = Imports::SecureFileDownloader.new(export.file).download_with_verification
+    File.write(file_path, file_content, mode: 'wb')
+  end
+
+  def add_file_metadata_to_export(export, export_hash, sanitized_filename)
+    export_hash['file_name'] = sanitized_filename
+    export_hash['original_filename'] = export.file.blob.filename.to_s
+    export_hash['file_size'] = export.file.blob.byte_size
+    export_hash['content_type'] = export.file.blob.content_type
+  end
+end

app/services/users/export_data/imports.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'parallel'
+
+class Users::ExportData::Imports
+  def initialize(user, files_directory)
+    @user = user
+    @files_directory = files_directory
+  end
+
+  def call
+    imports_with_files = user.imports.includes(:file_attachment).to_a
+
+    if imports_with_files.size > 1
+      results = Parallel.map(imports_with_files, in_threads: 2) do |import|
+        process_import(import)
+      end
+      results
+    else
+      imports_with_files.map { |import| process_import(import) }
+    end
+  end
+
+  private
+
+  attr_reader :user, :files_directory
+
+  def process_import(import)
+    Rails.logger.info "Processing import #{import.name}"
+
+    import_hash = import.as_json(except: %w[user_id raw_data id])
+
+    if import.file.attached?
+      add_file_data_to_import(import, import_hash)
+    else
+      add_empty_file_data_to_import(import_hash)
+    end
+
+    Rails.logger.info "Import #{import.name} processed"
+
+    import_hash
+  end
+
+  def add_file_data_to_import(import, import_hash)
+    sanitized_filename = generate_sanitized_filename(import)
+    file_path = files_directory.join(sanitized_filename)
+
+    begin
+      download_and_save_import_file(import, file_path)
+      add_file_metadata_to_import(import, import_hash, sanitized_filename)
+    rescue StandardError => e
+      ExceptionReporter.call(e)
+
+      import_hash['file_error'] = "Failed to download: #{e.message}"
+    end
+  end
+
+  def add_empty_file_data_to_import(import_hash)
+    import_hash['file_name'] = nil
+    import_hash['original_filename'] = nil
+  end
+
+  def generate_sanitized_filename(import)
+    "import_#{import.id}_#{import.file.blob.filename}".gsub(/[^0-9A-Za-z._-]/, '_')
+  end
+
+  def download_and_save_import_file(import, file_path)
+    file_content = Imports::SecureFileDownloader.new(import.file).download_with_verification
+    File.write(file_path, file_content, mode: 'wb')
+  end
+
+  def add_file_metadata_to_import(import, import_hash, sanitized_filename)
+    import_hash['file_name'] = sanitized_filename
+    import_hash['original_filename'] = import.file.blob.filename.to_s
+    import_hash['file_size'] = import.file.blob.byte_size
+    import_hash['content_type'] = import.file.blob.content_type
+  end
+end

app/services/users/export_data/notifications.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Users::ExportData::Notifications
+  def initialize(user)
+    @user = user
+  end
+
+  def call
+    # Export all notifications for the user
+    user.notifications
+        .as_json(except: %w[user_id id])
+  end
+
+  private
+
+  attr_reader :user
+end