Relaxed CAMS spatial pattern filename regex

VITObelgium · Apr 23, 2024 · 51e98b9 · 51e98b9
1 parent fedb833
commit 51e98b9
Show file tree

Hide file tree

Showing 91 changed files with 2 additions and 2 deletions.
diff --git a/logic/spatialpatterninventory.cpp b/logic/spatialpatterninventory.cpp
@@ -111,7 +111,7 @@ const SpatialPatternData* SpatialPatternTableCache::find_data_for_sector(const s
 
 SpatialPatternInventory::SpatialPatternInventory(const RunConfiguration& cfg)
 : _cfg(cfg)
-, _spatialPatternCamsRegex("CAMS_emissions_REG-APv\\d+.\\d+_(\\d{4})_(\\w+)_([A-Z]{1}_[^_]+|[1-6]{1}[^_]+)")
+, _spatialPatternCamsRegex("CAMS_emissions_REG-\\w+v\\d+.\\d+_(\\d{4})_(\\w+)_([A-Z]{1}_[^_]+|[1-6]{1}[^_]+)")
 , _spatialPatternCeipRegex("(\\w+)_([A-Z]{1}_[^_]+|[1-6]{1}[^_]+)_(\\d{4})_GRID_(\\d{4})")
 , _spatialPatternBelgium1Regex("Emissies per km2 (?:excl|incl) puntbrongegevens_(\\d{4})_([\\w,]+)")
 , _spatialPatternBelgium2Regex("Emissie per km2_met NFR_([\\w ,]+) (\\d{4})_(\\w+) (\\d{4})")

diff --git a/...ions_REG-APv5.1_2018_co_A_PublicPower.tif → ...ons_REG-ANTv6.1_2018_co_A_PublicPower.tif b/...ions_REG-APv5.1_2018_co_A_PublicPower.tif → ...ons_REG-ANTv6.1_2018_co_A_PublicPower.tif
diff --git a/...issions_REG-APv5.1_2018_co_B_Industry.tif → ...ssions_REG-ANTv6.1_2018_co_B_Industry.tif b/...issions_REG-APv5.1_2018_co_B_Industry.tif → ...ssions_REG-ANTv6.1_2018_co_B_Industry.tif
diff --git a/...-APv5.1_2018_co_C_OtherStationaryComb.tif → ...ANTv6.1_2018_co_C_OtherStationaryComb.tif b/...-APv5.1_2018_co_C_OtherStationaryComb.tif → ...ANTv6.1_2018_co_C_OtherStationaryComb.tif
diff --git a/...ssions_REG-APv5.1_2018_co_D_Fugitives.tif → ...sions_REG-ANTv6.1_2018_co_D_Fugitives.tif b/...ssions_REG-APv5.1_2018_co_D_Fugitives.tif → ...sions_REG-ANTv6.1_2018_co_D_Fugitives.tif
diff --git a/...issions_REG-APv5.1_2018_co_E_Solvents.tif → ...ssions_REG-ANTv6.1_2018_co_E_Solvents.tif b/...issions_REG-APv5.1_2018_co_E_Solvents.tif → ...ssions_REG-ANTv6.1_2018_co_E_Solvents.tif
diff --git a/...ns_REG-APv5.1_2018_co_F_RoadTransport.tif → ...s_REG-ANTv6.1_2018_co_F_RoadTransport.tif b/...ns_REG-APv5.1_2018_co_F_RoadTransport.tif → ...s_REG-ANTv6.1_2018_co_F_RoadTransport.tif
diff --git a/...issions_REG-APv5.1_2018_co_G_Shipping.tif → ...ssions_REG-ANTv6.1_2018_co_G_Shipping.tif b/...issions_REG-APv5.1_2018_co_G_Shipping.tif → ...ssions_REG-ANTv6.1_2018_co_G_Shipping.tif
diff --git a/...issions_REG-APv5.1_2018_co_H_Aviation.tif → ...ssions_REG-ANTv6.1_2018_co_H_Aviation.tif b/...issions_REG-APv5.1_2018_co_H_Aviation.tif → ...ssions_REG-ANTv6.1_2018_co_H_Aviation.tif
diff --git a/...missions_REG-APv5.1_2018_co_I_OffRoad.tif → ...issions_REG-ANTv6.1_2018_co_I_OffRoad.tif b/...missions_REG-APv5.1_2018_co_I_OffRoad.tif → ...issions_REG-ANTv6.1_2018_co_I_OffRoad.tif
diff --git a/..._emissions_REG-APv5.1_2018_co_J_Waste.tif → ...emissions_REG-ANTv6.1_2018_co_J_Waste.tif b/..._emissions_REG-APv5.1_2018_co_J_Waste.tif → ...emissions_REG-ANTv6.1_2018_co_J_Waste.tif
diff --git a/...ns_REG-APv5.1_2018_co_K_AgriLivestock.tif → ...s_REG-ANTv6.1_2018_co_K_AgriLivestock.tif b/...ns_REG-APv5.1_2018_co_K_AgriLivestock.tif → ...s_REG-ANTv6.1_2018_co_K_AgriLivestock.tif
diff --git a/...ssions_REG-APv5.1_2018_co_L_AgriOther.tif → ...sions_REG-ANTv6.1_2018_co_L_AgriOther.tif b/...ssions_REG-APv5.1_2018_co_L_AgriOther.tif → ...sions_REG-ANTv6.1_2018_co_L_AgriOther.tif
diff --git a/...ions_REG-APv5.1_2018_co_SumAllSectors.tif → ...ons_REG-ANTv6.1_2018_co_SumAllSectors.tif b/...ions_REG-APv5.1_2018_co_SumAllSectors.tif → ...ons_REG-ANTv6.1_2018_co_SumAllSectors.tif
diff --git a/...ons_REG-APv5.1_2018_nh3_A_PublicPower.tif → ...ns_REG-ANTv6.1_2018_nh3_A_PublicPower.tif b/...ons_REG-APv5.1_2018_nh3_A_PublicPower.tif → ...ns_REG-ANTv6.1_2018_nh3_A_PublicPower.tif
diff --git a/...ssions_REG-APv5.1_2018_nh3_B_Industry.tif → ...sions_REG-ANTv6.1_2018_nh3_B_Industry.tif b/...ssions_REG-APv5.1_2018_nh3_B_Industry.tif → ...sions_REG-ANTv6.1_2018_nh3_B_Industry.tif
diff --git a/...APv5.1_2018_nh3_C_OtherStationaryComb.tif → ...NTv6.1_2018_nh3_C_OtherStationaryComb.tif b/...APv5.1_2018_nh3_C_OtherStationaryComb.tif → ...NTv6.1_2018_nh3_C_OtherStationaryComb.tif
diff --git a/...sions_REG-APv5.1_2018_nh3_D_Fugitives.tif → ...ions_REG-ANTv6.1_2018_nh3_D_Fugitives.tif b/...sions_REG-APv5.1_2018_nh3_D_Fugitives.tif → ...ions_REG-ANTv6.1_2018_nh3_D_Fugitives.tif
diff --git a/...ssions_REG-APv5.1_2018_nh3_E_Solvents.tif → ...sions_REG-ANTv6.1_2018_nh3_E_Solvents.tif b/...ssions_REG-APv5.1_2018_nh3_E_Solvents.tif → ...sions_REG-ANTv6.1_2018_nh3_E_Solvents.tif
diff --git a/...s_REG-APv5.1_2018_nh3_F_RoadTransport.tif → ..._REG-ANTv6.1_2018_nh3_F_RoadTransport.tif b/...s_REG-APv5.1_2018_nh3_F_RoadTransport.tif → ..._REG-ANTv6.1_2018_nh3_F_RoadTransport.tif
diff --git a/...ssions_REG-APv5.1_2018_nh3_G_Shipping.tif → ...sions_REG-ANTv6.1_2018_nh3_G_Shipping.tif b/...ssions_REG-APv5.1_2018_nh3_G_Shipping.tif → ...sions_REG-ANTv6.1_2018_nh3_G_Shipping.tif
diff --git a/...ssions_REG-APv5.1_2018_nh3_H_Aviation.tif → ...sions_REG-ANTv6.1_2018_nh3_H_Aviation.tif b/...ssions_REG-APv5.1_2018_nh3_H_Aviation.tif → ...sions_REG-ANTv6.1_2018_nh3_H_Aviation.tif
diff --git a/...issions_REG-APv5.1_2018_nh3_I_OffRoad.tif → ...ssions_REG-ANTv6.1_2018_nh3_I_OffRoad.tif b/...issions_REG-APv5.1_2018_nh3_I_OffRoad.tif → ...ssions_REG-ANTv6.1_2018_nh3_I_OffRoad.tif
diff --git a/...emissions_REG-APv5.1_2018_nh3_J_Waste.tif → ...missions_REG-ANTv6.1_2018_nh3_J_Waste.tif b/...emissions_REG-APv5.1_2018_nh3_J_Waste.tif → ...missions_REG-ANTv6.1_2018_nh3_J_Waste.tif
diff --git a/...s_REG-APv5.1_2018_nh3_K_AgriLivestock.tif → ..._REG-ANTv6.1_2018_nh3_K_AgriLivestock.tif b/...s_REG-APv5.1_2018_nh3_K_AgriLivestock.tif → ..._REG-ANTv6.1_2018_nh3_K_AgriLivestock.tif
diff --git a/...sions_REG-APv5.1_2018_nh3_L_AgriOther.tif → ...ions_REG-ANTv6.1_2018_nh3_L_AgriOther.tif b/...sions_REG-APv5.1_2018_nh3_L_AgriOther.tif → ...ions_REG-ANTv6.1_2018_nh3_L_AgriOther.tif
diff --git a/...ons_REG-APv5.1_2018_nh3_SumAllSectors.tif → ...ns_REG-ANTv6.1_2018_nh3_SumAllSectors.tif b/...ons_REG-APv5.1_2018_nh3_SumAllSectors.tif → ...ns_REG-ANTv6.1_2018_nh3_SumAllSectors.tif
diff --git a/...ions_REG-APv5.1_2018_nmvoc_B_Industry.tif → ...ons_REG-ANTv6.1_2018_nmvoc_B_Industry.tif b/...ions_REG-APv5.1_2018_nmvoc_B_Industry.tif → ...ons_REG-ANTv6.1_2018_nmvoc_B_Industry.tif
diff --git a/...v5.1_2018_nmvoc_C_OtherStationaryComb.tif → ...v6.1_2018_nmvoc_C_OtherStationaryComb.tif b/...v5.1_2018_nmvoc_C_OtherStationaryComb.tif → ...v6.1_2018_nmvoc_C_OtherStationaryComb.tif
diff --git a/...ons_REG-APv5.1_2018_nmvoc_D_Fugitives.tif → ...ns_REG-ANTv6.1_2018_nmvoc_D_Fugitives.tif b/...ons_REG-APv5.1_2018_nmvoc_D_Fugitives.tif → ...ns_REG-ANTv6.1_2018_nmvoc_D_Fugitives.tif
diff --git a/...ions_REG-APv5.1_2018_nmvoc_E_Solvents.tif → ...ons_REG-ANTv6.1_2018_nmvoc_E_Solvents.tif b/...ions_REG-APv5.1_2018_nmvoc_E_Solvents.tif → ...ons_REG-ANTv6.1_2018_nmvoc_E_Solvents.tif
diff --git a/...REG-APv5.1_2018_nmvoc_F_RoadTransport.tif → ...EG-ANTv6.1_2018_nmvoc_F_RoadTransport.tif b/...REG-APv5.1_2018_nmvoc_F_RoadTransport.tif → ...EG-ANTv6.1_2018_nmvoc_F_RoadTransport.tif
diff --git a/...ions_REG-APv5.1_2018_nmvoc_G_Shipping.tif → ...ons_REG-ANTv6.1_2018_nmvoc_G_Shipping.tif b/...ions_REG-APv5.1_2018_nmvoc_G_Shipping.tif → ...ons_REG-ANTv6.1_2018_nmvoc_G_Shipping.tif
diff --git a/...ions_REG-APv5.1_2018_nmvoc_H_Aviation.tif → ...ons_REG-ANTv6.1_2018_nmvoc_H_Aviation.tif b/...ions_REG-APv5.1_2018_nmvoc_H_Aviation.tif → ...ons_REG-ANTv6.1_2018_nmvoc_H_Aviation.tif
diff --git a/...sions_REG-APv5.1_2018_nmvoc_I_OffRoad.tif → ...ions_REG-ANTv6.1_2018_nmvoc_I_OffRoad.tif b/...sions_REG-APv5.1_2018_nmvoc_I_OffRoad.tif → ...ions_REG-ANTv6.1_2018_nmvoc_I_OffRoad.tif
diff --git a/...issions_REG-APv5.1_2018_nmvoc_J_Waste.tif → ...ssions_REG-ANTv6.1_2018_nmvoc_J_Waste.tif b/...issions_REG-APv5.1_2018_nmvoc_J_Waste.tif → ...ssions_REG-ANTv6.1_2018_nmvoc_J_Waste.tif
diff --git a/...REG-APv5.1_2018_nmvoc_K_AgriLivestock.tif → ...EG-ANTv6.1_2018_nmvoc_K_AgriLivestock.tif b/...REG-APv5.1_2018_nmvoc_K_AgriLivestock.tif → ...EG-ANTv6.1_2018_nmvoc_K_AgriLivestock.tif
diff --git a/...ons_REG-APv5.1_2018_nmvoc_L_AgriOther.tif → ...ns_REG-ANTv6.1_2018_nmvoc_L_AgriOther.tif b/...ons_REG-APv5.1_2018_nmvoc_L_AgriOther.tif → ...ns_REG-ANTv6.1_2018_nmvoc_L_AgriOther.tif
diff --git a/...s_REG-APv5.1_2018_nmvoc_SumAllSectors.tif → ..._REG-ANTv6.1_2018_nmvoc_SumAllSectors.tif b/...s_REG-APv5.1_2018_nmvoc_SumAllSectors.tif → ..._REG-ANTv6.1_2018_nmvoc_SumAllSectors.tif
diff --git a/...ons_REG-APv5.1_2018_nox_A_PublicPower.tif → ...ns_REG-ANTv6.1_2018_nox_A_PublicPower.tif b/...ons_REG-APv5.1_2018_nox_A_PublicPower.tif → ...ns_REG-ANTv6.1_2018_nox_A_PublicPower.tif
diff --git a/...ssions_REG-APv5.1_2018_nox_B_Industry.tif → ...sions_REG-ANTv6.1_2018_nox_B_Industry.tif b/...ssions_REG-APv5.1_2018_nox_B_Industry.tif → ...sions_REG-ANTv6.1_2018_nox_B_Industry.tif
diff --git a/...APv5.1_2018_nox_C_OtherStationaryComb.tif → ...NTv6.1_2018_nox_C_OtherStationaryComb.tif b/...APv5.1_2018_nox_C_OtherStationaryComb.tif → ...NTv6.1_2018_nox_C_OtherStationaryComb.tif
diff --git a/...sions_REG-APv5.1_2018_nox_D_Fugitives.tif → ...ions_REG-ANTv6.1_2018_nox_D_Fugitives.tif b/...sions_REG-APv5.1_2018_nox_D_Fugitives.tif → ...ions_REG-ANTv6.1_2018_nox_D_Fugitives.tif
diff --git a/...ssions_REG-APv5.1_2018_nox_E_Solvents.tif → ...sions_REG-ANTv6.1_2018_nox_E_Solvents.tif b/...ssions_REG-APv5.1_2018_nox_E_Solvents.tif → ...sions_REG-ANTv6.1_2018_nox_E_Solvents.tif
diff --git a/...s_REG-APv5.1_2018_nox_F_RoadTransport.tif → ..._REG-ANTv6.1_2018_nox_F_RoadTransport.tif b/...s_REG-APv5.1_2018_nox_F_RoadTransport.tif → ..._REG-ANTv6.1_2018_nox_F_RoadTransport.tif
diff --git a/...ssions_REG-APv5.1_2018_nox_G_Shipping.tif → ...sions_REG-ANTv6.1_2018_nox_G_Shipping.tif b/...ssions_REG-APv5.1_2018_nox_G_Shipping.tif → ...sions_REG-ANTv6.1_2018_nox_G_Shipping.tif
diff --git a/...ssions_REG-APv5.1_2018_nox_H_Aviation.tif → ...sions_REG-ANTv6.1_2018_nox_H_Aviation.tif b/...ssions_REG-APv5.1_2018_nox_H_Aviation.tif → ...sions_REG-ANTv6.1_2018_nox_H_Aviation.tif
diff --git a/...emissions_REG-APv5.1_2018_nox_J_Waste.tif → ...missions_REG-ANTv6.1_2018_nox_J_Waste.tif b/...emissions_REG-APv5.1_2018_nox_J_Waste.tif → ...missions_REG-ANTv6.1_2018_nox_J_Waste.tif
diff --git a/...s_REG-APv5.1_2018_nox_K_AgriLivestock.tif → ..._REG-ANTv6.1_2018_nox_K_AgriLivestock.tif b/...s_REG-APv5.1_2018_nox_K_AgriLivestock.tif → ..._REG-ANTv6.1_2018_nox_K_AgriLivestock.tif
diff --git a/...sions_REG-APv5.1_2018_nox_L_AgriOther.tif → ...ions_REG-ANTv6.1_2018_nox_L_AgriOther.tif b/...sions_REG-APv5.1_2018_nox_L_AgriOther.tif → ...ions_REG-ANTv6.1_2018_nox_L_AgriOther.tif
diff --git a/...ons_REG-APv5.1_2018_nox_SumAllSectors.tif → ...ns_REG-ANTv6.1_2018_nox_SumAllSectors.tif b/...ons_REG-APv5.1_2018_nox_SumAllSectors.tif → ...ns_REG-ANTv6.1_2018_nox_SumAllSectors.tif
diff --git a/...ns_REG-APv5.1_2018_pm10_A_PublicPower.tif → ...s_REG-ANTv6.1_2018_pm10_A_PublicPower.tif b/...ns_REG-APv5.1_2018_pm10_A_PublicPower.tif → ...s_REG-ANTv6.1_2018_pm10_A_PublicPower.tif
diff --git a/...sions_REG-APv5.1_2018_pm10_B_Industry.tif → ...ions_REG-ANTv6.1_2018_pm10_B_Industry.tif b/...sions_REG-APv5.1_2018_pm10_B_Industry.tif → ...ions_REG-ANTv6.1_2018_pm10_B_Industry.tif
diff --git a/...Pv5.1_2018_pm10_C_OtherStationaryComb.tif → ...Tv6.1_2018_pm10_C_OtherStationaryComb.tif b/...Pv5.1_2018_pm10_C_OtherStationaryComb.tif → ...Tv6.1_2018_pm10_C_OtherStationaryComb.tif
diff --git a/...ions_REG-APv5.1_2018_pm10_D_Fugitives.tif → ...ons_REG-ANTv6.1_2018_pm10_D_Fugitives.tif b/...ions_REG-APv5.1_2018_pm10_D_Fugitives.tif → ...ons_REG-ANTv6.1_2018_pm10_D_Fugitives.tif
diff --git a/...sions_REG-APv5.1_2018_pm10_E_Solvents.tif → ...ions_REG-ANTv6.1_2018_pm10_E_Solvents.tif b/...sions_REG-APv5.1_2018_pm10_E_Solvents.tif → ...ions_REG-ANTv6.1_2018_pm10_E_Solvents.tif
diff --git a/..._REG-APv5.1_2018_pm10_F_RoadTransport.tif → ...REG-ANTv6.1_2018_pm10_F_RoadTransport.tif b/..._REG-APv5.1_2018_pm10_F_RoadTransport.tif → ...REG-ANTv6.1_2018_pm10_F_RoadTransport.tif
diff --git a/...sions_REG-APv5.1_2018_pm10_G_Shipping.tif → ...ions_REG-ANTv6.1_2018_pm10_G_Shipping.tif b/...sions_REG-APv5.1_2018_pm10_G_Shipping.tif → ...ions_REG-ANTv6.1_2018_pm10_G_Shipping.tif
diff --git a/...sions_REG-APv5.1_2018_pm10_H_Aviation.tif → ...ions_REG-ANTv6.1_2018_pm10_H_Aviation.tif b/...sions_REG-APv5.1_2018_pm10_H_Aviation.tif → ...ions_REG-ANTv6.1_2018_pm10_H_Aviation.tif
diff --git a/...ssions_REG-APv5.1_2018_pm10_I_OffRoad.tif → ...sions_REG-ANTv6.1_2018_pm10_I_OffRoad.tif b/...ssions_REG-APv5.1_2018_pm10_I_OffRoad.tif → ...sions_REG-ANTv6.1_2018_pm10_I_OffRoad.tif
diff --git a/...missions_REG-APv5.1_2018_pm10_J_Waste.tif → ...issions_REG-ANTv6.1_2018_pm10_J_Waste.tif b/...missions_REG-APv5.1_2018_pm10_J_Waste.tif → ...issions_REG-ANTv6.1_2018_pm10_J_Waste.tif
diff --git a/..._REG-APv5.1_2018_pm10_K_AgriLivestock.tif → ...REG-ANTv6.1_2018_pm10_K_AgriLivestock.tif b/..._REG-APv5.1_2018_pm10_K_AgriLivestock.tif → ...REG-ANTv6.1_2018_pm10_K_AgriLivestock.tif
diff --git a/...ions_REG-APv5.1_2018_pm10_L_AgriOther.tif → ...ons_REG-ANTv6.1_2018_pm10_L_AgriOther.tif b/...ions_REG-APv5.1_2018_pm10_L_AgriOther.tif → ...ons_REG-ANTv6.1_2018_pm10_L_AgriOther.tif
diff --git a/...ns_REG-APv5.1_2018_pm10_SumAllSectors.tif → ...s_REG-ANTv6.1_2018_pm10_SumAllSectors.tif b/...ns_REG-APv5.1_2018_pm10_SumAllSectors.tif → ...s_REG-ANTv6.1_2018_pm10_SumAllSectors.tif
diff --git a/...s_REG-APv5.1_2018_pm2_5_A_PublicPower.tif → ..._REG-ANTv6.1_2018_pm2_5_A_PublicPower.tif b/...s_REG-APv5.1_2018_pm2_5_A_PublicPower.tif → ..._REG-ANTv6.1_2018_pm2_5_A_PublicPower.tif
diff --git a/...ions_REG-APv5.1_2018_pm2_5_B_Industry.tif → ...ons_REG-ANTv6.1_2018_pm2_5_B_Industry.tif b/...ions_REG-APv5.1_2018_pm2_5_B_Industry.tif → ...ons_REG-ANTv6.1_2018_pm2_5_B_Industry.tif
diff --git a/...v5.1_2018_pm2_5_C_OtherStationaryComb.tif → ...v6.1_2018_pm2_5_C_OtherStationaryComb.tif b/...v5.1_2018_pm2_5_C_OtherStationaryComb.tif → ...v6.1_2018_pm2_5_C_OtherStationaryComb.tif
diff --git a/...ons_REG-APv5.1_2018_pm2_5_D_Fugitives.tif → ...ns_REG-ANTv6.1_2018_pm2_5_D_Fugitives.tif b/...ons_REG-APv5.1_2018_pm2_5_D_Fugitives.tif → ...ns_REG-ANTv6.1_2018_pm2_5_D_Fugitives.tif
diff --git a/...ions_REG-APv5.1_2018_pm2_5_E_Solvents.tif → ...ons_REG-ANTv6.1_2018_pm2_5_E_Solvents.tif b/...ions_REG-APv5.1_2018_pm2_5_E_Solvents.tif → ...ons_REG-ANTv6.1_2018_pm2_5_E_Solvents.tif
diff --git a/...REG-APv5.1_2018_pm2_5_F_RoadTransport.tif → ...EG-ANTv6.1_2018_pm2_5_F_RoadTransport.tif b/...REG-APv5.1_2018_pm2_5_F_RoadTransport.tif → ...EG-ANTv6.1_2018_pm2_5_F_RoadTransport.tif
diff --git a/...ions_REG-APv5.1_2018_pm2_5_G_Shipping.tif → ...ons_REG-ANTv6.1_2018_pm2_5_G_Shipping.tif b/...ions_REG-APv5.1_2018_pm2_5_G_Shipping.tif → ...ons_REG-ANTv6.1_2018_pm2_5_G_Shipping.tif
diff --git a/...ions_REG-APv5.1_2018_pm2_5_H_Aviation.tif → ...ons_REG-ANTv6.1_2018_pm2_5_H_Aviation.tif b/...ions_REG-APv5.1_2018_pm2_5_H_Aviation.tif → ...ons_REG-ANTv6.1_2018_pm2_5_H_Aviation.tif
diff --git a/...sions_REG-APv5.1_2018_pm2_5_I_OffRoad.tif → ...ions_REG-ANTv6.1_2018_pm2_5_I_OffRoad.tif b/...sions_REG-APv5.1_2018_pm2_5_I_OffRoad.tif → ...ions_REG-ANTv6.1_2018_pm2_5_I_OffRoad.tif
diff --git a/...issions_REG-APv5.1_2018_pm2_5_J_Waste.tif → ...ssions_REG-ANTv6.1_2018_pm2_5_J_Waste.tif b/...issions_REG-APv5.1_2018_pm2_5_J_Waste.tif → ...ssions_REG-ANTv6.1_2018_pm2_5_J_Waste.tif
diff --git a/...REG-APv5.1_2018_pm2_5_K_AgriLivestock.tif → ...EG-ANTv6.1_2018_pm2_5_K_AgriLivestock.tif b/...REG-APv5.1_2018_pm2_5_K_AgriLivestock.tif → ...EG-ANTv6.1_2018_pm2_5_K_AgriLivestock.tif
diff --git a/...ons_REG-APv5.1_2018_pm2_5_L_AgriOther.tif → ...ns_REG-ANTv6.1_2018_pm2_5_L_AgriOther.tif b/...ons_REG-APv5.1_2018_pm2_5_L_AgriOther.tif → ...ns_REG-ANTv6.1_2018_pm2_5_L_AgriOther.tif
diff --git a/...s_REG-APv5.1_2018_pm2_5_SumAllSectors.tif → ..._REG-ANTv6.1_2018_pm2_5_SumAllSectors.tif b/...s_REG-APv5.1_2018_pm2_5_SumAllSectors.tif → ..._REG-ANTv6.1_2018_pm2_5_SumAllSectors.tif
diff --git a/...ons_REG-APv5.1_2018_so2_A_PublicPower.tif → ...ns_REG-ANTv6.1_2018_so2_A_PublicPower.tif b/...ons_REG-APv5.1_2018_so2_A_PublicPower.tif → ...ns_REG-ANTv6.1_2018_so2_A_PublicPower.tif
diff --git a/...ssions_REG-APv5.1_2018_so2_B_Industry.tif → ...sions_REG-ANTv6.1_2018_so2_B_Industry.tif b/...ssions_REG-APv5.1_2018_so2_B_Industry.tif → ...sions_REG-ANTv6.1_2018_so2_B_Industry.tif
diff --git a/...APv5.1_2018_so2_C_OtherStationaryComb.tif → ...NTv6.1_2018_so2_C_OtherStationaryComb.tif b/...APv5.1_2018_so2_C_OtherStationaryComb.tif → ...NTv6.1_2018_so2_C_OtherStationaryComb.tif
diff --git a/...sions_REG-APv5.1_2018_so2_D_Fugitives.tif → ...ions_REG-ANTv6.1_2018_so2_D_Fugitives.tif b/...sions_REG-APv5.1_2018_so2_D_Fugitives.tif → ...ions_REG-ANTv6.1_2018_so2_D_Fugitives.tif
diff --git a/...ssions_REG-APv5.1_2018_so2_E_Solvents.tif → ...sions_REG-ANTv6.1_2018_so2_E_Solvents.tif b/...ssions_REG-APv5.1_2018_so2_E_Solvents.tif → ...sions_REG-ANTv6.1_2018_so2_E_Solvents.tif
diff --git a/...s_REG-APv5.1_2018_so2_F_RoadTransport.tif → ..._REG-ANTv6.1_2018_so2_F_RoadTransport.tif b/...s_REG-APv5.1_2018_so2_F_RoadTransport.tif → ..._REG-ANTv6.1_2018_so2_F_RoadTransport.tif
diff --git a/...ssions_REG-APv5.1_2018_so2_G_Shipping.tif → ...sions_REG-ANTv6.1_2018_so2_G_Shipping.tif b/...ssions_REG-APv5.1_2018_so2_G_Shipping.tif → ...sions_REG-ANTv6.1_2018_so2_G_Shipping.tif
diff --git a/...ssions_REG-APv5.1_2018_so2_H_Aviation.tif → ...sions_REG-ANTv6.1_2018_so2_H_Aviation.tif b/...ssions_REG-APv5.1_2018_so2_H_Aviation.tif → ...sions_REG-ANTv6.1_2018_so2_H_Aviation.tif
diff --git a/...issions_REG-APv5.1_2018_so2_I_OffRoad.tif → ...ssions_REG-ANTv6.1_2018_so2_I_OffRoad.tif b/...issions_REG-APv5.1_2018_so2_I_OffRoad.tif → ...ssions_REG-ANTv6.1_2018_so2_I_OffRoad.tif
diff --git a/...emissions_REG-APv5.1_2018_so2_J_Waste.tif → ...missions_REG-ANTv6.1_2018_so2_J_Waste.tif b/...emissions_REG-APv5.1_2018_so2_J_Waste.tif → ...missions_REG-ANTv6.1_2018_so2_J_Waste.tif
diff --git a/...s_REG-APv5.1_2018_so2_K_AgriLivestock.tif → ..._REG-ANTv6.1_2018_so2_K_AgriLivestock.tif b/...s_REG-APv5.1_2018_so2_K_AgriLivestock.tif → ..._REG-ANTv6.1_2018_so2_K_AgriLivestock.tif
diff --git a/...sions_REG-APv5.1_2018_so2_L_AgriOther.tif → ...ions_REG-ANTv6.1_2018_so2_L_AgriOther.tif b/...sions_REG-APv5.1_2018_so2_L_AgriOther.tif → ...ions_REG-ANTv6.1_2018_so2_L_AgriOther.tif
diff --git a/...ons_REG-APv5.1_2018_so2_SumAllSectors.tif → ...ns_REG-ANTv6.1_2018_so2_SumAllSectors.tif b/...ons_REG-APv5.1_2018_so2_SumAllSectors.tif → ...ns_REG-ANTv6.1_2018_so2_SumAllSectors.tif
diff --git a/logic/test/spatialpatterninventorytest.cpp b/logic/test/spatialpatterninventorytest.cpp
@@ -146,7 +146,7 @@ TEST_CASE("Spatial pattern selection test")
     {
         // Available in 2018 at gnfr (not in 2016 or 2015 or 2017 or 2014)
         const auto sp = inv.get_spatial_pattern(EmissionIdentifier(countries::NL, EmissionSector(sectors::nfr::Nfr1B2b), pollutants::NOx), nlCoverage);
-        CHECK(sp.source.path == fs::u8path(TEST_DATA_DIR) / "spatialinventory" / "rest" / "reporting_2021" / "CAMS" / "2018" / "CAMS_emissions_REG-APv5.1_2018_nox_D_Fugitives.tif");
+        CHECK(sp.source.path == fs::u8path(TEST_DATA_DIR) / "spatialinventory" / "rest" / "reporting_2021" / "CAMS" / "2018" / "CAMS_emissions_REG-ANTv6.1_2018_nox_D_Fugitives.tif");
         CHECK(sp.source.emissionId.pollutant == pollutants::NOx);
         CHECK(sp.source.emissionId.sector == EmissionSector(sectors::nfr::Nfr1B2b));
         CHECK(sp.source.usedEmissionId.sector == EmissionSector(sectors::gnfr::Fugitive));