From e5b86d34f6a74b7e24d22ed754143096c760887e Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Sun, 17 Oct 2021 15:02:18 +0200 Subject: [PATCH] hotfix: r20211017.1 add manual changes from production server, bump version --- www/events.js | 7 ++----- www/events.js.en | 9 +++------ www/index.html.de | 5 +++-- www/index.html.en | 17 ++++++++--------- www/map.js | 4 ++-- www/map.js.en | 8 ++++---- www/misc.js | 8 ++++---- www/specialevents.js | 7 +++++-- www/stations.js | 4 ++-- www/stations.js.en | 6 +++--- 10 files changed, 36 insertions(+), 39 deletions(-) diff --git a/www/events.js b/www/events.js index 6645b6a..9152c3f 100644 --- a/www/events.js +++ b/www/events.js @@ -4,7 +4,7 @@ **********************************************************************/ /* License - Copyright 2020-2021 Kasper D. Fischer + Copyright 2014-2021 Kasper D. Fischer This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. - Version r20211017 (2021-10-17) + Version r20211017.1 (2021-10-17) */ /* adding row(s) to a table and format date strings afterwards */ @@ -421,9 +421,6 @@ $(document).ready(function() { case 'earthquake': typetext += 'tektonisches Erdbeben (Stern)'; break; - case 'explosion': - typetext += 'Explosion (Sechseck)'; - break; case 'induced or triggered event': typetext += '(bergbau-)induziertes Ereignis (Kreis)'; break; diff --git a/www/events.js.en b/www/events.js.en index e05c575..3b1139f 100644 --- a/www/events.js.en +++ b/www/events.js.en @@ -1,10 +1,10 @@ /********************************************************************** - * events.js * + * events.js.en * * script for event specific functions and setup * **********************************************************************/ /* License - Copyright 2020-2021 Kasper D. Fischer + Copyright 2014-2021 Kasper D. Fischer This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. - Version r20211017 (2021-10-17) + Version r20211017.1 (2021-10-17) */ /* adding row(s) to a table and format date strings afterwards */ @@ -421,9 +421,6 @@ $(document).ready(function() { case 'earthquake': typetext += 'tectonic earthquake (star)'; break; - case 'explosion': - typetext += 'explosion (hexagon)'; - break; case 'induced or triggered event': typetext += '(mining-)induced event (circle)'; break; diff --git a/www/index.html.de b/www/index.html.de index 4cbf734..e4bec03 100755 --- a/www/index.html.de +++ b/www/index.html.de @@ -1,5 +1,5 @@ - + @@ -167,10 +167,11 @@

Impressum

Text wird geladen ...

+ - +
diff --git a/www/index.html.en b/www/index.html.en index 3d0df3c..ab8e817 100755 --- a/www/index.html.en +++ b/www/index.html.en @@ -1,5 +1,5 @@ - + @@ -154,23 +154,22 @@

Download as CSV file.

-
-

Text loading ...

-
+

Navigation / Links

-

Text loading ...

-

Copyright / Lizenz

-

Text loading ...

+

Loading text ...

+

Copyright / Licence

+

Loading text ...

Imprint

-

Text loading ...

+

Loading text ...

+
- +
diff --git a/www/map.js b/www/map.js index d277ea4..8bc4663 100644 --- a/www/map.js +++ b/www/map.js @@ -4,7 +4,7 @@ **********************************************************************/ /* License - Copyright 2020-2021 Kasper D. Fischer + Copyright 2014-2021 Kasper D. Fischer This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/. - Version r20211017 (2021-10-17) + Version r20211017.1 (2021-10-17) */ /* add station marker */ diff --git a/www/map.js.en b/www/map.js.en index bd11add..3aa306e 100644 --- a/www/map.js.en +++ b/www/map.js.en @@ -1,10 +1,10 @@ /********************************************************************** - * map.js * + * map.js.en * * script for map specific functions and setup * **********************************************************************/ /* License - Copyright 2020-2021 Kasper D. Fischer + Copyright 2014-2021 Kasper D. Fischer This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/. - Version r20211017 (2021-10-17) + Version r20211017.1 (2021-10-17) */ /* add station marker */ @@ -142,6 +142,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']); + // create baselayer switch ( config['map']['baselayer'] ) { case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names) @@ -162,7 +163,6 @@ $(document).ready(function() { default: // use OpenStreetMap.DE as default L.tileLayer.provider(config['map']['baselayer']).addTo(map); }; - // add controls new L.Control.Zoom({ position: 'topright' }).addTo(map); new L.control.scale({position: 'bottomright', imperial: false}).addTo(map); diff --git a/www/misc.js b/www/misc.js index 7a0922a..d2199c4 100644 --- a/www/misc.js +++ b/www/misc.js @@ -4,7 +4,7 @@ **********************************************************************/ /* License - Copyright 2020-2021 Kasper D. Fischer + Copyright 2014-2021 Kasper D. Fischer This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. - Version r20211017 (2021-10-17) + Version r20211017.1 (2021-10-17) */ /* calculate marker radius from magnitude @@ -94,7 +94,7 @@ var config = { mseedURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/dataselect/1/query', stationURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/station/1/query', nominatimURL: 'https://photon.komoot.de/reverse', - timespan: 180, + timespan: 400, }, event: { evaluationBlacklist: ['automatic', 'preliminary', 'rejected'], @@ -137,7 +137,7 @@ var config = { }, tab: { active: 0, - // disabled: [2], + disabled: [2], max: 4, }, }; diff --git a/www/specialevents.js b/www/specialevents.js index 057017a..f3b18de 100644 --- a/www/specialevents.js +++ b/www/specialevents.js @@ -1,4 +1,4 @@ -/* $Id$ */ +/* last change 2021-10-17 */ var specialEvents = [ //'bug2014ytlk', // Vechta 3.0 //'bug2014wjwx', // Haltern 3.6 @@ -33,5 +33,8 @@ var specialEvents = [ // 'bug2019czbt', // Ochtendung 2.9 // 'bug2019fura', // Sprengung Duisburg-Hochheide (Weißer Riese) 2.0 // 'bug2019yeij', // Tektonisch, Hambach 2.2 - 'bug2020fqxf' // Meckenheim, 2.5 + 'bug2020fqxf', // Meckenheim, 2.5 + 'bug2020skmt', // Heinsberg 1.7 + 'bug2020skon', // Heinsberg 2.5 + 'bug2020stdp' // Niederkassel 2.4 ]; diff --git a/www/stations.js b/www/stations.js index 65463ca..f5026f7 100644 --- a/www/stations.js +++ b/www/stations.js @@ -4,7 +4,7 @@ **********************************************************************/ /* License - Copyright 2020-2021 Kasper D. Fischer + Copyright 2014-2021 Kasper D. Fischer This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. - Version r20211017 (2021-10-17) + Version r20211017.1 (2021-10-17) */ /* Load the stations using ajax */ diff --git a/www/stations.js.en b/www/stations.js.en index 413207f..7cb1460 100644 --- a/www/stations.js.en +++ b/www/stations.js.en @@ -1,10 +1,10 @@ /********************************************************************** - * stations.js * + * stations.js.en * * script for station specific functions and setup * **********************************************************************/ /* License - Copyright 2020-2021 Kasper D. Fischer + Copyright 2014-2021 Kasper D. Fischer This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. - Version r20211017 (2021-10-17) + Version r20211017.1 (2021-10-17) */ /* Load the stations using ajax */