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>
281 lines
9.1 KiB
JavaScript
281 lines
9.1 KiB
JavaScript
import { PointsLayer } from 'maps_maplibre/layers/points_layer'
|
|
import { RoutesLayer } from 'maps_maplibre/layers/routes_layer'
|
|
import { HeatmapLayer } from 'maps_maplibre/layers/heatmap_layer'
|
|
import { VisitsLayer } from 'maps_maplibre/layers/visits_layer'
|
|
import { PhotosLayer } from 'maps_maplibre/layers/photos_layer'
|
|
import { AreasLayer } from 'maps_maplibre/layers/areas_layer'
|
|
import { TracksLayer } from 'maps_maplibre/layers/tracks_layer'
|
|
import { PlacesLayer } from 'maps_maplibre/layers/places_layer'
|
|
import { FogLayer } from 'maps_maplibre/layers/fog_layer'
|
|
import { FamilyLayer } from 'maps_maplibre/layers/family_layer'
|
|
import { RecentPointLayer } from 'maps_maplibre/layers/recent_point_layer'
|
|
import { lazyLoader } from 'maps_maplibre/utils/lazy_loader'
|
|
import { performanceMonitor } from 'maps_maplibre/utils/performance_monitor'
|
|
|
|
/**
|
|
* Manages all map layers lifecycle and visibility
|
|
*/
|
|
export class LayerManager {
|
|
constructor(map, settings, api) {
|
|
this.map = map
|
|
this.settings = settings
|
|
this.api = api
|
|
this.layers = {}
|
|
}
|
|
|
|
/**
|
|
* Add or update all layers with provided data
|
|
*/
|
|
async addAllLayers(pointsGeoJSON, routesGeoJSON, visitsGeoJSON, photosGeoJSON, areasGeoJSON, tracksGeoJSON, placesGeoJSON) {
|
|
performanceMonitor.mark('add-layers')
|
|
|
|
// Layer order matters - layers added first render below layers added later
|
|
// Order: scratch (bottom) -> heatmap -> areas -> tracks -> routes -> visits -> places -> photos -> family -> points -> recent-point (top) -> fog (canvas overlay)
|
|
|
|
await this._addScratchLayer(pointsGeoJSON)
|
|
this._addHeatmapLayer(pointsGeoJSON)
|
|
this._addAreasLayer(areasGeoJSON)
|
|
this._addTracksLayer(tracksGeoJSON)
|
|
this._addRoutesLayer(routesGeoJSON)
|
|
this._addVisitsLayer(visitsGeoJSON)
|
|
this._addPlacesLayer(placesGeoJSON)
|
|
|
|
// Add photos layer with error handling (async, might fail loading images)
|
|
try {
|
|
await this._addPhotosLayer(photosGeoJSON)
|
|
} catch (error) {
|
|
console.warn('Failed to add photos layer:', error)
|
|
}
|
|
|
|
this._addFamilyLayer()
|
|
this._addPointsLayer(pointsGeoJSON)
|
|
this._addRecentPointLayer()
|
|
this._addFogLayer(pointsGeoJSON)
|
|
|
|
performanceMonitor.measure('add-layers')
|
|
}
|
|
|
|
/**
|
|
* Setup event handlers for layer interactions
|
|
*/
|
|
setupLayerEventHandlers(handlers) {
|
|
// Click handlers
|
|
this.map.on('click', 'points', handlers.handlePointClick)
|
|
this.map.on('click', 'visits', handlers.handleVisitClick)
|
|
this.map.on('click', 'photos', handlers.handlePhotoClick)
|
|
this.map.on('click', 'places', handlers.handlePlaceClick)
|
|
// Areas have multiple layers (fill, outline, labels)
|
|
this.map.on('click', 'areas-fill', handlers.handleAreaClick)
|
|
this.map.on('click', 'areas-outline', handlers.handleAreaClick)
|
|
this.map.on('click', 'areas-labels', handlers.handleAreaClick)
|
|
|
|
// Cursor change on hover
|
|
this.map.on('mouseenter', 'points', () => {
|
|
this.map.getCanvas().style.cursor = 'pointer'
|
|
})
|
|
this.map.on('mouseleave', 'points', () => {
|
|
this.map.getCanvas().style.cursor = ''
|
|
})
|
|
this.map.on('mouseenter', 'visits', () => {
|
|
this.map.getCanvas().style.cursor = 'pointer'
|
|
})
|
|
this.map.on('mouseleave', 'visits', () => {
|
|
this.map.getCanvas().style.cursor = ''
|
|
})
|
|
this.map.on('mouseenter', 'photos', () => {
|
|
this.map.getCanvas().style.cursor = 'pointer'
|
|
})
|
|
this.map.on('mouseleave', 'photos', () => {
|
|
this.map.getCanvas().style.cursor = ''
|
|
})
|
|
this.map.on('mouseenter', 'places', () => {
|
|
this.map.getCanvas().style.cursor = 'pointer'
|
|
})
|
|
this.map.on('mouseleave', 'places', () => {
|
|
this.map.getCanvas().style.cursor = ''
|
|
})
|
|
// Areas hover handlers for all sub-layers
|
|
const areaLayers = ['areas-fill', 'areas-outline', 'areas-labels']
|
|
areaLayers.forEach(layerId => {
|
|
// Only add handlers if layer exists
|
|
if (this.map.getLayer(layerId)) {
|
|
this.map.on('mouseenter', layerId, () => {
|
|
this.map.getCanvas().style.cursor = 'pointer'
|
|
})
|
|
this.map.on('mouseleave', layerId, () => {
|
|
this.map.getCanvas().style.cursor = ''
|
|
})
|
|
}
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Toggle layer visibility
|
|
*/
|
|
toggleLayer(layerName) {
|
|
const layer = this.layers[`${layerName}Layer`]
|
|
if (!layer) return null
|
|
|
|
layer.toggle()
|
|
return layer.visible
|
|
}
|
|
|
|
/**
|
|
* Get layer instance
|
|
*/
|
|
getLayer(layerName) {
|
|
return this.layers[`${layerName}Layer`]
|
|
}
|
|
|
|
/**
|
|
* Clear all layer references (for style changes)
|
|
*/
|
|
clearLayerReferences() {
|
|
this.layers = {}
|
|
}
|
|
|
|
// Private methods for individual layer management
|
|
|
|
async _addScratchLayer(pointsGeoJSON) {
|
|
try {
|
|
if (!this.layers.scratchLayer && this.settings.scratchEnabled) {
|
|
const ScratchLayer = await lazyLoader.loadLayer('scratch')
|
|
this.layers.scratchLayer = new ScratchLayer(this.map, {
|
|
visible: true,
|
|
apiClient: this.api
|
|
})
|
|
await this.layers.scratchLayer.add(pointsGeoJSON)
|
|
} else if (this.layers.scratchLayer) {
|
|
await this.layers.scratchLayer.update(pointsGeoJSON)
|
|
}
|
|
} catch (error) {
|
|
console.warn('Failed to load scratch layer:', error)
|
|
}
|
|
}
|
|
|
|
_addHeatmapLayer(pointsGeoJSON) {
|
|
if (!this.layers.heatmapLayer) {
|
|
this.layers.heatmapLayer = new HeatmapLayer(this.map, {
|
|
visible: this.settings.heatmapEnabled
|
|
})
|
|
this.layers.heatmapLayer.add(pointsGeoJSON)
|
|
} else {
|
|
this.layers.heatmapLayer.update(pointsGeoJSON)
|
|
}
|
|
}
|
|
|
|
_addAreasLayer(areasGeoJSON) {
|
|
if (!this.layers.areasLayer) {
|
|
this.layers.areasLayer = new AreasLayer(this.map, {
|
|
visible: this.settings.areasEnabled || false
|
|
})
|
|
this.layers.areasLayer.add(areasGeoJSON)
|
|
} else {
|
|
this.layers.areasLayer.update(areasGeoJSON)
|
|
}
|
|
}
|
|
|
|
_addTracksLayer(tracksGeoJSON) {
|
|
if (!this.layers.tracksLayer) {
|
|
this.layers.tracksLayer = new TracksLayer(this.map, {
|
|
visible: this.settings.tracksEnabled || false
|
|
})
|
|
this.layers.tracksLayer.add(tracksGeoJSON)
|
|
} else {
|
|
this.layers.tracksLayer.update(tracksGeoJSON)
|
|
}
|
|
}
|
|
|
|
_addRoutesLayer(routesGeoJSON) {
|
|
if (!this.layers.routesLayer) {
|
|
this.layers.routesLayer = new RoutesLayer(this.map, {
|
|
visible: this.settings.routesVisible !== false // Default true unless explicitly false
|
|
})
|
|
this.layers.routesLayer.add(routesGeoJSON)
|
|
} else {
|
|
this.layers.routesLayer.update(routesGeoJSON)
|
|
}
|
|
}
|
|
|
|
_addVisitsLayer(visitsGeoJSON) {
|
|
if (!this.layers.visitsLayer) {
|
|
this.layers.visitsLayer = new VisitsLayer(this.map, {
|
|
visible: this.settings.visitsEnabled || false
|
|
})
|
|
this.layers.visitsLayer.add(visitsGeoJSON)
|
|
} else {
|
|
this.layers.visitsLayer.update(visitsGeoJSON)
|
|
}
|
|
}
|
|
|
|
_addPlacesLayer(placesGeoJSON) {
|
|
if (!this.layers.placesLayer) {
|
|
this.layers.placesLayer = new PlacesLayer(this.map, {
|
|
visible: this.settings.placesEnabled || false
|
|
})
|
|
this.layers.placesLayer.add(placesGeoJSON)
|
|
} else {
|
|
this.layers.placesLayer.update(placesGeoJSON)
|
|
}
|
|
}
|
|
|
|
async _addPhotosLayer(photosGeoJSON) {
|
|
console.log('[Photos] Adding photos layer, visible:', this.settings.photosEnabled)
|
|
if (!this.layers.photosLayer) {
|
|
this.layers.photosLayer = new PhotosLayer(this.map, {
|
|
visible: this.settings.photosEnabled || false
|
|
})
|
|
console.log('[Photos] Created new PhotosLayer instance')
|
|
await this.layers.photosLayer.add(photosGeoJSON)
|
|
console.log('[Photos] Added photos to layer')
|
|
} else {
|
|
console.log('[Photos] Updating existing PhotosLayer')
|
|
await this.layers.photosLayer.update(photosGeoJSON)
|
|
console.log('[Photos] Updated photos layer')
|
|
}
|
|
}
|
|
|
|
_addFamilyLayer() {
|
|
if (!this.layers.familyLayer) {
|
|
this.layers.familyLayer = new FamilyLayer(this.map, {
|
|
visible: false // Initially hidden, shown when family locations arrive via ActionCable
|
|
})
|
|
this.layers.familyLayer.add({ type: 'FeatureCollection', features: [] })
|
|
}
|
|
}
|
|
|
|
_addPointsLayer(pointsGeoJSON) {
|
|
if (!this.layers.pointsLayer) {
|
|
this.layers.pointsLayer = new PointsLayer(this.map, {
|
|
visible: this.settings.pointsVisible !== false, // Default true unless explicitly false
|
|
apiClient: this.api,
|
|
layerManager: this
|
|
})
|
|
this.layers.pointsLayer.add(pointsGeoJSON)
|
|
} else {
|
|
this.layers.pointsLayer.update(pointsGeoJSON)
|
|
}
|
|
}
|
|
|
|
_addRecentPointLayer() {
|
|
if (!this.layers.recentPointLayer) {
|
|
this.layers.recentPointLayer = new RecentPointLayer(this.map, {
|
|
visible: false // Initially hidden, shown only when live mode is enabled
|
|
})
|
|
this.layers.recentPointLayer.add({ type: 'FeatureCollection', features: [] })
|
|
}
|
|
}
|
|
|
|
_addFogLayer(pointsGeoJSON) {
|
|
// Always create fog layer for backward compatibility
|
|
if (!this.layers.fogLayer) {
|
|
this.layers.fogLayer = new FogLayer(this.map, {
|
|
clearRadius: this.settings.fogOfWarRadius || 1000,
|
|
visible: this.settings.fogEnabled || false
|
|
})
|
|
this.layers.fogLayer.add(pointsGeoJSON)
|
|
} else {
|
|
this.layers.fogLayer.update(pointsGeoJSON)
|
|
}
|
|
}
|
|
}
|