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

hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py

@@ -41,15 +41,10 @@ LOOKUP = f"{list(LOOKUPS.keys())[1]}.csv"
 authorised_indicators = ["landOccupationInputsProduction", "landOccupationDuringCycle"]
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def _run(land_occupation_indicators: list):
     values = [indicator['coefficient'] * indicator['area-by-year'] for indicator in land_occupation_indicators]
-    return _indicator(list_sum(values))
+    value = list_sum(values)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _should_run(impact_assessment: dict) -> Tuple[bool, list]:

hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py

@@ -64,19 +64,14 @@ RETURNS = {
 TERM_ID = 'soilQualityIndexLandTransformation'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def _run(transformations: List[dict]):
     values = [
         (transformation.get("factor-from", 0) + transformation.get("factor-to", 0)
          ) * transformation.get("value", 0) * 20
         for transformation in transformations
     ]
-    return _indicator(list_sum(values))
+    value = list_sum(values)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _is_valid_indicator(indicator: dict) -> bool:

hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py

@@ -25,15 +25,10 @@ RETURNS = {
 TERM_ID = 'soilQualityIndexTotalLandUseEffects'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator["value"] = value
-    return indicator
-
-
 def _run(indicators: list):
     values = [indicator["value"] for indicator in indicators]
-    return _indicator(list_sum(values))
+    value = list_sum(values)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)
 
 
 def _should_run(impactassessment: dict) -> tuple[bool, list]:

hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py

@@ -28,8 +28,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/fantkeEtAl2016/damageToHumanHealthParticulateMatterFormation.py

@@ -20,20 +20,11 @@ RETURNS = {
 TERM_ID = 'damageToHumanHealthParticulateMatterFormation'
 
 
-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=MODEL, term_id=TERM_ID, impact=impact_assessment, lookup_col=LOOKUPS['emission'], group_key='default'
     )
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-
-    should_run = all([value is not None])
-    logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
-
-    return _indicator(value) if should_run else None
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/faostat2018/liveweightPerHead.py

@@ -50,7 +50,7 @@ def _property(value: float):
     return prop
 
 
-def _product_value(product: dict, year: int, country_id: str):
+def _product_value(cycle: dict, product: dict, year: int, country_id: str):
     product_id = product.get('term', {}).get('@id')
     groupingFAO = get_animalProduct_lookup_value(MODEL, product_id, FAO_LOOKUP_COLUMN)
 
@@ -59,10 +59,14 @@ def _product_value(product: dict, year: int, country_id: str):
     # average_carcass_weight is in hg, divide by 10 to go back to kg
     kg_carcass_weight = average_carcass_weight / 10 if average_carcass_weight else None
 
-    kg_liveweight = convert_product_to_unit({
-        **product,
-        'value': [kg_carcass_weight]
-    }, Units.KG_LIVEWEIGHT) if kg_carcass_weight else None
+    kg_liveweight = convert_product_to_unit(
+        product={
+            **product,
+            'value': [kg_carcass_weight]
+        },
+        dest_unit=Units.KG_LIVEWEIGHT,
+        log_node=cycle, model=MODEL, term=product_id, property=TERM_ID
+    ) if kg_carcass_weight else None
 
     return kg_liveweight, groupingFAO
 
@@ -77,7 +81,7 @@ def _run_liveAnimal(cycle: dict, product: dict, year: int, country_id: str):
     animal_product_id = get_liveAnimal_to_animalProduct_id(product_id, LOOKUPS['liveAnimal'][0], term=TERM_ID)
 
     animal_product_term = download_term(animal_product_id, TermTermType.ANIMALPRODUCT) if animal_product_id else {}
-    kg_liveweight, groupingFAO = _product_value({**product, 'term': animal_product_term}, year, country_id)
+    kg_liveweight, groupingFAO = _product_value(cycle, {**product, 'term': animal_product_term}, year, country_id)
 
     logRequirements(cycle, model=MODEL, term=product_id, property=TERM_ID,
                     animal_product_id=animal_product_id,
@@ -94,7 +98,7 @@ def _run_liveAnimal(cycle: dict, product: dict, year: int, country_id: str):
 
 def _run_animalProduct(cycle: dict, product: dict, year: int, country_id: str):
     product_id = product.get('term', {}).get('@id')
-    kg_liveweight, groupingFAO = _product_value(product, year, country_id)
+    kg_liveweight, groupingFAO = _product_value(cycle, product, year, country_id)
 
     logRequirements(cycle, model=MODEL, term=product_id, property=TERM_ID,
                     country_id=country_id,

hestia_earth/models/faostat2018/product/price.py

@@ -103,11 +103,15 @@ def _run_by_liveAnimal(cycle: dict, product: dict, country: dict, year: int = No
     animal_product_id, price_per_kg_liveweight = _get_liveAnimal_lookup_values(cycle, product, country, year)
 
     animal_product = download_term(animal_product_id, TermTermType.ANIMALPRODUCT)
-    price_per_head = convert_product_to_unit({
-        **product,
-        'term': animal_product,
-        'value': [price_per_kg_liveweight]
-    }, Units.HEAD) if price_per_kg_liveweight else None
+    price_per_head = convert_product_to_unit(
+        product={
+            **product,
+            'term': animal_product,
+            'value': [price_per_kg_liveweight]
+        },
+        dest_unit=Units.HEAD,
+        log_node=cycle, model=MODEL, term=term_id, key=MODEL_KEY
+    ) if price_per_kg_liveweight else None
 
     logRequirements(cycle, model=MODEL, term=term_id, key=MODEL_KEY, by='liveAnimal',
                     year=year,

hestia_earth/models/faostat2018/seed.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import InputStatsDefinition, TermTermType
+from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum, safe_parse_float
 
@@ -25,21 +25,12 @@ RETURNS = {
     "Input": [{
         "value": "",
         "sd": "",
-        "statsDefinition": "regions"
+        "statsDefinition": "modelled"
     }]
 }
 TERM_ID = 'seed'
 
 
-def _input(value: float, sd: float):
-    input = _new_input(TERM_ID, MODEL)
-    input['value'] = [value]
-    if sd > 0:
-        input['sd'] = [sd]
-        input['statsDefinition'] = InputStatsDefinition.REGIONS.value
-    return input
-
-
 def _run_product(product: dict):
     term = product.get('term', {})
     product_value = list_sum(product.get('value', []))
@@ -54,7 +45,9 @@ def _run(products: list):
     total_value = list_sum([value for value, _ in values])
     # TODO: we only fill-in sd for single values as the total value is complicated to calculate
     total_sd = values[0][1] if len(values) == 1 else 0
-    return [_input(total_value, total_sd)] if total_value > 0 else []
+    return [
+        _new_input(term=TERM_ID, model=MODEL, value=total_value, sd=total_sd)
+    ] if total_value > 0 else []
 
 
 def _should_run_product(product: dict):

hestia_earth/models/faostat2018/utils.py

@@ -177,12 +177,20 @@ def run_landTransformationFromCropland(term_id: str, impact: dict, indicators: l
 
     return flatten([
         [
-            _new_indicator(term_id, MODEL, value.get('landCover-id'), 'annualCropland') | {
-                'value': value.get('value') * value.get('diff-temporary-area') / value.get('diff-total-area')
-            },
-            _new_indicator(term_id, MODEL, value.get('landCover-id'), 'permanentCropland') | {
-                'value': value.get('value') * value.get('diff-permanent-area') / value.get('diff-total-area')
-            }
+            _new_indicator(
+                term=term_id,
+                value=value.get('value') * value.get('diff-temporary-area') / value.get('diff-total-area'),
+                model=MODEL,
+                land_cover_id=value.get('landCover-id'),
+                previous_land_cover_id='annualCropland'
+            ),
+            _new_indicator(
+                term=term_id,
+                value=value.get('value') * value.get('diff-permanent-area') / value.get('diff-total-area'),
+                model=MODEL,
+                land_cover_id=value.get('landCover-id'),
+                previous_land_cover_id='permanentCropland'
+            )
         ]
         for value in values
     ])

hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py

@@ -1,11 +1,10 @@
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.lookup import get_table_value, download_lookup, column_name
 from hestia_earth.utils.model import filter_list_term_type
-from hestia_earth.utils.tools import flatten, list_sum
+from hestia_earth.utils.tools import flatten, list_sum, omit, pick, unique_values
 from hestia_earth.utils.blank_node import group_by_keys
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
-from hestia_earth.models.utils import unique_values, _omit, _include
 from hestia_earth.models.utils.indicator import _new_indicator
 from hestia_earth.models.utils.lookup import _node_value
 from . import MODEL
@@ -43,11 +42,8 @@ TERM_ID = 'ionisingRadiationKbqU235Eq'
 
 
 def _indicator(value: float, key: dict, inputs: list) -> dict:
-    indicator = _new_indicator(TERM_ID, MODEL)
+    indicator = _new_indicator(term=TERM_ID, model=MODEL, value=value, inputs=inputs)
     indicator['key'] = key
-    indicator['value'] = value
-    if inputs:
-        indicator['inputs'] = inputs
     return indicator
 
 
@@ -90,7 +86,7 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
                 col_match_with=emission['key'].get('@id'),
                 col_val=column_name(emission['term']['@id'])
             )
-        } | _include(emission, ['key', 'inputs'])
+        } | pick(emission, ['key', 'inputs'])
         for emission in emissions
         if emission.get('key')
     ]
@@ -117,7 +113,7 @@ def _should_run(impact_assessment: dict) -> tuple[bool, list]:
                     has_emissions=has_emissions,
                     valid_key_requirements=valid_key_requirements,
                     all_emissions_have_known_CF=all_emissions_have_known_cf,
-                    emissions=log_as_table([_omit(v, ['key', 'inputs']) for v in emissions_unpacked])
+                    emissions=log_as_table([omit(v, ['key', 'inputs']) for v in emissions_unpacked])
                     )
 
     should_run = all([emissions_unpacked, valid_key_requirements])

hestia_earth/models/geospatialDatabase/altitude.py

@@ -34,8 +34,7 @@ BIBLIO_TITLE = 'An Enhanced Global Elevation Model Generalized From Multiple Hig
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/geospatialDatabase/clayContent.py

@@ -70,8 +70,7 @@ BIBLIO_TITLE = 'Harmonized World Soil Database Version 2.0.'
 
 
 def _measurement(site: dict, value: int, depthUpper: int, depthLower: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['depthUpper'] = depthUpper
     measurement['depthLower'] = depthLower
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/croppingIntensity.py

@@ -45,10 +45,8 @@ TERM_ID = 'croppingIntensity'
 
 
 def _practice(site: dict, value: float):
-    practice = _new_practice(TERM_ID)
+    practice = _new_practice(term=TERM_ID, value=value)
     practice['site'] = linked_node(site)
-    # force conversion to float from numpy, avoiding errors when reading it in other models
-    practice['value'] = [float(round(value, 7))]
     return practice
 
 

hestia_earth/models/geospatialDatabase/drainageClass.py

@@ -32,8 +32,7 @@ BIBLIO_TITLE = 'Harmonized World Soil Database Version 2.0.'
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/geospatialDatabase/ecoClimateZone.py

@@ -36,9 +36,8 @@ BIBLIO_TITLE = 'Biofuels: a new methodology to estimate GHG emissions from globa
 
 
 def _measurement(site: dict, value: int):
-    measurement = _new_measurement(TERM_ID)
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['description'] = _name(value)
-    measurement['value'] = [value]
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/geospatialDatabase/erodibility.py

@@ -31,8 +31,7 @@ BIBLIO_TITLE = 'Modelling spatially explicit impacts from phosphorus emissions i
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/geospatialDatabase/heavyWinterPrecipitation.py

@@ -31,8 +31,7 @@ BIBLIO_TITLE = 'Modelling spatially explicit impacts from phosphorus emissions i
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/geospatialDatabase/histosol.py

@@ -42,8 +42,7 @@ BIBLIO_TITLE = 'Harmonized World Soil Database Version 1.2. Food and Agriculture
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [round(value, 7)]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['depthUpper'] = 0
     measurement['depthLower'] = 30
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/longFallowRatio.py

@@ -45,10 +45,8 @@ TERM_ID = 'longFallowRatio'
 
 
 def _practice(site: dict, value: float):
-    practice = _new_practice(TERM_ID)
+    practice = _new_practice(term=TERM_ID, value=value)
     practice['site'] = linked_node(site)
-    # force conversion to float from numpy, avoiding errors when reading it in other models
-    practice['value'] = [float(round(value, 7))]
     return practice
 
 

hestia_earth/models/geospatialDatabase/nutrientLossToAquaticEnvironment.py

@@ -31,8 +31,7 @@ BIBLIO_TITLE = 'Modelling spatially explicit impacts from phosphorus emissions i
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/geospatialDatabase/organicCarbonPerKgSoil.py

@@ -59,8 +59,7 @@ BIBLIO_TITLE = 'Harmonized World Soil Database Version 2.0.'
 
 
 def _measurement(site: dict, value: int, depthUpper: int, depthLower: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['depthUpper'] = depthUpper
     measurement['depthLower'] = depthLower
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/potentialEvapotranspirationAnnual.py

@@ -36,8 +36,7 @@ EE_PARAMS = {
 
 
 def _measurement(value: float, year: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     measurement['startDate'] = f"{year}-01-01"
     measurement['endDate'] = max_date(f"{year}-12-31")

hestia_earth/models/geospatialDatabase/potentialEvapotranspirationLongTermAnnualMean.py

@@ -38,8 +38,7 @@ EE_PARAMS = {
 
 
 def _measurement(value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     measurement['startDate'] = START_DATE
     measurement['endDate'] = END_DATE

hestia_earth/models/geospatialDatabase/potentialEvapotranspirationMonthly.py

@@ -37,8 +37,7 @@ BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the gl
 
 
 def _measurement(site: dict, value: list, dates: list):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = value
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['dates'] = dates
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)

hestia_earth/models/geospatialDatabase/precipitationAnnual.py

@@ -38,8 +38,7 @@ BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the gl
 
 
 def _measurement(site: dict, value: float, year: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     measurement['startDate'] = f"{year}-01-01"
     measurement['endDate'] = max_date(f"{year}-12-31")

hestia_earth/models/geospatialDatabase/precipitationLongTermAnnualMean.py

@@ -40,8 +40,7 @@ BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the gl
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     measurement['startDate'] = START_DATE
     measurement['endDate'] = END_DATE

hestia_earth/models/geospatialDatabase/precipitationMonthly.py

@@ -37,8 +37,7 @@ BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the gl
 
 
 def _measurement(site: dict, value: list, dates: list):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = value
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['dates'] = dates
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)

hestia_earth/models/geospatialDatabase/sandContent.py

@@ -70,8 +70,7 @@ BIBLIO_TITLE = 'Harmonized World Soil Database Version 2.0.'
 
 
 def _measurement(site: dict, value: int, depthUpper: int, depthLower: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['depthUpper'] = depthUpper
     measurement['depthLower'] = depthLower
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/siltContent.py

@@ -49,8 +49,7 @@ BIBLIO_TITLE = 'Harmonized World Soil Database Version 2.0.'
 
 
 def _measurement(site: dict, value: int, depthUpper: int, depthLower: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['depthUpper'] = depthUpper
     measurement['depthLower'] = depthLower
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/slope.py

@@ -31,8 +31,7 @@ BIBLIO_TITLE = 'An Enhanced Global Elevation Model Generalized From Multiple Hig
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [round(value, 7)]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/geospatialDatabase/slopeLength.py

@@ -31,8 +31,7 @@ BIBLIO_TITLE = 'An Enhanced Global Elevation Model Generalized From Multiple Hig
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/geospatialDatabase/soilPh.py

@@ -59,8 +59,7 @@ BIBLIO_TITLE = 'Harmonized World Soil Database Version 2.0.'
 
 
 def _measurement(site: dict, value: int, depthUpper: int, depthLower: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['depthUpper'] = depthUpper
     measurement['depthLower'] = depthLower
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/temperatureAnnual.py

@@ -38,8 +38,7 @@ BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the gl
 
 
 def _measurement(site: dict, value: float, year: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['startDate'] = f"{year}-01-01"
     measurement['endDate'] = max_date(f"{year}-12-31")
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py

@@ -40,8 +40,7 @@ BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the gl
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     measurement['startDate'] = START_DATE
     measurement['endDate'] = END_DATE

hestia_earth/models/geospatialDatabase/temperatureMonthly.py

@@ -37,8 +37,7 @@ BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the gl
 
 
 def _measurement(site: dict, value: list, dates: list):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = value
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['dates'] = dates
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement | get_source(site, BIBLIO_TITLE)

hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py

@@ -59,8 +59,7 @@ BIBLIO_TITLE = 'Harmonized World Soil Database Version 2.0.'
 
 
 def _measurement(site: dict, value: int, depthUpper: int, depthLower: int):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['depthUpper'] = depthUpper
     measurement['depthLower'] = depthLower
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py

@@ -34,8 +34,7 @@ BIBLIO_TITLE = 'Modelling spatially explicit impacts from phosphorus emissions i
 
 
 def _measurement(site: dict, value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['depthUpper'] = 0
     measurement['depthLower'] = 50
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value

hestia_earth/models/geospatialDatabase/waterDepth.py

@@ -29,8 +29,7 @@ EE_PARAMS = {
 
 
 def _measurement(value: float):
-    measurement = _new_measurement(TERM_ID)
-    measurement['value'] = [value]
+    measurement = _new_measurement(term=TERM_ID, value=value)
     measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
     return measurement
 

hestia_earth/models/hestia/aboveGroundCropResidue.py

@@ -34,8 +34,7 @@ TOTAL_TERM_ID = 'aboveGroundCropResidueTotal'
 REMAINING_MODEL = PRODUCT_ID_TO_PRACTICES_ID[-1]['product']
 
 
-def _product(term_id: str, value: float):
-    return _new_product(term_id, round(value, 7), MODEL)
+def _product(term_id: str, value: float): return _new_product(term=term_id, model=MODEL, value=value)
 
 
 def _get_practices(term_id: str):

hestia_earth/models/hestia/aboveGroundCropResidueTotal.py

@@ -21,16 +21,11 @@ RETURNS = {
 TERM_ID = 'aboveGroundCropResidueTotal'
 
 
-def _product(value: float):
-    product = _new_product(TERM_ID, value, MODEL)
-    return product
-
-
 def _run(practice: dict, product: dict):
     practice_value = list_sum(practice.get('value', []))
     product_value = list_sum(product.get('value', []))
     value = product_value / (practice_value / 100)
-    return [_product(round(value, 7))]
+    return [_new_product(term=TERM_ID, model=MODEL, value=value)]
 
 
 def _matching_product_by_practice(term_id: str):

hestia_earth/models/hestia/brackishWater.py

@@ -22,8 +22,7 @@ TERM_ID = 'brackishWater'
 
 
 def _measurement():
-    data = _new_measurement(TERM_ID, MODEL)
-    data['value'] = [True]
+    data = _new_measurement(term=TERM_ID, model=MODEL, value=True)
     data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data