hestia-earth-models 0.73.0__py3-none-any.whl → 0.73.1__py3-none-any.whl

hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import TermTermType
 from hestia_earth.utils.tools import list_sum, safe_parse_float
 from hestia_earth.utils.model import filter_list_term_type
 
-from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
+from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.indicator import _new_indicator
 from hestia_earth.models.utils.impact_assessment import get_product, convert_value_from_cycle, get_site
@@ -25,6 +25,13 @@ REQUIREMENTS = {
                 "completeness.water": "True",
                 "inputs": [{"@type": "Input", "term.termType": "water", "value": "> 0"}]
             }
+        },
+        "optional": {
+            "practices": [{
+                "@type": "Practice",
+                "value": "> 0",
+                "term.termType": "waterRegime"
+            }]
         }
     }
 }
@@ -39,7 +46,8 @@ LOOKUPS = {
         "Conveyancing_Efficiency_Annual_crops",
         "Conveyancing_Efficiency_Permanent_crops",
         "Conveyancing_Efficiency_Perennial_crops"
-    ]
+    ],
+    "waterRegime": "conveyancingEfficiency"
 }
 TERM_ID = 'freshwaterWithdrawalsDuringCycle'
 
@@ -50,19 +58,49 @@ def _indicator(term_id: str, value: float):
     return indicator
 
 
-def _get_conveyancing_efficiency(impact_assessment: dict, product: dict):
+def _get_conveyancing_efficiency_from_waterRegime(impact_assessment: dict):
+    practices = filter_list_term_type(impact_assessment.get('cycle', {}).get('practices', []), TermTermType.WATERREGIME)
+    practices_with_factors = [
+        {
+            'practice-id': p.get('term', {}).get('@id'),
+            'practice-value': list_sum(p.get('value'), default=None),
+            'conveyancing': safe_parse_float(
+                get_lookup_value(p.get('term', {}), 'conveyancingEfficiency'), default=None)
+        }
+        for p in practices
+    ]
+    total_practice_value = list_sum([p.get('practice-value', 0) for p in practices_with_factors])
+    conveyancing_from_practices = list_sum([
+        (p.get('practice-value') or 0) * (p.get('conveyancing', 0) or 0) for p in practices_with_factors
+    ]) / total_practice_value if total_practice_value > 0 else None
+    valid_waterRegime_practices = all([
+        p.get('conveyancing') is not None or p.get('practice-value', 0) == 0
+        for p in practices_with_factors
+    ])
+
+    debugValues(impact_assessment, model=MODEL, term=TERM_ID,
+                waterRegime_conveyancing_efficiency_values=log_as_table(practices_with_factors),
+                waterRegime_conveyancing_efficiency=conveyancing_from_practices)
+
+    return conveyancing_from_practices if valid_waterRegime_practices else None
+
+
+def _get_conveyancing_efficiency_from_country(impact_assessment: dict, product: dict):
     site = get_site(impact_assessment)
     country = impact_assessment.get('country', {}) or site.get('country', {})
     grouping = get_crop_grouping_fao(MODEL, TERM_ID, product.get('term', {}))
     value = get_lookup_value(country, f"Conveyancing_Efficiency_{grouping}", model=MODEL, term=TERM_ID)
     debugValues(impact_assessment, model=MODEL, term=TERM_ID,
                 grouping=grouping,
-                conveyancing_efficiency=value)
+                country_conveyancing_efficiency=value)
     return safe_parse_float(value, default=1)
 
 
 def _run(impact_assessment: dict, product: dict, irrigation: float):
-    conveyancing = _get_conveyancing_efficiency(impact_assessment, product)
+    conveyancing = (
+        _get_conveyancing_efficiency_from_waterRegime(impact_assessment) or
+        _get_conveyancing_efficiency_from_country(impact_assessment, product)
+    )
     # convert from m3 to litre
     value = convert_value_from_cycle(
         impact_assessment,

hestia_earth/models/site/grouped_measurement.py

@@ -5,7 +5,7 @@ from hestia_earth.utils.tools import non_empty_list, flatten, is_number, list_su
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import _include
 from hestia_earth.models.utils.measurement import _new_measurement
-from hestia_earth.models.utils.blank_node import get_lookup_value
+from hestia_earth.models.utils.term import get_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {

hestia_earth/models/utils/background_emissions.py

@@ -5,7 +5,7 @@ from hestia_earth.utils.emission import cycle_emissions_in_system_boundary
 
 from hestia_earth.models.log import logShouldRun
 from . import is_from_model
-from .blank_node import get_lookup_value
+from .term import get_lookup_value
 
 
 def _animal_inputs(animal: dict):

hestia_earth/models/utils/impact_assessment.py

@@ -1,6 +1,6 @@
 from typing import Optional
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.model import find_term_match, filter_list_term_type
+from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum, safe_parse_date
 
 from hestia_earth.models.log import debugValues
@@ -50,7 +50,7 @@ def get_site(impact_assessment: dict) -> dict:
     return impact_assessment.get('site') or impact_assessment.get('cycle', {}).get('site') or {}
 
 
-def get_region_id(impact_assessment: dict) -> str:
+def get_region_id(impact_assessment: dict, blank_node: dict = None) -> str:
     """
     Get the country or region @id of the ImpactAssessment.
     Note: level 1 GADM region will be returned only, even if the region is of level > 1.
@@ -59,18 +59,29 @@ def get_region_id(impact_assessment: dict) -> str:
     ----------
     impact_assessment : dict
         The `ImpactAssessment`.
+    blank_node : dict
+        If getting a value for a specific `emissionsResourceUse`, will try to get country from it.
 
     Returns
     -------
     str
         The `@id` of the `region`.
     """
-    site = get_site(impact_assessment)
-    term_id = site.get('region', site.get('country', impact_assessment.get('country', {}))).get('@id')
-    return term_id if not term_id.startswith('GADM') else region_level_1_id(term_id)
-
-
-def get_country_id(impact_assessment: dict) -> str:
+    term_id: str = (
+        (blank_node or {}).get('region') or
+        (blank_node or {}).get('country') or
+        impact_assessment.get('country') or
+        get_site(impact_assessment).get('region') or
+        get_site(impact_assessment).get('country') or
+        {}
+    ).get('@id')
+    return (
+        term_id if not term_id.startswith('GADM-') else
+        region_level_1_id(term_id)
+    ) if term_id else None
+
+
+def get_country_id(impact_assessment: dict, blank_node: dict = None) -> str:
     """
     Get the country or @id of the ImpactAssessment.
 
@@ -78,13 +89,21 @@ def get_country_id(impact_assessment: dict) -> str:
     ----------
     impact_assessment : dict
         The `ImpactAssessment`.
+    blank_node : dict
+        If getting a value for a specific `emissionsResourceUse`, will try to get country from it.
 
     Returns
     -------
     str
         The `@id` of the `country`.
     """
-    return impact_assessment.get('country', get_site(impact_assessment).get('country', {})).get('@id')
+    term_id = (
+        (blank_node or {}).get('country') or
+        impact_assessment.get('country') or
+        get_site(impact_assessment).get('country') or
+        {}
+    ).get('@id')
+    return term_id if term_id else None
 
 
 def impact_emission_lookup_value(
@@ -170,7 +189,7 @@ def impact_country_value(
         lookup_col=country_id,
         blank_nodes=blank_nodes,
         grouped_key=group_key,
-        default_no_values=None,
+        default_no_values=default_no_values,
         factor_value_func=_term_factor_value
     )
 
@@ -251,10 +270,6 @@ def impact_endpoint_value(model: str, term_id: str, impact: dict, lookup_col: st
     )
 
 
-def emission_value(impact_assessment: dict, term_id: str):
-    return find_term_match(impact_assessment.get('emissionsResourceUse', []), term_id).get('value')
-
-
 def convert_value_from_cycle(
     log_node: dict, product: dict, value: float, default=None, model: str = None, term_id: str = None
 ):

hestia_earth/models/utils/lookup.py

@@ -44,7 +44,11 @@ def _term_factor_value(model: str, term_id: str, lookup_name: str, lookup_term_i
     def get_value(data: dict):
         node_term_id = data.get('term', {}).get('@id')
         value = _node_value(data)
-        coefficient = get_region_lookup_value(lookup_name, lookup_term_id, node_term_id, model=model, term=term_id)
+        # when getting data for a `region`, we can try to get the `region` on the node first, in case it is set
+        region_term_id = (
+            (data.get('region') or data.get('country') or {'@id': lookup_term_id}).get('@id')
+        ) if lookup_term_id.startswith('GADM-') else lookup_term_id
+        coefficient = get_region_lookup_value(lookup_name, region_term_id, node_term_id, model=model, term=term_id)
         coefficient = safe_parse_float(
             extract_grouped_data(coefficient, group_key) if group_key else coefficient,
             default=None

hestia_earth/models/utils/measurement.py

@@ -37,7 +37,6 @@ def measurement_value(measurement: dict, is_larger_unit: bool = False, default=N
     reducer = get_lookup_value(term, 'arrayTreatmentLargerUnitOfTime' if is_larger_unit else 'arrayTreatment') or 'mean'
     value = non_empty_list(measurement.get('value', []))
     is_value_valid = value is not None and isinstance(value, list) and len(value) > 0
-    print(reducer, value, is_value_valid)
     return MEASUREMENT_REDUCE.get(reducer, lambda v: v[0])(value) if is_value_valid else default
 
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.73.0'
+VERSION = '0.73.1'

{hestia_earth_models-0.73.0.dist-info → hestia_earth_models-0.73.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.73.0
+Version: 0.73.1
 Summary: HESTIA's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: HESTIA Team

{hestia_earth_models-0.73.0.dist-info → hestia_earth_models-0.73.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 hestia_earth/models/cache_nodes.py,sha256=CqcTkvT0SQw-MKExUJgM3wDRt2sgdxgVYb6ylNnfC4I,5423
-hestia_earth/models/cache_sites.py,sha256=VwUNMhmCXZIEnligS0jtcWDdn13GIknpzxBMWzG9kcg,6353
+hestia_earth/models/cache_sites.py,sha256=XpXnkYt823PQzrswgP__L4CT8xZG_n7a41CIHK8wQ3U,6427
 hestia_earth/models/log.py,sha256=eRuH86v7Thuw-QXdKqaqVmA_MkwnOCo0UBEwtuDq4Oc,3554
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=ko6xDdKVRu7Xx-36NfOOGe9oNxu3iebJLKeVnFGGf28,19
+hestia_earth/models/version.py,sha256=hAIsADvvT3pUfuetJKnq_AYIZolRAZkIV3u6dNVZric,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=1ngl8pdxeNhlVV8keAeWRwGorr_1uFXM9EoPUWx-uSc,4382
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=queToXuzq0tQ9_XuUJ2pJgSywXmbt9uX3ZoIKgqkROM,2660
@@ -15,14 +15,14 @@ hestia_earth/models/akagiEtAl2011/nh3ToAirCropResidueBurning.py,sha256=MUVyLifn5
 hestia_earth/models/akagiEtAl2011/noxToAirCropResidueBurning.py,sha256=aFot00A68gFM6Sp1cGkzruB4nIyc-BNGX7T75sb_CCw,791
 hestia_earth/models/akagiEtAl2011/pm25ToAirCropResidueBurning.py,sha256=88LaJnezcbfOO_GCKz41zt39yhCFOFFmC9TTo1TAOMU,792
 hestia_earth/models/akagiEtAl2011/so2ToAirCropResidueBurning.py,sha256=hoymFUx3TxzwhlOV65RzOx43IK-CGM8jYfWLH6ibHNo,791
-hestia_earth/models/akagiEtAl2011/utils.py,sha256=HxRsPhoo164tyHtC9dq_FqZmtGTh-jdSLJxBoGfLS68,1778
+hestia_earth/models/akagiEtAl2011/utils.py,sha256=CwRhUP2LN8NULyg3nxdnXGR6dv1uNOZX9JXsaULu52Q,1772
 hestia_earth/models/aware/__init__.py,sha256=F8XRo9nRiX-fHAqyeMARYtFmJWRPs-hnIaCiHcZhyMw,406
-hestia_earth/models/aware/scarcityWeightedWaterUse.py,sha256=z1mpBX7dxArkMKErU8dNR-hN-A-qAuXeJlG6OcxZgUw,3795
+hestia_earth/models/aware/scarcityWeightedWaterUse.py,sha256=HO3ic8xFXs_ez13N7kG1JuYit2S8YTi5WgeP9cOyOqc,3936
 hestia_earth/models/chaudharyBrooks2018/__init__.py,sha256=LKxQu7-6gyWPpdXaYHDTawzsBNm7CpDrk98I5_TTLhA,420
 hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandOccupation.py,sha256=qsOClIL45FT9qbglvyB5NPOHlWLm8TZl8LDT0duQyfw,3905
-hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandTransformation.py,sha256=q3kGrb20LPpAGcprVKkf29IKiTvv84Txv58KHcrMRcE,3242
+hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandTransformation.py,sha256=34WuvMQa3ERW-D9WEv3kbfLbCywaRqGAuXt85wTstUQ,3358
 hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=IcPJbfRTDQYYjcRXpx7_U7eEf7nSkKouvVeTUX-JhFc,2631
-hestia_earth/models/chaudharyBrooks2018/utils.py,sha256=l_Yv_lt31Mh5wXsyYWrNaZMwcHbndm6mCzSkFtVULe0,1684
+hestia_earth/models/chaudharyBrooks2018/utils.py,sha256=UsjuO-tL6zBD4xXoFQBdK-BUoTibQ5qdW8aZEzucmy0,1738
 hestia_earth/models/cml2001Baseline/__init__.py,sha256=0uGrCKDNUH-MUkpvts9MyPMnZKao-M03gU8uKquUozQ,416
 hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=K7rq8jARCGvxA_nstNNGCnNrqtF0AsdMKElbYVNdx6M,4731
 hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=RT69ZgQjwtY72Qxrxq7Kw7L6WLTfPttYANYVs9OMRnA,5151
@@ -62,14 +62,14 @@ hestia_earth/models/cycle/animal/input/properties.py,sha256=PoW8qBlPuWSQRBNK4iBh
 hestia_earth/models/cycle/completeness/__init__.py,sha256=bQ-tpeCbUsIdSPGla06Mg2IZWpGp7TgWXlgZTYeLsKk,1512
 hestia_earth/models/cycle/completeness/animalFeed.py,sha256=_qUJcQ2ggdy0fBCBkHmeRDL71HuX4b9KfnSm7JqPgFM,830
 hestia_earth/models/cycle/completeness/cropResidue.py,sha256=7SNfYvP4erJ2keem3DHdOzuzzuAsrj15iffacWNgJHE,2653
-hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=TuhuYPp9-JGRmTEkZLWCU1wZSM3MUe56tBBydAfDm2E,1933
+hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=ZXljdjAxYgu75GdHioYjNYTgF97LClEP_1g3hFcvJYU,1927
 hestia_earth/models/cycle/completeness/excreta.py,sha256=wgrinfKnsXMG4I01g0iyFIpz2Ir-T69YB00pgrM_zvY,821
-hestia_earth/models/cycle/completeness/freshForage.py,sha256=YpZ3bbZh93Cbqjup38V8IRJhKJpCIKgu23E-OeVcunA,2228
+hestia_earth/models/cycle/completeness/freshForage.py,sha256=UBBPlixmiffDGck-XvJ7wGiJeRA1L8Wm0qrzXUbe5KA,2222
 hestia_earth/models/cycle/completeness/material.py,sha256=cF33MJkVBUnoicmecdsR78Snrv1Zng097aUeEfYDfdc,1185
 hestia_earth/models/cycle/completeness/seed.py,sha256=O4OygpPOeXHbn_32rdUk8m1BcZiQ6QpmvV463UOCmKY,1763
 hestia_earth/models/cycle/completeness/soilAmendment.py,sha256=RQPq1Y5VWJbz50tKFtcW54DdQ1YT48mQOteidW8sFcQ,1226
 hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=u4sNTBe9vQHe1-Jlz_qCQ6DyioJTN_hq7L56nCf9vhs,5696
+hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=wLdIWCSMHURAt3_cnHI_f5gpz0E9JIFnZOCldmNohTE,5648
 hestia_earth/models/cycle/input/properties.py,sha256=-bsKbgS92AicE7_0GSamFG2-O3Rvn2LnXcmlrEt72dA,2752
 hestia_earth/models/cycle/input/value.py,sha256=TUcqoaMheIhlM0c7Ki7qWSdHpxes3SEVORAUNdyR8Rg,1391
 hestia_earth/models/cycle/post_checks/__init__.py,sha256=5ThdvGKp7ilFOzn8Tq23c4XXqhA345PYIe63yOtGJTY,336
@@ -85,7 +85,7 @@ hestia_earth/models/cycle/pre_checks/otherSites.py,sha256=G1F8BREiOmq4etwJ0F84yC
 hestia_earth/models/cycle/pre_checks/site.py,sha256=nMvzSIeqC5KdLetvmGH3XpxtiWdyArVkUdcI6na5cmI,637
 hestia_earth/models/cycle/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/cycle/product/currency.py,sha256=hFhwhkgYCwXMf10rufYupTKv43-Hqr69IZOVn81An_E,2063
-hestia_earth/models/cycle/product/economicValueShare.py,sha256=eSepth3l6c6Nf_2gR4HIzoOYulIQMtQMUni4oATmIG0,8120
+hestia_earth/models/cycle/product/economicValueShare.py,sha256=DAqjgmZOw7oaelVqLnmLnE4J3__2zT9oOu2KjBxTLXA,8114
 hestia_earth/models/cycle/product/price.py,sha256=uApxfOeWMjvjNeYQtrLMwZh-mxV0OchZE9_m1h1Vn1w,2300
 hestia_earth/models/cycle/product/primary.py,sha256=gRRHGcaIsmDBrz-LIrzOHNv-hMbWOBQD4zEIR2iMZdI,1737
 hestia_earth/models/cycle/product/properties.py,sha256=rnxRq-4kSjQMVyPEv1RBuF5xGJQEOBe51HuID2ytTbQ,1293
@@ -121,13 +121,13 @@ hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=TaT5GyYK6MyJQHKA
 hestia_earth/models/emepEea2019/utils.py,sha256=yynKXlW2qi46xSiPuJ6JaFg21S6a1KkP2dUqkMlBJx0,5651
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=yAunIZI_4nGV0khRiGhbZAmXmMiuICzEH-pvzWX1lpM,3000
 hestia_earth/models/environmentalFootprintV3_1/__init__.py,sha256=tF2WrWiV1Wzi2vnRiNXdfPWfmVxgVu9w9-7eA6PA7-s,473
-hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=XjukJ0ecX62mK7Nhp3JZ7xYg9cKNAWbdhvy5M7VbXH0,5810
+hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=TojoseslBok28v--yID-Xi2WTEQU2S8SK620ICWYaRo,5804
 hestia_earth/models/environmentalFootprintV3_1/freshwaterEcotoxicityPotentialCtue.py,sha256=N_gw2aNoCMW5Z1XM-uAyCF1kfpZUI07giv_bo3Lmr5Q,918
 hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py,sha256=UM9pezQeETfk9i0FtOBRdreaaJ9OqL6G4gYljrKOz-0,1063
 hestia_earth/models/environmentalFootprintV3_1/photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py,sha256=47raZTA3aUbBpgClTzKnzUI8Vfy9qUwYNdFDUKM3hJ0,1101
 hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py,sha256=JhZB4qGQBQb7fF3ambBuILL7eKLG6B_4RYvIgbINNpY,1299
-hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=PFSCgEND7GeO7AbrAqG08YP39Oys2eK9U5P0eITuPjM,4823
-hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=VyW1GpC11dFVmu93UpVKR8X6ryIAWKWf5uFBClyK6yQ,6841
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=xCQUf4bUJuAqnPgaRZv0Qcc2zzIxhFBePPuNUdjHvLo,4739
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=HEIAG3VHYnv-XaLmnzXGvShVeT9MoRHBMODNQ9vNLAo,6796
 hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py,sha256=6g76wBf0XcQdAadE4BCD5-qUmpGbbYV9kfKsM6cKnHM,3075
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=683vgGM-m4cdFhbvlp9V1yobLHM7bQWYMwjByoozzZA,1724
@@ -141,7 +141,7 @@ hestia_earth/models/faostat2018/landTransformation20YearAverageDuringCycle.py,sh
 hestia_earth/models/faostat2018/liveweightPerHead.py,sha256=2BmSe8xdEdm68i6t_UkeXQshxLH3WVNyvButsoE_9zE,5031
 hestia_earth/models/faostat2018/readyToCookWeightPerHead.py,sha256=obJLPV8GgG2lEhLqg9RrJLSFPzbasXJnmzHnwkpW7O0,3131
 hestia_earth/models/faostat2018/seed.py,sha256=brDGypvFJR6gpb4VMTW16cN2Jw0jbvD2msV-NMWuwxQ,2948
-hestia_earth/models/faostat2018/utils.py,sha256=gcEyhxLuBif7ksIGAkoQGz6RySncYrmG19Xq3XJ8XmI,7286
+hestia_earth/models/faostat2018/utils.py,sha256=bxd4dtML0z5D5LP7peZTcvt7U6GLxGdXzt2CtpqoCQA,7846
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/faostat2018/product/price.py,sha256=6oG8n-tGFRX2p4aC1RBeEvO7iexooFiRok39m8f4VN0,7734
 hestia_earth/models/frischknechtEtAl2000/__init__.py,sha256=Fixyy9UwoCGP5-MHyJu_ctS40SQ2imfvZo8a547029U,421
@@ -177,7 +177,7 @@ hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=y
 hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=E2k2kkhVDtmeFEB4_AZhhq5od57lRDMWu6AqaurgqvQ,3194
 hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=eajSzMCX201k_xrfZZSHtTzEIH29hqgJdztQgQeewig,2853
 hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=fL8wNpx-3WdD3k9riy6AaUnpdRMFNMzzc338jRIqfw8,2102
-hestia_earth/models/geospatialDatabase/utils.py,sha256=YfWjM8TZcSCjZCkpO4luIPzo0rnimwNKMpHN88EC_DQ,6726
+hestia_earth/models/geospatialDatabase/utils.py,sha256=IBF7_HcRM00b_TX4f0ioRppMbNfXBNfNRJxQFuPhV70,6794
 hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=Xy2UxwAJrgdOkcw59NetEHMt5vgRYE6qg4fgXb1ptlU,1643
 hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
 hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=UuFzMbDrvmll3LL6T887DZ76CHt3wrK-2hl9ymmg2FI,4089
@@ -194,10 +194,10 @@ hestia_earth/models/hestia/coldDressedCarcassWeightPerHead.py,sha256=NE1aw4-rmKs
 hestia_earth/models/hestia/concentrateFeed.py,sha256=HnuG3zAECtFVdPRbTATGz5ImO2Ve1NruqD8brbrO2c4,6647
 hestia_earth/models/hestia/cropResidueManagement.py,sha256=5t32oILM-lbOsPiP6tDiITpuLZ0eISlB6Lp0goDH8eE,2223
 hestia_earth/models/hestia/croppingIntensity.py,sha256=xev3GOE06nBJ8ZY3XtbnE0eR2YR_kqAFPnrTuKFtLrQ,1777
-hestia_earth/models/hestia/default_emissions.py,sha256=7w3MAOaUFI4Hr_seMnnOecXpOJa2_Wa-s4o3NW5A2Nk,3414
-hestia_earth/models/hestia/default_resourceUse.py,sha256=zFfG9--zx_lntyN6ep9Q_MPhynUhGAxewK2JwrqiqQU,3699
+hestia_earth/models/hestia/default_emissions.py,sha256=GiO9zQ_shIcdLsZAhW3uKX9vouKuhS2xxq65oG2VzkA,3408
+hestia_earth/models/hestia/default_resourceUse.py,sha256=M5_mC3_t_rzvfNoyKJjZ1tSrV1V9Ci_40LIv0iawVB4,3693
 hestia_earth/models/hestia/energyContentLowerHeatingValue.py,sha256=2gR7Iu5nUUCGSXjFrkTnss6XBGtQz-yKwexCQoy8TJU,2214
-hestia_earth/models/hestia/excretaKgMass.py,sha256=8yUZZ_Mmx5HC6Jv2uQBFi-oJIzd-pR2Py1q0dhKY1Mo,4021
+hestia_earth/models/hestia/excretaKgMass.py,sha256=Ct9nwTUXSv7FmJwDNCk45vkaW_2flu6A53ZJN6Wo4kI,3996
 hestia_earth/models/hestia/excretaKgN.py,sha256=-GfHPx6AECNPW2i_ioCuf-DhW7Xau201xqe-qWcK474,2857
 hestia_earth/models/hestia/excretaKgVs.py,sha256=fzBV7hgznevLTcvHyHKQk9upkCgmJ0xH1NuMETeSF8A,2860
 hestia_earth/models/hestia/flowingWater.py,sha256=Iy5PCWun7GMrr0zszd0zpp9lKADpXesjC3doqLY4n28,1603
@@ -235,16 +235,16 @@ hestia_earth/models/hestia/residueLeftOnField.py,sha256=EZoPlDhh1aNJvPT52Bvro6xc
 hestia_earth/models/hestia/residueRemoved.py,sha256=2I4wTJJcORrhkWiRJOzjwxRMIn3Jjeggh1dhFC2CK4Y,4969
 hestia_earth/models/hestia/resourceUse_utils.py,sha256=SYMN-40NW76LaVo2jVdnCbTgYN03mmSqvYRzgDzm5jI,8564
 hestia_earth/models/hestia/salineWater.py,sha256=rqiF3KfjvvNx3sxWFiXsP1_e5aB3ekA4QGC8vtcFHmo,1270
-hestia_earth/models/hestia/seed_emissions.py,sha256=amHFAc68BN_0wmXiYjia5FH-FmDQKOM7binh1vTWec4,11936
+hestia_earth/models/hestia/seed_emissions.py,sha256=kP1VPDDm5M6EOOFyKhEI3L5GuUuKb7-4ni_WXrB-nSU,11930
 hestia_earth/models/hestia/soilMeasurement.py,sha256=cP4nuz2DE-FLaFbP-0fG5wbIgU28s3n4-lo8-RTFpF0,7088
-hestia_earth/models/hestia/stockingDensityAnimalHousingAverage.py,sha256=Ce0RZmAADDtGksfXzhX4lh-jdAs3WlCQqy2FAF3xFjo,1850
+hestia_earth/models/hestia/stockingDensityAnimalHousingAverage.py,sha256=WIRmBSTk70Dffm_KcbTqpAhtnrV4rzl_m0gKED5NIAo,1844
 hestia_earth/models/hestia/temperatureAnnual.py,sha256=IhMoO-SkSp1JBxgu9bSr1OCtr7QQlZsoCXqhsWeEprs,1963
 hestia_earth/models/hestia/temperatureMonthly.py,sha256=sY4MrjCTm7X3BoDTUC0ZkxD7CWxvl51JW2UxDykCKzg,1842
 hestia_earth/models/hestia/totalNitrogenPerKgSoil.py,sha256=hpyYqMwO9TvZjrpQuSBA3uRFrOk_PPZEo9ev4QeECI4,1956
 hestia_earth/models/hestia/unknownPreSeasonWaterRegime.py,sha256=Ix7Eg4NVW1iKvPKIOqOdSkahn7BlJNtPM8nlrogrfcM,1460
 hestia_earth/models/hestia/utils.py,sha256=oTdk7VKuaxDTKj9Cz4t3qp3RZ5wSt3bZXpPiImgIIto,4768
 hestia_earth/models/hestia/waterDepth.py,sha256=gnvd1kwbTCt9HjgxlKzuCGkPi8Sq7nQiHFbk8xBAZV0,1251
-hestia_earth/models/hestia/waterSalinity.py,sha256=_AEyH9yVPhW03dmZ3a1JZ9R5kgOeF5uOA3Oh1zGyQTU,2673
+hestia_earth/models/hestia/waterSalinity.py,sha256=2tE2LWhXTFikXu4gkHnKOAPJs8rHYVDbRwQmsC3gA2g,2667
 hestia_earth/models/hestia/feedConversionRatio/__init__.py,sha256=G4T1jfN1OqERsywiWyrBiFneUZs5QXpChz7dgGfg9Ko,2512
 hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioCarbon.py,sha256=21_PXoKXJCxPOPOspKqqq-E7dh-2tVQnR4cnGZ9JGj8,1992
 hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioDryMatter.py,sha256=zf-v-cAPLpSe7sr1auzUUXkjXwpXRTVvsCrzbZrwBI8,2388
@@ -289,7 +289,7 @@ hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=z4Z0gDCFV9p50hMpLf7WrA
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=qbfsLBPaMIt4oQzYAzbsZdkJozTbwuztNr48TLYC5-Y,3507
 hestia_earth/models/ipcc2019/biomass_utils.py,sha256=bPvge2EOVACkxJlxMoFhlRMRQHdUEiBqaFX_aEmyyC0,15812
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=XhXDu6DRQxANBsRsCEgw4f0UJDOgWsvhVyEwK1-4YT0,7263
-hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=1qT29z22qLYOTbf7MHlrh6cfiQMTq0NYtpUFoCur3Ck,3535
+hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=JeyF4tUPn3KIDbXwgM_MFp18hnTZjLBBqMFMH_ciZ1Q,3529
 hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=b9FIMIGMGcpOhYHhD6yFsiatHsPe_KoF5yB3Rm6AKwA,12525
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=4GI_d4sTlskQiSK7xR2f1EaFhBt5Mu7sx0Xq9eUhiJk,6608
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=26WZtckmb7b3sbUN7hpshEdaSdvJpL3-Oer60III_KU,10225
@@ -303,7 +303,7 @@ hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=4aRB
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=P6OxdUbvONaTVGchvogEnGeNxox-X1FaZ08yOdqqm6k,3879
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=X2fuBCr-mspLwJUGOlVis9lnyzdZ92vYqgDA6dgL5eo,3088
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=nAhwrl0b3pbGQnAycEESAzakdpXajONTnbhNwgPR7nw,7293
-hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py,sha256=43DObFfqABoH66fjgROu_Iv3bRKOUmCKk87bhBx1yj4,1851
+hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py,sha256=K-3-pjH46Z3eEcFnOchBucuOYB2jcAA6C4q0C8i-ezo,1845
 hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=Fand7NbT27unwgFTxi_9NxT024s63vQ7U6-tk9yp3d8,3990
 hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionIndirect.py,sha256=_Oj6Jw8F4rce7FmhWkzeqyB7W3ZQWpOiA10p6xrfSwc,3777
 hestia_earth/models/ipcc2019/n2OToAirExcretaDirect.py,sha256=RW_aFY409kplCYWo3oHHVk9FD3DkoEnGkprU9SaTdcw,2196
@@ -448,14 +448,14 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=7M-E7u35fIF0uMoA1hwcr
 hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
-hestia_earth/models/mocking/search-results.json,sha256=yFpO3uRv4HbUY56ZOVVdLFnl_IZD3hSxMSSjbb6mwW4,162616
+hestia_earth/models/mocking/search-results.json,sha256=wK9Azsu0qZHpjEONUgnLbUQrA0rwyP6uj5x0Sikg1Qg,162618
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=oXillpppAas1q9GKmODxe1YXyno3EzV-j12xhzkqtTc,2404
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=_pQMPSvI--Xm00H6vXDA4ct_pQXKRGrLE2f-2tQE6y4,2323
 hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=k_dB5iwOg6swQWb4fvfMCZ1dm1PnRff8Rpm1aclKOqA,6517
 hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=EKVQK_wfDGRvj3lsSYp4xCjVEobOVt04fNhiZZXXfDk,5956
 hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=khyeuP2KBHSpseR2YPtXg0mT3qZS3fVVE47ey674fvw,9289
-hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=jyFhTiL7gHPrYqxZgeP0Dfd9oRFa1TaiyVq5-ia1Lfg,3928
+hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=n6_QxRZlAMkhf9yVerv2EQ6nJOxIBsrv3dgVtIFKrjw,5656
 hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=gSUzPuzzLwQsBiX_Tgx6mWJ4pEB5qhlKoOtaEdmDGQ4,3431
 hestia_earth/models/pooreNemecek2018/longFallowDuration.py,sha256=qtqIPWR4Fvbi5yWnMlG3apYPQT4X_YMCob3z035mQMU,1519
 hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=n3G4p1ed7-45Ts09kbGGyJ4wea4dp8cY4lTm_9HAsP8,2375
@@ -549,7 +549,7 @@ hestia_earth/models/schmidt2007/utils.py,sha256=tbTFg5TXAyS12JCa-OXQg37M1YymHxKW
 hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
 hestia_earth/models/site/defaultMethodClassification.py,sha256=1EIWC99Fegu7B8GFlpysvWhuXaLDmABom3wDelIYUjc,1068
 hestia_earth/models/site/defaultMethodClassificationDescription.py,sha256=4YXf8grO9Zf5N7bPomKAqXKPOa7JhmLCXm6sO53I4is,1213
-hestia_earth/models/site/grouped_measurement.py,sha256=S5EHKbLJOH5jPhAawzddR6vsaxa1ny1Vzuj_CstpTcQ,4230
+hestia_earth/models/site/grouped_measurement.py,sha256=Eyi9fPWzUMYRyz_r0TkzVW_Yk8Q0lVE4vEdcO9XrXao,4224
 hestia_earth/models/site/measurement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/site/measurement/value.py,sha256=D09-nYYqAEQEaiaAnYtZQGp-JNP0CVFapDoIFj7iOTA,1484
 hestia_earth/models/site/post_checks/__init__.py,sha256=wgAeEJ-1oeUZP5yS8_7n5PclohdQeP57xnHnXmmYCaI,310
@@ -595,7 +595,7 @@ hestia_earth/models/utils/aggregated.py,sha256=G7FNJfHqJ_eoXB66kGdjLyZGDOI_gsF56
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/array_builders.py,sha256=ko1pDZKaUudZqxOZ99vJamKAdoR6ND4ZmxVrYH6YjPc,19498
-hestia_earth/models/utils/background_emissions.py,sha256=DnPzhEWO6OU7MwYsV33TjV9QjzwFNd2eBsxQXDtoxFM,3106
+hestia_earth/models/utils/background_emissions.py,sha256=54zuH4yFNc_cle3uYGtK_EjhkG0XGaG5L6eGKiTyOG4,3100
 hestia_earth/models/utils/blank_node.py,sha256=o1MzCz6FXuJ4Iit55EeGrHbrGM9VUfdAF1RNqTBU89Y,56070
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=iRG4uviOAQQ4T2Nr4LlelPVTS_F1felGZNJYxek_JG8,1239
@@ -612,15 +612,15 @@ hestia_earth/models/utils/excretaManagement.py,sha256=PNZoaf6nvdt1t7B8Apa638rU8T
 hestia_earth/models/utils/feedipedia.py,sha256=fVyEx2C5CSu0pv--tG6dOfQQ7WzThPoVuzM_FW9jP18,4009
 hestia_earth/models/utils/fertiliser.py,sha256=9Kv7czDEPDvZ5Bz6Rr_2vy2MsXrPDvBC3921cEJSks8,810
 hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
-hestia_earth/models/utils/impact_assessment.py,sha256=YeO7Z-9_KYyIsb1JpRJmUBbsik0FcIuLAzafF2v9yQQ,7933
+hestia_earth/models/utils/impact_assessment.py,sha256=MW38yKehkrF7YWYCbDtG-xMjVhhAffxkcOiLYOdrmFI,8377
 hestia_earth/models/utils/indicator.py,sha256=qdXJP9PDQbEzcGYERp3d3exkDGFmgj1-2987Ls6Hums,772
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=2Uq6ATWwb_YYRzBCMdrlVWyCDDtWVApUxgxDEN3-3OA,1782
 hestia_earth/models/utils/input.py,sha256=61aaJV6QApJQIQT5TMsBww46cBYpJdf__krnwV95KsY,6160
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=-ufUs00ALXRKGbrRJi7a7eTWVvkEj_pxLDWYbMJmx2g,1770
-hestia_earth/models/utils/lookup.py,sha256=1sDA9LAh1zomS4XWdfM3QcBajgy7P5mfwngb6PPlRtM,6198
+hestia_earth/models/utils/lookup.py,sha256=70dw7QcNAPqL8t0nDQc2aGEcrFXhZKF24Os36AvVDtA,6499
 hestia_earth/models/utils/management.py,sha256=urvoHvTw5wrO12POjGQ50Or25X1Y4Gx26l4fDoVt-Ck,376
-hestia_earth/models/utils/measurement.py,sha256=HElALkyxRa1Jj_rsf0cTUcgKPpxJZEP-XuMDFn8TusQ,11786
+hestia_earth/models/utils/measurement.py,sha256=1Da0CzWu_RDzVEqcBIl_EGsRq7PmafICyBva3-QtjVQ,11744
 hestia_earth/models/utils/method.py,sha256=ZYN2_Fyeiwr9pmvD84ZPg7ZHBlvaIY2A6XL4F_KByS0,740
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
 hestia_earth/models/utils/pesticideAI.py,sha256=DQIAjgkWjKPyuMLUvnEgVkeQGCEOBjyJJktWU747b00,2047
@@ -1081,7 +1081,7 @@ tests/models/pooreNemecek2018/test_belowGroundCropResidue.py,sha256=A6EOD2B6frN0
 tests/models/pooreNemecek2018/test_ch4ToAirAquacultureSystems.py,sha256=p_n0NZim2DsHGTWp20pkwSF1R0L3Lv-HDf-DitvHKhg,2492
 tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=HExbvxYBDumOg0u6wkXZ9F_2rW0vxgsTDaEp9lj6Nos,4054
 tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=VQCfF6y7oPQAQ7DgwPHWoeFcgVSuLzhU2G0VgEfECOo,3252
-tests/models/pooreNemecek2018/test_freshwaterWithdrawalsDuringCycle.py,sha256=5QxDU6VzcwWup3Nuhn32kJoIlAkqcSggGr4CmoRqrFA,1623
+tests/models/pooreNemecek2018/test_freshwaterWithdrawalsDuringCycle.py,sha256=TQEYds8imjMNHqjApn0MIMuPbx5HtZtVABb_Ds5T7ZY,2044
 tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=R8tiV9FtpvwDNcxt4zs1RUDDLNKRjGHS1fS9ZJKZYgA,1986
 tests/models/pooreNemecek2018/test_longFallowDuration.py,sha256=kelZajIbKyvVm1vX_grRZy0IUrtejGI5GPn03qbElnw,925
 tests/models/pooreNemecek2018/test_n2OToAirAquacultureSystemsDirect.py,sha256=Dvgnk1tOxJteXzULyDr0dVbqkYe_TYnjGJcAK2kZujk,1977
@@ -1221,7 +1221,7 @@ tests/models/utils/test_descriptive_stats.py,sha256=BpCuUBzvrqc_LjXutIGyyVPhsmbp
 tests/models/utils/test_ecoClimateZone.py,sha256=Pzy1wuCqkz4Ftms-6eCxdYg1sdOVu8bobTNVd-TUm3U,4280
 tests/models/utils/test_emission.py,sha256=N7Vk_CMsU5wy73nh_VoHtXDsp02R1oGalFwppYD8Bzo,1941
 tests/models/utils/test_feedipedia.py,sha256=S7c1W4bJ5xWXPh42pPbl3R7lDX_iEeaEtFaPXgB7hgE,906
-tests/models/utils/test_impact_assessment.py,sha256=rZVGzf_ZKOttdTxyyalR5DtcG9vHKfMuTAB_3ohkiDQ,1141
+tests/models/utils/test_impact_assessment.py,sha256=XeIBY2-a-GQDrIjBlEupqUAOonrHVgpVSmw4nc7mql8,1582
 tests/models/utils/test_indicator.py,sha256=zEBSwHO-0py20lydi_9Lsg1RGsPnJ2e6JccvhtxVzIY,636
 tests/models/utils/test_input.py,sha256=oUjgIYrqPf-KxgJB1mjbPlj95MbBp-4gQygQTJpI4rI,2441
 tests/models/utils/test_liveAnimal.py,sha256=bntT4vULWsDF2DOigtiMjpS0gJS5ipalPsfrk-JxC-I,986
@@ -1254,8 +1254,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.73.0.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.73.0.dist-info/METADATA,sha256=OFEDflzVeE8N4CAJRyBDBZi2scLUFQd8Vx2lqji16zI,4045
-hestia_earth_models-0.73.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.73.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.73.0.dist-info/RECORD,,
+hestia_earth_models-0.73.1.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.73.1.dist-info/METADATA,sha256=vjktwIa0xJyoOFhMxOrsXFFTagjl1E2vtj24Knc3qM4,4045
+hestia_earth_models-0.73.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.73.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.73.1.dist-info/RECORD,,

tests/models/pooreNemecek2018/test_freshwaterWithdrawalsDuringCycle.py

@@ -46,3 +46,15 @@ def test_run_data_complete(*args):
 
     value = run(impact)
     assert value == expected
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run_with_waterRegime(*args):
+    with open(f"{fixtures_folder}/with-waterRegime/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
+
+    with open(f"{fixtures_folder}/with-waterRegime/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(impact)
+    assert value == expected

tests/models/utils/test_impact_assessment.py

@@ -1,4 +1,6 @@
-from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value, get_region_id
+import pytest
+
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value, get_region_id, get_country_id
 
 
 def test_impact_emission_lookup_value():
@@ -17,16 +19,30 @@ def test_impact_emission_lookup_value():
     assert impact_emission_lookup_value('', '', impact, 'co2EqGwp100ExcludingClimate-CarbonFeedbacksIpcc2013') == 2800
 
 
-def test_get_region_id():
-    impact = {'country': {'@id': ''}}
+@pytest.mark.parametrize(
+    'impact,expected',
+    [
+        ({}, None),
+        ({'country': {'@id': ''}}, None),
+        ({'country': {'@id': 'region-world'}}, 'region-world'),
+        ({'country': {'@id': 'GADM-AUS'}}, 'GADM-AUS'),
+        ({'site': {'country': {'@id': 'GADM-AUS'}, 'region': {'@id': 'GADM-AUS.101_1'}}}, 'GADM-AUS.101_1'),
+        ({'site': {'region': {'@id': 'GADM-ZAF.5.1.2_1'}}}, 'GADM-ZAF.5_1'),
+    ]
+)
+def test_get_region_id(impact: dict, expected: str):
+    assert get_region_id(impact) == expected, expected
+
 
-    impact['country']['@id'] = 'region-world'
-    assert get_region_id(impact) == 'region-world'
-    impact['country']['@id'] = 'GADM-AUS'
-    assert get_region_id(impact) == 'GADM-AUS'
-    impact['country']['@id'] = 'GADM-AUS.101_1'
-    assert get_region_id(impact) == 'GADM-AUS.101_1'
-    impact['country']['@id'] = 'GADM-AUS.1.2_1'
-    assert get_region_id(impact) == 'GADM-AUS.1_1'
-    impact['country']['@id'] = 'GADM-ZAF.5.1.2_1'
-    assert get_region_id(impact) == 'GADM-ZAF.5_1'
+@pytest.mark.parametrize(
+    'impact,expected',
+    [
+        ({}, None),
+        ({'country': {'@id': ''}}, None),
+        ({'country': {'@id': 'region-world'}}, 'region-world'),
+        ({'country': {'@id': 'GADM-AUS'}}, 'GADM-AUS'),
+        ({'site': {'country': {'@id': 'GADM-AUS'}}}, 'GADM-AUS'),
+    ]
+)
+def test_get_country_id(impact: dict, expected: str):
+    assert get_country_id(impact) == expected, expected