kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-11 09:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1566 from Freika/fix/live-map-checkbox

Browse source 
Fix live map checkbox
This commit is contained in:
Evgenii Burmakin 2025-07-26 13:11:24 +02:00 committed by GitHub
commit b94be44cbf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## Fixed ## Fixed
- The Warden error in jobs is now fixed. #1556 - The Warden error in jobs is now fixed. #1556
- The Live Map setting is now respected.
- The Live Map info modal is now displayed. #665

6
app/javascript/controllers/maps_controller.js
View file

@ -969,6 +969,12 @@ export default class extends BaseController {
this.routeOpacity = parseFloat(newSettings.route_opacity) || 0.6; this.routeOpacity = parseFloat(newSettings.route_opacity) || 0.6;
this.clearFogRadius = parseInt(newSettings.fog_of_war_meters) || 50; this.clearFogRadius = parseInt(newSettings.fog_of_war_meters) || 50;
// Update the DOM data attribute to keep it in sync
const mapElement = document.getElementById('map');
if (mapElement) {
mapElement.setAttribute('data-user_settings', JSON.stringify(this.userSettings));
}
// Store current layer states // Store current layer states
const layerStates = { const layerStates = {
Points: this.map.hasLayer(this.markersLayer), Points: this.map.hasLayer(this.markersLayer),

2
app/models/point.rb
View file

@ -70,6 +70,8 @@ class Point < ApplicationRecord
# rubocop:disable Metrics/MethodLength Metrics/AbcSize # rubocop:disable Metrics/MethodLength Metrics/AbcSize
def broadcast_coordinates def broadcast_coordinates
return unless user.safe_settings.live_map_enabled
PointsChannel.broadcast_to( PointsChannel.broadcast_to(
user, user,
[ [

17
app/views/map/_settings_modals.html.erb
View file

@ -156,6 +156,23 @@
<label class="modal-backdrop" for="speed_colored_routes_info">Close</label> <label class="modal-backdrop" for="speed_colored_routes_info">Close</label>
</div> </div>
<input type="checkbox" id="live_map_enabled_info" class="modal-toggle" />
<div class="modal focus:z-99" role="dialog">
<div class="modal-box">
<h3 class="text-lg font-bold">Live map</h3>
<p class="py-4">
This checkbox will enable the live map.
</p>
<p class="py-4">
Uncheck this checkbox if you want to disable the live map.
</p>
<p class="py-4">
When the live map is enabled, the map will update in real-time with the latest points.
</p>
</div>
<label class="modal-backdrop" for="live_map_enabled_info">Close</label>
</div>
<input type="checkbox" id="speed_color_scale_info" class="modal-toggle" /> <input type="checkbox" id="speed_color_scale_info" class="modal-toggle" />
<div class="modal focus:z-99" role="dialog"> <div class="modal focus:z-99" role="dialog">
<div class="modal-box"> <div class="modal-box">