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

Compare commits

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

17 Commits
feature/va ... main

Author SHA1 Message Date
Kasper D. Fischer
fb9b623aa6 bug fix 2023-04-17 15:26:04 +02:00
Kasper D. Fischer
bd300c2b07 new release v1.3 
add paramter zoom to customize zoom level
 2023-04-17 14:47:28 +02:00
Kasper D. Fischer
736009b75d prepare new reelease v1.3 
add parameter zoom
 2023-04-17 14:38:31 +02:00
Kasper D. Fischer
7e2ea42f52 update specialevents.js 
event bug2023hlmh M3.3 Brüggen
 2023-04-17 14:19:14 +02:00
Kasper D. Fischer
bd01b7cba4 Merge remote-tracking branch 'origin/develop' into develop 2023-04-17 14:18:35 +02:00
Kasper D. Fischer
6d62279199 add zoom level to parseQueryString evaluation 2023-04-17 14:17:45 +02:00
Kasper D. Fischer
94d6e63b0f add zoom level to parseQueryString evaluation 2023-04-17 11:12:54 +02:00
Kasper D. Fischer
4e97e09466 support running nginx in vbox 
add Vagrant file with configuration to run nginx in virtual box. Use vagrant up to start. Server listens to http://localhost:8888/map/
 2022-02-28 13:24:51 +01:00
Kasper D. Fischer
4e14f49d98 new release v1.2 (2022-02-23) 
changed photon.komoot.de to photon.komoot.io
 2022-02-23 14:30:03 +01:00
Kasper D. Fischer
d204bdd8e5 Merge branch 'release/v1.2' into main 2022-02-23 14:22:03 +01:00
Kasper D. Fischer
dc367000ba prepare release v1.2 (2022-02-23) 2022-02-23 14:21:23 +01:00
Kasper D. Fischer
2decf93012 fixed version string 2021-11-01 12:22:55 +01:00
Kasper D. Fischer
952746e6cd create new release v1.1 (2021-10-31) 2021-10-31 13:25:45 +01:00
Kasper D. Fischer
779602d821 create new release v1.1 (2021-10-31) 2021-10-31 13:05:22 +01:00
Kasper D. Fischer
86a65108cc Merge branch 'release/v1.0' into main 2021-10-27 10:30:48 +02:00
Kasper D. Fischer
95fb75ef14 set version to "v1.0 (2021-10-27)" 2021-10-27 10:30:22 +02:00
Kasper D. Fischer
a91616d003 Merge branch 'hotfix/r20211017.2' into main 2021-10-17 15:47:16 +02:00
20 changed files with 29 additions and 24 deletions
Show Stats Expand all files Collapse all files

2
Dockerfile
View File

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

2
docker-compose.yaml
View File

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

2
nginx/default.conf
View File

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

2
nginx/nginx.conf
View File

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

2
scripts/fetchEvents.sh
View File

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

4
scripts/mkGeolocationTable.py
View File

@ -12,7 +12,7 @@
AJAX calls to the Nominatim service small, e. g. : 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 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: VVVVV Version: v1.3 (2023-04-17)
License License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
@ -125,7 +125,7 @@ if __name__ == "__main__":
# parse arguments # parse arguments
import argparse import argparse
versionText = 'VVVVV' versionText = 'v1.3 (2023-04-17)'
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='Reverse geocoding lookup of events in xml format (stdin).', description='Reverse geocoding lookup of events in xml format (stdin).',
epilog=versionText) epilog=versionText)

2
scripts/patchVersion.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# version: VVVVV # version: v1.3 (2023-04-17)
function fail { function fail {
printf '%s\n' "$1" >&2 ## Send message to stderr. printf '%s\n' "$1" >&2 ## Send message to stderr.
exit "${2-1}" ## Return a code specified by $2, or 1 by default. 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 Get waveform data from FDSN web service and create a fancy plot
This programme runs as a script or as a WSGI application. This programme runs as a script or as a WSGI application.
:version VVVVV :version v1.1 (2021-10-31)
:license :license
Copyright 2020 Kasper Fischer <kasper.fischer@ruhr-uni-bochum.de> Copyright 2020 Kasper Fischer <kasper.fischer@ruhr-uni-bochum.de>
@ -378,7 +378,7 @@ if __name__ == "__main__":
epilog=u'$Revision$ ($Date$, $Author$)'.replace( epilog=u'$Revision$ ($Date$, $Author$)'.replace(
"$", "")) "$", ""))
parser.add_argument(u'-v', u'-V', u'--version', action='version', parser.add_argument(u'-v', u'-V', u'--version', action='version',
version=u'VVVVV') version=u'v1.1 (2021-10-31)')
parser.add_argument(u'-u', u'--url', action='store', dest='server', parser.add_argument(u'-u', u'--url', action='store', dest='server',
default=u'https://ariadne.geophysik.ruhr-uni-bochum.de', 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).') 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 :return: response to be sent to the client by the wsgi server
:rtype: list :rtype: list
:version: VVVVV :version: v1.2 (2022-02-23)
""" """
from cgi import FieldStorage from cgi import FieldStorage

2
wsgi/traceDayplot.py
View File

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

5
www/data/specialevents.js
View File

@ -6,6 +6,7 @@ var specialEvents = [
// 'bug2016vico', // Central Italy 6.5 // 'bug2016vico', // Central Italy 6.5
// 'bug2017rfxe', // CTBT violation North Korea 6.1 // 'bug2017rfxe', // CTBT violation North Korea 6.1
// 'bug2019fura', // Sprengung Duisburg-Hochheide (Weißer Riese) 2.0 // 'bug2019fura', // Sprengung Duisburg-Hochheide (Weißer Riese) 2.0
'bug2021vtgi', // Geilenkirchen 1.9 // 'bug2021vtgi', // Geilenkirchen 1.9
'bug2022ahxi' // Erftstadt 2.9 // 'bug2022ahxi', // Erftstadt 2.9
'bug2023hlmh' // Brüggen 3.3
]; ];

2
www/events.js
View File

@ -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 VVVVV Version v1.3 (2023-04-17)
*/ */
/* adding row(s) to a table and format date strings afterwards */ /* adding row(s) to a table and format date strings afterwards */

2
www/events.js.en
View File

@ -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 VVVVV Version v1.3 (2023-04-17)
*/ */
/* adding row(s) to a table and format date strings afterwards */ /* adding row(s) to a table and format date strings afterwards */

2
www/index.html.de
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- Version VVVVV --> <!-- Version v1.3 (2023-04-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" />

2
www/index.html.en
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- Version VVVVV --> <!-- Version v1.3 (2023-04-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" />

2
www/map.js
View File

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

8
www/misc.js
View File

@ -4,7 +4,7 @@
**********************************************************************/ **********************************************************************/
/* License /* License
Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2014-2023 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 VVVVV Version v1.3 (2023-04-17)
*/ */
/* calculate marker radius from magnitude /* calculate marker radius from magnitude
@ -198,6 +198,10 @@ $(document).ready(function() {
config['tab']['active'] = Number(parameters['tab']); 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 // AJAX setup
$.ajaxSetup({timeout: config['ajax']['timeout']}); $.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 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 VVVVV Version v1.3 (2023-04-17)
*/ */
/* Load the stations using ajax */ /* 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 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 VVVVV Version v1.3 (2023-04-17)
*/ */
/* Load the stations using ajax */ /* Load the stations using ajax */