kasper/seisobs-webapp
1
0
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Merge changes from trunk, except parsing URL get parameters.

Browse Source
This commit is contained in:
Kasper D. Fischer 2014-05-14 05:30:09 +00:00
parent 14d988b0b4
commit 338d54ade4
Notes: subgit 2018-03-07 17:58:53 +01:00 
r640 www/branches/life
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
www/events.js
View File

@ -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 += '<tr class="tablesorter-childRow event-download">'
+ '<td colspan="4" eventid="'+id+'">'
@ -133,6 +132,7 @@ function ajaxLoadEvents(stime, etime) {
+ 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);
};

2
www/index.html.de
View File

@ -90,7 +90,7 @@
<tbody>
</tbody>
</table>
<p>Nominatim Search Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png"></p>
<p>Nominatim Search Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img alt="Mapquest Logo" src="http://developer.mapquest.com/content/osm/mq_logo.png" /></p>
</div>
<!-- Stations -->
<div class="tab" id="stationstab">

6
www/map.js
View File

@ -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();