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 branch 'master' into dev

Browse source
This commit is contained in:
Evgenii Burmakin 2025-02-08 22:53:58 +01:00 committed by GitHub
commit d101d5e544
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -46,10 +46,6 @@ This will select points tracked between January 1st and January 31st 2025. Then
- Fixed a bug where export file was not being deleted from the server after it was deleted. #808 - Fixed a bug where export file was not being deleted from the server after it was deleted. #808
- After an area was drawn on the map, a popup is now being shown to allow user to provide a name and save the area. #740 - After an area was drawn on the map, a popup is now being shown to allow user to provide a name and save the area. #740
### Added
- `X-Dawarich-Version` header to the `GET /api/v1/health` endpoint response. #800
# 0.23.6 - 2025-02-06 # 0.23.6 - 2025-02-06
### Added ### Added

2
app/assets/builds/tailwind.css
View file

File diff suppressed because one or more lines are too long

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

@ -462,9 +462,6 @@ export default class extends Controller {
return response.json(); return response.json();
}) })
.then(data => { .then(data => {
// Show success message
showFlashMessage('notice', 'Point was successfully deleted');
// Remove the marker and update all layers // Remove the marker and update all layers
this.removeMarker(id); this.removeMarker(id);
let wasPolyLayerVisible = false; let wasPolyLayerVisible = false;
@ -474,6 +471,7 @@ export default class extends Controller {
wasPolyLayerVisible = true; wasPolyLayerVisible = true;
} }
this.map.removeLayer(this.polylinesLayer); this.map.removeLayer(this.polylinesLayer);
} }
// Create new polylines layer // Create new polylines layer
@ -495,16 +493,17 @@ export default class extends Controller {
if (this.layerControl) { if (this.layerControl) {
this.map.removeControl(this.layerControl); this.map.removeControl(this.layerControl);
const controlsLayer = { const controlsLayer = {
Points: this.markersLayer || L.layerGroup(), Points: this.markersLayer,
Routes: this.polylinesLayer || L.layerGroup(), Routes: this.polylinesLayer,
Heatmap: this.heatmapLayer || L.heatLayer([]), Heatmap: this.heatmapLayer,
"Fog of War": new this.fogOverlay(), "Fog of War": this.fogOverlay,
"Scratch map": this.scratchLayer || L.layerGroup(), "Scratch map": this.scratchLayer,
Areas: this.areasLayer || L.layerGroup(), Areas: this.areasLayer,
Photos: this.photoMarkers || L.layerGroup() Photos: this.photoMarkers
}; };
this.layerControl = L.control.layers(this.baseMaps(), controlsLayer).addTo(this.map); this.layerControl = L.control.layers(this.baseMaps(), controlsLayer).addTo(this.map);
} }
// Update heatmap // Update heatmap
this.heatmapLayer.setLatLngs(this.markers.map(marker => [marker[0], marker[1], 0.2])); this.heatmapLayer.setLatLngs(this.markers.map(marker => [marker[0], marker[1], 0.2]));