Skip to content

Commit 140b0b3

Browse files
author
xss
committed
optimise map move
1 parent b571e40 commit 140b0b3

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,10 @@ <h3>Report Recovery</h3>
398398
<div id="main" style="display: none">
399399
<div class="scrollwrapper">
400400
<div class="portrait">
401-
<div class="row vehicle0"><div class="header empty"><img style="width:90px;height:30px" src="img/hab-spinner.gif"/></div></div>
401+
<div class="row vehicle0" id="pv0"><div class="header empty"><img style="width:90px;height:30px" src="img/hab-spinner.gif"/></div></div>
402402
</div>
403403
<div class="landscape">
404-
<div class="row vehicle0"><div class="header empty"><img style="width:90px;height:30px" src="img/hab-spinner.gif"/></div></div>
404+
<div class="row vehicle0" id="lv0><div class="header empty"><img style="width:90px;height:30px" src="img/hab-spinner.gif"/></div></div>
405405
</div>
406406
</div>
407407
</div>

js/tracker.js

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,20 +1175,19 @@ function panToRecovery(rcallsign) {
11751175
}
11761176

11771177
function sidebar_update() {
1178-
if (offline.get('opt_selective_sidebar')) {
1179-
for (let serial in vehicles) {
1178+
for (let serial in vehicles) {
1179+
var p = document.getElementById("pv"+vehicles[serial].uuid)
1180+
var l = document.getElementById("lv"+vehicles[serial].uuid)
1181+
var state = "block"
1182+
if (offline.get('opt_selective_sidebar')) {
11801183
if (map.getBounds().contains(vehicles[serial].marker.getLatLng())) {
1181-
$("#main .vehicle"+vehicles[serial].uuid).show();
1184+
state = "block"
11821185
} else {
1183-
if (!($("#main .vehicle"+vehicles[serial].uuid).hasClass("follow"))) {
1184-
$("#main .vehicle"+vehicles[serial].uuid).hide();
1185-
}
1186+
state = "none"
11861187
}
11871188
}
1188-
} else {
1189-
for (let serial in vehicles) {
1190-
$("#main .vehicle"+vehicles[serial].uuid).show();
1191-
}
1189+
if (p) { p.style.display=state}
1190+
if (l) { l.style.display=state }
11921191
}
11931192
}
11941193

@@ -1660,18 +1659,20 @@ function updateVehicleInfo(vcallsign, newPosition) {
16601659
// if (vehicle["vehicle_type"] == "car") {
16611660
if (elm.length === 0) {
16621661
if (vehicle.vehicle_type!="car") {
1663-
$('.portrait').prepend('<div class="row vehicle'+vehicle.uuid+'" data-vcallsign="'+vcallsign+'"></div>');
1664-
$('.landscape').prepend('<div class="row vehicle'+vehicle.uuid+'" data-vcallsign="'+vcallsign+'"></div>');
1662+
$('.portrait').prepend('<div id="pv'+vehicle.uuid+'" class="row vehicle'+vehicle.uuid+'" data-vcallsign="'+vcallsign+'"></div>');
1663+
$('.landscape').prepend('<div id="lv'+vehicle.uuid+'" class="row vehicle'+vehicle.uuid+'" data-vcallsign="'+vcallsign+'"></div>');
16651664
} else {
1666-
$('.portrait').append('<div class="row vehicle'+vehicle.uuid+'" data-vcallsign="'+vcallsign+'"></div>');
1667-
$('.landscape').append('<div class="row vehicle'+vehicle.uuid+'" data-vcallsign="'+vcallsign+'"></div>');
1665+
$('.portrait').append('<div id="pv'+vehicle.uuid+'" class="row vehicle'+vehicle.uuid+'" data-vcallsign="'+vcallsign+'"></div>');
1666+
$('.landscape').append('<div id="lv'+vehicle.uuid+'" class="row vehicle'+vehicle.uuid+'" data-vcallsign="'+vcallsign+'"></div>');
16681667
}
16691668

16701669
if (offline.get('opt_selective_sidebar')) {
16711670
if (map.getBounds().contains(vehicles[vcallsign].marker.getLatLng())) {
1672-
$("#main .vehicle"+vehicle.uuid).show();
1671+
document.getElementById("pv"+vehicle.uuid).style.display = "block";
1672+
document.getElementById("lv"+vehicle.uuid).style.display = "block";
16731673
} else {
1674-
$("#main .vehicle"+vehicle.uuid).hide();
1674+
document.getElementById("pv"+vehicle.uuid).style.display = "none";
1675+
document.getElementById("lv"+vehicle.uuid).style.display = "none";
16751676
}
16761677
}
16771678

0 commit comments

Comments
 (0)