Skip to content

Switch to canvas rendering for station icons #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheSkorm merged 2 commits into from
Jun 28, 2021
Merged

Switch to canvas rendering for station icons #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b7bd71
big performance improvement
LukePrior Jun 28, 2021
e8ff403
include files
LukePrior Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
big performance improvement
  • Loading branch information
@LukePrior
LukePrior committed Jun 28, 2021
commit 6b7bd719c638908d72306d18829d7cd1a65575f4
2 changes: 2 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,8 @@ <h3>Report Recovery</h3>
<script type="text/javascript" language="javascript" src="js/leaflet.js"></script>
<script type="text/javascript" language="javascript" src="js/Leaflet.fullscreen.min.js"></script>
<script type="text/javascript" language="javascript" src="js/L.Terminator.js"></script>
<script type="text/javascript" language="javascript" src="js/rbush.js"></script>
<script type="text/javascript" language="javascript" src="js/leaflet-markers-canvas.min.js"></script>
<script src="https://xc5dqkj2cgb1.statuspage.io/embed/script.js"></script>
<script type="text/javascript" language="javascript" src="js/mobile.js"></script>
<!--
Expand Down
14 changes: 9 additions & 5 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ var recovery_names = [];
var recoveries = [];

var launches = null;
var receiverCanvas = null;

var got_positions = false;
var zoomed_in = false;
Expand Down Expand Up @@ -413,6 +414,9 @@ function load() {
// update current position if we geolocation is available
if(currentPosition) updateCurrentPosition(currentPosition.lat, currentPosition.lon);

//Receiver canvas
receiverCanvas = new L.MarkersCanvas();
receiverCanvas.addTo(map);

// initalize nite overlay
nite = new L.terminator();
Expand Down Expand Up @@ -2874,11 +2878,13 @@ function updateReceiverMarker(receiver) {
icon: receiverIcon,
title: receiver.name,
zIndexOffset: Z_STATION,
}).addTo(map);
});

receiver.infobox = new L.popup({ autoClose: false, closeOnClick: false }).setContent(receiver.description);

receiver.marker.bindPopup(receiver.infobox);

receiverCanvas.addMarker(receiver.marker);
} else {
receiver.marker.setLatLng(latlng);
}
Expand Down Expand Up @@ -2929,10 +2935,8 @@ function updateReceivers(r) {
i++;
}
else {
// close box, remove event handle, and remove marker
//e.infobox.close();
//e.infobox_handle.remove();
map.removeLayer(e.marker);
map.removeLayer(e.infobox);
receiverCanvas.removeMarker(e.marker);

// remove from arrays
receivers.splice(i,1);
Expand Down