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

Compare commits

base: kasper:main
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/mapquest
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

No commits in common. "main" and "feature/mapquest" have entirely different histories.
main ... feature/ma

22 changed files with 60 additions and 58 deletions
Show Stats Expand all files Collapse all files

7
.gitignore vendored
View File

@ -38,12 +38,6 @@ Network Trash Folder
Temporary Items
.apdisk
## Vagrant
.vagrant/
# Log files (if you are creating logs in debug mode, uncomment this)
# *.log
## Project Files
wsgi/.idea
www/dlsv
@ -53,4 +47,3 @@ www/data/events.xml
www/data/geolocation.js
scripts/*.json
scripts/*.xml

2
Dockerfile
View File

@ -1,4 +1,4 @@
# Version: v1.3 (2023-04-17)
# Version: VVVVV
FROM nginx:alpine
# set labels

16
Vagrantfile vendored
View File

@ -1,16 +0,0 @@
Vagrant.configure("2") do |config|
config.vm.box = "ubuntu/jammy64"
config.vm.synced_folder ".", "/vagrant"
config.vm.network(:forwarded_port, guest: 80, host: 8888)
config.vm.provision :shell, inline: <<-SHELL
sudo apt-get -y update
sudo apt-get -y install nginx
echo "Starting nginx..."
sudo ln -s /vagrant/www /var/www/html/map
sudo cp /vagrant/www/index.html.en /vagrant/www/index.html
sudo useradd -s /bin/false nginx
sudo service nginx restart
SHELL
end

2
docker-compose.yaml
View File

@ -9,7 +9,7 @@ services:
build:
context: .
dockerfile: Dockerfile
image: seisobs-map:v1.1
image: seisobs-map:dev
networks:
- seisobs
volumes:

2
nginx/default.conf
View File

@ -1,4 +1,4 @@
# Version: v1.3 (2023-04-17)
# Version: VVVVV
server {
listen 80;
listen [::]:80;

2
nginx/nginx.conf
View File

@ -1,4 +1,4 @@
# Version: v1.3 (2023-04-17)
# Version: VVVVV
user nginx;
worker_processes 1;

2
scripts/fetchEvents.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
# Version: v1.3 (2023-04-17)
# Version: VVVVV
# get starting date
# find gdate or date command ( OSX: brew install coreutils)

10
scripts/mkGeolocationTable.py
View File

@ -12,7 +12,7 @@
AJAX calls to the Nominatim service small, e. g. :
curl -s "https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?minlat=50&maxlat=54&minlon=3&maxlon=10&minmag=1" | mkGeolocationTable.py > geolocationTable.js
Version: v1.3 (2023-04-17)
Version: VVVVV
License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
@ -52,7 +52,7 @@ def mkGeolocationTable(file=''):
from geopy.exc import GeocoderServiceError
## constants
URL = 'https://photon.komoot.io/reverse?lon={lng:.3f}&lat={lat:.3f}&limit=10'
URL = 'https://photon.komoot.io/reverse?lon={lng:.3f}&lat={lat:.3f}&limit=5'
NAMESPACES = {'sc3': 'http://geofon.gfz-potsdam.de/ns/seiscomp3-schema/0.7',
'qml': 'http://quakeml.org/xmlns/bed/1.2'}
@ -70,7 +70,7 @@ def mkGeolocationTable(file=''):
# parse event.xml
DOM = ET.parse(stdin).getroot()
geolocator = Photon()
reverse_geolocate = RateLimiter(geolocator.reverse, min_delay_seconds=2)
reverse_geolocate = RateLimiter(geolocator.reverse, min_delay_seconds=1)
# iterate over all events
count = 0
@ -88,7 +88,7 @@ def mkGeolocationTable(file=''):
else:
logging.info('Processing event {id}'.format(id=publicID))
try:
locations = reverse_geolocate("{lat:.3f}, {lng:.3f}".format(lat=lat, lng=lng),exactly_one=False,limit=10)
locations = reverse_geolocate("{lat:.3f}, {lng:.3f}".format(lat=lat, lng=lng),exactly_one=False,limit=5)
except GeocoderServiceError:
logging.warning('Reverse Geolocation failed. Skipping event.')
continue
@ -125,7 +125,7 @@ if __name__ == "__main__":
# parse arguments
import argparse
versionText = 'v1.3 (2023-04-17)'
versionText = 'VVVVV'
parser = argparse.ArgumentParser(
description='Reverse geocoding lookup of events in xml format (stdin).',
epilog=versionText)

2
scripts/patchVersion.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
# version: v1.3 (2023-04-17)
# version: VVVVV
function fail {
printf '%s\n' "$1" >&2 ## Send message to stderr.
exit "${2-1}" ## Return a code specified by $2, or 1 by default.

4
wsgi/plotFDSN.py
View File

@ -4,7 +4,7 @@
Get waveform data from FDSN web service and create a fancy plot
This programme runs as a script or as a WSGI application.
:version v1.1 (2021-10-31)
:version VVVVV
:license
Copyright 2020 Kasper Fischer <kasper.fischer@ruhr-uni-bochum.de>
@ -378,7 +378,7 @@ if __name__ == "__main__":
epilog=u'$Revision$ ($Date$, $Author$)'.replace(
"$", ""))
parser.add_argument(u'-v', u'-V', u'--version', action='version',
version=u'v1.1 (2021-10-31)')
version=u'VVVVV')
parser.add_argument(u'-u', u'--url', action='store', dest='server',
default=u'https://ariadne.geophysik.ruhr-uni-bochum.de',
help=u'Base URL of the FDSN web service (https://ariadne.geophysik.ruhr-uni-bochum.de).')

2
wsgi/showEnv.py
View File

@ -8,7 +8,7 @@ def application(environ, start_response):
:return: response to be sent to the client by the wsgi server
:rtype: list
:version: v1.2 (2022-02-23)
:version: VVVVV
"""
from cgi import FieldStorage

2
wsgi/traceDayplot.py
View File

@ -3,7 +3,7 @@
"""
Produce a dayplot from seismogram recordings
version: v1.2 (2022-02-23)
version: VVVVV
license: gpl3
Copyright 2012-2020 Seismological Observatory, Ruhr-University Bochum

37
www/data/specialevents.js
View File

@ -1,12 +1,41 @@
/* last change 2022-20-23 */
/* last change 2021-10-30 */
var specialEvents = [
//'bug2014ytlk', // Vechta 3.0
//'bug2014wjwx', // Haltern 3.6
//'bug2014ldts', // Darmstadt
//'bug2014kowj', // Vogtland 5.0
//'bug2014jptq', // Seeheim-Jugenheim
//'bug2014infb', // Troisdorf
//'bug2014ilxd', // Bassum
//'bug2014gfzw', // Darmstadt
//'bug2014datb', // Groningen
// 'bug2013yvko', // Haltern 3.4
// 'bug2015fdpy', // Darmstadt 3.0
// 'bug2016ajgm', // CTBT violation North Korea
// 'bug2016cqkd', // Taunusstein 2.5
// 'bug2016hdae', // Aldenhoven 2.6
// 'bug2016hdaj', // Aldenhoven 2.4
// 'bug2016kkrq', // Bottrop 3.3
// 'bug2016qphy', // Central Italy 6.1
// 'bug2016rslt', // CTBT violation North Korea
// 'bug2016ueqo', // Darmstadt 2.4
// 'bug2016ufpi', // Darmstadt 3.0
// 'bug2016vico', // Central Italy 6.5
// 'bug2016vrnc', // Nörvenich 3.2
// 'bug2016zawb', // St Goar 3.2
// 'bug2017iyhl', // Hürtgenwald 2.1
// 'bug2017omwg', // Brühl 2.3
// 'bug2017rfxe', // CTBT violation North Korea 6.1
// 'bug2017rjvq', // Dreieich / Hessen 2.6
// 'bug2017vxmm', // Brühl / Hürth 3.1
// 'bug2018nyax' // Ochtendung 2.7
// 'bug2019cxga', // Ochtendung 3.0
// 'bug2019czbt', // Ochtendung 2.9
// 'bug2019fura', // Sprengung Duisburg-Hochheide (Weißer Riese) 2.0
// 'bug2021vtgi', // Geilenkirchen 1.9
// 'bug2022ahxi', // Erftstadt 2.9
'bug2023hlmh' // Brüggen 3.3
// 'bug2019yeij', // Tektonisch, Hambach 2.2
'bug2020fqxf', // Meckenheim, 2.5
'bug2020skmt', // Heinsberg 1.7
'bug2020skon', // Heinsberg 2.5
'bug2020stdp', // Niederkassel 2.4
'bug2021ryaa' // Thedinghausen 3.2
];

4
www/events.js
View File

@ -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 v1.3 (2023-04-17)
Version VVVVV
*/
/* adding row(s) to a table and format date strings afterwards */
@ -47,7 +47,7 @@ function getGeolocation(id, lat, lng) {
var city = json.features[0].properties.city;
var countryCode = json.features[0].properties.country;
geolocationTable[id] = city;
( countryCode != "Germany" && countryCode != "Deutschland" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
( countryCode != "Germany" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
if ( city ) {
$("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]);
var sort = [[0,1],[1,1],[2,1]];

4
www/events.js.en
View File

@ -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 v1.3 (2023-04-17)
Version VVVVV
*/
/* adding row(s) to a table and format date strings afterwards */
@ -47,7 +47,7 @@ function getGeolocation(id, lat, lng) {
var city = json.features[0].properties.city;
var countryCode = json.features[0].properties.country;
geolocationTable[id] = city;
( countryCode != "Germany" && countryCode != "Deutschland" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
( countryCode != "Germany" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
if ( city ) {
$("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]);
var sort = [[0,1],[1,1],[2,1]];

2
www/index.html.de
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<!-- Version v1.3 (2023-04-17) -->
<!-- Version VVVVV -->
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />

2
www/index.html.en
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<!-- Version v1.3 (2023-04-17) -->
<!-- Version VVVVV -->
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />

2
www/map.js
View File

@ -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 v1.3 (2023-04-17)
Version VVVVV
*/
/* add station marker */

2
www/map.js.en
View File

@ -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 v1.3 (2023-04-17)
Version VVVVV
*/
/* add station marker */

8
www/misc.js
View File

@ -4,7 +4,7 @@
**********************************************************************/
/* License
Copyright 2014-2023 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
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 v1.3 (2023-04-17)
Version VVVVV
*/
/* calculate marker radius from magnitude
@ -198,10 +198,6 @@ $(document).ready(function() {
config['tab']['active'] = Number(parameters['tab']);
};
};
if ( Number(parameters['zoom']) ) {
config['map']['zoomDefault'] = Number(parameters['zoom']);
config['map']['zoomFocus'] = Number(parameters['zoom']+3);
};
// AJAX setup
$.ajaxSetup({timeout: config['ajax']['timeout']});

2
www/stations.js
View File

@ -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 v1.3 (2023-04-17)
Version VVVVV
*/
/* Load the stations using ajax */

2
www/stations.js.en
View File

@ -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 v1.3 (2023-04-17)
Version VVVVV
*/
/* Load the stations using ajax */