208 Commits

Author SHA1 Message Date
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
5d38db389d Merge branch 'develop' into feature/vagrant 2022-02-23 16:54:07 +01:00
9333db3d29 test for "Deutschland" in contryCode when doing geolocation lookup. 2022-02-23 16:53:37 +01:00
2d287ea304 add event bug2020ahxi (Erftstadt 2.9) to specialevents.js 2022-02-23 16:52:44 +01:00
a7d16e5b8a fix scripts/mkGeolocationTable.py
* increase query limit to 10
* increase min_delay_seconds of RateLimiter to 2 seconds
2022-02-23 15:17:08 +01:00
08047bcff8 clean up of file specialevents.js 2022-02-23 15:15:26 +01:00
34f1bd4877 Merge branch 'develop' into feature/vagrant 2022-02-23 14:32:41 +01:00
d718875d03 Merge branch 'develop' into feature/mapquest 2022-02-23 13:55:04 +01:00
8b4df0c04d add Vagrant file 2022-02-23 13:51:16 +01:00
60461263db change URL of photon service by komoot to photon.komoot.io 2022-02-23 13:50:57 +01:00
42588db791 change URL of photon service by komoot to photon.komoot.io 2022-02-23 13:41:08 +01:00
73099a24e8 removed obsolete files 2021-11-01 12:32:02 +01:00
757607f29b fixed error output if sponge is not installed 2021-10-31 13:27:17 +01:00
5d3a9b81aa add docker-compose file 2021-10-31 12:47:20 +01:00
33365f53f3 update jquery and leaflet javascript libraries 2021-10-30 23:45:49 +02:00
2ca1aa40ce updated doctye to meet html5 standard
see https://developer.mozilla.org/en-US/docs/Web/HTML/Quirks_Mode_and_Standards_Mode for more info
2021-10-30 23:15:51 +02:00
3eb2f0a8fb moved volatile files to data directory
affected files: events.xml geolocation.js and specialevents.js
2021-10-30 23:12:44 +02:00
bbee8038a2 updated server configuration
document root is at /usr/share/nginx/html
map app is located in /usr/share/nginx/html
server responds to /, /map, /map/, /karte, /karte/
server uses DE or EN page depending on $http_accept_language as set by client
2021-10-30 22:38:57 +02:00
af7c6642ff prepared version placeholder
placeholder is "VVVVV"
use patchVersion.sh to replace version for new release. Do not use this script in develop branch.
2021-10-27 10:27:32 +02:00
8b2b58be05 removed -x option from shebang 2021-10-27 10:02:12 +02:00
5455f182d7 adding script to patch version strings
version strings are "VVVVV"
2021-10-26 23:28:42 +02:00
788f4fa091 add favicon.ico 2021-10-26 22:05:06 +02:00
7341982716 add language auto-negotiation 2021-10-26 22:04:50 +02:00
c022aa318c update Dockerfile and nginx config 2021-10-22 23:19:22 +02:00
0fa012c95d add nginx.conf
default nginx.conf form standard docker container
2021-10-21 23:13:00 +02:00
7e7f7d59a0 using mapquest leaflet sdk 2021-10-18 12:44:04 +02:00
60c7e0ef09 Merge branch 'develop' into feature/mapquest 2021-10-18 11:27:24 +02:00
93c15d8640 add Dockerfile for simple local testing
usage:
docker build -t seisobs-webapp:dev .
docker run --name seisobs-map -d -p 8080:80 seisobs-webapp:dev
2021-10-18 11:27:01 +02:00
2e5e998d8a added mapquest baselayer option
uses API key registered to https://araidne.geophysik.ruhr-uni-bochum.de/map/
2021-10-18 10:58:32 +02:00
ecdeaecfde Merge branch 'develop' into feature/mapquest 2021-10-18 10:20:37 +02:00
137b4a2761 fixing broken TopPlus baselayer 2021-10-18 10:18:21 +02:00
5989af8ce1 Merge branch 'hotfix/r20211017.2' into develop 2021-10-17 15:47:16 +02:00
a659f47a87 hotfix-20211017.2: broken default basemap
fixed borken default basemap
decrease default minMag to 0.7
2021-10-17 15:46:39 +02:00
6576b0a2b5 load mapquest leaflet scripts w/ api key 2021-10-17 15:13:17 +02:00
b585e447f0 Merge branch 'hotfix/r20211017.1' into develop 2021-10-17 15:09:02 +02:00
db1f4758f5 Merge branch 'hotfix/r20211017.1' into main release/r20211017.1 2021-10-17 15:09:02 +02:00
e5b86d34f6 hotfix: r20211017.1
add manual changes from production server, bump version
2021-10-17 15:08:42 +02:00
723ec43eee Merge remote-tracking branch 'origin/develop' into develop 2021-10-17 13:32:41 +02:00
d65abe1b08 new release release/r20211017 2021-10-17 13:30:12 +02:00
9c3564f9ab Merge branch 'release/r20211017' into develop 2021-10-17 13:28:50 +02:00
a23019b50f updated version strings for release r20211017 2021-10-17 13:28:19 +02:00
938452b898 renamed mkEvents.csh to fetchEvents.sh, set default values
default values:
* starttime ($1): 6 month ago if date / gdate works, today otherwise
* output file ($2): stdout
2021-10-17 13:07:26 +02:00
dc1df224cc use module logging instead of warning for messages 2021-10-16 19:27:16 +02:00
7fd109b3ea update .gitignore 2021-10-16 15:55:02 +02:00
9167804f1e make reverse geolocation lookup more stableand removed unused modules 2021-10-16 15:53:15 +02:00
9faf11d0df upgrade to python3
fixed some typos
2021-10-16 15:51:38 +02:00
844f77e8e8 update .gitignore
* add MacOS / OSX files
* ad VS code files
* removed outdated paths
2021-10-16 11:53:33 +02:00