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 @@
-
+
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 zu den Internetseiten
+
+
Navigation zu den Internetseiten
-
Informationen zu Erdbeben
-
-
-
-
-
-
-
+
Informationen zu Erdbeben
+
+
Informationen zum Steinkohlenabbau in NRW
+
