Compare commits
	
		
			No commits in common. "main" and "feature/vagrant" have entirely different histories.
		
	
	
		
			main
			...
			feature/va
		
	
		
| @ -1,4 +1,4 @@ | ||||
| # Version: v1.3 (2023-04-17) | ||||
| # Version: VVVVV | ||||
| FROM nginx:alpine | ||||
| 
 | ||||
| # set labels | ||||
|  | ||||
| @ -9,7 +9,7 @@ services: | ||||
|       build: | ||||
|         context: . | ||||
|         dockerfile: Dockerfile | ||||
|       image: seisobs-map:v1.1 | ||||
|       image: seisobs-map:dev | ||||
|       networks: | ||||
|         - seisobs | ||||
|       volumes: | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| # Version: v1.3 (2023-04-17) | ||||
| # Version: VVVVV | ||||
| server { | ||||
|     listen       80; | ||||
|     listen  [::]:80; | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| # Version: v1.3 (2023-04-17) | ||||
| # Version: VVVVV | ||||
| user  nginx; | ||||
| worker_processes  1; | ||||
| 
 | ||||
|  | ||||
| @ -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) | ||||
|  | ||||
| @ -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> | ||||
| @ -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) | ||||
|  | ||||
| @ -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,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).') | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -6,7 +6,6 @@ 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
 | ||||
| 	'bug2023hlmh' // Brüggen 3.3
 | ||||
| 	'bug2021vtgi', // Geilenkirchen 1.9
 | ||||
| 	'bug2022ahxi' // Erftstadt 2.9
 | ||||
| ]; | ||||
|  | ||||
| @ -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 */ | ||||
|  | ||||
| @ -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 */ | ||||
|  | ||||
| @ -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" /> | ||||
|  | ||||
| @ -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" /> | ||||
|  | ||||
| @ -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 */ | ||||
|  | ||||
| @ -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 */ | ||||
|  | ||||
| @ -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']}); | ||||
|  | ||||
| @ -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 */ | ||||
|  | ||||
| @ -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 */ | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user