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

Update route popup with the correct distance unit

Browse source
This commit is contained in:
Eugene Burmakin 2024-08-29 00:17:51 +02:00
parent 9f9debdb1d
commit 88de60517e
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
It's recommended to update your stats manually after changing the `DISTANCE_UNIT` environment variable. You can do this by clicking the "Update stats" button on the Stats page. It's recommended to update your stats manually after changing the `DISTANCE_UNIT` environment variable. You can do this by clicking the "Update stats" button on the Stats page.
⚠️IMPORTANT⚠️: All settings are still should be provided in meters. All calculations though will be converted to feets and miles if `DISTANCE_UNIT` is set to `mi`.
## [0.12.2] — 2024-08-28 ## [0.12.2] — 2024-08-28
### Added ### Added

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

@ -25,7 +25,7 @@ export default class extends Controller {
this.userSettings = JSON.parse(this.element.dataset.user_settings); this.userSettings = JSON.parse(this.element.dataset.user_settings);
this.clearFogRadius = parseInt(this.userSettings.fog_of_war_meters) || 50; this.clearFogRadius = parseInt(this.userSettings.fog_of_war_meters) || 50;
this.routeOpacity = parseFloat(this.userSettings.route_opacity) || 0.6; this.routeOpacity = parseFloat(this.userSettings.route_opacity) || 0.6;
this.distanceUnit = this.userSettings.distance_unit || "km"; this.distanceUnit = this.element.dataset.distance_unit || "km";
this.center = this.markers[this.markers.length - 1] || [52.514568, 13.350111]; this.center = this.markers[this.markers.length - 1] || [52.514568, 13.350111];
@ -278,7 +278,7 @@ export default class extends Controller {
<b>Duration:</b> ${timeOnRoute}<br> <b>Duration:</b> ${timeOnRoute}<br>
<b>Total Distance:</b> ${formatDistance(totalDistance, this.distanceUnit)}<br> <b>Total Distance:</b> ${formatDistance(totalDistance, this.distanceUnit)}<br>
`; `;
console.log(this.distanceUnit);
if (isDebugMode) { if (isDebugMode) {
const prevPoint = polylineCoordinates[0]; const prevPoint = polylineCoordinates[0];
const nextPoint = polylineCoordinates[polylineCoordinates.length - 1]; const nextPoint = polylineCoordinates[polylineCoordinates.length - 1];

36
app/javascript/maps/helpers.js
View file

@ -1,28 +1,30 @@
// javascript/maps/helpers.js // javascript/maps/helpers.js
export function formatDistance(distance, unit = 'km') { export function formatDistance(distance, unit = 'km') {
let smallUnit, bigUnit;
if (unit === 'mi') { if (unit === 'mi') {
distance *= 0.621371; // Convert to miles distance *= 0.621371; // Convert km to miles
var smallUnit = 'ft'; smallUnit = 'ft';
var bigUnit = 'mi'; bigUnit = 'mi';
// If the distance is less than 1 mi, return it in feet
// else return it in miles
if (distance < 621) {
distance *= 5280;
// If the distance is less than 1 mile, return it in feet
if (distance < 1) {
distance *= 5280; // Convert miles to feet
return `${distance.toFixed(2)} ${smallUnit}`; return `${distance.toFixed(2)} ${smallUnit}`;
} else {
return `${distance.toFixed(2)} ${bigUnit}`;
} }
} else { } else {
var smallUnit = 'm'; smallUnit = 'm';
var bigUnit = 'km'; bigUnit = 'km';
}
// If the distance is less than 1 km/mi, return it in meters/feet // If the distance is less than 1 km, return it in meters
if (distance < 1) {
if (distance < 1000) { distance *= 1000; // Convert km to meters
return `${distance.toFixed(2)} ${smallUnit}`; return `${distance.toFixed(2)} ${smallUnit}`;
} else { } else {
return `${(distance / 1000).toFixed(2)} ${bigUnit}`; return `${distance.toFixed(2)} ${bigUnit}`;
}
} }
} }