mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-10 17:21:38 -05:00
Fix inconsistent password for the dawarich_db service in docker-compose_mounted_volumes.yml.
This commit is contained in:
parent
4eab6a4766
commit
73fc9be3fb
9 changed files with 41 additions and 12 deletions
|
|
@ -1 +1 @@
|
||||||
0.21.5
|
0.21.6
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
|
||||||
The format is based on [Keep a Changelog](http://keepachangelog.com/)
|
The format is based on [Keep a Changelog](http://keepachangelog.com/)
|
||||||
and this project adheres to [Semantic Versioning](http://semver.org/).
|
and this project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
|
|
||||||
|
# 0.21.6 - 2025-01-07
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Inconsistent password for the `dawarich_db` service in `docker-compose_mounted_volumes.yml`. #605
|
||||||
|
- Points are now being rendered with higher z-index than polylines. #577
|
||||||
|
|
||||||
# 0.21.5 - 2025-01-07
|
# 0.21.5 - 2025-01-07
|
||||||
|
|
||||||
You may now use Geoapify API for reverse geocoding. To obtain an API key, sign up at https://myprojects.geoapify.com/ and create a new project. Make sure you have read and understood the [pricing policy](https://www.geoapify.com/pricing) and [Terms and Conditions](https://www.geoapify.com/terms-and-conditions/).
|
You may now use Geoapify API for reverse geocoding. To obtain an API key, sign up at https://myprojects.geoapify.com/ and create a new project. Make sure you have read and understood the [pricing policy](https://www.geoapify.com/pricing) and [Terms and Conditions](https://www.geoapify.com/terms-and-conditions/).
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -43,8 +43,9 @@ export default class extends Controller {
|
||||||
|
|
||||||
const polyline = L.polyline(points, {
|
const polyline = L.polyline(points, {
|
||||||
color: 'blue',
|
color: 'blue',
|
||||||
|
opacity: 0.8,
|
||||||
weight: 3,
|
weight: 3,
|
||||||
opacity: 0.8
|
zIndexOffset: 400
|
||||||
}).addTo(this.map)
|
}).addTo(this.map)
|
||||||
|
|
||||||
this.map.fitBounds(polyline.getBounds(), {
|
this.map.fitBounds(polyline.getBounds(), {
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,14 @@ export default class extends Controller {
|
||||||
|
|
||||||
addMarkers() {
|
addMarkers() {
|
||||||
this.coordinates.forEach(coord => {
|
this.coordinates.forEach(coord => {
|
||||||
const marker = L.circleMarker([coord[0], coord[1]], {radius: 4})
|
const marker = L.circleMarker(
|
||||||
|
[coord[0], coord[1]],
|
||||||
|
{
|
||||||
|
radius: 4,
|
||||||
|
color: coord[5] < 0 ? "orange" : "blue",
|
||||||
|
zIndexOffset: 1000
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
const popupContent = createPopupContent(coord, this.timezone, this.distanceUnit)
|
const popupContent = createPopupContent(coord, this.timezone, this.distanceUnit)
|
||||||
marker.bindPopup(popupContent)
|
marker.bindPopup(popupContent)
|
||||||
|
|
@ -152,8 +159,9 @@ export default class extends Controller {
|
||||||
const points = this.coordinates.map(coord => [coord[0], coord[1]])
|
const points = this.coordinates.map(coord => [coord[0], coord[1]])
|
||||||
const polyline = L.polyline(points, {
|
const polyline = L.polyline(points, {
|
||||||
color: 'blue',
|
color: 'blue',
|
||||||
|
opacity: 0.8,
|
||||||
weight: 3,
|
weight: 3,
|
||||||
opacity: 0.8
|
zIndexOffset: 400
|
||||||
})
|
})
|
||||||
// Add to polylines layer instead of directly to map
|
// Add to polylines layer instead of directly to map
|
||||||
this.polylinesLayer.addTo(this.map)
|
this.polylinesLayer.addTo(this.map)
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,15 @@ export default class extends Controller {
|
||||||
|
|
||||||
addMarkers() {
|
addMarkers() {
|
||||||
this.coordinates.forEach((coordinate) => {
|
this.coordinates.forEach((coordinate) => {
|
||||||
L.circleMarker([coordinate[0], coordinate[1]], { radius: 4 }).addTo(this.map);
|
L.circleMarker(
|
||||||
|
[coordinate[0], coordinate[1]],
|
||||||
|
{
|
||||||
|
radius: 4,
|
||||||
|
color: coordinate[5] < 0 ? "orange" : "blue",
|
||||||
|
zIndexOffset: 1000
|
||||||
|
}
|
||||||
|
).addTo(this.map);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,8 @@ export function createMarkersArray(markersData, userSettings) {
|
||||||
return L.circleMarker([lat, lon], {
|
return L.circleMarker([lat, lon], {
|
||||||
radius: 4,
|
radius: 4,
|
||||||
color: markerColor,
|
color: markerColor,
|
||||||
zIndexOffset: 1000
|
zIndexOffset: 1000,
|
||||||
|
pane: 'markerPane'
|
||||||
}).bindPopup(popupContent, { autoClose: false });
|
}).bindPopup(popupContent, { autoClose: false });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -47,6 +48,9 @@ export function createSimplifiedMarkers(markersData) {
|
||||||
const [lat, lon] = marker;
|
const [lat, lon] = marker;
|
||||||
const popupContent = createPopupContent(marker);
|
const popupContent = createPopupContent(marker);
|
||||||
let markerColor = marker[5] < 0 ? "orange" : "blue";
|
let markerColor = marker[5] < 0 ? "orange" : "blue";
|
||||||
return L.circleMarker([lat, lon], { radius: 4, color: markerColor }).bindPopup(popupContent);
|
return L.circleMarker(
|
||||||
|
[lat, lon],
|
||||||
|
{ radius: 4, color: markerColor, zIndexOffset: 1000 }
|
||||||
|
).bindPopup(popupContent);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,8 @@ export function createPolylinesLayer(markers, map, timezone, routeOpacity, userS
|
||||||
color: "blue",
|
color: "blue",
|
||||||
opacity: 0.6,
|
opacity: 0.6,
|
||||||
weight: 3,
|
weight: 3,
|
||||||
zIndexOffset: 400
|
zIndexOffset: 400,
|
||||||
|
pane: 'overlayPane'
|
||||||
});
|
});
|
||||||
|
|
||||||
addHighlightOnHover(polyline, map, polylineCoordinates, userSettings, distanceUnit);
|
addHighlightOnHover(polyline, map, polylineCoordinates, userSettings, distanceUnit);
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,7 @@ services:
|
||||||
- dawarich
|
- dawarich
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: postgres
|
||||||
POSTGRES_PASSWORD: eJH3YZsVc2s6byhFwpEny
|
POSTGRES_PASSWORD: password
|
||||||
POSTGRES_DATABASE: dawarich
|
POSTGRES_DATABASE: dawarich
|
||||||
volumes:
|
volumes:
|
||||||
- ./db:/var/lib/postgresql/data
|
- ./db:/var/lib/postgresql/data
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue