<%= form.label :notes %>
- <%= form.rich_text_area :notes %>
+ <%= form.rich_text_area :notes, class: 'trix-content-editor' %>
diff --git a/app/views/trips/_trip.html.erb b/app/views/trips/_trip.html.erb
index e0b14ba8..f7a198b6 100644
--- a/app/views/trips/_trip.html.erb
+++ b/app/views/trips/_trip.html.erb
@@ -13,7 +13,7 @@
class="rounded-lg z-0"
data-controller="trip-map"
data-trip-map-trip-id-value="<%= trip.id %>"
- data-trip-map-coordinates-value="<%= trip.points.pluck(:latitude, :longitude, :battery, :altitude, :timestamp, :velocity, :id, :country).to_json %>"
+ data-trip-map-path-value="<%= trip.path.to_json %>"
data-trip-map-api-key-value="<%= current_user.api_key %>"
data-trip-map-user-settings-value="<%= current_user.settings.to_json %>"
data-trip-map-timezone-value="<%= Rails.configuration.time_zone %>"
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
index f399eb3f..f4709aa5 100644
--- a/app/views/trips/show.html.erb
+++ b/app/views/trips/show.html.erb
@@ -24,7 +24,9 @@
data-distance_unit="<%= DISTANCE_UNIT %>"
data-api_key="<%= current_user.api_key %>"
data-user_settings="<%= current_user.settings.to_json %>"
- data-coordinates="<%= @coordinates.to_json %>"
+ data-path="<%= @trip.path.to_json %>"
+ data-started_at="<%= @trip.started_at %>"
+ data-ended_at="<%= @trip.ended_at %>"
data-timezone="<%= Rails.configuration.time_zone %>">
diff --git a/config/database.yml b/config/database.yml
index fca7a51c..79ad2b3b 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,5 +1,5 @@
default: &default
- adapter: postgresql
+ adapter: postgis
encoding: unicode
database: <%= ENV['DATABASE_NAME'] %>
username: <%= ENV['DATABASE_USERNAME'] %>
diff --git a/config/initializers/03_dawarich_settings.rb b/config/initializers/03_dawarich_settings.rb
index 87cf4817..6c9766d7 100644
--- a/config/initializers/03_dawarich_settings.rb
+++ b/config/initializers/03_dawarich_settings.rb
@@ -2,6 +2,17 @@
class DawarichSettings
class << self
+ def config
+ {
+ reverse_geocoding_enabled: reverse_geocoding_enabled?,
+ photon_enabled: photon_enabled?,
+ photon_uses_komoot_io: photon_uses_komoot_io?,
+ geoapify_enabled: geoapify_enabled?,
+ meters_between_tracks: meters_between_tracks,
+ minutes_between_tracks: minutes_between_tracks
+ }
+ end
+
def reverse_geocoding_enabled?
@reverse_geocoding_enabled ||= photon_enabled? || geoapify_enabled?
end
@@ -17,5 +28,13 @@ def photon_uses_komoot_io?
def geoapify_enabled?
@geoapify_enabled ||= GEOAPIFY_API_KEY.present?
end
+
+ def meters_between_tracks
+ @meters_between_tracks ||= 500
+ end
+
+ def minutes_between_tracks
+ @minutes_between_tracks ||= 30
+ end
end
end
diff --git a/config/routes.rb b/config/routes.rb
index 9a6a38ca..ae5abf20 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -68,6 +68,7 @@
get 'users/me', to: 'users#me'
resources :areas, only: %i[index create update destroy]
+ resources :tracks, only: %i[index show]
resources :points, only: %i[index create update destroy]
resources :visits, only: %i[update]
resources :stats, only: :index
diff --git a/db/data/20250123151849_create_paths_for_trips.rb b/db/data/20250123151849_create_paths_for_trips.rb
new file mode 100644
index 00000000..c78cffff
--- /dev/null
+++ b/db/data/20250123151849_create_paths_for_trips.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreatePathsForTrips < ActiveRecord::Migration[8.0]
+ def up
+ Trip.find_each do |trip|
+ Trips::CreatePathJob.perform_later(trip.id)
+ end
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/data/20250124153905_create_tracks_from_points.rb b/db/data/20250124153905_create_tracks_from_points.rb
new file mode 100644
index 00000000..a612aa71
--- /dev/null
+++ b/db/data/20250124153905_create_tracks_from_points.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateTracksFromPoints < ActiveRecord::Migration[8.0]
+ def up
+ # Get all users to process their points separately
+ User.find_each do |user|
+ Tracks::CreatePathJob.perform_later(user.id)
+ end
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/migrate/20250123145155_enable_postgis_extension.rb b/db/migrate/20250123145155_enable_postgis_extension.rb
new file mode 100644
index 00000000..e9d816dd
--- /dev/null
+++ b/db/migrate/20250123145155_enable_postgis_extension.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class EnablePostgisExtension < ActiveRecord::Migration[8.0]
+ def change
+ enable_extension 'postgis'
+ end
+end
diff --git a/db/migrate/20250123145954_create_tracks.rb b/db/migrate/20250123145954_create_tracks.rb
new file mode 100644
index 00000000..35c6afa1
--- /dev/null
+++ b/db/migrate/20250123145954_create_tracks.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateTracks < ActiveRecord::Migration[8.0]
+ def change
+ create_table :tracks do |t|
+ t.datetime :started_at, null: false
+ t.datetime :ended_at, null: false
+ t.references :user, null: false, foreign_key: true
+ t.line_string :path, srid: 3857, null: false
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20250123151657_add_path_to_trips.rb b/db/migrate/20250123151657_add_path_to_trips.rb
new file mode 100644
index 00000000..a5f121e7
--- /dev/null
+++ b/db/migrate/20250123151657_add_path_to_trips.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPathToTrips < ActiveRecord::Migration[8.0]
+ def change
+ add_column :trips, :path, :line_string, srid: 3857
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ebf1007e..7e9cca52 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,9 +10,10 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.0].define(version: 2025_01_20_154555) do
+ActiveRecord::Schema[8.0].define(version: 2025_01_23_151657) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"
+ enable_extension "postgis"
create_table "action_text_rich_texts", force: :cascade do |t|
t.string "name", null: false
@@ -192,6 +193,16 @@
t.index ["year"], name: "index_stats_on_year"
end
+ create_table "tracks", force: :cascade do |t|
+ t.datetime "started_at", null: false
+ t.datetime "ended_at", null: false
+ t.bigint "user_id", null: false
+ t.geometry "path", limit: {:srid=>3857, :type=>"line_string"}, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["user_id"], name: "index_tracks_on_user_id"
+ end
+
create_table "trips", force: :cascade do |t|
t.string "name", null: false
t.datetime "started_at", null: false
@@ -200,6 +211,7 @@
t.bigint "user_id", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.geometry "path", limit: {:srid=>3857, :type=>"line_string"}
t.index ["user_id"], name: "index_trips_on_user_id"
end
@@ -252,6 +264,7 @@
add_foreign_key "points", "users"
add_foreign_key "points", "visits"
add_foreign_key "stats", "users"
+ add_foreign_key "tracks", "users"
add_foreign_key "trips", "users"
add_foreign_key "visits", "areas"
add_foreign_key "visits", "places"
diff --git a/spec/factories/tracks.rb b/spec/factories/tracks.rb
new file mode 100644
index 00000000..32603460
--- /dev/null
+++ b/spec/factories/tracks.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+ factory :track do
+ started_at { DateTime.new(2025, 1, 23, 15, 59, 55) }
+ ended_at { DateTime.new(2025, 1, 23, 16, 0, 0) }
+ user
+ path { 'LINESTRING(0 0, 1 1, 2 2)' }
+ end
+end
diff --git a/spec/factories/trips.rb b/spec/factories/trips.rb
index 4ef4041a..5986e882 100644
--- a/spec/factories/trips.rb
+++ b/spec/factories/trips.rb
@@ -7,6 +7,8 @@
started_at { DateTime.new(2024, 11, 27, 17, 16, 21) }
ended_at { DateTime.new(2024, 11, 29, 17, 16, 21) }
notes { FFaker::Lorem.sentence }
+ distance { 100 }
+ path { 'LINESTRING(1 1, 2 2, 3 3)' }
trait :with_points do
after(:build) do |trip|
diff --git a/spec/jobs/tracks/create_job_spec.rb b/spec/jobs/tracks/create_job_spec.rb
new file mode 100644
index 00000000..5f67d08f
--- /dev/null
+++ b/spec/jobs/tracks/create_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Tracks::CreateJob, type: :job do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/jobs/tracks/create_path_job_spec.rb b/spec/jobs/tracks/create_path_job_spec.rb
new file mode 100644
index 00000000..9ef7c6e3
--- /dev/null
+++ b/spec/jobs/tracks/create_path_job_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Tracks::CreatePathJob, type: :job do
+ let!(:track) { create(:track) }
+ let!(:points) { create_list(:point, 3, user: track.user, timestamp: track.started_at.to_i) }
+ let(:track_path) do
+ "LINESTRING (#{points.map do |point|
+ "#{point.longitude.to_f.round(5)} #{point.latitude.to_f.round(5)}"
+ end.join(', ')})"
+ end
+
+ before do
+ track.update(path: nil)
+ end
+
+ it 'creates a path for a track' do
+ described_class.perform_now(track.id)
+
+ expect(track.reload.path.to_s).to eq(track_path)
+ end
+end
diff --git a/spec/jobs/trips/create_path_job_spec.rb b/spec/jobs/trips/create_path_job_spec.rb
new file mode 100644
index 00000000..60d288e3
--- /dev/null
+++ b/spec/jobs/trips/create_path_job_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Trips::CreatePathJob, type: :job do
+ let!(:trip) { create(:trip, :with_points) }
+ let(:points) { trip.points }
+ let(:trip_path) do
+ "LINESTRING (#{points.map do |point|
+ "#{point.longitude.to_f.round(5)} #{point.latitude.to_f.round(5)}"
+ end.join(', ')})"
+ end
+
+ before do
+ trip.update(path: nil, distance: nil)
+ end
+
+ it 'creates a path for a trip' do
+ described_class.perform_now(trip.id)
+
+ expect(trip.reload.path.to_s).to eq(trip_path)
+ end
+end
diff --git a/spec/models/track_spec.rb b/spec/models/track_spec.rb
new file mode 100644
index 00000000..051b8ae8
--- /dev/null
+++ b/spec/models/track_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Track, type: :model do
+ describe 'validations' do
+ it { is_expected.to validate_presence_of(:path) }
+ it { is_expected.to validate_presence_of(:started_at) }
+ it { is_expected.to validate_presence_of(:ended_at) }
+ end
+
+ describe 'associations' do
+ it { is_expected.to belong_to(:user) }
+ end
+end
diff --git a/spec/models/trip_spec.rb b/spec/models/trip_spec.rb
index 032185bd..f56daf20 100644
--- a/spec/models/trip_spec.rb
+++ b/spec/models/trip_spec.rb
@@ -21,6 +21,10 @@
it 'sets the distance' do
expect(trip.distance).to eq(calculated_distance)
end
+
+ it 'sets the path' do
+ expect(trip.path).to be_present
+ end
end
describe '#countries' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 398e436f..a9ce1d1e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -14,6 +14,7 @@
it { is_expected.to have_many(:visits).dependent(:destroy) }
it { is_expected.to have_many(:places).through(:visits) }
it { is_expected.to have_many(:trips).dependent(:destroy) }
+ it { is_expected.to have_many(:tracks).dependent(:destroy) }
end
describe 'callbacks' do
diff --git a/spec/requests/api/v1/tracks_spec.rb b/spec/requests/api/v1/tracks_spec.rb
new file mode 100644
index 00000000..f85a6f3d
--- /dev/null
+++ b/spec/requests/api/v1/tracks_spec.rb
@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+RSpec.describe "Api::V1::Tracks", type: :request do
+ describe "GET /index" do
+ pending "add some examples (or delete) #{__FILE__}"
+ end
+end
diff --git a/spec/services/tracks/build_path_spec.rb b/spec/services/tracks/build_path_spec.rb
new file mode 100644
index 00000000..1d2db10a
--- /dev/null
+++ b/spec/services/tracks/build_path_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Tracks::BuildPath do
+ describe '#call' do
+ let(:coordinates) do
+ [
+ [45.123456, -122.654321], # [lat, lng]
+ [45.234567, -122.765432],
+ [45.345678, -122.876543]
+ ]
+ end
+
+ let(:service) { described_class.new(coordinates) }
+ let(:result) { service.call }
+
+ it 'returns an RGeo::Geographic::SphericalLineString' do
+ expect(result).to be_a(RGeo::Geographic::SphericalLineStringImpl)
+ end
+
+ it 'creates a line string with the correct number of points' do
+ expect(result.num_points).to eq(coordinates.length)
+ end
+
+ it 'correctly converts coordinates to points with rounded values' do
+ points = result.points
+
+ coordinates.each_with_index do |(lat, lng), index|
+ expect(points[index].x).to eq(lng.to_f.round(5))
+ expect(points[index].y).to eq(lat.to_f.round(5))
+ end
+ end
+ end
+end