Merge pull request #35 from josephfoulds/web

Add ability to toggle display of receiver ranges on /geo
pull/38/head
bert hubert 2019-11-11 11:45:41 +01:00 committed by GitHub
commit 5ca3a298c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 4 deletions

View File

@ -19,7 +19,6 @@ body {
#galmoninfo {
border-top: blue 1px solid;
margin-bottom: 10px;
}
#combined {
@ -69,7 +68,7 @@ body {
svg {
// border: red 1px solid;
// background-color: transparent;
padding: 20px;
padding: 0px 20px 20px 20px;
// margin-left: auto;
// margin-right: auto;
}
@ -126,3 +125,12 @@ path.merged {
stroke-width: 2px;
}
label {
cursor: pointer;
}
input[type="checkbox"] {
cursor: pointer;
}
#options_other {
padding-top:10px;
}

View File

@ -117,6 +117,15 @@ function draw_almanac(data_almanac)
{
var arr = get_almanac_valid(data_almanac);
display_gnssid = {
0: d3.select("#GPS").property("checked"),
2: d3.select("#Gal").property("checked"),
3: d3.select("#BeiDou").property("checked"),
6: d3.select("#Glonass").property("checked")
};
arr = arr.filter(sat => display_gnssid[sat.gnssid]);
console.log("draw_almanac() " + arr.length);
svgAlmanac.selectAll("circle")
@ -202,7 +211,12 @@ function do_update_almanac(error, results)
// console.log("do_update_almanac() " + Object.keys(data_almanac).length + " " + data_observers.length);
if (display_observers_count == 0) {
// Zero out the observers if they're not meant to display
if (!d3.select("#Obs").property("checked")){
svgObservers.html("");
}
if (display_observers_count == 0 || d3.select("#Obs").property("checked")) {
// does not need that much updating!
svgObservers.html("");
draw_observers(data_observers);

View File

@ -13,8 +13,17 @@
<div id="galmongeo">
<h1>galmon.eu geo</h1>
<div id="galmoninfo">
This is a live map from the <a href="/">galmon.eu</a> project</p>
This is a live map from the <a href="/">galmon.eu</a> project
</div>
<center id="options_sats">
<input type="checkbox" id="Gal" onclick="do_timer();" checked> <label for="Gal">Galileo</label> &nbsp;&nbsp;
<input type="checkbox" id="BeiDou" onclick="do_timer();" checked> <label for="BeiDou">BeiDou</label> &nbsp;&nbsp;
<input type="checkbox" id="Glonass" onclick="do_timer();" checked> <label for="Glonass">Glonass</label> &nbsp;&nbsp;
<input type="checkbox" id="GPS" onclick="do_timer();" checked> <label for="GPS">GPS</label>
</center>
<center id="options_other">
<input type="checkbox" id="Obs" onclick="do_timer();" checked> <label for="Obs">Observers</label> &nbsp;&nbsp;
</center>
<div id="combined">
<svg id="svgworld"></svg>
<svg id="svggraticule"></svg>