Skip to content

Commit 9cbc7f8

Browse files
vlaucianivlauciani
committed
Merge branch 'release/2.15.0'
2 parents b3974f2 + b2e6ef7 commit 9cbc7f8

15 files changed

Lines changed: 347 additions & 177 deletions

‎.github/workflows/version-check.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Check version alignment
2+
3+
on:
4+
push:
5+
paths:
6+
- "js/config-base.js"
7+
- "publiccode.yml"
8+
- "CHANGELOG.md"
9+
- ".github/workflows/version-check.yml"
10+
pull_request:
11+
paths:
12+
- "js/config-base.js"
13+
- "publiccode.yml"
14+
- "CHANGELOG.md"
15+
- ".github/workflows/version-check.yml"
16+
17+
permissions: {}
18+
19+
jobs:
20+
check:
21+
runs-on: ubuntu-latest
22+
permissions:
23+
contents: read
24+
name: version alignment
25+
steps:
26+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
27+
28+
- name: Compare versions across sources
29+
shell: bash
30+
run: |
31+
set -euo pipefail
32+
33+
# Strip an optional leading "v" so "v2.15.0-dev" and "2.15.0-dev" match.
34+
normalize() {
35+
local VALUE="$1"
36+
echo "${VALUE#v}"
37+
}
38+
39+
# js/config-base.js -> version: "v2.15.0-dev"
40+
CONFIG_VERSION="$(grep -oE 'version:[[:space:]]*"[^"]*"' js/config-base.js | head -n1 | sed -E 's/.*"([^"]*)".*/\1/')"
41+
42+
# publiccode.yml -> softwareVersion: v2.15.0-dev
43+
PUBLICCODE_VERSION="$(grep -oE '^softwareVersion:[[:space:]]*\S+' publiccode.yml | head -n1 | sed -E 's/^softwareVersion:[[:space:]]*//')"
44+
45+
# CHANGELOG.md -> first "### Release 2.15.0-dev (...)" entry
46+
CHANGELOG_VERSION="$(grep -oE '^###[[:space:]]+Release[[:space:]]+\S+' CHANGELOG.md | head -n1 | sed -E 's/^###[[:space:]]+Release[[:space:]]+//')"
47+
48+
if [ -z "${CONFIG_VERSION}" ] || [ -z "${PUBLICCODE_VERSION}" ] || [ -z "${CHANGELOG_VERSION}" ]; then
49+
echo "::error::Could not extract a version from one of the sources."
50+
echo " js/config-base.js : '${CONFIG_VERSION}'"
51+
echo " publiccode.yml : '${PUBLICCODE_VERSION}'"
52+
echo " CHANGELOG.md : '${CHANGELOG_VERSION}'"
53+
exit 1
54+
fi
55+
56+
CONFIG_NORM="$(normalize "${CONFIG_VERSION}")"
57+
PUBLICCODE_NORM="$(normalize "${PUBLICCODE_VERSION}")"
58+
CHANGELOG_NORM="$(normalize "${CHANGELOG_VERSION}")"
59+
60+
echo "js/config-base.js : ${CONFIG_VERSION} (normalized: ${CONFIG_NORM})"
61+
echo "publiccode.yml : ${PUBLICCODE_VERSION} (normalized: ${PUBLICCODE_NORM})"
62+
echo "CHANGELOG.md : ${CHANGELOG_VERSION} (normalized: ${CHANGELOG_NORM})"
63+
64+
if [ "${CONFIG_NORM}" != "${PUBLICCODE_NORM}" ] || [ "${CONFIG_NORM}" != "${CHANGELOG_NORM}" ]; then
65+
echo "::error::Version mismatch across sources. Align js/config-base.js, publiccode.yml and CHANGELOG.md."
66+
exit 1
67+
fi
68+
69+
echo "All versions are aligned: ${CONFIG_NORM}"

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ events.json
55
.playwright-cli/
66
js/config-env.js
77
events_raw.json.tmp
8+
CONTEXT.md

‎AUTHORS.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
Valentino Lauciani <valentino.lauciani@ingv.it>
2+
Dario Jozinović <dario.jozinovic@sed.ethz.ch>
3+
Licia Faenza <licia.faenza@ingv.it>
4+
Alberto Michelini <alberto.michelini@ingv.it>
5+
Ilaria Oliveti <ilaria.oliveti@ingv.it>

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Release Notes
22

3+
### Release 2.15.0 (2026-06-15)
4+
- Add sortable columns to the Station List tables (seismic and reported intensity)
5+
- Add light gray grid lines to the analysis regression plots
6+
- Fix portal version shown in the footer
7+
- Add CI check for version alignment across config-base.js, publiccode.yml and CHANGELOG.md
8+
- Update contributors-ingv.md
9+
- Add ESM logo
10+
- Update disclaimer-ingv.md
11+
- Update contributors-eu.md
12+
- Add new logo for Croatia
13+
- Update scientific-background-eu.md
14+
315
### Release 2.14.0 (2026-05-15)
416
- Roll back tracked code, configuration, and documentation to the v2.9.0 state
517

‎contributors-eu.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Contributors
22

33
## DOI and Citation
4-
**DOI**:
4+
**DOI**: https://doi.org/10.13127/shakemap-eu
55

66
**Cite as**:
77
```
8-
--
8+
ShakeMap-EU working group. (2020, April 3). ShakeMap-EU. Istituto Nazionale di Geofisica e Vulcanologia (INGV). https://doi.org/10.13127/shakemap-eu
99
```
1010

1111
## Participating Institutes
@@ -16,15 +16,15 @@
1616
| ![SED](images/contributors-eu/SED.png) | Swiss Seismological Service (SED) | Carlo Cauzzi, Philipp Kästli, John Clinton |
1717
| ![Univ. Tirana](images/contributors-eu/Univ_Tirana.png) | Department of Seismology, Institute of Geosciences, Polytechnic University of Tirana | Edmond Dushi, Besian Rama |
1818
| ![ROB](images/contributors-eu/ROB.jpg) | Royal Observatory of Belgium (ROB) | Thomas Lecocq, Kris Vanneste, Koen Van Noten |
19-
| ![HGI](images/contributors-eu/HGI.jpg) | Croatian Seismological Survey (HGI) | Krešimir Kuk |
19+
| ![HGI](images/contributors-eu/Croatia.png) | Croatian Seismological Survey (GFZ) | Krešimir Kuk |
2020
| ![BCSF-RéNaSS](images/contributors-eu/BCSFReNaSS.jpg) | BCSF-Rénass Epos-France | Marc Grunberg, Véronique Mendel, Antoine Schlupp, Christophe Sira |
2121
| ![ITSAK](images/contributors-eu/ITSAK.png) | Institute of Engineering Seismology & Earthquake Engineering (ITSAK) | Kiriaki Konstantinidou, Nikolaos Theodoulidis |
2222
| ![NOA](images/contributors-eu/NOA.png) | National Observatory of Athens (NOA) | Nicos Melis |
2323
| ![OGS](images/contributors-eu/OGS.jpeg) | Istituto Nazionale di Oceanografia e di Geofisica Sperimentale - OGS | Luca Moratto |
2424
| ![IHMS](images/contributors-eu/IHMS.jpeg) | Institute of Hydrometeorology and Seismology (IHMS) | Jovan Dedic, Jadranka Mihaljevic |
2525
| ![IGPAS](images/contributors-eu/IGPAS.jpg) | Institute of Geophysics of the Polish Academy of Sciences | Janusz Mirek, Łukasz Rudziński |
2626
| ![IPMA](images/contributors-eu/IPMA.png) | Portuguese Institute of the Sea and Atmosphere (IPMA) | Fernando Carrilho |
27-
| ![Skopje](images/contributors-eu/Skopje.png) | University of Skopje | Dragana Cernih, Radmila Salic |
27+
| ![Skopje](images/contributors-eu/Skopje.png) | Ss. Cyril and Methodius University in Skopje | Dragana Cernih, Radmila Salic |
2828
| ![NIEP](images/contributors-eu/INFP.png) | National Institute for Earth Physics (NIEP) | Bogdan Grecu, Constantin Ionescu, Alexandru Marmureanu |
2929
| ![ARSO](images/contributors-eu/Slovenia.jpg) | Slovenian Environment Agency (ARSO) | Martina Čarman, Polona Zupančič |
3030

@@ -44,6 +44,7 @@
4444
| Remy Bossu | Euro-Mediterranean Seismological Centre (EMSC/CSEM) | France |
4545
| Robert Steed | Euro-Mediterranean Seismological Centre (EMSC/CSEM) | France |
4646
| Graeme Weatherill | German Research Centre for Geosciences (GFZ) | Germany |
47+
| Zafeiria Roumelioti | University of Patras | Greece |
4748
| Andrea Antonucci | Istituto Nazionale di Geofisica e Vulcanologia (INGV) | Italy |
4849
| Mario Locati | Istituto Nazionale di Geofisica e Vulcanologia (INGV) | Italy |
4950
| Lucia Luzi | Istituto Nazionale di Geofisica e Vulcanologia (INGV) | Italy |

‎contributors-ingv.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,9 @@ Istituto Nazionale di Geofisica e Vulcanologia (INGV). https://doi.org/10.13127/
2323
| ![GeoSphere](images/contributors-ingv/GeoSphere.png) | GeoSphere (GeoSphere) | -- |
2424
| ![SED](images/contributors-ingv/SED.png) | Swiss Seismological Service (SED) | -- |
2525
| ![DPC-Friuli](images/contributors-ingv/DPC-Friuli.jpg) | Dipartimento della Protezione Civile - Friuli Venezia Giulia (DPC-Friuli) | -- |
26+
27+
## ShakeMap Support Group
28+
29+
| Logo | Name |
30+
|------|----------|
31+
|![ESM](images/contributors-ingv/esm_logo_max.png)| ESM (Engineering Strong-Motion Database) | 

‎css/style.css‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,8 +1438,32 @@ footer {
14381438
background-color: #f1f1f1;
14391439
font-weight: bold;
14401440
cursor: default;
1441-
pointer-events: none;
1442-
/* Make header not clickable */
1441+
}
1442+
1443+
.collapsible.header-row:hover {
1444+
background-color: #f1f1f1;
1445+
/* Header itself is not a toggle; only its sortable cells react */
1446+
}
1447+
1448+
/* Sortable header cells (click to sort) */
1449+
.sortable-col {
1450+
cursor: pointer;
1451+
user-select: none;
1452+
white-space: nowrap;
1453+
}
1454+
1455+
.sortable-col:hover {
1456+
color: #000;
1457+
}
1458+
1459+
.sortable-col i {
1460+
font-size: 11px;
1461+
color: #999;
1462+
margin-left: 2px;
1463+
}
1464+
1465+
.sortable-col.active-sort i {
1466+
color: #333;
14431467
}
14441468

14451469
/* Content (Hidden by default) */

‎disclaimer-ingv.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Italiano
44

5-
Le mappe di scuotimento (ShakeMaps) pubblicate su questo sito sono determinate automaticamente e forniscono stime preliminari e incomplete dello scuotimento causato dal terremoto. Le mappe vengono aggiornate man mano che ulteriori dati registrati dalle stazioni sismiche diventano disponibili. Le stazioni appartengono alla Rete Sismica Nazionale Italiana o ad altre reti locali, regionali e nazionali di altre istituzioni italiane o estere, come indicato nella pagina [Contributors](#contributors).
5+
Le mappe di scuotimento (ShakeMaps) pubblicate su questo sito sono determinate automaticamente e forniscono stime preliminari e incomplete dello scuotimento causato dal terremoto. Le mappe vengono aggiornate man mano che ulteriori dati registrati dalle stazioni sismiche diventano disponibili, anche attraverso i dati rielaborati da [ESM](https://esm-db.eu/#/home). Le stazioni appartengono alla Rete Sismica Nazionale Italiana o ad altre reti locali, regionali e nazionali di altre istituzioni italiane o estere, come indicato nella pagina [Contributors](#contributors).
66

77
Le mappe non hanno alcun valore ufficiale e INGV declina qualsiasi responsabilità per eventuali usi impropri delle informazioni in esse contenute.
88

@@ -14,7 +14,7 @@ A partire dal 6 marzo 2023, e per specifici eventi per i quali sono stati rivist
1414

1515
## English
1616

17-
The maps of ground shaking - ShakeMaps - published on this website have been determined for research purposes only and provide preliminary and incomplete estimates of the experienced shaking. They are produced automatically from instrumentally recorded data by seismic stations and are updated as more data become available. The stations belong to the Italian National Seismic Network or to other local, regional and national networks of other Italian or foreign institutions, as indicated in the [Contributors](#contributors) page.
17+
The maps of ground shaking - ShakeMaps - published on this website have been determined for research purposes only and provide preliminary and incomplete estimates of the experienced shaking. They are produced automatically from instrumentally recorded data by seismic stations and are updated as more data become available, with contributions from [ESM](https://esm-db.eu/#/home). The stations belong to the Italian National Seismic Network or to other local, regional and national networks of other Italian or foreign institutions, as indicated in the [Contributors](#contributors) page.
1818

1919
The maps do not have any official value and INGV declines any responsibility for any improper use of the information therein represented.
2020

‎images/contributors-eu/Croatia.png‎

7.73 KB
Loading

‎images/contributors-ingv/esm_logo_max.png‎

13.2 KB
Loading

0 commit comments

Comments
 (0)