hestia-earth-models 0.74.10__py3-none-any.whl → 0.74.12__py3-none-any.whl

hestia_earth/models/agribalyse2016/fuelElectricity.py

@@ -32,8 +32,7 @@ MODEL_KEY = 'fuelElectricity'
 
 
 def _input(term_id: str, value: float, operation: dict):
-    input = _new_input(term_id, MODEL)
-    input['value'] = [value]
+    input = _new_input(term=term_id, model=MODEL, value=value)
     input['operation'] = operation
     return input
 

hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py

@@ -32,12 +32,6 @@ RETURNS = {
 TERM_ID = 'machineryInfrastructureDepreciatedAmountPerCycle'
 
 
-def _input(value: float):
-    input = _new_input(TERM_ID, MODEL)
-    input['value'] = [value]
-    return input
-
-
 def _get_input_value_from_term(inputs: list, term_id: str):
     values = flatten([
         input.get('value', []) for input in inputs if input.get('term', {}).get('@id') == term_id
@@ -63,7 +57,7 @@ def get_value(country: dict, cycle: dict):
 def _run(cycle: dict):
     country = cycle.get('site', {}).get('country', {})
     value = get_value(country, cycle)
-    return [_input(value)] if value is not None else []
+    return [_new_input(term=TERM_ID, model=MODEL, value=value)] if value is not None else []
 
 
 def _should_run(cycle: dict):

hestia_earth/models/akagiEtAl2011/utils.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier, TermTermType
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import multiply_values
@@ -12,12 +12,8 @@ LOOKUP_NAME = 'akagiEtAl2011CropResidueBurningFactor'
 
 
 def _emission(term_id: str, value: float, sd: float = None):
-    emission = _new_emission(term_id, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=term_id, model=MODEL, value=value, sd=sd)
     emission['methodTier'] = TIER
-    if sd is not None:
-        emission['sd'] = [sd]
-        emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     return emission
 
 

hestia_earth/models/aware/scarcityWeightedWaterUse.py

@@ -52,10 +52,7 @@ _REGION_LOOKUP = 'region-aware-factors.csv'
 _AWARE_LOOKUP = 'awareWaterBasinId.csv'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _get_factor_from_basinId(site: dict, aware_id: str):

hestia_earth/models/aware2_0/scarcityWeightedWaterUse.py

@@ -52,10 +52,7 @@ _REGION_LOOKUP = 'region-aware-2-0-factors.csv'
 _AWARE_LOOKUP = 'awareWaterBasinId-2-0.csv'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _lookup_column(site: dict):

hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandOccupation.py

@@ -60,10 +60,7 @@ TERM_ID = 'damageToTerrestrialEcosystemsLandOccupation'
 LOOKUP_SUFFIX = 'LandOccupationChaudaryBrooks2018CF'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _run(impact_assessment: dict):

hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandTransformation.py

@@ -52,10 +52,7 @@ _LOOKUP_SUFFIX = 'LandTransformationChaudaryBrooks2018CF'
 _TRANSFORMATION_TERM_ID = 'landTransformation20YearAverageDuringCycle'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _run(impact_assessment: dict):

hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsTotalLandUseEffects.py

@@ -36,10 +36,7 @@ TERM_ID = 'damageToTerrestrialEcosystemsTotalLandUseEffects'
 BIODIVERSITY_TERM_IDS = [TERM_ID_1, TERM_ID_2]
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def impact_value(impact_assessment: dict, term_id: str):

hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py

@@ -67,10 +67,7 @@ def _valid_input(input: dict) -> bool:
     ]))
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator["value"] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _run(energy_resources_in_mj: list):

hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py

@@ -53,10 +53,7 @@ def _valid_resource_indicator(resource: dict) -> bool:
     return len(resource.get('inputs', [])) == 1 and isinstance(_node_value(resource), (int, float))
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _run(resources: list):

hestia_earth/models/cml2001Baseline/eutrophicationPotentialExcludingFate.py

@@ -19,10 +19,7 @@ LOOKUPS = {
 TERM_ID = 'eutrophicationPotentialExcludingFate'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def run(impact_assessment: dict):

hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionDuringCycle.py

@@ -1,13 +1,12 @@
 from collections import defaultdict
 from itertools import groupby
 from typing import Tuple, Optional
-
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import filter_list_term_type
-from hestia_earth.utils.tools import list_sum
+from hestia_earth.utils.tools import list_sum, pick
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
-from hestia_earth.models.utils import Units, _include
+from hestia_earth.models.utils import Units
 from hestia_earth.models.utils.blank_node import convert_unit
 from hestia_earth.models.utils.indicator import _new_indicator
 from . import MODEL
@@ -64,16 +63,19 @@ INPUTS_TYPES_UNITS = {
 
 
 def _indicator(values: list[float], cycle_input: dict):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = list_sum(values)
-    indicator['inputs'] = [cycle_input | {"units": "MJ"}]
+    value = list_sum(values)
+    indicator = _new_indicator(term=TERM_ID, model=MODEL, value=value, inputs=[cycle_input])
     return indicator
 
 
 def _run(grouped_energy_terms: dict):
-    indicators = [_indicator(values=[input['value-in-MJ'] for input in energy_term_group_vals],
-                             cycle_input=energy_term_group_vals[0]['input']['term'])
-                  for energy_term_group_vals in grouped_energy_terms.values()]
+    indicators = [
+        _indicator(
+            values=[input['value-in-MJ'] for input in energy_term_group_vals],
+            cycle_input=energy_term_group_vals[0]['input']['term']
+        )
+        for energy_term_group_vals in grouped_energy_terms.values()
+    ]
     return indicators
 
 
@@ -118,7 +120,7 @@ def _should_run(cycle: dict) -> Tuple[bool, dict]:
         grouped_energy_terms[k].extend(list(v))
 
     logs = [
-        _include(input, ['id', 'units', 'termType', 'value', 'value-in-MJ']) | {
+        pick(input, ['id', 'units', 'termType', 'value', 'value-in-MJ']) | {
             'properties': "    ".join([
                 f"{p.get('term', {}).get('@id')}= {p.get('value')} ({p.get('term', {}).get('units')})"
                 for p in input.get('properties', [])

hestia_earth/models/cml2001Baseline/resourceUseMineralsAndMetalsDuringCycle.py

@@ -35,16 +35,16 @@ authorised_term_types = [TermTermType.MATERIAL, TermTermType.SOILAMENDMENT, Term
 
 
 def _indicator(value: list[float], cycle_input: dict):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = list_sum(value)
-    indicator['inputs'] = [cycle_input]
+    indicator = _new_indicator(term=TERM_ID, model=MODEL, value=list_sum(value), inputs=[cycle_input])
     return indicator
 
 
 def _run(grouped_abiotic_terms: dict):
     indicators = [
-        _indicator(value=_sum_nodes_value(abiotic_term_group_vals),
-                   cycle_input=abiotic_term_group_vals[0]['term'])
+        _indicator(
+            value=_sum_nodes_value(abiotic_term_group_vals),
+            cycle_input=abiotic_term_group_vals[0]['term']
+        )
         for abiotic_term_group_vals in grouped_abiotic_terms.values()
     ]
     return indicators

hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFateAverageEurope.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'terrestrialAcidificationPotentialIncludingFateAverageEurope'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'eutrophicationPotentialIncludingFateAverageEurope'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'terrestrialAcidificationPotentialExcludingFate'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/config/ImpactAssessment.json

@@ -876,7 +876,8 @@
         "runStrategy": "always",
         "mergeStrategy": "list",
         "mergeArgs": {
-          "replaceThreshold": ["value", 0.01]
+          "replaceThreshold": ["value", 0.01],
+          "sameMethodModel": true
         },
         "stage": 1
       },
@@ -887,7 +888,8 @@
         "runStrategy": "always",
         "mergeStrategy": "list",
         "mergeArgs": {
-          "replaceThreshold": ["value", 0.01]
+          "replaceThreshold": ["value", 0.01],
+          "sameMethodModel": true
         },
         "stage": 1
       }
@@ -911,7 +913,8 @@
         "runStrategy": "always",
         "mergeStrategy": "list",
         "mergeArgs": {
-          "replaceThreshold": ["value", 0.01]
+          "replaceThreshold": ["value", 0.01],
+          "sameMethodModel": true
         },
         "stage": 1
       }
@@ -923,7 +926,8 @@
       "runStrategy": "always",
       "mergeStrategy": "list",
       "mergeArgs": {
-        "replaceThreshold": ["value", 0.01]
+        "replaceThreshold": ["value", 0.01],
+        "sameMethodModel": true
       },
       "stage": 1
     },
@@ -934,7 +938,8 @@
       "runStrategy": "always",
       "mergeStrategy": "list",
       "mergeArgs": {
-        "replaceThreshold": ["value", 0.01]
+        "replaceThreshold": ["value", 0.01],
+        "sameMethodModel": true
       },
       "stage": 1
     },
@@ -945,7 +950,8 @@
       "runStrategy": "always",
       "mergeStrategy": "list",
       "mergeArgs": {
-        "replaceThreshold": ["value", 0.01]
+        "replaceThreshold": ["value", 0.01],
+        "sameMethodModel": true
       },
       "stage": 1
     },

hestia_earth/models/config/Site.json

@@ -106,6 +106,22 @@
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
         "stage": 1
+      },
+      {
+        "key": "measurements",
+        "model": "hestia",
+        "value": "slopeLength",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
+      },
+      {
+        "key": "measurements",
+        "model": "hestia",
+        "value": "slope",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
       }
     ],
     [

hestia_earth/models/cycle/aboveGroundCropResidueTotal.py

@@ -27,11 +27,6 @@ RETURNS = {
 TERM_ID = 'aboveGroundCropResidueTotal'
 
 
-def _product(value: float):
-    product = _new_product(TERM_ID, value)
-    return product
-
-
 def _should_run(cycle: dict):
     term_type_incomplete = _is_term_type_incomplete(cycle, TERM_ID)
     value = sum_above_ground_crop_residue(cycle)
@@ -47,4 +42,4 @@ def _should_run(cycle: dict):
 
 def run(cycle: dict):
     should_run, value = _should_run(cycle)
-    return [_product(value)] if should_run else []
+    return [_new_product(term=TERM_ID, value=value)] if should_run else []

hestia_earth/models/cycle/practice/landCover.py

@@ -1,10 +1,9 @@
 from functools import reduce
 from hestia_earth.schema import TermTermType, SiteSiteType
 from hestia_earth.utils.model import filter_list_term_type
-from hestia_earth.utils.tools import non_empty_list, flatten, list_sum
+from hestia_earth.utils.tools import non_empty_list, flatten, list_sum, omit, pick
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils import _omit, _include
 from hestia_earth.models.utils.practice import _new_practice
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.blank_node import condense_nodes
@@ -53,11 +52,12 @@ MODEL_KEY = 'landCover'
 
 
 def practice(data: dict):
-    node = _new_practice(data.get('id'))
-    node['value'] = [data['value']]
-    node['endDate'] = data['endDate']
-    if data.get('startDate'):
-        node['startDate'] = data['startDate']
+    node = _new_practice(
+        term=data.get('id'),
+        value=data['value'],
+        end_date=data['endDate'],
+        start_date=data.get('startDate')
+    )
     if data.get('properties'):
         node['properties'] = data['properties']
     return node
@@ -70,7 +70,7 @@ def _should_gap_fill(term: dict):
 
 def _filter_properties(blank_node: dict):
     properties = list(filter(lambda p: _should_gap_fill(p.get('term', {})), blank_node.get('properties', [])))
-    return _omit(blank_node, ['properties']) | ({'properties': properties} if properties else {})
+    return omit(blank_node, ['properties']) | ({'properties': properties} if properties else {})
 
 
 def _map_to_value(value: dict):
@@ -92,7 +92,7 @@ def _run(cycle: dict, products: list, total: float):
     products = list(map(_filter_properties, products))
 
     nodes = [
-        _map_to_value(_include(cycle, ["startDate", "endDate"]) | _copy_item_if_exists(
+        _map_to_value(pick(cycle, ["startDate", "endDate"]) | _copy_item_if_exists(
             source=product,
             keys=['properties', 'startDate', 'endDate'],
             dest={

hestia_earth/models/dammgen2009/noxToAirExcreta.py

@@ -26,8 +26,7 @@ _N2O_TERM_ID = 'n2OToAirExcretaDirect'
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py

@@ -44,8 +44,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/ecoalimV9/cycle.py

@@ -64,8 +64,7 @@ TIER = EmissionMethodTier.BACKGROUND.value
 
 
 def _emission(term_id: str, value: float, input: dict, country_id: str = None, key_id: str = None):
-    emission = _new_emission(term_id, MODEL, country_id, key_id)
-    emission['value'] = [value]
+    emission = _new_emission(term=term_id, model=MODEL, value=value, country_id=country_id, key_id=key_id)
     emission['methodTier'] = TIER
     emission['inputs'] = [input.get('term')]
     if input.get('operation'):

hestia_earth/models/ecoalimV9/impact_assessment.py

@@ -72,10 +72,17 @@ def _indicator(
     land_cover_id: str = None,
     previous_land_cover_id: str = None,
 ):
-    indicator = _new_indicator(term_id, MODEL, land_cover_id, previous_land_cover_id, country_id, key_id)
-    indicator['value'] = value
+    indicator = _new_indicator(
+        term=term_id,
+        value=value,
+        model=MODEL,
+        land_cover_id=land_cover_id,
+        previous_land_cover_id=previous_land_cover_id,
+        country_id=country_id,
+        key_id=key_id,
+        inputs=[input.get('term')]
+    )
     indicator['methodTier'] = TIER
-    indicator['inputs'] = [input.get('term')]
     if input.get('operation'):
         indicator['operation'] = input.get('operation')
     if input.get('animal'):

hestia_earth/models/ecoinventV3/cycle.py

@@ -68,8 +68,7 @@ TIER = EmissionMethodTier.BACKGROUND.value
 
 
 def _emission(term_id: str, value: float, input: dict, country_id: str = None, key_id: str = None):
-    emission = _new_emission(term_id, MODEL, country_id, key_id)
-    emission['value'] = [value]
+    emission = _new_emission(term=term_id, model=MODEL, value=value, country_id=country_id, key_id=key_id)
     emission['methodTier'] = TIER
     emission['inputs'] = [input.get('term')]
     if input.get('operation'):

hestia_earth/models/ecoinventV3AndEmberClimate/cycle.py

@@ -66,8 +66,7 @@ TIER = EmissionMethodTier.BACKGROUND.value
 
 
 def _emission(term_id: str, value: float, input: dict):
-    emission = _new_emission(term_id, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=term_id, model=MODEL, value=value)
     emission['methodTier'] = TIER
     emission['inputs'] = [input.get('term')]
     if input.get('operation'):

hestia_earth/models/edip2003/ozoneDepletionPotential.py

@@ -20,15 +20,9 @@ RETURNS = {
 TERM_ID = 'ozoneDepletionPotential'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/emepEea2019/utils.py

@@ -10,8 +10,7 @@ from . import MODEL
 
 
 def _emission(value: float, tier: str, term_id: str, input: dict = None, operation: dict = None):
-    emission = _new_emission(term_id, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=term_id, model=MODEL, value=value)
     emission['methodTier'] = tier
     if input:
         emission['inputs'] = [input]

hestia_earth/models/emissionNotRelevant/__init__.py

@@ -26,6 +26,7 @@ LOOKUPS = {
         "productTermIdsAllowed",
         "productTermTypesAllowed",
         "siteTypesAllowed",
+        "siteMeasurementIdsAllowed",
         "typesAllowed"
     ],
     "emission-model-productTermIdsAllowed": "",
@@ -36,8 +37,7 @@ TIER = EmissionMethodTier.NOT_RELEVANT.value
 
 
 def _emission(term_id: str):
-    emission = _new_emission(term_id, MODEL)
-    emission['value'] = [0]
+    emission = _new_emission(term=term_id, model=MODEL, value=0)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py

@@ -103,10 +103,7 @@ def _count_duplicate_indicators(reference_indicator: dict, indicators: list) ->
     ])
 
 
-def _indicator(value: float) -> dict:
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
+def _indicator(value: float): return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _run(indicators: List[dict]):

hestia_earth/models/environmentalFootprintV3_1/freshwaterEcotoxicityPotentialCtue.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'freshwaterEcotoxicityPotentialCtue'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py

@@ -22,15 +22,9 @@ LOOKUPS = {
 TERM_ID = 'marineEutrophicationPotential'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/environmentalFootprintV3_1/photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py

@@ -23,14 +23,8 @@ LOOKUPS = {
 TERM_ID = 'photochemicalOzoneCreationPotentialHumanHealthNmvocEq'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator["value"] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS["emission"])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID, value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py

@@ -25,16 +25,10 @@ RETURNS = {
 TERM_ID = 'scarcityWeightedWaterUse'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv",
                                  default_world_value=True)
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return None if value is None else _indicator(value)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)