Use cachec events list.
This commit is contained in:
parent
ad920ee0fc
commit
81204d76c7
Notes:
subgit
2018-03-07 17:59:03 +01:00
r703 www/trunk
@ -66,7 +66,7 @@ function getGeolocation(id, lat, lng) {
|
||||
};
|
||||
|
||||
/* Load events using ajax */
|
||||
function ajaxLoadEvents(stime, etime, id, url, target) {
|
||||
function ajaxLoadEvents(stime, etime, eventid, url, target) {
|
||||
var mapBounds = map.getBounds();
|
||||
var request_data = {};
|
||||
var rtime;
|
||||
@ -75,7 +75,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
|
||||
stime = new Date();
|
||||
stime.setDate(stime.getDate()-config['map']['timespan']);
|
||||
rtime = new Date();
|
||||
rtime.setDate(rtime.getDate()-config['ajax']['timespan']);
|
||||
rtime.setDate(rtime.getDate()-Math.min(config['ajax']['timespan'], config['map']['timespan']));
|
||||
} else {
|
||||
rtime = stime;
|
||||
};
|
||||
@ -83,8 +83,8 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
|
||||
var ajax_url = url;
|
||||
request_data = {};
|
||||
} else {
|
||||
if ( id ) {
|
||||
request_data = { eventid: id };
|
||||
if ( eventid ) {
|
||||
request_data = { eventid: eventid };
|
||||
} else {
|
||||
request_data = {
|
||||
starttime: sprintf("%d-%02d-%02d", rtime.getFullYear(), rtime.getMonth()+1, rtime.getDate()),
|
||||
@ -100,6 +100,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
|
||||
};
|
||||
};
|
||||
};
|
||||
//console.log(ajax_url+'?'+$.param(request_data));
|
||||
if ( etime == '' || !etime ) { etime = new Date(); };
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
@ -152,20 +153,21 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
|
||||
addTableRow(row, target);
|
||||
}
|
||||
// create marker
|
||||
var marker = addEventMarker(id, Number(lat), Number(lng), Number(mag), type);
|
||||
var text = sprintf('<h3 eventid="%s">%s</h3>', id, location)
|
||||
+ sprintf('<p>Ereignis: %s</br>', id)
|
||||
+ sprintf('Type: %s</br>', type)
|
||||
+ sprintf('Magnitude: %3.1f</br>', Number(mag))
|
||||
+ sprintf('Ort: %.4f °N, %.4f °O </br>', Number(lat), Number(lng))
|
||||
+ sprintf('Tiefe: %.1f km</br>', Number(depth)/1000.)
|
||||
+ sprintf('Zeit: <span class="utctime">%sZ</span></p>', otime.split('.')[0], otime.split('.')[0]);
|
||||
marker.bindPopup(text);
|
||||
if ((stime <= oTime && etime >= oTime ) || ( id == eventid )) {
|
||||
var marker = addEventMarker(id, Number(lat), Number(lng), Number(mag), type);
|
||||
var text = sprintf('<h3 eventid="%s">%s</h3>', id, location)
|
||||
+ sprintf('<p>Ereignis: %s</br>', id)
|
||||
+ sprintf('Type: %s</br>', type)
|
||||
+ sprintf('Magnitude: %3.1f</br>', Number(mag))
|
||||
+ sprintf('Ort: %.4f °N, %.4f °O </br>', Number(lat), Number(lng))
|
||||
+ sprintf('Tiefe: %.1f km</br>', Number(depth)/1000.)
|
||||
+ sprintf('Zeit: <span class="utctime">%sZ</span></p>', otime.split('.')[0], otime.split('.')[0]);
|
||||
marker.bindPopup(text);
|
||||
};
|
||||
};
|
||||
});
|
||||
},
|
||||
complete: function () {
|
||||
initStationTable();
|
||||
var sort = [[0,1],[1,1],[2,1]];
|
||||
$("#eventstable").trigger("update", [true]);
|
||||
$("#eventstable").trigger("updateCache");
|
||||
@ -181,7 +183,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
|
||||
});
|
||||
// create events csv download link
|
||||
request_data['format'] = 'text';
|
||||
if ( id == '' || !id ) { $('#events-csv-link').attr('href', config['ajax']['eventURL']+'?'+$.param(request_data)) };
|
||||
if ( eventid == '' || !eventid ) { $('#events-csv-link').attr('href', config['ajax']['eventURL']+'?'+$.param(request_data)) };
|
||||
};
|
||||
|
||||
/* ajaxLoadEventInfo */
|
||||
@ -383,7 +385,7 @@ $(document).ready(function() {
|
||||
// load event details
|
||||
var eventid = $(this).attr('eventid');
|
||||
( eventDetails[eventid] ) ? null : ajaxLoadEventInfo(eventid);
|
||||
|
||||
|
||||
// toggle visibility of selected row
|
||||
$(this).closest('tr').nextUntil('tr.tablesorter-hasChildRow').find('td').toggle('slow');
|
||||
// mark currently selected row and remove class selected from all other rows
|
||||
|
Loading…
Reference in New Issue
Block a user