Skip to content

Commit f24664e

Browse files
committed
Initial test of show/hide horizon rings.
1 parent d013737 commit f24664e

File tree

3 files changed

+59
-10
lines changed

3 files changed

+59
-10
lines changed

index.html

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
<link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon.png" />
1717
<link rel="fluid-icon" href="img/fluidicon.png" title="Mobile Tracker" />
1818
<link rel="icon" type="image/x-icon" href="favicon.ico" />
19-
<!--
19+
2020
<link rel="stylesheet" href="css/base.css"/>
2121
<link rel="stylesheet" href="css/skeleton.css"/>
2222
<link rel="stylesheet" href="css/layout.css"/>
2323
<link rel="stylesheet" href="css/habitat-font.css"/>
2424
<link rel="stylesheet" href="css/main.css"/>
25-
-->
26-
<link rel="stylesheet" href="css/mobile.css"/>
25+
26+
<!--<link rel="stylesheet" href="css/mobile.css"/>-->
2727
</head>
2828
<body>
2929

@@ -154,6 +154,13 @@ <h2><i class="icon-settings rfloat"></i>Settings</h2>
154154
<input type="checkbox" id="opt_hilight_vehicle">
155155
</div>
156156
</div>
157+
<div class="row option">
158+
<span><b>Hide Horizon Rings</b></span>
159+
<div class="switch off" id="sw_hide_horizon">
160+
<span class="thumb"></span>
161+
<input type="checkbox" id="opt_hide_horizon">
162+
</div>
163+
</div>
157164
<h4>Overlays</h4>
158165
<hr/>
159166
<div class="row option">
@@ -303,16 +310,16 @@ <h2>Chase car mode</h2>
303310
</div>
304311
</div>
305312
<script src="https://maps.google.com/maps/api/js?v=3.31&libraries=map,common,controls,util,marker,onion,kml,ga,infowindow,stats,poly,overlay,weather,weather_impl,geometry&language=en_us&key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg" type="text/javascript"></script>
306-
<script type="text/javascript" language="javascript" src="js/mobile.js"></script>
307-
<!--
313+
<!--<script type="text/javascript" language="javascript" src="js/mobile.js"></script>-->
314+
308315
<script type="text/javascript" language="javascript" src="js/gmaps_extentions.js"></script>
309316
<script type="text/javascript" language="javascript" src="js/jquery-1.12.4-min.js"></script>
310317
<script type="text/javascript" language="javascript" src="js/chasecar.lib.js"></script>
311318
<script type="text/javascript" language="javascript" src="js/iscroll.js"></script>
312319
<script type="text/javascript" language="javascript" src="js/nite-overlay.js"></script>
313320
<script type="text/javascript" language="javascript" src="js/tracker.js"></script>
314321
<script type="text/javascript" language="javascript" src="js/app.js"></script>
315-
-->
322+
316323
<script type="text/javascript">
317324

318325
var _gaq = _gaq || [];

js/app.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,7 @@ $(window).ready(function() {
785785
"#sw_hide_receivers",
786786
"#sw_hide_timebox",
787787
"#sw_hilight_vehicle",
788+
'#sw_hide_horizon',
788789
"#sw_nowelcome",
789790
"#sw_interpolate",
790791
];
@@ -845,6 +846,15 @@ $(window).ready(function() {
845846
$('#lookanglesbox').css({top:'40px'});
846847
}
847848
break;
849+
case "opt_hide_horizon":
850+
if(on) {
851+
// TODO: Remove horizon and labels from map
852+
console.log("Remove horizons.");
853+
}
854+
else {
855+
// TODO: Add horizon to map.
856+
console.log("Add horizons.");
857+
}
848858
case "opt_layers_aprs":
849859
if(on) map.overlayMapTypes.setAt("1", overlayAPRS);
850860
else map.overlayMapTypes.setAt("1", null);

js/tracker.js

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,10 +1678,13 @@ function addPosition(position) {
16781678
};
16791679
} else {
16801680
vehicle.marker.shadow.setVisible(true);
1681-
vehicle.horizon_circle.setVisible(true);
1682-
vehicle.horizon_circle.label.set('visible', true);
1683-
vehicle.subhorizon_circle.setVisible(true);
1684-
vehicle.subhorizon_circle.label.set('visible', true);
1681+
1682+
if(offline.get('opt_hide_horizon') == false){
1683+
vehicle.horizon_circle.setVisible(true);
1684+
vehicle.horizon_circle.label.set('visible', true);
1685+
vehicle.subhorizon_circle.setVisible(true);
1686+
vehicle.subhorizon_circle.label.set('visible', true);
1687+
}
16851688

16861689
if(mode == "parachute") {
16871690
img = {
@@ -1812,6 +1815,13 @@ function addPosition(position) {
18121815
google.maps.event.addListener(subhorizon_circle, 'center_changed', refresh_func);
18131816
google.maps.event.addListener(subhorizon_circle, 'radius_changed', refresh_func);
18141817

1818+
if(offline.get("opt_hide_horizon")){
1819+
horizon_circle.setVisible(false);
1820+
horizon_circle.label.set('visible', false);
1821+
subhorizon_circle.setVisible(false);
1822+
subhorizon_circle.label.set('visible', false);
1823+
}
1824+
18151825
marker.setAltitude(0);
18161826
polyline_visible = true;
18171827
polyline = [
@@ -2794,6 +2804,28 @@ function refreshUI() {
27942804
if(follow_vehicle !== null) update_lookangles(follow_vehicle);
27952805
}
27962806

2807+
2808+
function hideHorizonRings(){
2809+
for(var vcallsign in vehicles) {
2810+
if(vehicles[vcallsign].vehicle_type == "balloon"){
2811+
vehicles[vcallsign].horizon_circle.setVisible(false);
2812+
vehicles[vcallsign].horizon_circle.label.set('visible', false);
2813+
vehicles[vcallsign].subhorizon_circle.setVisible(false);
2814+
vehicles[vcallsign].subhorizon_circle.label.set('visible', false);
2815+
}
2816+
}
2817+
}
2818+
function showHorizonRings(){
2819+
for(var vcallsign in vehicles) {
2820+
if(vehicles[vcallsign].vehicle_type == "balloon"){
2821+
vehicles[vcallsign].horizon_circle.setVisible(true);
2822+
vehicles[vcallsign].horizon_circle.label.set('visible', true);
2823+
vehicles[vcallsign].subhorizon_circle.setVisible(true);
2824+
vehicles[vcallsign].subhorizon_circle.label.set('visible', true);
2825+
}
2826+
}
2827+
}
2828+
27972829
var ssdv = {};
27982830
var status = "";
27992831
var bs_idx = 0;

0 commit comments

Comments
 (0)