<%= 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.ci.yml b/config/database.ci.yml
index c5ee5c9d..d5e13575 100644
--- a/config/database.ci.yml
+++ b/config/database.ci.yml
@@ -1,8 +1,9 @@
# config/database.ci.yml
test:
- adapter: postgresql
+ adapter: postgis
encoding: unicode
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+ host: localhost
database: <%= ENV["POSTGRES_DB"] %>
username: <%= ENV['POSTGRES_USER'] %>
password: <%= ENV["POSTGRES_PASSWORD"] %>
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..451ed716 100644
--- a/config/initializers/03_dawarich_settings.rb
+++ b/config/initializers/03_dawarich_settings.rb
@@ -17,5 +17,13 @@ def photon_uses_komoot_io?
def geoapify_enabled?
@geoapify_enabled ||= GEOAPIFY_API_KEY.present?
end
+
+ def meters_between_tracks
+ @meters_between_tracks ||= 300
+ end
+
+ def minutes_between_tracks
+ @minutes_between_tracks ||= 20
+ end
end
end
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/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/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..b431351f 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
@@ -200,6 +201,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
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/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/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/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