diff --git a/app/controllers/api/v1/countries/borders_controller.rb b/app/controllers/api/v1/countries/borders_controller.rb
index 9d880528..1c3d13a8 100644
--- a/app/controllers/api/v1/countries/borders_controller.rb
+++ b/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
diff --git a/app/controllers/api/v1/overland/batches_controller.rb b/app/controllers/api/v1/overland/batches_controller.rb
index db7c4ade..18ea576a 100644
--- a/app/controllers/api/v1/overland/batches_controller.rb
+++ b/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)
diff --git a/app/controllers/api/v1/owntracks/points_controller.rb b/app/controllers/api/v1/owntracks/points_controller.rb
index 26c53c2f..6f97cfe9 100644
--- a/app/controllers/api/v1/owntracks/points_controller.rb
+++ b/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)
diff --git a/app/controllers/api/v1/points_controller.rb b/app/controllers/api/v1/points_controller.rb
index 5a2a8d34..505bb123 100644
--- a/app/controllers/api/v1/points_controller.rb
+++ b/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
diff --git a/app/controllers/api/v1/subscriptions_controller.rb b/app/controllers/api/v1/subscriptions_controller.rb
index 8a35ee86..2da2e97d 100644
--- a/app/controllers/api/v1/subscriptions_controller.rb
+++ b/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
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index ab8038cd..4d13bdaf 100644
--- a/app/controllers/api_controller.rb
+++ b/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
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 9cd2765c..f193bdd8 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -6,7 +6,7 @@ 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
@@ -102,4 +102,10 @@ class ImportsController < ApplicationController
import
end
+
+ def validate_points_limit
+ limit_exceeded = PointsLimitExceeded.new(current_user).call
+
+ redirect_to new_import_path, alert: 'Points limit exceeded', status: :unprocessable_entity if limit_exceeded
+ end
end
diff --git a/app/jobs/data_migrations/set_points_country_ids_job.rb b/app/jobs/data_migrations/set_points_country_ids_job.rb
new file mode 100644
index 00000000..85c1a436
--- /dev/null
+++ b/app/jobs/data_migrations/set_points_country_ids_job.rb
@@ -0,0 +1,9 @@
+class DataMigrations::SetPointsCountryIdsJob < ApplicationJob
+ queue_as :default
+
+ def perform(point_id)
+ point = Point.find(point_id)
+ point.country_id = Country.containing_point(point.lon, point.lat).id
+ point.save!
+ end
+end
diff --git a/app/jobs/data_migrations/start_settings_points_country_ids_job.rb b/app/jobs/data_migrations/start_settings_points_country_ids_job.rb
new file mode 100644
index 00000000..7bb13c5f
--- /dev/null
+++ b/app/jobs/data_migrations/start_settings_points_country_ids_job.rb
@@ -0,0 +1,9 @@
+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
diff --git a/app/models/country.rb b/app/models/country.rb
new file mode 100644
index 00000000..fe649360
--- /dev/null
+++ b/app/models/country.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Country < ApplicationRecord
+ 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
+end
diff --git a/app/models/point.rb b/app/models/point.rb
index 68ed47c9..dab71d5f 100644
--- a/app/models/point.rb
+++ b/app/models/point.rb
@@ -29,6 +29,7 @@ class Point < ApplicationRecord
scope :not_visited, -> { where(visit_id: nil) }
after_create :async_reverse_geocode, if: -> { DawarichSettings.store_geodata? }
+ after_create :set_country
after_create_commit :broadcast_coordinates
def self.without_raw_data
@@ -57,6 +58,10 @@ class Point < ApplicationRecord
lonlat.y
end
+ def found_in_country
+ Country.containing_point(lon, lat)
+ end
+
private
# rubocop:disable Metrics/MethodLength Metrics/AbcSize
@@ -76,4 +81,9 @@ class Point < ApplicationRecord
)
end
# rubocop:enable Metrics/MethodLength
+
+ def set_country
+ self.country_id = found_in_country&.id
+ save! if changed?
+ end
end
diff --git a/app/models/trip.rb b/app/models/trip.rb
index 9d19b721..60fd27cc 100644
--- a/app/models/trip.rb
+++ b/app/models/trip.rb
@@ -46,7 +46,8 @@ class Trip < ApplicationRecord
end
def calculate_countries
- countries = Trips::Countries.new(self).call
+ countries =
+ Country.where(id: points.pluck(:country_id).compact.uniq).pluck(:name)
self.visited_countries = countries
end
diff --git a/app/serializers/api/point_serializer.rb b/app/serializers/api/point_serializer.rb
index 0f875575..e8484d38 100644
--- a/app/serializers/api/point_serializer.rb
+++ b/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)
diff --git a/app/serializers/point_serializer.rb b/app/serializers/point_serializer.rb
index 6dfe5502..580dd574 100644
--- a/app/serializers/point_serializer.rb
+++ b/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)
diff --git a/app/services/points_limit_exceeded.rb b/app/services/points_limit_exceeded.rb
new file mode 100644
index 00000000..97909efc
--- /dev/null
+++ b/app/services/points_limit_exceeded.rb
@@ -0,0 +1,18 @@
+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
diff --git a/app/services/reverse_geocoding/places/fetch_data.rb b/app/services/reverse_geocoding/places/fetch_data.rb
index 72195437..da4ec379 100644
--- a/app/services/reverse_geocoding/places/fetch_data.rb
+++ b/app/services/reverse_geocoding/places/fetch_data.rb
@@ -56,7 +56,7 @@ class ReverseGeocoding::Places::FetchData
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?
diff --git a/app/services/trips/countries.rb b/app/services/trips/countries.rb
deleted file mode 100644
index fffad4aa..00000000
--- a/app/services/trips/countries.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-class Trips::Countries
- FILE_PATH = Rails.root.join('lib/assets/countries.json')
-
- def initialize(trip, batch_count = 2)
- @trip = trip
- @batch_count = batch_count
- @factory = RGeo::Geographic.spherical_factory
- @file = File.read(FILE_PATH)
- @countries_features =
- RGeo::GeoJSON.decode(@file, json_parser: :json, geo_factory: @factory)
- end
-
- def call
- all_points = @trip.points.to_a
- total_points = all_points.size
-
- # Return empty hash if no points
- return {} if total_points.zero?
-
- batches = split_into_batches(all_points, @batch_count)
- threads_results = process_batches_in_threads(batches, total_points)
-
- merge_thread_results(threads_results).uniq.compact
- end
-
- private
-
- def split_into_batches(points, batch_count)
- batch_count = [batch_count, 1].max # Ensure batch_count is at least 1
- batch_size = (points.size / batch_count.to_f).ceil
- points.each_slice(batch_size).to_a
- end
-
- def process_batches_in_threads(batches, total_points)
- threads_results = []
- threads = []
-
- batches.each do |batch|
- threads << Thread.new do
- threads_results << process_batch(batch)
- end
- end
-
- threads.each(&:join)
- threads_results
- end
-
- def merge_thread_results(threads_results)
- countries = []
-
- threads_results.each do |result|
- countries.concat(result)
- end
-
- countries
- end
-
- def process_batch(points)
- points.map do |point|
- country_code = geocode_point(point)
- next unless country_code
-
- country_code
- end
- end
-
- def geocode_point(point)
- lonlat = point.lonlat
- return nil unless lonlat
-
- latitude = lonlat.y
- longitude = lonlat.x
-
- fetch_country_code(latitude, longitude)
- end
-
- def fetch_country_code(latitude, longitude)
- results = Geocoder.search([latitude, longitude], limit: 1)
- return nil unless results.any?
-
- result = results.first
- result.data['properties']['countrycode']
- rescue StandardError => e
- Rails.logger.error("Error geocoding point: #{e.message}")
-
- ExceptionReporter.call(e)
-
- nil
- end
-end
diff --git a/app/views/devise/registrations/_points_usage.html.erb b/app/views/devise/registrations/_points_usage.html.erb
new file mode 100644
index 00000000..e31c13ec
--- /dev/null
+++ b/app/views/devise/registrations/_points_usage.html.erb
@@ -0,0 +1,6 @@
+
+
+ You have used <%= number_with_delimiter(current_user.points.count) %> points of <%= number_with_delimiter(DawarichSettings::BASIC_PAID_PLAN_LIMIT) %> available.
+
+
+
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 79a41867..97c8ce33 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -5,6 +5,7 @@
Edit your account!
<%= render 'devise/registrations/api_key' %>
+ <%= render 'devise/registrations/points_usage' %>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), class: 'form-body', method: :put, data: { turbo_method: :put, turbo: false }) do |f| %>
diff --git a/config/initializers/03_dawarich_settings.rb b/config/initializers/03_dawarich_settings.rb
index 19f7394e..e7eaf76f 100644
--- a/config/initializers/03_dawarich_settings.rb
+++ b/config/initializers/03_dawarich_settings.rb
@@ -1,7 +1,10 @@
# frozen_string_literal: true
class DawarichSettings
+ BASIC_PAID_PLAN_LIMIT = 10_000_000 # 10 million points
+
class << self
+
def reverse_geocoding_enabled?
@reverse_geocoding_enabled ||= photon_enabled? || geoapify_enabled? || nominatim_enabled?
end
diff --git a/db/data/20250516180933_set_points_country_ids.rb b/db/data/20250516180933_set_points_country_ids.rb
new file mode 100644
index 00000000..fbdc6bf2
--- /dev/null
+++ b/db/data/20250516180933_set_points_country_ids.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SetPointsCountryIds < ActiveRecord::Migration[8.0]
+ def up
+ DataMigrations::StartSettingsPointsCountryIdsJob.perform_later
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/data_schema.rb b/db/data_schema.rb
index f977f743..c470d5b8 100644
--- a/db/data_schema.rb
+++ b/db/data_schema.rb
@@ -1 +1 @@
-DataMigrate::Data.define(version: 20_250_404_182_629)
+DataMigrate::Data.define(version: 20250516180933)
diff --git a/db/migrate/20250515190752_create_countries.rb b/db/migrate/20250515190752_create_countries.rb
new file mode 100644
index 00000000..5233a34d
--- /dev/null
+++ b/db/migrate/20250515190752_create_countries.rb
@@ -0,0 +1,17 @@
+class CreateCountries < ActiveRecord::Migration[8.0]
+ def change
+ create_table :countries do |t|
+ t.string :name, null: false
+ t.string :iso_a2, null: false
+ t.string :iso_a3, null: false
+ t.multi_polygon :geom, srid: 4326
+
+ t.timestamps
+ end
+
+ add_index :countries, :name
+ add_index :countries, :iso_a2
+ add_index :countries, :iso_a3
+ add_index :countries, :geom, using: :gist
+ end
+end
diff --git a/db/migrate/20250515192211_add_country_id_to_points.rb b/db/migrate/20250515192211_add_country_id_to_points.rb
new file mode 100644
index 00000000..09fef06a
--- /dev/null
+++ b/db/migrate/20250515192211_add_country_id_to_points.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCountryIdToPoints <