mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-09 08:47:11 -05:00
* fix: move foreman to global gems to fix startup crash (#1971) * Update exporting code to stream points data to file in batches to red… (#1980) * Update exporting code to stream points data to file in batches to reduce memory usage * Update changelog * Update changelog * Feature/maplibre frontend (#1953) * Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet * Implement phase 1 * Phases 1-3 + part of 4 * Fix e2e tests * Phase 6 * Implement fog of war * Phase 7 * Next step: fix specs, phase 7 done * Use our own map tiles * Extract v2 map logic to separate manager classes * Update settings panel on v2 map * Update v2 e2e tests structure * Reimplement location search in maps v2 * Update speed routes * Implement visits and places creation in v2 * Fix last failing test * Implement visits merging * Fix a routes e2e test and simplify the routes layer styling. * Extract js to modules from maps_v2_controller.js * Implement area creation * Fix spec problem * Fix some e2e tests * Implement live mode in v2 map * Update icons and panel * Extract some styles * Remove unused file * Start adding dark theme to popups on MapLibre maps * Make popups respect dark theme * Move v2 maps to maplibre namespace * Update v2 references to maplibre * Put place, area and visit info into side panel * Update API to use safe settings config method * Fix specs * Fix method name to config in SafeSettings and update usages accordingly * Add missing public files * Add handling for real time points * Fix remembering enabled/disabled layers of the v2 map * Fix lots of e2e tests * Add settings to select map version * Use maps/v2 as main path for MapLibre maps * Update routing * Update live mode * Update maplibre controller * Update changelog * Remove some console.log statements * Pull only necessary data for map v2 points * Feature/raw data archive (#2009) * 0.36.2 (#2007) * fix: move foreman to global gems to fix startup crash (#1971) * Update exporting code to stream points data to file in batches to red… (#1980) * Update exporting code to stream points data to file in batches to reduce memory usage * Update changelog * Update changelog * Feature/maplibre frontend (#1953) * Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet * Implement phase 1 * Phases 1-3 + part of 4 * Fix e2e tests * Phase 6 * Implement fog of war * Phase 7 * Next step: fix specs, phase 7 done * Use our own map tiles * Extract v2 map logic to separate manager classes * Update settings panel on v2 map * Update v2 e2e tests structure * Reimplement location search in maps v2 * Update speed routes * Implement visits and places creation in v2 * Fix last failing test * Implement visits merging * Fix a routes e2e test and simplify the routes layer styling. * Extract js to modules from maps_v2_controller.js * Implement area creation * Fix spec problem * Fix some e2e tests * Implement live mode in v2 map * Update icons and panel * Extract some styles * Remove unused file * Start adding dark theme to popups on MapLibre maps * Make popups respect dark theme * Move v2 maps to maplibre namespace * Update v2 references to maplibre * Put place, area and visit info into side panel * Update API to use safe settings config method * Fix specs * Fix method name to config in SafeSettings and update usages accordingly * Add missing public files * Add handling for real time points * Fix remembering enabled/disabled layers of the v2 map * Fix lots of e2e tests * Add settings to select map version * Use maps/v2 as main path for MapLibre maps * Update routing * Update live mode * Update maplibre controller * Update changelog * Remove some console.log statements --------- Co-authored-by: Robin Tuszik <mail@robin.gg> * Remove esbuild scripts from package.json * Remove sideEffects field from package.json * Raw data archivation * Add tests * Fix tests * Fix tests * Update ExceptionReporter * Add schedule to run raw data archival job monthly * Change file structure for raw data archival feature * Update changelog and version for raw data archival feature --------- Co-authored-by: Robin Tuszik <mail@robin.gg> * Set raw_data to an empty hash instead of nil when archiving * Fix storage configuration and file extraction * Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation (#2018) * Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation * Remove raw data from visited cities api endpoint * Use user timezone to show dates on maps (#2020) * Fix/pre epoch time (#2019) * Use user timezone to show dates on maps * Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates. * Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates. * Fix tests failing due to new index on stats table * Fix failing specs * Update redis client configuration to support unix socket connection * Update changelog * Fix kml kmz import issues (#2023) * Fix kml kmz import issues * Refactor KML importer to improve readability and maintainability * Implement moving points in map v2 and fix route rendering logic to ma… (#2027) * Implement moving points in map v2 and fix route rendering logic to match map v1. * Fix route spec * fix(maplibre): update date format to ISO 8601 (#2029) * Add verification step to raw data archival process (#2028) * Add verification step to raw data archival process * Add actual verification of raw data archives after creation, and only clear raw_data for verified archives. * Fix failing specs * Eliminate zip-bomb risk * Fix potential memory leak in js * Return .keep files * Use Toast instead of alert for notifications * Add help section to navbar dropdown * Update changelog * Remove raw_data_archival_job * Ensure file is being closed properly after reading in Archivable concern * Add composite index to stats table if not exists * Update changelog * Update entrypoint to always sync static assets (not only new ones) * Add family layer to MapLibre maps (#2055) * Add family layer to MapLibre maps * Update migration * Don't show family toggle if feature is disabled * Update changelog * Return changelog * Update changelog * Update tailwind file * Bump sentry-rails from 6.0.0 to 6.1.0 (#1945) Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/getsentry/sentry-ruby/releases) - [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-ruby/compare/6.0.0...6.1.0) --- updated-dependencies: - dependency-name: sentry-rails dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump turbo-rails from 2.0.17 to 2.0.20 (#1944) Bumps [turbo-rails](https://github.com/hotwired/turbo-rails) from 2.0.17 to 2.0.20. - [Release notes](https://github.com/hotwired/turbo-rails/releases) - [Commits](https://github.com/hotwired/turbo-rails/compare/v2.0.17...v2.0.20) --- updated-dependencies: - dependency-name: turbo-rails dependency-version: 2.0.20 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> * Bump webmock from 3.25.1 to 3.26.1 (#1943) Bumps [webmock](https://github.com/bblimke/webmock) from 3.25.1 to 3.26.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.25.1...v3.26.1) --- updated-dependencies: - dependency-name: webmock dependency-version: 3.26.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgenii Burmakin <Freika@users.noreply.github.com> * Bump brakeman from 7.1.0 to 7.1.1 (#1942) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v7.1.0...v7.1.1) --- updated-dependencies: - dependency-name: brakeman dependency-version: 7.1.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump redis from 5.4.0 to 5.4.1 (#1941) Bumps [redis](https://github.com/redis/redis-rb) from 5.4.0 to 5.4.1. - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v5.4.0...v5.4.1) --- updated-dependencies: - dependency-name: redis dependency-version: 5.4.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Put import deletion into background job (#2045) * Put import deletion into background job * Update changelog * fix null type error and update heatmap styling (#2037) * fix: use constant weight for maplibre heatmap layer * fix null type, update heatmap styling * improve heatmap styling * fix typo * Fix stats calculation to recursively reduce H3 resolution when too ma… (#2065) * Fix stats calculation to recursively reduce H3 resolution when too many hexagons are generated * Update CHANGELOG.md * Validate trip start and end dates (#2066) * Validate trip start and end dates * Update changelog * Update migration to clean up duplicate stats before adding unique index * Fix fog of war radius setting being ignored and applying settings causing errors (#2068) * Update changelog * Add Rack::Deflater middleware to config/application.rb to enable gzip compression for responses. * Add composite index to points on user_id and timestamp * Deduplicte points based on timestamp brought to unix time * Fix/stats cache invalidation (#2072) * Fix family layer toggle in Map v2 settings for non-selfhosted env * Invalidate cache * Remove comments * Remove comment * Add new indicies to improve performance and remove unused ones to opt… (#2078) * Add new indicies to improve performance and remove unused ones to optimize database. * Remove comments * Update map search suggestions panel styling * Add yearly digest (#2073) * Add yearly digest * Rename YearlyDigests to Users::Digests * Minor changes * Update yearly digest layout and styles * Add flags and chart to email * Update colors * Fix layout of stats in yearly digest view * Remove cron job for yearly digest scheduling * Update CHANGELOG.md * Update digest email setting handling * Allow sharing digest for 1 week or 1 month * Change Digests Distance to Bigint * Fix settings page * Update changelog * Add RailsPulse (#2079) * Add RailsPulse * Add RailsPulse monitoring tool with basic HTTP authentication * Bring points_count to integer * Update migration and version * Update rubocop issues --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Robin Tuszik <mail@robin.gg> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
172 lines
4.4 KiB
Ruby
172 lines
4.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
# This class uses Komoot's Photon API
|
|
class ReverseGeocoding::Places::FetchData
|
|
attr_reader :place
|
|
|
|
def initialize(place_id)
|
|
@place = Place.find(place_id)
|
|
end
|
|
|
|
def call
|
|
unless DawarichSettings.reverse_geocoding_enabled?
|
|
Rails.logger.warn('Reverse geocoding is not enabled')
|
|
|
|
return
|
|
end
|
|
|
|
places = geocoder_places
|
|
first_place = places.shift
|
|
update_place(first_place)
|
|
|
|
osm_ids = extract_osm_ids(places)
|
|
|
|
return if osm_ids.empty?
|
|
|
|
existing_places = find_existing_places(osm_ids)
|
|
|
|
places_to_create, places_to_update = prepare_places_for_bulk_operations(places, existing_places)
|
|
|
|
save_places(places_to_create, places_to_update)
|
|
end
|
|
|
|
private
|
|
|
|
def update_place(reverse_geocoded_place)
|
|
return if reverse_geocoded_place.nil?
|
|
|
|
data = reverse_geocoded_place.data
|
|
|
|
place.update!(
|
|
name: place_name(data),
|
|
lonlat: build_point_coordinates(data['geometry']['coordinates']),
|
|
city: data['properties']['city'],
|
|
country: data['properties']['country'],
|
|
geodata: data,
|
|
source: Place.sources[:photon],
|
|
reverse_geocoded_at: Time.current
|
|
)
|
|
end
|
|
|
|
def find_place(place_data, existing_places)
|
|
osm_id = place_data['properties']['osm_id'].to_s
|
|
|
|
existing_place = existing_places[osm_id]
|
|
|
|
return existing_place if existing_place.present?
|
|
|
|
coordinates = place_data['geometry']['coordinates']
|
|
|
|
Place.new(
|
|
lonlat: build_point_coordinates(coordinates),
|
|
latitude: coordinates[1].to_f.round(5),
|
|
longitude: coordinates[0].to_f.round(5)
|
|
)
|
|
end
|
|
|
|
def place_name(data)
|
|
name = data.dig('properties', 'name')
|
|
type = data.dig('properties', 'osm_value')&.capitalize&.gsub('_', ' ')
|
|
address = "#{data.dig('properties', 'postcode')} #{data.dig('properties', 'street')}"
|
|
address += " #{data.dig('properties', 'housenumber')}" if data.dig('properties', 'housenumber').present?
|
|
|
|
name ||= address
|
|
|
|
"#{name} (#{type})"
|
|
end
|
|
|
|
def extract_osm_ids(places)
|
|
places.map { |place| place.data['properties']['osm_id'].to_s }
|
|
end
|
|
|
|
def find_existing_places(osm_ids)
|
|
Place.where("geodata->'properties'->>'osm_id' IN (?)", osm_ids)
|
|
.global
|
|
.index_by { |p| p.geodata.dig('properties', 'osm_id').to_s }
|
|
.compact
|
|
end
|
|
|
|
def prepare_places_for_bulk_operations(places, existing_places)
|
|
places_to_create = []
|
|
places_to_update = []
|
|
|
|
places.each do |reverse_geocoded_place|
|
|
data = reverse_geocoded_place.data
|
|
new_place = find_place(data, existing_places)
|
|
|
|
populate_place_attributes(new_place, data)
|
|
|
|
if new_place.persisted?
|
|
places_to_update << new_place
|
|
else
|
|
places_to_create << new_place
|
|
end
|
|
end
|
|
|
|
[places_to_create, places_to_update]
|
|
end
|
|
|
|
def populate_place_attributes(place, data)
|
|
place.name = place_name(data)
|
|
place.city = data['properties']['city']
|
|
place.country = data['properties']['country']
|
|
place.geodata = data
|
|
place.source = :photon
|
|
|
|
return if place.lonlat.present?
|
|
|
|
place.lonlat = build_point_coordinates(data['geometry']['coordinates'])
|
|
end
|
|
|
|
def save_places(places_to_create, places_to_update)
|
|
if places_to_create.any?
|
|
place_attributes = places_to_create.map do |place|
|
|
{
|
|
name: place.name,
|
|
latitude: place.latitude,
|
|
longitude: place.longitude,
|
|
lonlat: place.lonlat,
|
|
city: place.city,
|
|
country: place.country,
|
|
geodata: place.geodata,
|
|
source: place.source,
|
|
created_at: Time.current,
|
|
updated_at: Time.current
|
|
}
|
|
end
|
|
Place.insert_all(place_attributes)
|
|
end
|
|
|
|
return unless places_to_update.any?
|
|
|
|
update_attributes = places_to_update.map do |place|
|
|
{
|
|
id: place.id,
|
|
name: place.name,
|
|
latitude: place.latitude,
|
|
longitude: place.longitude,
|
|
lonlat: place.lonlat,
|
|
city: place.city,
|
|
country: place.country,
|
|
geodata: place.geodata,
|
|
source: place.source,
|
|
updated_at: Time.current
|
|
}
|
|
end
|
|
Place.upsert_all(update_attributes, unique_by: :id)
|
|
end
|
|
|
|
def build_point_coordinates(coordinates)
|
|
"POINT(#{coordinates[0]} #{coordinates[1]})"
|
|
end
|
|
|
|
def geocoder_places
|
|
Geocoder.search(
|
|
[place.lat, place.lon],
|
|
limit: 10,
|
|
distance_sort: true,
|
|
radius: 1,
|
|
units: :km
|
|
)
|
|
end
|
|
end
|