Skip to content

Commit 64dbce2

Browse files
authored
Merge pull request projecthorus#87 from LukePrior/testing
Prepare custom icons + fix refresh with websockets
2 parents 1a93294 + a5e40ff commit 64dbce2

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

css/main.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,19 @@ header .search form input[type='submit'] {
754754
text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
755755
}
756756

757+
.gold {
758+
filter: drop-shadow(1px 0px 0 gold) drop-shadow(0px 1px 0 gold) drop-shadow(-1px -0px 0 gold) drop-shadow(-0px -1px 0 gold);
759+
}
760+
.silver {
761+
filter: drop-shadow(1px 0px 0 grey) drop-shadow(0px 1px 0 grey) drop-shadow(-1px -0px 0 grey) drop-shadow(-0px -1px 0 grey);
762+
}
763+
.bronze {
764+
filter: drop-shadow(1px 0px 0 chocolate) drop-shadow(0px 1px 0 chocolate) drop-shadow(-1px -0px 0 chocolate) drop-shadow(-0px -1px 0 chocolate);
765+
}
766+
.white {
767+
filter: drop-shadow(1px 0px 0 white) drop-shadow(0px 1px 0 white) drop-shadow(-1px -0px 0 white) drop-shadow(-0px -1px 0 white);
768+
}
769+
757770
@media only screen and (min-width: 900px) {
758771
}
759772

js/tracker.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,8 @@ function clean_refresh(text, force, history_step) {
345345
if(text == wvar.mode && !force) return false;
346346
stopAjax();
347347

348+
live_data_buffer.positions.position=[];
349+
348350
if (clientActive) {
349351
clientActive = false;
350352
if (!document.getElementById("stTimer").classList.contains('friendly-dtime') ) {
@@ -3290,14 +3292,6 @@ function updateReceiverMarker(receiver) {
32903292

32913293
// init a marker if the receiver doesn't already have one
32923294
if(!receiver.marker) {
3293-
3294-
if (receiver.software == "radiosonde_auto_rx") {
3295-
//future option to show different icon per software
3296-
} else if (receiver.software == "rdzTTGO") {
3297-
//future option to show different icon per software
3298-
} else {
3299-
//future option to show different icon per software
3300-
}
33013295

33023296
receiverIcon = new L.icon({
33033297
iconUrl: host_url + markers_url + "antenna-green.png",
@@ -3311,7 +3305,10 @@ function updateReceiverMarker(receiver) {
33113305
title: receiver.name,
33123306
zIndexOffset: Z_STATION,
33133307
});
3314-
3308+
3309+
//receiver.infobox = new L.popup({ autoClose: false, closeOnClick: false, className: "gold" }).setContent(receiver.description);
3310+
//receiver.infobox = new L.popup({ autoClose: false, closeOnClick: false, className: "silver" }).setContent(receiver.description);
3311+
//receiver.infobox = new L.popup({ autoClose: false, closeOnClick: false, className: "bronze" }).setContent(receiver.description);
33153312
receiver.infobox = new L.popup({ autoClose: false, closeOnClick: false }).setContent(receiver.description);
33163313

33173314
receiver.marker.bindPopup(receiver.infobox);

0 commit comments

Comments
 (0)