Skip to content

Commit b8d42fe

Browse files
authored
Merge pull request projecthorus#22 from LukePrior/testing
PWA Support
2 parents 9d32363 + 5b59626 commit b8d42fe

12 files changed

+122
-6
lines changed

img/icons/maskable_icon_x128.png

10.4 KB
Loading

img/icons/maskable_icon_x192.png

17.5 KB
Loading

img/icons/maskable_icon_x384.png

41 KB
Loading

img/icons/maskable_icon_x48.png

2.79 KB
Loading

img/icons/maskable_icon_x512.png

58.4 KB
Loading

img/icons/maskable_icon_x72.png

4.88 KB
Loading

img/icons/maskable_icon_x96.png

7.21 KB
Loading

index.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
<meta name="apple-mobile-web-app-title" content="SondeHub Tracker">
1111
<meta name="apple-mobile-web-app-capable" content="yes" />
1212
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
13+
<meta name="theme-color" content="#00a3d3" />
1314
<link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon.png" />
1415
<link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon.png" />
1516
<link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon.png" />
1617
<link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon.png" />
1718
<link rel="fluid-icon" href="img/fluidicon.png" title="Mobile Tracker" />
1819
<link rel="icon" type="image/x-icon" href="favicon.ico" />
20+
<link rel="manifest" href="manifest.json">
1921

2022
<link rel="stylesheet" href="css/mobile.css"/>
2123
<link rel="stylesheet" href="css/leaflet.css" />
@@ -363,12 +365,13 @@ <h3>Report Recovery</h3>
363365
<script type="text/javascript" language="javascript" src="js/leaflet.js"></script>
364366
<script type="text/javascript" language="javascript" src="js/Leaflet.fullscreen.min.js"></script>
365367
<script type="text/javascript" language="javascript" src="js/L.Terminator.js"></script>
366-
<script src="https://xc5dqkj2cgb1.statuspage.io/embed/script.js"></script>
368+
<script src="https://xc5dqkj2cgb1.statuspage.io/embed/script.js" async defer></script>
367369
<script type="text/javascript" language="javascript" src="js/mobile.js"></script>
368370
<script type="text/javascript" language="javascript" src="js/rbush.js"></script>
369371
<script>var module = {};</script>
370372
<script src="js/leaflet.canvas-markers.js"></script>
371373
<script>module.exports(L);</script>
374+
<script type="text/javascript" language="javascript" src="js/pwa.js"></script>
372375
<!--
373376
<script type="text/javascript" language="javascript" src="js/iscroll.js"></script>
374377
<script type="text/javascript" language="javascript" src="js/jquery-1.12.4-min.js"></script>

js/pwa.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
if ('serviceWorker' in navigator) {
2+
navigator.serviceWorker.register('/service-worker.js')
3+
}

js/tracker.js

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,8 @@ function load() {
384384
preferCanvas: true,
385385
});
386386

387+
var svgRenderer = L.svg();
388+
387389
map.addControl(new L.Control.Fullscreen({ position: 'bottomleft' }));
388390

389391
new L.Control.Zoom({ position: 'bottomright' }).addTo(map);
@@ -419,7 +421,7 @@ function load() {
419421
receiverCanvas.addTo(map);
420422

421423
// initalize nite overlay
422-
nite = new L.terminator();
424+
nite = new L.terminator({ renderer: svgRenderer });
423425

424426
if (offline.get("opt_daylight")) {
425427
map.addLayer(nite);
@@ -1372,8 +1374,11 @@ function redrawPrediction(vcallsign) {
13721374
}
13731375
}
13741376

1375-
function updatePolyline(vcallsign) {
1377+
function updatePolyline(vcallsign, flag) {
13761378
for(var k in vehicles[vcallsign].polyline) {
1379+
if (flag) {
1380+
vehicles[vcallsign].polyline[k].setLatLngs([]);
1381+
}
13771382
vehicles[vcallsign].polyline[k].setLatLngs(vehicles[vcallsign].positions);
13781383
}
13791384
}
@@ -2539,7 +2544,10 @@ function refresh(serial) {
25392544
success: function(response, textStatus) {
25402545
$("#stText").text("loading |");
25412546
response.fetch_timestamp = Date.now();
2542-
update(response);
2547+
if (serial === undefined) {update(response);} else {
2548+
//vehicles[serial].kill();
2549+
update(response, true);
2550+
}
25432551
$("#stText").text("");
25442552
$("#stTimer").attr("data-timestamp", response.fetch_timestamp);
25452553
},
@@ -3194,7 +3202,7 @@ var ssdv = {};
31943202
var status = "";
31953203
var bs_idx = 0;
31963204

3197-
function update(response) {
3205+
function update(response, flag) {
31983206
if (response === null ||
31993207
!response.positions ||
32003208
!response.positions.position ||
@@ -3265,7 +3273,12 @@ function update(response) {
32653273
if(vehicle === undefined) return;
32663274

32673275
if(vehicle.updated) {
3268-
updatePolyline(vcallsign);
3276+
if (flag) {
3277+
updatePolyline(vcallsign, true);
3278+
} else {
3279+
updatePolyline(vcallsign);
3280+
}
3281+
32693282
updateVehicleInfo(vcallsign, vehicle.curr_position);
32703283

32713284
// remember last position for each vehicle

0 commit comments

Comments
 (0)