diff --git a/www/events.js b/www/events.js index e60d8cf..df4bd69 100644 --- a/www/events.js +++ b/www/events.js @@ -106,17 +106,6 @@ function ajaxLoadEvents(stime, etime, id, target) { var evaluationMode = $(this).find('evaluationMode').text(); var evaluationStatus = $(this).find('evaluationStatus').text(); var type = $(this).find('type').last().text(); - var typeId; - switch ( type ) { - case 'earthquake': - typeId = 'EQ'; - break; - case 'quarry blast': - typeId = 'QB'; - break; - default: - typeId = 'IE'; - }; var location // get location, try this in order: // regional map name, given value, cached value, or nominatim lookup @@ -129,12 +118,11 @@ function ajaxLoadEvents(stime, etime, id, target) { + ''+otime.split('.')[0]+'Z' + ''+otime.split('.')[0]+'Z' + sprintf('%.1f', Number(mag)) - + ''+location+'Karte' - + ''+typeId+'' + + ''+location+' Karte' + ''; // setting up event details (2nd line) row += '' - + 'Daten werden geladen ...'; + + 'Daten werden geladen ...'; // 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); @@ -142,7 +130,7 @@ function ajaxLoadEvents(stime, etime, id, target) { var eTime = new Date(oTime.getTime()+50*1000.-oTime.getMilliseconds()); 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 @@ -180,6 +168,9 @@ function ajaxLoadEvents(stime, etime, id, target) { console.log( "Request Failed: " + err ); } }); + // create events csv download link + request_data['format'] = 'text'; + if ( id == '' || !id ) { $('#events-csv-link').attr('href', config['ajax']['eventURL']+'?'+$.param(request_data)) }; }; /* ajaxLoadEventInfo */ @@ -260,7 +251,6 @@ function ajaxLoadEventInfo(id) { /* toggles visibility of filtered markers * only events in the event list are shown */ function toggleFilteredMarkers() { - console.log('toggleFilteredMarkers'); // show all shown events in map $("#eventstable > tbody > tr:not(.filtered) > td > a.map-link").each( function() { if ( $(this).attr("eventid") ) { @@ -412,17 +402,18 @@ $(document).ready(function() { $("#events-minmag").text(sprintf('%.1f', config['event']['minMag'])); config['event']['typeWhitelist'].map(function(type) { var typetext; + ( $("#events-type").text() == "Symbole:" ) ? typetext = ' ' : typetext = ', '; switch ( type ) { case 'earthquake': - typetext = 'EQ - tektonisches Erdbeben'; + typetext += 'tektonisches Erdbeben (Stern)'; break; case 'induced or triggered event': - typetext = 'IE - (bergbau-)induziertes Ereignis'; + typetext += '(bergbau-)induziertes Ereignis (Kreis)'; break; case 'quarry blast': - typetext = 'QB - Steinbruchsprengung'; + typetext += 'Steinbruchsprengung (Rad)'; break; }; - $("#events-type").append(' '+typetext); + $("#events-type").append(typetext); }); }); diff --git a/www/index.html.de b/www/index.html.de index e3a7140..d9a8b3a 100644 --- a/www/index.html.de +++ b/www/index.html.de @@ -64,7 +64,6 @@
-

Ereignisse der letzten 180 Tage ab Magnitude 1.2

First Prev @@ -96,14 +95,20 @@ Zeit Mag. Ort - Typ -

Typ:
- Nominatim Search Courtesy of MapQuest Mapquest Logo

+

+ Ereignisse der letzten 180 Tage ab Magnitude 1.2 im Bereich der Karte und besondere Ereignisse in angrenzenden Bereichen. Download als CSV. +

+

+ Symbole: +

+

+ Nominatim Search Courtesy of MapQuest Mapquest Logo +

@@ -142,7 +147,7 @@ -

Download als CSV

+

Download als CSV.

diff --git a/www/main.css b/www/main.css index ccfe67d..bc0c37d 100644 --- a/www/main.css +++ b/www/main.css @@ -73,4 +73,7 @@ td.ar { text-align: right; } + p.table-caption { + font-size: smaller; + }