From 1285d68eb48572e0e175faa1290208fb8cb2f016 Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Tue, 6 May 2014 11:31:30 +0000 Subject: [PATCH 01/10] Copy trunk to branches/life for live website. From 14d988b0b4158e3feca4b57c1fb63ae2dafe8289 Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Mon, 12 May 2014 16:16:01 +0000 Subject: [PATCH 02/10] Merge. --- www/events.js | 9 +++------ www/map.js | 23 ++++++++++++++++++----- www/misc.js | 1 + 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/www/events.js b/www/events.js index a632b48..a0e9023 100644 --- a/www/events.js +++ b/www/events.js @@ -87,12 +87,9 @@ function ajaxLoadEvents(stime, etime) { var location // try to use location with reverse geolocation lookup (nominatim), check cache first // use getLocation if it fails or description -> text if it also fails - if ( geolocationTable[id] ) { - location = geolocationTable[id]; - } else { - location = getGeolocation(id, lat, lng); - ( location ) ? null : location = $(this).find('description > text').text(); - }; + ( location = geolocationTable[id] ) ? null : location = getGeolocation(id, lat, lng); + ( location ) ? null : location = getLocation(lat, lng)[0]; + ( location ) ? null : $(this).find('description > text').text(); // create table row: Date, Time, Mag, Location if ( !eventTable[id] && $.inArray(type, config['event']['typeWhitelist'] )+1 && $.inArray(evaluationStatus, config['event']['evaluationBlacklist'])<0 && Number(mag)+0.05 >= config['event']['minMag'] ) { // general event info (1st line) diff --git a/www/map.js b/www/map.js index c8ef474..d3371fd 100644 --- a/www/map.js +++ b/www/map.js @@ -106,6 +106,7 @@ $(document).ready(function() { // create a map in the "map" div, set the view to a given place and zoom map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']); new L.Control.Zoom({ position: 'topright' }).addTo(map); + new L.control.scale({position: 'bottomright', imperial: false}).addTo(map); // add MapQuestOSM tile layer // L.tileLayer.grayscale('http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg', @@ -135,12 +136,24 @@ $(document).ready(function() { map.on('popupopen', function() { // convert date/time to localtime $("div.leaflet-popup span.utctime").each(function(){$(this).addClass("localtime").removeClass("utctime");$.localtime.formatObject($(this), "dd.MM.yyyy - HH:mm")}); - var eventid = $("div.leaflet-popup h3").attr("eventid"); - if ( eventid ) { - // highlight event in table - highlightEvent(eventid); + openMarkerID = $("div.leaflet-popup h3").attr("eventid"); + if ( openMarkerID ) { // update city in popup - $("div.leaflet-popup h3").text(geolocationTable[eventid]); + $("div.leaflet-popup h3").text(geolocationTable[openMarkerID]); + // highlight event in table and show details + // highlightEvent(eventid); + $('#eventstable > tbody > tr > td > a.toggle').each(function() { + if ( $(this).attr('eventid') == openMarkerID ) { + $(this)[0].click(); + }; + }); }; }); + map.on('popupclose', function() { + $('#eventstable > tbody > tr > td > a.toggle').each(function() { + if ( $(this).attr('eventid') == openMarkerID ) { + $(this)[0].click(); + }; + }); + }); }); diff --git a/www/misc.js b/www/misc.js index a8efb38..b727fa9 100644 --- a/www/misc.js +++ b/www/misc.js @@ -73,6 +73,7 @@ $( window ).resize(function() { /* create global vars */ var map; +var openMarkerID; var eventTable = {}; var eventDetails = {}; var stationTable = {}; From 338d54ade4ca32e3914dd5d5f6c4065df49e769f Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Wed, 14 May 2014 05:30:09 +0000 Subject: [PATCH 03/10] Merge changes from trunk, except parsing URL get parameters. --- www/events.js | 36 ++++++++++++++++++------------------ www/index.html.de | 2 +- www/map.js | 6 +++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/www/events.js b/www/events.js index a0e9023..1f36c23 100644 --- a/www/events.js +++ b/www/events.js @@ -51,24 +51,25 @@ function getGeolocation(id, lat, lng) { /* Load events using ajax */ function ajaxLoadEvents(stime, etime) { + var request_data = {}; if ( !stime ) { - var stime = new Date(); + stime = new Date(); stime.setDate(stime.getDate()-config['map']['timespan']); }; - if ( !etime ) { - var etime = new Date(); - etime.setDate(etime.getDate()+1); - }; var mapBounds = map.getBounds(); - var request_data = { + 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: 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'], + orderby: 'time-asc', + minlat: sprintf('%.2f', mapBounds.getSouth()-config['map']['latlngDelta']), + maxlat: sprintf('%.2f', mapBounds.getNorth()+config['map']['latlngDelta']), + minlon: sprintf('%.2f', mapBounds.getWest()-config['map']['latlngDelta']), + maxlon: sprintf('%.2f', mapBounds.getEast()+config['map']['latlngDelta']), + minmag: sprintf('%.1f', config['event']['minMag']-config['event']['minMagDelta']), }; + if ( etime ) { + request_data['endtime'] = sprintf("%d-%02d-%02d", etime.getFullYear(), etime.getMonth()+1, etime.getDate()); + }; + console.log(request_data); $.ajax({ type: "GET", url: config['ajax']['eventURL'], @@ -81,15 +82,14 @@ function ajaxLoadEvents(stime, etime) { var otime = $(this).find('origin > time > value').text(); var lng = $(this).find('origin > longitude > value').text(); var lat = $(this).find('origin > latitude > value').text(); + var depth = $(this).find('origin > depth > value').text(); var evaluationMode = $(this).find('evaluationMode').text(); var evaluationStatus = $(this).find('evaluationStatus').text(); var type = $(this).find('type').last().text(); var location - // try to use location with reverse geolocation lookup (nominatim), check cache first - // use getLocation if it fails or description -> text if it also fails - ( location = geolocationTable[id] ) ? null : location = getGeolocation(id, lat, lng); - ( location ) ? null : location = getLocation(lat, lng)[0]; - ( location ) ? null : $(this).find('description > text').text(); + // get location, try this in order: + // cached value, nominatim lookup, regional map name, or given value + location = geolocationTable[id] || getGeolocation(id, lat, lng) || getLocation(lat, lng)[0] || $(this).find('description > text').text(); // create table row: Date, Time, Mag, Location if ( !eventTable[id] && $.inArray(type, config['event']['typeWhitelist'] )+1 && $.inArray(evaluationStatus, config['event']['evaluationBlacklist'])<0 && Number(mag)+0.05 >= config['event']['minMag'] ) { // general event info (1st line) @@ -107,7 +107,6 @@ function ajaxLoadEvents(stime, etime) { 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 += '' + '' @@ -133,6 +132,7 @@ function ajaxLoadEvents(stime, etime) { + sprintf('Type: %s
', type) + sprintf('Magnitude: %3.1f
', Number(mag)) + sprintf('Ort: %.4f °N, %.4f °O
', Number(lat), Number(lng)) + + sprintf('Tiefe: %.1f km
', Number(depth)/1000.) + sprintf('Zeit: %sZ

', otime.split('.')[0], otime.split('.')[0]); marker.bindPopup(text); }; diff --git a/www/index.html.de b/www/index.html.de index 72277a4..f575ea5 100644 --- a/www/index.html.de +++ b/www/index.html.de @@ -90,7 +90,7 @@ -

Nominatim Search Courtesy of MapQuest

+

Nominatim Search Courtesy of MapQuest Mapquest Logo

diff --git a/www/map.js b/www/map.js index d3371fd..26c060e 100644 --- a/www/map.js +++ b/www/map.js @@ -124,11 +124,11 @@ $(document).ready(function() { maxZoom: 16 }).addTo(map); */ - // read in stations + // create station and event layer stationLayer = L.geoJson().addTo(map); - - // read in events, process filter eventLayer = L.geoJson().addTo(map); + + // load events ajaxLoadEvents(); toggleFilteredMarkers(); From 5bfa403288b4b36c42008a9fa06cbf473282b666 Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Mon, 19 May 2014 20:12:14 +0000 Subject: [PATCH 04/10] Merge. --- .gitignore | 1 + www/events.js | 45 +++++++++++++---------- www/index.html.de | 5 ++- www/map.js | 53 +++++++++++++++++++-------- www/misc.js | 21 +++++++++++ www/stations.js | 93 +++++++++++++++++++++++++++++++++++++++-------- 6 files changed, 166 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index f47c021..1c5f384 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +www/dlsv www/event.xml www/geolocation.js www/stations.xml diff --git a/www/events.js b/www/events.js index 504fa91..1cfee10 100644 --- a/www/events.js +++ b/www/events.js @@ -50,24 +50,29 @@ function getGeolocation(id, lat, lng) { }; /* Load events using ajax */ -function ajaxLoadEvents(stime, etime) { - var request_data = {}; - if ( !stime ) { - stime = new Date(); - stime.setDate(stime.getDate()-config['map']['timespan']); - }; +function ajaxLoadEvents(stime, etime, id) { var mapBounds = map.getBounds(); - request_data = { - starttime: sprintf("%d-%02d-%02d", stime.getFullYear(), stime.getMonth()+1, stime.getDate()), - orderby: 'time-asc', - minlat: sprintf('%.2f', mapBounds.getSouth()-config['map']['latlngDelta']), - maxlat: sprintf('%.2f', mapBounds.getNorth()+config['map']['latlngDelta']), - minlon: sprintf('%.2f', mapBounds.getWest()-config['map']['latlngDelta']), - maxlon: sprintf('%.2f', mapBounds.getEast()+config['map']['latlngDelta']), - minmag: sprintf('%.1f', config['event']['minMag']-config['event']['minMagDelta']), - }; - if ( etime ) { - request_data['endtime'] = sprintf("%d-%02d-%02d", etime.getFullYear(), etime.getMonth()+1, etime.getDate()); + var request_data = {}; + if ( id ) { + if ( id == 'bug2014jptq' ) console.log('Loading special event '+id); + request_data = { eventid: id }; + } else { + if ( !stime ) { + stime = new Date(); + stime.setDate(stime.getDate()-config['map']['timespan']); + }; + request_data = { + starttime: sprintf("%d-%02d-%02d", stime.getFullYear(), stime.getMonth()+1, stime.getDate()), + orderby: 'time-asc', + minlat: sprintf('%.2f', mapBounds.getSouth()-config['map']['latlngDelta']), + maxlat: sprintf('%.2f', mapBounds.getNorth()+config['map']['latlngDelta']), + minlon: sprintf('%.2f', mapBounds.getWest()-config['map']['latlngDelta']), + maxlon: sprintf('%.2f', mapBounds.getEast()+config['map']['latlngDelta']), + minmag: sprintf('%.1f', config['event']['minMag']-config['event']['minMagDelta']), + }; + if ( etime ) { + request_data['endtime'] = sprintf("%d-%02d-%02d", etime.getFullYear(), etime.getMonth()+1, etime.getDate()); + }; }; $.ajax({ type: "GET", @@ -87,10 +92,12 @@ function ajaxLoadEvents(stime, etime) { var type = $(this).find('type').last().text(); var location // get location, try this in order: - // cached value, nominatim lookup, regional map name, or given value - location = geolocationTable[id] || getGeolocation(id, lat, lng) || getLocation(lat, lng)[0] || $(this).find('description > text').text(); + // regional map name, given value, cached value, or nominatim lookup + location = ( getLocation(lat, lng)[0] || $(this).find('description > text').text() ); + location = ( geolocationTable[id] || getGeolocation(id, lat, lng) ); // create table row: Date, Time, Mag, Location if ( !eventTable[id] && $.inArray(type, config['event']['typeWhitelist'] )+1 && $.inArray(evaluationStatus, config['event']['evaluationBlacklist'])<0 && Number(mag)+0.05 >= config['event']['minMag'] ) { + if ( id == 'bug2014jptq' ) console.log('Adding row for special event '+id); // general event info (1st line) var row = '' + ''+otime.split('.')[0]+'Z' diff --git a/www/index.html.de b/www/index.html.de index 3c72833..078bd3b 100644 --- a/www/index.html.de +++ b/www/index.html.de @@ -115,8 +115,8 @@ - - + + @@ -129,6 +129,7 @@ +

Download als CSV

diff --git a/www/map.js b/www/map.js index 2cf0d28..19f578c 100644 --- a/www/map.js +++ b/www/map.js @@ -42,25 +42,32 @@ function addStationMarker(id, lat, lng, station) { /* add event marker */ function addEventMarker(id, lat, lng, mag) { - var markerOptions = { - gradient: true, - dropShadow: false, - fillColor: config['event']['markerColor'], - fillOpacity: config['event']['markerOpacity'], - color: config['event']['markerColor'], - weight: 0, - opacity: 1, - className: id+' eventMarker', - radius: mag2radius(mag) + if ( id == 'bug2014jptq' ) console.log('Adding marker for special event '+id); + if ( eventTable[id] ) { + return eventTable[id]; + console.log('Marker allready exists ID: '+id); + } else { + var markerOptions = { + gradient: true, + dropShadow: false, + fillColor: config['event']['markerColor'], + fillOpacity: config['event']['markerOpacity'], + color: config['event']['markerColor'], + weight: 0, + opacity: 1, + className: id+' eventMarker', + radius: mag2radius(mag) + }; + var marker = L.circleMarker(L.latLng(lat, lng), markerOptions); + eventLayer.addLayer(marker); + eventTable[id] = marker; + return marker; }; - var marker = L.circleMarker(L.latLng(lat, lng), markerOptions); - eventLayer.addLayer(marker); - eventTable[id] = marker; - return marker; }; /* handle to show events on map */ function initMapLink() { + $("#eventstable > tbody > tr > td > a.map-link").off('click'); $("#eventstable > tbody > tr > td > a.map-link").on('click' , function(){ var highlightStyle = { color: config['event']['markerColorH'], @@ -89,15 +96,15 @@ function initMapLink() { if ( $(this).hasClass('selected') ) { $(this).removeClass('selected'); $(this).text('Karte'); - eventTable[$(this).attr('eventid')].setStyle(normalStyle); map.setView(config['map']['centerDefault'], config['map']['zoomDefault']); + eventTable[$(this).attr('eventid')].setStyle(normalStyle); highlightFirstEvent(); // unselected -> selected } else { $(this).addClass('selected'); $(this).text('im Fokus (rot)'); - eventTable[$(this).attr('eventid')].setStyle(highlightStyle); map.setView(eventTable[$(this).attr('eventid')].getLatLng(), config['map']['zoomFocus']); + eventTable[$(this).attr('eventid')].setStyle(highlightStyle) }; }); return false; @@ -116,6 +123,12 @@ $(document).ready(function() { // create baselayer switch ( config['map']['baselayer'] ) { + case 'osmde': // add OpenStreetMap.DE tile layer + L.tileLayer('http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', + { + attribution: '© OpenStreetMap contributors, CC-BY-SA', + }).addTo(map); + break; case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names) L.tileLayer('//server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', { @@ -123,6 +136,12 @@ $(document).ready(function() { maxZoom: 16 }).addTo(map); break; + case 'aerial': // add ESRI WordImagery tile layer + L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', + { + attribution: 'Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community' + }).addTo(map); + break; case 'mapquestgray': // add MapQuestOSM tile layer L.tileLayer.grayscale('http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg', { @@ -150,6 +169,8 @@ $(document).ready(function() { // load events ajaxLoadEvents(); + //ajaxLoadEvents([], [], ['bug2014jptq', 'gfz2013yvko']); + ajaxLoadEvents([], [], 'bug2014jptq'); toggleFilteredMarkers(); // bind popupopen event diff --git a/www/misc.js b/www/misc.js index dfb20fa..61849c0 100644 --- a/www/misc.js +++ b/www/misc.js @@ -92,6 +92,7 @@ var config = { ajax: { timeout: 10000, // 10 seconds eventURL: 'https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query', + dlsvURL: 'dlsv', 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', @@ -121,11 +122,27 @@ var config = { GE_IBBN: 10, GR_BUG: 10, GR_KAST: 10, + NL_HGN: 3, NL_OPLO: 3, + NL_VKB: 3, + NL_WIT: 3, NL_WTSB: 3, }, + networkBlacklist: ['NL', 'X5'], }, }; +var networkURL = { + GE: 'http://dx.doi.org/10.14470/TR560404', + GR: 'http://www.bgr.bund.de/DE/Themen/Erdbeben-Gefaehrdungsanalysen/Seismologie/Seismologie/Seismometer_Stationen/Stationsnetze/d_stationsnetz_node.html', + NL: 'http://www.knmi.nl/seismologie/seismisch_network_knmi3.html', +}; +var networkText = { + GE: 'GEOFON Program, GFZ Potsdam', + GR: 'German Regional Seismic Network, BGR Hannover', + NL: 'Netherlands Seismic Network, The Netherlands', + RN: 'RuhrNet - Ruhr-University Bochum, Germany', +}; +var bochumStation = ['BUG', 'IBBN', 'KERA', 'KARP']; /********************************************************************** * document ready * @@ -136,6 +153,9 @@ $(document).ready(function() { if ( parameters['baselayer'] ) { config['map']['baselayer'] = parameters['baselayer'][0]; }; + if ( Number(parameters['lat']) && Number(parameters['lon']) ) { + config['map']['centerDefault'] = [Number(parameters['lat']), Number(parameters['lon'])]; + }; if ( Number(parameters['minmag']) ) { config['event']['minMag'] = Number(parameters['minmag']); }; @@ -162,6 +182,7 @@ $(document).ready(function() { var tabOptions = { active: 0, disabled: [2, 3], + activate: function( event, ui ) { ui['newPanel'].find('table').trigger("update", [true]); }, }; $('#tabs').tabs(tabOptions); }); diff --git a/www/stations.js b/www/stations.js index 33c7f2b..f9d5d36 100644 --- a/www/stations.js +++ b/www/stations.js @@ -40,6 +40,7 @@ function loadStations(stime, etime) { var request_data = { endafter: sprintf("%d-%02d-%02d", stime.getFullYear(), stime.getMonth()+1, stime.getDate()), startbefore: sprintf("%d-%02d-%02d", etime.getFullYear(), etime.getMonth()+1, etime.getDate()), + level: 'station', minlat: S-config['map']['latlngDelta'], maxlat: N+config['map']['latlngDelta'], minlon: W-config['map']['latlngDelta'], @@ -53,19 +54,46 @@ function loadStations(stime, etime) { success: function (xml) { $(xml).find('Network').each(function () { var network = $(this).attr('code'); - $(this).find('Station').each(function () { - var station = $(this).attr('code'), - lat = $(this).find('Latitude').text(), - lng = $(this).find('Longitude').text(), - stationID = network+'_'+station, - stationText = network+'.'+station; - if ( !stationTable[stationID] ) { // && N >= lat && S <= lat && W<= lng && E >= lng - var row = sprintf('%s%s%7.4f%7.4f' , network, station, Number(lat), Number(lng)); - var r = $(row); - $('#stationstable tbody').append(r); - addStationMarker(stationID, Number(lat), Number(lng), stationText.toUpperCase()); - }; - }); + if ( $.inArray(network, config['station']['networkBlacklist'])<0 ) { + $(this).find('Station').each(function () { + var station = $(this).attr('code'), + lat = $(this).find('Latitude').text(), + lng = $(this).find('Longitude').text(), + stationID = network+'_'+station, + stationText = network+'.'+station; + if ( !stationTable[stationID] ) { + // general station info (1st line) + var row = sprintf('%s%s%7.4f%7.4f' , network, station, Number(lat), Number(lng)); + // setting up network details (2nd line) + row += sprintf('%s', networkText[network] || ''); + row += ( $.inArray(station, bochumStation)+1 ) ? '
Betreiber: Ruhr-Universität Bochum' : '' ; + if ( network == 'RN' || network == 'X5' || $.inArray(station, bochumStation)+1 ) { + // setting up station details (3rd line) + row += 'not implemented'; + // setting up download links (4th line) + var URL, fdsnxmlURL, fdsnxmlRespURL, sc3mlURL, sc3mlRespURL, dlsvURL; + URL = sprintf('%s?network=%s&station=%s', config['ajax']['stationURL'], network, station); + fdsnxmlURL = URL + '&level=station&format=xml'; + fdsnxmlRespURL = URL + '&level=response&format=xml'; + sc3mlURL = URL + '&level=station&format=sc3ml'; + sc3mlRespURL = URL + '&level=response&format=sc3ml'; + dlsvFile = sprintf('%s_%s.dlsv', network.toUpperCase(), station.toUpperCase()); + row += '' + + sprintf('Download details: FDSNxml or SC3ml
', fdsnxmlURL, sc3mlURL) + + sprintf('Response files: FDSNxml, SC3ml ', fdsnxmlRespURL, sc3mlRespURL) + + sprintf('or datalessSEED', config['ajax']['dlsvURL'] + '/' + dlsvFile, dlsvFile.toLowerCase()) + + ''; + } + else { + row += 'Kontaktieren Sie den '; + row += ( networkURL[network.toUpperCase()] ) ? 'Netzwerkkoordinator' : 'Netzwerkkoordinator'; + row += ' für weitere Details.'; + }; + $('#stationstable tbody').append(row); + addStationMarker(stationID, Number(lat), Number(lng), stationText.toUpperCase()); + }; + }); + }; }); }, complete: function () { @@ -79,6 +107,9 @@ function loadStations(stime, etime) { stationLayer.bringToFront(); } }); + // create stations csv download link + request_data['format'] = 'text'; + $('#stations-csv-link').attr('href', config['ajax']['stationURL']+'?'+$.param(request_data)); }; /* initStationTable */ @@ -110,7 +141,7 @@ function initStationTable() { // css class names of pager arrows pager_css: { container : 'stations-tablesorter-pager', - errorRow : 'tablesorter-errorRow', // error information row (don't include period at beginning) + errorRow : 'stations-tablesorter-errorRow', // error information row (don't include period at beginning) disabled : 'disabled' // class added to arrows @ extremes (i.e. prev/first arrows "disabled" on first page) }, // jQuery pager selectors @@ -126,7 +157,7 @@ function initStationTable() { }, filter_childRows : true, - filter_cssFilter : 'tablesorter-filter', + filter_cssFilter : 'stations-tablesorter-filter', filter_startsWith : false, filter_ignoreCase : true, scroller_height: $('div.map').height() - 250, @@ -137,6 +168,12 @@ function initStationTable() { showProcessing: true, } }); + // hide child rows + $('#stationstable > tbody > tr.tablesorter-childRow > td').hide(); + // update map after filtering + // $('#stationsstable').bind('filterEnd', function(){ + // toggleFilteredMarkers(); + // }); }; /********************************************************************** @@ -144,4 +181,30 @@ function initStationTable() { **********************************************************************/ $(document).ready(function() { loadStations(); + // show / hide station info + $('#stationstable').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'); + $(this).closest('tbody').find('td.selected').each(function(){ + if ( ! $(this).hasClass('selected-now') ) { + $(this).hide(); + $(this).removeClass('selected'); + }; + }); + $(this).closest('tr').nextUntil('tr.tablesorter-hasChildRow').find('td').each(function(){ + $(this).removeClass('selected-now'); + var selected = $(this).hasClass('selected'); + if ( selected ) { + $(this).removeClass('selected'); + //highlightFirstEvent(); + } else { + $(this).addClass('selected'); + //toggleHighlightStation($(this).attr('stationid')); + }; + }); + return false; + }); }); From deea103fdf0d5c5bdca79ab8a91f11b75d2b54a0 Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Thu, 28 Aug 2014 15:26:00 +0000 Subject: [PATCH 05/10] Merge from trunk. --- .gitattributes | 1 + www/copyright.inc.de | 6 ++++++ www/events.js | 34 ++++++++++++++++++---------------- www/index.html.de | 14 +++++++++++++- www/info.inc.de | 31 ++++++++++++++----------------- 5 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 www/copyright.inc.de diff --git a/.gitattributes b/.gitattributes index 1228093..fd7ecf9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ * text=auto !eol +www/copyright.inc.de -text www/external/TileLayer.Grayscale.js -text www/external/css/dvf.css -text www/external/css/leaflet.label.css -text diff --git a/www/copyright.inc.de b/www/copyright.inc.de new file mode 100644 index 0000000..4ba51b4 --- /dev/null +++ b/www/copyright.inc.de @@ -0,0 +1,6 @@ +
+

Kartengrundlage

+

Ereignisdaten

+

Stationsdaten

+

Sonstiger Inhalt

+
diff --git a/www/events.js b/www/events.js index 9a55398..0d4a738 100644 --- a/www/events.js +++ b/www/events.js @@ -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('

%s

', id, location) - + sprintf('

Ereignis: %s
', id) - + sprintf('Type: %s
', type) - + sprintf('Magnitude: %3.1f
', Number(mag)) - + sprintf('Ort: %.4f °N, %.4f °O
', Number(lat), Number(lng)) - + sprintf('Tiefe: %.1f km
', Number(depth)/1000.) - + sprintf('Zeit: %sZ

', 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('

%s

', id, location) + + sprintf('

Ereignis: %s
', id) + + sprintf('Type: %s
', type) + + sprintf('Magnitude: %3.1f
', Number(mag)) + + sprintf('Ort: %.4f °N, %.4f °O
', Number(lat), Number(lng)) + + sprintf('Tiefe: %.1f km
', Number(depth)/1000.) + + sprintf('Zeit: %sZ

', 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 diff --git a/www/index.html.de b/www/index.html.de index 1be07cd..d371626 100755 --- a/www/index.html.de +++ b/www/index.html.de @@ -157,7 +157,19 @@
-
+
+
+

Navigation / Links

+ +

Copyright / Lizenz

+ +

Impressum

+ +
+
+
+ +
diff --git a/www/info.inc.de b/www/info.inc.de index 8308b8f..d0b0059 100644 --- a/www/info.inc.de +++ b/www/info.inc.de @@ -1,24 +1,21 @@ -
-

Navigation / Links

-
-

Navigation zu den Internetseiten

+
+

Navigation zu den Internetseiten

-

Informationen zu Erdbeben

- -
-

Copyright / Lizenz

-
-
-

Impressum

- +

Informationen zu Erdbeben

+ +

Informationen zum Steinkohlenabbau in NRW

+
From 20de44f50d305d6acd8204feb77b7951af7c1841 Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Tue, 16 Sep 2014 12:24:19 +0000 Subject: [PATCH 06/10] Merging revisions 738-739 (Adding Spinner image) and 743 (Workaround fo rmissing console.log). --- .gitattributes | 1 + www/events.js | 1 - www/index.html.de | 1 + www/main.css | 12 ++++++++++++ www/misc.js | 15 ++++++++++++--- www/spinner.gif | Bin 0 -> 3951 bytes 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 www/spinner.gif diff --git a/.gitattributes b/.gitattributes index 5029e53..83a4949 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,3 +24,4 @@ www/external/widget-pager.js -text www/impressum.inc.de -text www/info.inc.de -text www/logo_RUB_155x30.png -text +www/spinner.gif -text diff --git a/www/events.js b/www/events.js index 0d4a738..55598cc 100644 --- a/www/events.js +++ b/www/events.js @@ -100,7 +100,6 @@ function ajaxLoadEvents(stime, etime, eventid, url, target) { }; }; }; - //console.log(ajax_url+'?'+$.param(request_data)); if ( etime == '' || !etime ) { etime = new Date(); }; $.ajax({ type: "GET", diff --git a/www/index.html.de b/www/index.html.de index d371626..8cfde49 100755 --- a/www/index.html.de +++ b/www/index.html.de @@ -175,5 +175,6 @@
+ diff --git a/www/main.css b/www/main.css index fc8c168..333b86b 100644 --- a/www/main.css +++ b/www/main.css @@ -87,4 +87,16 @@ p.table-caption { font-size: smaller; } + div.spinner { + position: fixed; + top: 50%; + left: 50%; + margin-left: -64px; /* half width of the spinner gif */ + margin-top: -8px; /* half height of the spinner gif */ + text-align:center; + z-index: 19000; + overflow: auto; + width: 128px; /* width of the spinner gif */ + height: 40px; /*hight of the spinner gif +2px to fix IE8 issue */ + } diff --git a/www/misc.js b/www/misc.js index 7e07721..da87ab6 100644 --- a/www/misc.js +++ b/www/misc.js @@ -145,6 +145,9 @@ var networkText = { }; var bochumStation = ['BUG', 'IBBN', 'KERA', 'KARP']; +// FIX: firefox has no console +if (typeof console == "undefined") var console = { log: function() {} }; + /********************************************************************** * document ready * **********************************************************************/ @@ -192,6 +195,12 @@ $(document).ready(function() { heightStyle: 'content', animate: 200, }); - -}); - + // spinner + $(document).bind("ajaxSend", function() { + $("#spinner").show(); + console.log('Starting Spinner at '+Date()); + }).bind("ajaxStop", function() { + $("#spinner").hide(); + console.log('Stopping Spinner at '+Date()); + }); +}); \ No newline at end of file diff --git a/www/spinner.gif b/www/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..95cb0849ef06ea4b2bca41d8e3a2e33066754fc2 GIT binary patch literal 3951 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 riI^34yOZHfnufsmf0;CjueRt Date: Tue, 16 Sep 2014 14:55:36 +0000 Subject: [PATCH 07/10] Merging copyright / licensing information. --- www/copyright.inc.de | 54 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/www/copyright.inc.de b/www/copyright.inc.de index 4ba51b4..3def99c 100644 --- a/www/copyright.inc.de +++ b/www/copyright.inc.de @@ -1,6 +1,54 @@
-

Kartengrundlage

-

Ereignisdaten

-

Stationsdaten

+

Das Urheberrecht der verwendeten Daten, Kartengrundlagen und + JavaScript Dateien liegt bei dem jeweiligen Urheber. Die + Benutzung unterliegt verschiedenen Lizenzen. Eine normale + Nutzung zur Darstellung im Internet ist dabei bei den benutzten + Quellen frei mögliche. Eine darüber hinaus gehende Nutzung (z. + B. drucken, speichern, Weiterverwendung in anderen Publikationen + etc.) ist nur unter Beachtung der verschiedenen Lizenzen + möglich. Diese sind im folgenden zusammengefasst.

+ +

Kartengrundlage und Nominatim Dienst

+

Die Kartengrundlagen und der Nominatim Dienst (reverse + Geocodierung) basieren auf Daten des OpenStreetMap + Projektes und wurden durch MapQuest Mapquest Logo zur + Verfügung gestellt. Hierfür gelten die „Terms of use“ des Anbieters. Diese gestatten + eine nicht-kommerzielle, öffentlich zugängliche Nutzung.

+ +

Ereignisdaten und Stationsdaten

+

Die dargestellten Daten der seismischen Ereignisse und der + seismischen Stationen unterliegen der „Open Data Commons Open Database Lizenz“ + (ODbL). Die Daten dürfen frei kopieren, weitergegeben, + übermittel sowie angepasst werden, sofern das Seismologische Observatorium der + Ruhr-Universität als Quelle genannt wird. Werden diese Daten + wiederverwendet, so unterliegen sie weiterhin dieser Lizenz. Der + vollständige Lizenztext erläutert die Rechte und + Pflichten dieser Lizenz.

+ +

JavaScript Dateien

+

Diese Webseite benutzt verschiedene JavaScript Bibliotheken, + die unterschiedlichen Lizenzen unterliegen. Die jeweiligen + Lizenzen werden in der Regel im Quellcode der benutzten + Bibliotheken aufgeführt.

+

Sonstiger Inhalt

+

Sonstiger Inhalt dieser Webseite unterliegt der + „Creative-Commons''-Lizenz „Namensnennung – Weitergabe unter gleichen + Bedingungen“ 4.0 (CC BY-SA). Der vollständige Lizenztext erläutert die Rechte und + Pflichten dieser Lizenz.

From a7f19281ff24b126ec07b31447545fd2d71fb17f Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Tue, 23 Sep 2014 16:00:18 +0000 Subject: [PATCH 08/10] SVN merge r763. --- www/misc.js | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/www/misc.js b/www/misc.js index da87ab6..76036a0 100644 --- a/www/misc.js +++ b/www/misc.js @@ -131,6 +131,11 @@ var config = { }, networkBlacklist: ['NL', 'X5'], }, + tab: { + active: 0, + disabled: [2], + max: 4, + }, }; var networkURL = { GE: 'http://dx.doi.org/10.14470/TR560404', @@ -175,6 +180,11 @@ $(document).ready(function() { if ( Number(parameters['timespan']) ) { config['map']['timespan'] = Number(parameters['timespan']); }; + if ( Number(parameters['tab']) ) { + if ( Number(parameters['tab']) < config['tab']['max'] ) { + config['tab']['active'] = Number(parameters['tab']); + }; + }; // AJAX setup $.ajaxSetup({timeout: config['ajax']['timeout']}); @@ -184,8 +194,8 @@ $(document).ready(function() { // create tabs $('#tabs').tabs({ - active: 0, - disabled: [2], + active: config['tab']['active'], + disabled: config['tab']['disabled'], activate: function( event, ui ) { ui['newPanel'].find('table').trigger("update", [true]); }, }); // create accordions @@ -195,12 +205,12 @@ $(document).ready(function() { heightStyle: 'content', animate: 200, }); - // spinner - $(document).bind("ajaxSend", function() { - $("#spinner").show(); - console.log('Starting Spinner at '+Date()); - }).bind("ajaxStop", function() { - $("#spinner").hide(); - console.log('Stopping Spinner at '+Date()); - }); + // spinner + $(document).bind("ajaxSend", function() { + $("#spinner").show(); + console.log('Starting Spinner at '+Date()); + }).bind("ajaxStop", function() { + $("#spinner").hide(); + console.log('Stopping Spinner at '+Date()); + }); }); \ No newline at end of file From 9669bd5ec8b609c81b45261c75af455335f2f6f9 Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Mon, 19 Jan 2015 10:07:48 +0000 Subject: [PATCH 09/10] Updated list of special events. --- www/specialevents.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/specialevents.js b/www/specialevents.js index bcf0bef..07d6cc2 100644 --- a/www/specialevents.js +++ b/www/specialevents.js @@ -1,13 +1,13 @@ /* $Id$ */ var specialEvents = [ - //'bug2014ytlk', // Vechta 3.0 - //'bug2014wjwx', // Haltern 3.6 + 'bug2014ytlk', // Vechta 3.0 + 'bug2014wjwx', // Haltern 3.6 //'bug2014ldts', // Darmstadt //'bug2014kowj', // Vogtland 5.0 //'bug2014jptq', // Seeheim-Jugenheim - //'bug2014infb', // Troisdorf + 'bug2014infb', // Troisdorf //'bug2014ilxd', // Bassum //'bug2014gfzw', // Darmstadt //'bug2014datb', // Groningen - //'bug2013yvko', // Haltern 3.4 + 'bug2013yvko', // Haltern 3.4 ]; From f8a4a0abf2477a482cb36561267b6719d36feccf Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Fri, 10 Apr 2015 08:47:58 +0000 Subject: [PATCH 10/10] Updating files of life branch. --- scripts/mkEvents.csh | 2 +- www/misc.js | 2 -- www/specialevents.js | 7 ++++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/mkEvents.csh b/scripts/mkEvents.csh index 3ce16d2..a4cb770 100755 --- a/scripts/mkEvents.csh +++ b/scripts/mkEvents.csh @@ -1 +1 @@ -curl -o events.xml "https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?starttime=2014-01-01&orderby=time-asc&minlat=50.92&maxlat=52.76&minlon=4.26&maxlon=9.74&minmag=1.1" +curl -o events.xml "https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?starttime=2014-08-01&orderby=time&minlat=50.92&maxlat=52.76&minlon=4.26&maxlon=9.74&minmag=1.1" diff --git a/www/misc.js b/www/misc.js index a2ebe1d..ef6b11b 100644 --- a/www/misc.js +++ b/www/misc.js @@ -208,9 +208,7 @@ $(document).ready(function() { // spinner $(document).bind("ajaxSend", function() { $("#spinner").show(); - console.log('Starting Spinner at '+Date()); }).bind("ajaxStop", function() { $("#spinner").hide(); - console.log('Stopping Spinner at '+Date()); }); }); \ No newline at end of file diff --git a/www/specialevents.js b/www/specialevents.js index 07d6cc2..5ecfd56 100644 --- a/www/specialevents.js +++ b/www/specialevents.js @@ -1,13 +1,14 @@ /* $Id$ */ var specialEvents = [ - 'bug2014ytlk', // Vechta 3.0 - 'bug2014wjwx', // Haltern 3.6 + //'bug2014ytlk', // Vechta 3.0 + //'bug2014wjwx', // Haltern 3.6 //'bug2014ldts', // Darmstadt //'bug2014kowj', // Vogtland 5.0 //'bug2014jptq', // Seeheim-Jugenheim - 'bug2014infb', // Troisdorf + //'bug2014infb', // Troisdorf //'bug2014ilxd', // Bassum //'bug2014gfzw', // Darmstadt //'bug2014datb', // Groningen 'bug2013yvko', // Haltern 3.4 + 'bug2015fdpy', // Darmstadt 3.0 ];