Skip to content

Correct prediction loading for historic sondes, hashing of colours, fix for rotation #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheSkorm merged 8 commits into from
Jul 17, 2024
Merged

Correct prediction loading for historic sondes, hashing of colours, fix for rotation #331

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
130f6ef
reinstated landing targets for all historic sondes
smwnwrght May 7, 2024
4bf9179
fix formatting and reinstate whitespace
smwnwrght May 9, 2024
ffe062b
Merge pull request #318 from smwnwrght/master
darksidelemm May 11, 2024
c16f0cd
Merge branch 'testing' of github.com:projecthorus/sondehub-tracker in…
May 21, 2024
d3b2f00
Make showing predictions conditional on sonde being more than 100m ab…
Jun 15, 2024
8b6787c
Initialise gps_heading, else the setCourse call gets unhappy
Jun 22, 2024
4742e22
Change balloon color selection to be stable per-balloon
bismurphy Jun 26, 2024
b1beb06
Merge pull request #325 from bismurphy/use_colorhash
darksidelemm Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ var manual_pan = false;

var car_index = 0;
var car_colors = ["blue", "red", "green", "yellow", "teal", "purple"];
var balloon_index = 0;
var balloon_colors_name = ["red", "blue", "green", "purple", "orange", "cyan"];
var balloon_colors = ["#f00", "blue", "green", "#c700e6", "#ff8a0f", "#0fffca"];

Expand Down Expand Up @@ -831,7 +830,6 @@ function clean_refresh(text, force, history_step) {
}

car_index = 0;
balloon_index = 0;
nyan_color_index = 0;
stopFollow(force);

Expand Down Expand Up @@ -3088,7 +3086,11 @@ function addPosition(position) {
marker.addTo(map);
} else {
vehicle_type = "balloon";
color_index = balloon_index++ % balloon_colors.length;
let colorHash = 0;
for (let i = 0; i < vcallsign.length; i++){
colorHash += vcallsign.charCodeAt(i);
}
color_index = colorHash % balloon_colors.length;

if(wvar.nena){
// All the balloon are red.
Expand Down