Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ui-test-deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'npm'
Expand All @@ -49,7 +49,7 @@ jobs:
with:
creds: ${{ secrets.DEV_AZURE_CREDENTIALS }}
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ui-test-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
creds: ${{ secrets.PROD_AZURE_CREDENTIALS }}
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'npm'
Expand Down
2,019 changes: 1,006 additions & 1,013 deletions api/api/assets/facilities.csv

Large diffs are not rendered by default.

4,589 changes: 2,605 additions & 1,984 deletions api/api/assets/releases.csv

Large diffs are not rendered by default.

15,799 changes: 8,431 additions & 7,368 deletions api/api/assets/waste_transfers.csv

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions api/data_import.log
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PRTR-data import: 25/03/12 11:50:17
Read 1072 facilities
Read 5290 releases
Read 8564 waste transfers
PRTR-data import: 26/03/09 13:35:31
Read 1065 facilities
Read 5911 releases
Read 9627 waste transfers
Wrote facilities to file: api/assets/facilities.csv
Wrote releases to file: api/assets/releases.csv
Wrote waste_transfers to file: api/assets/waste_transfers.csv
2 changes: 1 addition & 1 deletion api/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def test_get_releases_by_facility_id():
)
assert response.status_code == 200
data = response.json()['data']
assert len(data) == 7
assert len(data) == 8
release_prev = None
for release in data:
assert release['facilityId'] == facility_id
Expand Down
14 changes: 14 additions & 0 deletions ui/src/assets/authorityInfo/authorityInfo.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
[
{
"Ely_Id": 0,
"Nro": 0,
"Lyhenne": "LVV",
"Nimi": "Lupa- ja valvontavirasto",
"NimiRuo": "Tillstånds- och tillsynsverket",
"NimiEng": "Finnish Supervisory Agency",
"Puh": "",
"PostiOsoite": "",
"PostiTpaikkaNro": 0,
"PostiTpaikkaNimi": "",
"PostiTpaikkaNimiRuo": "",
"Url": "https://lvv.fi/ymparisto/"
},
{
"Ely_Id": 3967,
"Nro": 7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ export const AdditionalInfoPageContentEn = () => {
Activities causing environmental pollution require a permit in
accordance with the Environmental Protection Act. One can search for the
permits of the facilities presented in this service from the{' '}
<a href="https://ylupa.avi.fi/fi-FI">
Water and Environmental Permits Information Service
<a href="https://ytietopalvelu.lvv.fi/fi-FI" target="blank">
Environmental information service of the Finnish Supervisory Agency
</a>
.
</p>
Expand Down Expand Up @@ -164,8 +164,8 @@ export const AdditionalInfoPageContentEn = () => {
Finnish Environment Institute has built the website on the request from
the Ministry of the Environment. Feedback on data and other content can
be sent to supervising authorities (
<a href="https://www.ely-keskus.fi/ympariston-tilan-seuranta">
ELY-keskukset
<a href="https://lvv.fi/en/environment" target="blank">
Finnish Supervisory Agency
</a>
). Feedback on the technical functions or improvement proposals can be
sent to <a href="mailto:PRTR@syke.fi">PRTR@syke.fi</a>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ export const AdditionalInfoPageContentFi = () => {
<li>Mineraaliteollisuus</li>
<li>Kemianteollisuus</li>
<li>Jäte- ja jätevesihuolto</li>
<li>Paperin ja puun tuotanto ja jalostus</li>
<li>Kotieläintuotanto ja viljely</li>
<li>Metsäteollisuus</li>
<li>Kotieläintuotanto ja vesiviljely</li>
<li>Elintarvike- ja rehuteollisuus</li>
<li>Muu toiminta</li>
</ul>
<p>
Expand Down Expand Up @@ -135,9 +136,9 @@ export const AdditionalInfoPageContentFi = () => {
<p>
Ympäristön pilaantumisen vaaraa aiheuttaville toiminnoille tarvitaan
ympäristönsuojelulain mukainen lupa. Voit etsiä palvelussa esitettävien
laitosten ympäristölupia aluehallintoviraston{' '}
<a href="https://ylupa.avi.fi/fi-FI">
Vesi- ja ympäristölupien tietopalvelun
laitosten ympäristölupia Lupa- ja valvontaviraston{' '}
<a href="https://ytietopalvelu.lvv.fi/fi-FI" target="blank">
Ympäristöasioiden tietopalvelun
</a>{' '}
avulla.
</p>
Expand Down Expand Up @@ -175,8 +176,8 @@ export const AdditionalInfoPageContentFi = () => {
Suomen ympäristökeskus on toteuttanut sivuston ympäristöministeriön
toimeksiannosta. Palautetta päästötiedoista ja muista sisältöä
koskevista asioista voi lähettää valvontaviranomaisille (
<a href="https://www.ely-keskus.fi/ympariston-tilan-seuranta">
ELY-keskukset
<a href="https://lvv.fi/ymparisto/" target="blank">
Lupa- ja valvontavirasto
</a>
). Sivuston teknisestä toiminnasta voi lähettää palautetta tai
kehitysehdotuksia osoitteeseen{' '}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,9 @@ export const AdditionalInfoPageContentSv = () => {
Verksamhet som orsakar miljöföroreningar kräver miljötillstånd enligt
miljöskyddslagen. Man kan söka Miljötillstånden för de anläggningar som
presenteras i denna websida från{' '}
<a href="https://ylupa.avi.fi/se-FI">
Databas över vatten- och miljötillstånd
<a href="https://ytietopalvelu.lvv.fi/sv-FI" target="blank">
Informationstjänsten för miljöärenden av Tillstånds- och
tillsynsverket
</a>
.
</p>
Expand Down Expand Up @@ -174,8 +175,8 @@ export const AdditionalInfoPageContentSv = () => {
Finlands miljöcentral har förverkligat webbsidan enligt uppdrag av
miljöministeriet. Respons om uppgifterna och annat innehåll kan skickas
till  övervakningsmyndigheter (
<a href="https://www.ely-keskus.fi/ympariston-tilan-seuranta">
ELY-keskukset
<a href="https://lvv.fi/sv/miljo" target="blank">
Tillstånds -och tillsynsverket
</a>
). Respons om sidornas tekniska funktioner eller förbättringsförslag kan
skickas till <a href="mailto:PRTR@syke.fi">PRTR@syke.fi</a>.
Expand Down
22 changes: 15 additions & 7 deletions ui/src/components/FacilityPage/FacilityBasicInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,13 @@ export const FacilityBasicInfo = ({
const { t } = useTranslation(['translation', 'mainActivityCodeDesc'])
const { i18n } = useTranslation()

/** Use LVV as hardcoded authority, as ELY-keskus doesn't exist anymore.
* Current data is from period where ELYs existed (2025),
* therefore they are still referenced in data.
*/
const authorityInfo =
facility && facility.authorityName
? getAuthorityInfo(facility.authorityName)
? getAuthorityInfo('Finnish Supervisory Agency')
: undefined

return (
Expand Down Expand Up @@ -93,10 +97,13 @@ export const FacilityBasicInfo = ({
label={t('translation:common.placename')}
value={facility.city}
/>
{!hasPersonalData(facility) && (<InfoPropRow
label={t('translation:common.streetAddress')}
value={getStreetAddress(facility)}
/>)}

{!hasPersonalData(facility) && (
<InfoPropRow
label={t('translation:common.streetAddress')}
value={getStreetAddress(facility)}
/>
)}
<Box marginY={2}>
<Box fontWeight="semibold">
{t('translation:common.competentAuthority')}
Expand All @@ -113,10 +120,11 @@ export const FacilityBasicInfo = ({
</Link>
)}
</Box>
<InfoPropRow
{/* Hide as ELY-keskus doesn't exist anymore */}
{/* <InfoPropRow
label={t('translation:common.telephoneNumberToAuthority')}
value={facility.authorityTelephoneNo || ''}
/>
/> */}
<InfoPropRow
label={t('translation:facilities.status.title')}
value={
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/FrontPage/FrontPageContentEn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ export const FrontPageContentEn = () => {
Finnish Environment Institute has built the website on the request from
the Ministry of the Environment. Feedback on data and other content can
be sent to supervising authorities (
<a href="https://www.ely-keskus.fi/ympariston-tilan-seuranta">
ELY-keskukset
<a href="https://lvv.fi/en/environment" target="blank">
Finnish Supervisory Agency
</a>
). Feedback on the technical functions or improvement proposals can be
sent to <a href="mailto:PRTR@syke.fi">PRTR@syke.fi</a>.
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/FrontPage/FrontPageContentFi.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ export const FrontPageContentFi = () => {
Suomen ympäristökeskus on toteuttanut sivuston ympäristöministeriön
toimeksiannosta. Palautetta päästötiedoista ja muista sisältöä
koskevista asioista voi lähettää valvontaviranomaisille (
<a href="https://www.ely-keskus.fi/ympariston-tilan-seuranta">
ELY-keskukset
<a href="https://lvv.fi/ymparisto/" target="blank">
Lupa- ja valvontavirasto
</a>
). Sivuston teknisestä toiminnasta voi lähettää palautetta tai
kehitysehdotuksia osoitteeseen{' '}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/FrontPage/FrontPageContentSv.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ export const FrontPageContentSv = () => {
Finlands miljöcentral har förverkligat webbsidan enligt uppdrag av
miljöministeriet. Respons om uppgifterna och annat innehåll kan skickas
till  övervakningsmyndigheter (
<a href="https://www.ely-keskus.fi/ympariston-tilan-seuranta">
ELY-keskukset
<a href="https://lvv.fi/sv/miljo" target="blank">
Tillstånds -och tillsynsverket
</a>
). Respons om sidornas tekniska funktioner eller förbättringsförslag kan
skickas till <a href="mailto:PRTR@syke.fi">PRTR@syke.fi</a>.
Expand Down
Loading