9 Commits

Author SHA1 Message Date
6c43521eea bug fix 2023-04-17 15:26:34 +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
a2713522c9 update Vagrantfile
create link to map directory at right position
2022-02-27 22:36:18 +01:00
a1e044c082 use ubuntu/jammy64 (22.04) as base image 2022-02-27 22:35:36 +01:00
4c7a1c6916 update .gitignore
ignore .vagrant directory
2022-02-27 22:34:57 +01:00
4 changed files with 17 additions and 5 deletions

7
.gitignore vendored
View File

@@ -38,6 +38,12 @@ 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
@@ -47,3 +53,4 @@ www/data/events.xml
www/data/geolocation.js
scripts/*.json
scripts/*.xml

4
Vagrantfile vendored
View File

@@ -1,5 +1,5 @@
Vagrant.configure("2") do |config|
config.vm.box = "ubuntu/focal64"
config.vm.box = "ubuntu/jammy64"
config.vm.synced_folder ".", "/vagrant"
config.vm.network(:forwarded_port, guest: 80, host: 8888)
@@ -8,7 +8,7 @@ Vagrant.configure("2") do |config|
sudo apt-get -y install nginx
echo "Starting nginx..."
sudo ln -s /vagrant/www /usr/share/nginx/html/map
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

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

@@ -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
@@ -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']});