Compare commits

...

17 Commits

Author SHA1 Message Date
fb9b623aa6 bug fix 2023-04-17 15:26:04 +02:00
bd300c2b07 new release v1.3
add paramter zoom to customize zoom level
2023-04-17 14:47:28 +02:00
736009b75d prepare new reelease v1.3
add parameter zoom
2023-04-17 14:38:31 +02:00
7e2ea42f52 update specialevents.js
event bug2023hlmh M3.3 Brüggen
2023-04-17 14:19:14 +02:00
bd01b7cba4 Merge remote-tracking branch 'origin/develop' into develop 2023-04-17 14:18:35 +02:00
6d62279199 add zoom level to parseQueryString evaluation 2023-04-17 14:17:45 +02:00
94d6e63b0f add zoom level to parseQueryString evaluation 2023-04-17 11:12:54 +02:00
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
4e14f49d98 new release v1.2 (2022-02-23)
changed photon.komoot.de to photon.komoot.io
2022-02-23 14:30:03 +01:00
d204bdd8e5 Merge branch 'release/v1.2' into main 2022-02-23 14:22:03 +01:00
dc367000ba prepare release v1.2 (2022-02-23) 2022-02-23 14:21:23 +01:00
2decf93012 fixed version string 2021-11-01 12:22:55 +01:00
952746e6cd create new release v1.1 (2021-10-31) 2021-10-31 13:25:45 +01:00
779602d821 create new release v1.1 (2021-10-31) 2021-10-31 13:05:22 +01:00
86a65108cc Merge branch 'release/v1.0' into main 2021-10-27 10:30:48 +02:00
95fb75ef14 set version to "v1.0 (2021-10-27)" 2021-10-27 10:30:22 +02:00
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

View File

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

View File

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

View File

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

View File

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

View File

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

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

View File

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

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 VVVVV
:version v1.1 (2021-10-31)
: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'VVVVV')
version=u'v1.1 (2021-10-31)')
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).')

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: VVVVV
:version: v1.2 (2022-02-23)
"""
from cgi import FieldStorage

View File

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

View File

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

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

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

View File

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

View File

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

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

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

View File

@ -4,7 +4,7 @@
**********************************************************************/
/* 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
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 VVVVV
Version v1.3 (2023-04-17)
*/
/* calculate marker radius from magnitude
@ -198,6 +198,10 @@ $(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']});

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

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