From fa0ef11337cdac801986b420f9b0b147c94ab7ce Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Fri, 9 May 2014 07:00:03 +0000 Subject: [PATCH] Adding download links to event table. --- www/events.js | 34 +++++++++++++++++----------------- www/misc.js | 1 + 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/www/events.js b/www/events.js index 069071a..69c1243 100644 --- a/www/events.js +++ b/www/events.js @@ -51,11 +51,6 @@ function getGeolocation(id, lat, lng) { /* Load events using ajax */ function ajaxLoadEvents(stime, etime) { - var mapBounds = map.getBounds(); - var N = mapBounds.getNorth(); - var E = mapBounds.getEast(); - var S = mapBounds.getSouth(); - var W = mapBounds.getWest(); if ( !stime ) { var stime = new Date(); stime.setDate(stime.getDate()-config['map']['timespan']); @@ -64,15 +59,16 @@ function ajaxLoadEvents(stime, etime) { var etime = new Date(); etime.setDate(etime.getDate()+1); }; + var mapBounds = map.getBounds(); var request_data = { starttime: sprintf("%d-%02d-%02d", stime.getFullYear(), stime.getMonth()+1, stime.getDate()), endtime: sprintf("%d-%02d-%02d", etime.getFullYear(), etime.getMonth()+1, etime.getDate()), - minlat: S-config['map']['latlngDelta'], - maxlat: N+config['map']['latlngDelta'], - minlon: W-config['map']['latlngDelta'], - maxlon: E+config['map']['latlngDelta'], + minlat: mapBounds.getSouth()-config['map']['latlngDelta'], + maxlat: mapBounds.getNorth()+config['map']['latlngDelta'], + minlon: mapBounds.getWest()-config['map']['latlngDelta'], + maxlon: mapBounds.getEast()+config['map']['latlngDelta'], minmag: config['event']['minMag']-config['event']['minMagDelta'], - includeArrivals: true, + includearrivals: true, }; $.ajax({ type: "GET", @@ -151,6 +147,17 @@ function ajaxLoadEvents(stime, etime) { }; }); row += ''; + // setting up download links (3nd line) + var xmlurl = sprintf('%s?formatted=true&includearrivals=true&eventid=%s', config['ajax']['eventURL'], id); + var oTime = new Date(otime); + var stime = new Date(oTime.getTime()-10*1000.-oTime.getMilliseconds()); + var etime = new Date(oTime.getTime()+50*1000.-oTime.getMilliseconds()); + console.log(oTime, stime, etime); + var mseedurl = sprintf('%s?net=GE,GR,RN&cha=EH?,HH?&start=%04d-%02d-%02dT%02d:%02d:%02d&end=%04d-%02d-%02dT%02d:%02d:%02d', config['ajax']['mseedURL'], Number(stime.getUTCFullYear()), Number(stime.getUTCMonth())+1, Number(stime.getUTCDate()), Number(stime.getUTCHours()), Number(stime.getUTCMinutes()), Number(stime.getUTCSeconds()), Number(etime.getUTCFullYear()), Number(etime.getUTCMonth())+1, Number(etime.getUTCDate()), Number(etime.getUTCHours()), Number(etime.getUTCMinutes()), Number(etime.getUTCSeconds())); + row += '' + + '' + + sprintf('Download QuakeML or miniSEED', xmlurl, mseedurl) + + ''; // add row to table var added = $('#eventstable tbody').append(row); added.find('.tablesorter-childRow td').hide(); @@ -200,7 +207,6 @@ function toggleFilteredMarkers() { eventTable[$(this).attr("eventid")].setStyle({opacity: 1, strokeOpacity: 1, fillOpacity: config['event']['markerOpacity']}); }; }); - // hide filtered events in map $("#eventstable > tbody > tr.filtered > td > a.map-link").each( function() { if ( $(this).attr("eventid") ) { @@ -292,25 +298,20 @@ $(document).ready(function() { showProcessing: true, } }); - // hide child rows $('#eventstable > tbody > tr.tablesorter-childRow td').hide(); - // update map after filtering $('#eventstable').bind('filterEnd', function(){ toggleFilteredMarkers(); }); - // highlight first event $('#eventstable').bind('sortEnd', function(){ highlightFirstEvent(); }); - // show / hide event info $('#eventstable').delegate('.toggle', 'click' , function(){ // 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 // hide other rows $(this).closest('tr').nextUntil('tr.tablesorter-hasChildRow').find('td').addClass('selected-now'); @@ -333,5 +334,4 @@ $(document).ready(function() { }); return false; }); - }); diff --git a/www/misc.js b/www/misc.js index aca89d2..7da0a00 100644 --- a/www/misc.js +++ b/www/misc.js @@ -80,6 +80,7 @@ var config = { ajax: { timeout: 150000, // 15 seconds eventURL: 'https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query', + mseedURL: 'https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/dataselect/1/query', stationURL: 'https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/station/1/query', nominatimURL: '//open.mapquestapi.com/nominatim/v1/reverse.php', // nominatimURL: '//nominatim.openstreetmap.org/reverse',