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

Compare commits

base: kasper:9333db3d29b92d25fdd1aacb03b71370e17b03a8
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:a7d16e5b8a669c3b9c4d6826076d0f07f89fd6e1
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

No commits in common. "9333db3d29b92d25fdd1aacb03b71370e17b03a8" and "a7d16e5b8a669c3b9c4d6826076d0f07f89fd6e1" have entirely different histories.
9333db3d29 ... a7d16e5b8a

3 changed files with 3 additions and 4 deletions
Show Stats Expand all files Collapse all files

3
www/data/specialevents.js
View File

@ -6,6 +6,5 @@ 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
]; ];

2
www/events.js
View File

@ -47,7 +47,7 @@ function getGeolocation(id, lat, lng) {
var city = json.features[0].properties.city; var city = json.features[0].properties.city;
var countryCode = json.features[0].properties.country; var countryCode = json.features[0].properties.country;
geolocationTable[id] = city; geolocationTable[id] = city;
( countryCode != "Germany" && countryCode != "Deutschland" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null; ( countryCode != "Germany" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
if ( city ) { if ( city ) {
$("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]); $("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]);
var sort = [[0,1],[1,1],[2,1]]; var sort = [[0,1],[1,1],[2,1]];

2
www/events.js.en
View File

@ -47,7 +47,7 @@ function getGeolocation(id, lat, lng) {
var city = json.features[0].properties.city; var city = json.features[0].properties.city;
var countryCode = json.features[0].properties.country; var countryCode = json.features[0].properties.country;
geolocationTable[id] = city; geolocationTable[id] = city;
( countryCode != "Germany" && countryCode != "Deutschland" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null; ( countryCode != "Germany" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
if ( city ) { if ( city ) {
$("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]); $("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]);
var sort = [[0,1],[1,1],[2,1]]; var sort = [[0,1],[1,1],[2,1]];