Mirrors/Hauk
1
0
Fork 0
mirror of https://github.com/bilde2910/Hauk.git synced 2026-01-23 02:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Support multiple track colors

Browse source
This commit is contained in:
tuffnerdstuff 2021-04-02 22:18:26 +02:00
parent b95f517ada
commit 0fa2529358
4 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend-php/dynamic.js.php
View file

@ -13,7 +13,7 @@ var DEFAULT_ZOOM = <?php echo json_encode(getConfig("default_zoom")); ?>;
var MAX_ZOOM = <?php echo json_encode(getConfig("max_zoom")); ?>;
var MAX_POINTS = <?php echo json_encode(getConfig("max_shown_pts")); ?>;
var VELOCITY_DELTA_TIME = <?php echo json_encode(getConfig("v_data_points")); ?>;
var TRAIL_COLOR = <?php echo json_encode(getConfig("trail_color")); ?>;
var TRAIL_COLORS = <?php echo json_encode(getConfig("trail_colors")); ?>;
var VELOCITY_UNIT = <?php echo json_encode(getConfig("velocity_unit")); ?>;
var OFFLINE_TIMEOUT = <?php echo json_encode(getConfig("offline_timeout")); ?>;
var REQUEST_TIMEOUT = <?php echo json_encode(getConfig("request_timeout")); ?>;

4
backend-php/include/config-sample.php
View file

@ -267,8 +267,8 @@
// Number of seconds of data that should be used to calculate velocity.
"v_data_points" => 2,
// The color of the marker trails. HTML color name or #rrggbb hex color code.
"trail_color" => '#d80037',
// The colors of the marker trails. An array of HTML color names or #rrggbb hex color codes.
"trail_colors" => ['#d80037', '#3cb44b', '#ffe119', '#4363d8', '#f58231', '#911eb4', '#46f0f0', '#f032e6', '#bcf60c', '#fabebe', '#008080', '#e6beff', '#9a6324', '#fffac8', '#800000', '#aaffc3', '#808000', '#ffd8b1', '#000075', '#808080'],
// The unit of measurement of velocity. Valid are:
// KILOMETERS_PER_HOUR, MILES_PER_HOUR, METERS_PER_SECOND

2
backend-php/include/inc.php
View file

@ -147,7 +147,7 @@ const DEFAULTS = array(
"max_cached_pts" => 3,
"max_shown_pts" => 100,
"v_data_points" => 2,
"trail_color" => '#d80037',
"trail_colors" => ['#d80037', '#3cb44b', '#ffe119', '#4363d8', '#f58231', '#911eb4', '#46f0f0', '#f032e6', '#bcf60c', '#fabebe', '#008080', '#e6beff', '#9a6324', '#fffac8', '#800000', '#aaffc3', '#808000', '#ffd8b1', '#000075', '#808080'],
"velocity_unit" => KILOMETERS_PER_HOUR,
"public_url" => 'https://example.com/'

14
frontend/main.js
View file

@ -727,7 +727,7 @@ function processUpdate(data, init) {
} else {
// If there is a marker, draw a line from its last location
// instead and move the marker.
line = L.polyline([shares[user].marker.getLatLng(), [lat, lon]], {color: TRAIL_COLOR}).addTo(markerLayer);
line = L.polyline([shares[user].marker.getLatLng(), [lat, lon]], {color: getTrackColor(user)}).addTo(markerLayer);
shares[user].marker.setLatLng([lat, lon]);
}
// Draw an accuracy circle if GPS accuracy was provided by the
@ -890,6 +890,18 @@ function processUpdate(data, init) {
}
}
var currColorIndex = 0;
// Gets a new color from TRAIL_COLORS array for each new user of the share
function getTrackColor(user) {
var trackColor = shares[user].color;
if (!trackColor) {
trackColor = TRAIL_COLORS[currColorIndex];
shares[user].color = trackColor;
currColorIndex=(currColorIndex+1) % TRAIL_COLORS.length;
}
return trackColor;
}
// Calculates the distance between two points on a sphere using the Haversine
// algorithm.
function distance(from, to) {