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

Compare commits

base: kasper:release/r20211017
Branches Tags
kasper:main kasper:develop kasper:feature/vagrant kasper:feature/mapquest kasper:feature/docker-nginx kasper:feature/topplus kasper:support/iframe
kasper:v1.1 kasper:release/v1.2 kasper:release/v1.1 kasper:release/v1.0 kasper:release/r20211017.2 kasper:release/r20211017.1 kasper:release/r20211017 kasper:release/r20200714 kasper:release/r20131023 kasper:release/r20140505 kasper:release/r20130222
...
compare: kasper:feature/topplus
Branches Tags
kasper:develop kasper:main kasper:feature/vagrant kasper:feature/mapquest kasper:feature/docker-nginx kasper:feature/topplus kasper:support/iframe
kasper:v1.1 kasper:release/v1.2 kasper:release/v1.1 kasper:release/v1.0 kasper:release/r20211017.2 kasper:release/r20211017.1 kasper:release/r20211017 kasper:release/r20200714 kasper:release/r20131023 kasper:release/r20140505 kasper:release/r20130222

8 Commits
release/r2 ... feature/to

Author SHA1 Message Date
Kasper D. Fischer
137b4a2761 fixing broken TopPlus baselayer 2021-10-18 10:18:21 +02:00
Kasper D. Fischer
5989af8ce1 Merge branch 'hotfix/r20211017.2' into develop 2021-10-17 15:47:16 +02:00
Kasper D. Fischer
a659f47a87 hotfix-20211017.2: broken default basemap 
fixed borken default basemap
decrease default minMag to 0.7
 2021-10-17 15:46:39 +02:00
Kasper D. Fischer
b585e447f0 Merge branch 'hotfix/r20211017.1' into develop 2021-10-17 15:09:02 +02:00
Kasper D. Fischer
db1f4758f5 Merge branch 'hotfix/r20211017.1' into main 2021-10-17 15:09:02 +02:00
Kasper D. Fischer
e5b86d34f6 hotfix: r20211017.1 
add manual changes from production server, bump version
 2021-10-17 15:08:42 +02:00
Kasper D. Fischer
723ec43eee Merge remote-tracking branch 'origin/develop' into develop 2021-10-17 13:32:41 +02:00
Kasper D. Fischer
9c3564f9ab Merge branch 'release/r20211017' into develop 2021-10-17 13:28:50 +02:00
10 changed files with 49 additions and 49 deletions
Expand all files Collapse all files

7
www/events.js
View File

@@ -4,7 +4,7 @@
**********************************************************************/ **********************************************************************/
/* License /* License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>
This program is free software: you can redistribute it and/or modify it 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 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 You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017 (2021-10-17) Version r20211017.2 (2021-10-17)
*/ */
/* adding row(s) to a table and format date strings afterwards */ /* adding row(s) to a table and format date strings afterwards */
@@ -421,9 +421,6 @@ $(document).ready(function() {
case 'earthquake': case 'earthquake':
typetext += 'tektonisches Erdbeben&nbsp;(Stern)'; typetext += 'tektonisches Erdbeben&nbsp;(Stern)';
break; break;
case 'explosion':
typetext += 'Explosion&nbsp;(Sechseck)';
break;
case 'induced or triggered event': case 'induced or triggered event':
typetext += '(bergbau-)induziertes Ereignis&nbsp;(Kreis)'; typetext += '(bergbau-)induziertes Ereignis&nbsp;(Kreis)';
break; break;

9
www/events.js.en
View File

@@ -1,10 +1,10 @@
/********************************************************************** /**********************************************************************
* events.js * * events.js.en *
* script for event specific functions and setup * * script for event specific functions and setup *
**********************************************************************/ **********************************************************************/
/* License /* License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>
This program is free software: you can redistribute it and/or modify it 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 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 You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017 (2021-10-17) Version r20211017.2 (2021-10-17)
*/ */
/* adding row(s) to a table and format date strings afterwards */ /* adding row(s) to a table and format date strings afterwards */
@@ -421,9 +421,6 @@ $(document).ready(function() {
case 'earthquake': case 'earthquake':
typetext += 'tectonic earthquake&nbsp;(star)'; typetext += 'tectonic earthquake&nbsp;(star)';
break; break;
case 'explosion':
typetext += 'explosion&nbsp;(hexagon)';
break;
case 'induced or triggered event': case 'induced or triggered event':
typetext += '(mining-)induced event&nbsp;(circle)'; typetext += '(mining-)induced event&nbsp;(circle)';
break; break;

5
www/index.html.de
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'> <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<!-- $Id$ --> <!-- r20211017.2 (2021-10-17) -->
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'> <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
@@ -167,10 +167,11 @@
<h3 class="aheader">Impressum</h3> <h3 class="aheader">Impressum</h3>
<div class="imprint_de"><p>Text wird geladen ...</p></div> <div class="imprint_de"><p>Text wird geladen ...</p></div>
</div> </div>
</div> </div>
</div> </div>
<!-- Logo --> <!-- Logo -->
<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-Universität Bochum" title="Ruhr-Universität Bochum" border="0"/></a></div> <div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-Universität Bochum" title="Ruhr-Universität Bochum" border="0"/></a></div>
<!-- Map --> <!-- Map -->
<div id="map" class="map"></div> <div id="map" class="map"></div>
<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/><br />Loading ...</div> <div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/><br />Loading ...</div>

17
www/index.html.en
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'> <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<!-- $Id$ --> <!-- r20211017.2 (2021-10-17) -->
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'> <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
@@ -154,23 +154,22 @@
<p class="table-caption">Download as <a id="stations-csv-link" href="link" download="stations.csv">CSV file</a>.</p> <p class="table-caption">Download as <a id="stations-csv-link" href="link" download="stations.csv">CSV file</a>.</p>
</div> </div>
<!-- More --> <!-- More -->
<div class="tab more_en" id="moretab"> <div class="tab" id="moretab"><!--include virtual="more.html.de" --></div>
<p>Text loading ...</p>
</div>
<!-- Info --> <!-- Info -->
<div class="tab" id="infotab"> <div class="tab" id="infotab">
<div id="infoaccordion"> <div id="infoaccordion">
<h3 class="aheader">Navigation / Links</h3> <h3 class="aheader">Navigation / Links</h3>
<div class="info_en"><p>Text loading ...</p></div> <div class="info_de"><p>Loading text ...</p></div>
<h3 class="aheader">Copyright / Lizenz</h3> <h3 class="aheader">Copyright / Licence</h3>
<div class="copyright_en"><p>Text loading ...</p></div> <div class="copyright_de"><p>Loading text ...</p></div>
<h3 class="aheader">Imprint</h3> <h3 class="aheader">Imprint</h3>
<div class="imprint_en"><p>Text loading ...</p></div> <div class="imprint_de"><p>Loading text ...</p></div>
</div> </div>
</div> </div>
</div> </div>
<!-- Logo --> <!-- Logo -->
<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-University Bochum" title="Ruhr-University Bochum" border="0"/></a></div> <div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/en/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-University Bochum" title="Ruhr-University Bochum" border="0"/></a></div>
<!-- Map --> <!-- Map -->
<div id="map" class="map"></div> <div id="map" class="map"></div>
<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/><br />Loading ...</div> <div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/><br />Loading ...</div>

15
www/map.js
View File

@@ -4,7 +4,7 @@
**********************************************************************/ **********************************************************************/
/* License /* License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>
This program is free software: you can redistribute it and/or modify it 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 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 You should have received a copy of the GNU General Public License along
with this program. If not, see https://www.gnu.org/licenses/. with this program. If not, see https://www.gnu.org/licenses/.
Version r20211017 (2021-10-17) Version VVVVV
*/ */
/* add station marker */ /* add station marker */
@@ -153,14 +153,15 @@ $(document).ready(function() {
case 'opentopo': // add OpenTopoMap tile layer case 'opentopo': // add OpenTopoMap tile layer
L.tileLayer.provider('OpenTopoMap').addTo(map); L.tileLayer.provider('OpenTopoMap').addTo(map);
break; break;
case 'osmde': // add OpenStreetMap.DE tile layer, default case 'mapnik': // add OpenStreetMap.Mapnik tile layer
L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
break;
case 'mapnik': // add OpenStreetMap.Mapni tile layer
L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map); L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map);
break; break;
case 'topplus': // add TopPlus tile layer (https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html)
L.tileLayer('https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/web/default/WEBMERCATOR/{z}/{y}/{x}.png',
{attribution: '&copy; Bundesamt für Kartographie und Geodäsie ('+jahr+'), Datenquellen: <a href="http://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf">Geodatenzentrum</a>'}).addTo(map);
break;
default: // use OpenStreetMap.DE as default default: // use OpenStreetMap.DE as default
L.tileLayer.provider(config['map']['baselayer']).addTo(map); L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
}; };
// add controls // add controls

17
www/map.js.en
View File

@@ -1,10 +1,10 @@
/********************************************************************** /**********************************************************************
* map.js * * map.js.en *
* script for map specific functions and setup * * script for map specific functions and setup *
**********************************************************************/ **********************************************************************/
/* License /* License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>
This program is free software: you can redistribute it and/or modify it 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 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 You should have received a copy of the GNU General Public License along
with this program. If not, see https://www.gnu.org/licenses/. with this program. If not, see https://www.gnu.org/licenses/.
Version r20211017 (2021-10-17) Version VVVVV
*/ */
/* add station marker */ /* 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 // 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']); map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
// create baselayer // create baselayer
switch ( config['map']['baselayer'] ) { switch ( config['map']['baselayer'] ) {
case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names) case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
@@ -153,16 +154,16 @@ $(document).ready(function() {
case 'opentopo': // add OpenTopoMap tile layer case 'opentopo': // add OpenTopoMap tile layer
L.tileLayer.provider('OpenTopoMap').addTo(map); L.tileLayer.provider('OpenTopoMap').addTo(map);
break; break;
case 'osmde': // add OpenStreetMap.DE tile layer, default
L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
break;
case 'mapnik': // add OpenStreetMap.Mapni tile layer case 'mapnik': // add OpenStreetMap.Mapni tile layer
L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map); L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map);
break; break;
case 'topplus': // add TopPlus tile layer (https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html)
L.tileLayer('https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/web/default/WEBMERCATOR/{z}/{y}/{x}.png',
{attribution: '&copy; Federal Agency for Cartography and Geodesy ('+jahr+'), Datasource: <a href="http://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf">Geodatenzentrum</a>'}).addTo(map);
break;
default: // use OpenStreetMap.DE as default default: // use OpenStreetMap.DE as default
L.tileLayer.provider(config['map']['baselayer']).addTo(map); L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
}; };
// add controls // add controls
new L.Control.Zoom({ position: 'topright' }).addTo(map); new L.Control.Zoom({ position: 'topright' }).addTo(map);
new L.control.scale({position: 'bottomright', imperial: false}).addTo(map); new L.control.scale({position: 'bottomright', imperial: false}).addTo(map);

11
www/misc.js
View File

@@ -4,7 +4,7 @@
**********************************************************************/ **********************************************************************/
/* License /* License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>
This program is free software: you can redistribute it and/or modify it 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 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 You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017 (2021-10-17) Version VVVVV
*/ */
/* calculate marker radius from magnitude /* calculate marker radius from magnitude
@@ -81,6 +81,7 @@ function parseQueryString() {
} }
/* create global vars */ /* create global vars */
var jahr = new Date().getFullYear();
var map; var map;
var openMarkerID; var openMarkerID;
var eventTable = {}; var eventTable = {};
@@ -94,14 +95,14 @@ var config = {
mseedURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/dataselect/1/query', mseedURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/dataselect/1/query',
stationURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/station/1/query', stationURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/station/1/query',
nominatimURL: 'https://photon.komoot.de/reverse', nominatimURL: 'https://photon.komoot.de/reverse',
timespan: 180, timespan: 400,
}, },
event: { event: {
evaluationBlacklist: ['automatic', 'preliminary', 'rejected'], evaluationBlacklist: ['automatic', 'preliminary', 'rejected'],
markerOpacity: 0.4, markerOpacity: 0.4,
markerColor: 'blue', markerColor: 'blue',
markerColorH: 'red', markerColorH: 'red',
minMag: 1.2, minMag: 0.7,
minMagDelta: 0.1, minMagDelta: 0.1,
typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion'], typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion'],
// typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion', 'nuclear explosion'], // typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion', 'nuclear explosion'],
@@ -137,7 +138,7 @@ var config = {
}, },
tab: { tab: {
active: 0, active: 0,
// disabled: [2], disabled: [2],
max: 4, max: 4,
}, },
}; };

7
www/specialevents.js
View File

@@ -1,4 +1,4 @@
/* $Id$ */ /* last change 2021-10-17 */
var specialEvents = [ var specialEvents = [
//'bug2014ytlk', // Vechta 3.0 //'bug2014ytlk', // Vechta 3.0
//'bug2014wjwx', // Haltern 3.6 //'bug2014wjwx', // Haltern 3.6
@@ -33,5 +33,8 @@ var specialEvents = [
// 'bug2019czbt', // Ochtendung 2.9 // 'bug2019czbt', // Ochtendung 2.9
// 'bug2019fura', // Sprengung Duisburg-Hochheide (Weißer Riese) 2.0 // 'bug2019fura', // Sprengung Duisburg-Hochheide (Weißer Riese) 2.0
// 'bug2019yeij', // Tektonisch, Hambach 2.2 // '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
]; ];

4
www/stations.js
View File

@@ -4,7 +4,7 @@
**********************************************************************/ **********************************************************************/
/* License /* License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>
This program is free software: you can redistribute it and/or modify it 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 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 You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017 (2021-10-17) Version r20211017.2 (2021-10-17)
*/ */
/* Load the stations using ajax */ /* Load the stations using ajax */

6
www/stations.js.en
View File

@@ -1,10 +1,10 @@
/********************************************************************** /**********************************************************************
* stations.js * * stations.js.en *
* script for station specific functions and setup * * script for station specific functions and setup *
**********************************************************************/ **********************************************************************/
/* License /* License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>
This program is free software: you can redistribute it and/or modify it 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 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 You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017 (2021-10-17) Version r20211017.2 (2021-10-17)
*/ */
/* Load the stations using ajax */ /* Load the stations using ajax */