mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-10 17:21:38 -05:00
Merge branch 'master' into dev
This commit is contained in:
commit
d101d5e544
3 changed files with 10 additions and 15 deletions
|
|
@ -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
|
||||
- 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
|
||||
|
||||
### Added
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -462,9 +462,6 @@ export default class extends Controller {
|
|||
return response.json();
|
||||
})
|
||||
.then(data => {
|
||||
// Show success message
|
||||
showFlashMessage('notice', 'Point was successfully deleted');
|
||||
|
||||
// Remove the marker and update all layers
|
||||
this.removeMarker(id);
|
||||
let wasPolyLayerVisible = false;
|
||||
|
|
@ -474,6 +471,7 @@ export default class extends Controller {
|
|||
wasPolyLayerVisible = true;
|
||||
}
|
||||
this.map.removeLayer(this.polylinesLayer);
|
||||
|
||||
}
|
||||
|
||||
// Create new polylines layer
|
||||
|
|
@ -495,16 +493,17 @@ export default class extends Controller {
|
|||
if (this.layerControl) {
|
||||
this.map.removeControl(this.layerControl);
|
||||
const controlsLayer = {
|
||||
Points: this.markersLayer || L.layerGroup(),
|
||||
Routes: this.polylinesLayer || L.layerGroup(),
|
||||
Heatmap: this.heatmapLayer || L.heatLayer([]),
|
||||
"Fog of War": new this.fogOverlay(),
|
||||
"Scratch map": this.scratchLayer || L.layerGroup(),
|
||||
Areas: this.areasLayer || L.layerGroup(),
|
||||
Photos: this.photoMarkers || L.layerGroup()
|
||||
Points: this.markersLayer,
|
||||
Routes: this.polylinesLayer,
|
||||
Heatmap: this.heatmapLayer,
|
||||
"Fog of War": this.fogOverlay,
|
||||
"Scratch map": this.scratchLayer,
|
||||
Areas: this.areasLayer,
|
||||
Photos: this.photoMarkers
|
||||
};
|
||||
this.layerControl = L.control.layers(this.baseMaps(), controlsLayer).addTo(this.map);
|
||||
}
|
||||
|
||||
// Update heatmap
|
||||
this.heatmapLayer.setLatLngs(this.markers.map(marker => [marker[0], marker[1], 0.2]));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue