Skip to content

Testing -> Master of some Fixes #38

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
darksidelemm merged 3 commits into from
Jul 12, 2021
Merged

Testing -> Master of some Fixes #38

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea8fa2d
Merge pull request #2 from projecthorus/master
LukePrior Jul 12, 2021
dc33015
Fix the issue using less bad code
LukePrior Jul 12, 2021
71b60c8
Merge pull request #37 from LukePrior/testing
darksidelemm Jul 12, 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
2 changes: 1 addition & 1 deletion js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function load_hash(no_refresh) {
manual_pan = true;
v = v.split(',');
var latlng = new L.LatLng(v[0], v[1]);
map.setView(latlng);
map.panTo(latlng);
break;
case "f":
refocus = (follow_vehicle != v);
Expand Down
50 changes: 27 additions & 23 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,11 +389,14 @@ function load() {
map = new L.map(document.getElementById('map'), {
zoom: 5,
zoomControl: false,
center: [53.467511,-2.2338940],
zoomAnimationThreshold: 0,
center: [53.467511,-2.233894],
layers: [osm],
preferCanvas: true,
});

map.setView([53.467511,-2.233894], 5, {animate: false});

// fullscreen button
map.addControl(new L.Control.Fullscreen({ position: 'bottomleft' }));

Expand Down Expand Up @@ -428,6 +431,27 @@ function load() {

L.control.status({ position: 'bottomright' }).addTo(map);

L.Control.PeriodControl = L.Control.extend({
onAdd: function(map) {
var div = L.DomUtil.create('div');

div.innerHTML = '<select name="timeperiod" id="timeperiod" style="width:auto !important;height:30px;" onchange="clean_refresh(this.value)"><option value="1 hour">1 hour</option><option value="3 hours" selected="selected">3 hours</option><option value="6 hours">6 hours</option><option value="12 hours">12 hours</option></select>';
div.innerHTML.onload = setTimeValue();

return div;
},

onRemove: function(map) {
// Nothing to do here
}
});

L.control.periodcontrol = function(opts) {
return new L.Control.PeriodControl(opts);
}

L.control.periodcontrol({ position: 'topleft' }).addTo(map);

// update current position if we geolocation is available
if(currentPosition) updateCurrentPosition(currentPosition.lat, currentPosition.lon);

Expand Down Expand Up @@ -494,29 +518,9 @@ function load() {
// only start population the map, once its completely loaded
var callBack = function() {
load_hash(null);
map.options.zoomAnimationThreshold = 4;

L.Control.PeriodControl = L.Control.extend({
onAdd: function(map) {
var div = L.DomUtil.create('div');

div.innerHTML = '<select name="timeperiod" id="timeperiod" style="width:auto !important;height:30px;" onchange="clean_refresh(this.value)"><option value="1 hour">1 hour</option><option value="3 hours" selected="selected">3 hours</option><option value="6 hours">6 hours</option><option value="12 hours">12 hours</option></select>';
div.innerHTML.onload = setTimeValue();

return div;
},

onRemove: function(map) {
// Nothing to do here
}
});

L.control.periodcontrol = function(opts) {
return new L.Control.PeriodControl(opts);
}

L.control.periodcontrol({ position: 'topleft' }).addTo(map);

map.on('idle', function() {
map.on('moveend', function() {
lhash_update();
});
map.on('baselayerchange', function() {
Expand Down