hestia-earth-models 0.65.7__py3-none-any.whl → 0.65.9__py3-none-any.whl

hestia_earth/models/config/run-calculations.json

@@ -15,11 +15,6 @@
         "key": "nested",
         "type": "Site",
         "stage": 1
-      },
-      {
-        "key": "nested",
-        "type": "ImpactAssessment",
-        "stage": 1
       }
     ],
     "stage-2": [
@@ -27,6 +22,11 @@
         "key": "nested",
         "type": "Site",
         "stage": 2
+      },
+      {
+        "key": "nested",
+        "type": "ImpactAssessment",
+        "stage": 1
       }
     ]
   },

hestia_earth/models/config/trigger-calculations.json

@@ -36,7 +36,7 @@
       {
         "key": "related",
         "type": "Cycle",
-        "stage": 1
+        "stage": 2
       }
     ]
   }

hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandTransformation.py

@@ -25,7 +25,8 @@ REQUIREMENTS = {
             {
                 "@type": "Indicator",
                 "term.termType": "resourceUse",
-                "term.name": "Land transformation",
+                "term.@id": ["landTransformation20YearAverageInputsProduction",
+                             "landTransformation20YearAverageDuringCycle"],
                 "value": "> 0",
                 "landCover": {"@type": "Term", "term.termType": "landCover"},
                 "previousLandCover": {"@type": "Term", "term.termType": "landCover"}
@@ -74,6 +75,10 @@ def _run(transformations: List[dict]):
     return _indicator(list_sum(values))
 
 
+def _is_valid_indicator(indicator: dict) -> bool:
+    return indicator['term']['@id'] in REQUIREMENTS['ImpactAssessment']['emissionsResourceUse'][0]['term.@id']
+
+
 def _should_run(impact_assessment: dict) -> Tuple[bool, list]:
     resource_uses = filter_list_term_type(impact_assessment.get('emissionsResourceUse', []), TermTermType.RESOURCEUSE)
     found_transformations = [
@@ -82,7 +87,9 @@ def _should_run(impact_assessment: dict) -> Tuple[bool, list]:
             'land-cover-id-from': transformation_indicator.get('previousLandCover', {}).get("@id"),
             'land-cover-id-to': transformation_indicator.get('landCover', {}).get("@id"),
             'indicator-id': transformation_indicator.get('term', {}).get('@id', ''),
-            'good-land-cover-term': transformation_indicator.get('landCover', {}).get('termType') == 'landCover',
+            'indicator-is-valid': _is_valid_indicator(transformation_indicator),
+            'good-land-cover-term': all([bool(transformation_indicator.get('landCover')),
+                                         bool(transformation_indicator.get('previousLandCover'))]),
             'country-id': get_country_id(impact_assessment),
             'area-is-valid': _node_value(transformation_indicator) is not None and _node_value(
                 transformation_indicator) > 0,
@@ -112,19 +119,20 @@ def _should_run(impact_assessment: dict) -> Tuple[bool, list]:
     valid_transformations_with_coef = [
         t for t in found_transformations_with_coefficient if all([
             t['area-is-valid'],
+            t['indicator-is-valid'],
             t['factor-from'] is not None,
             t['factor-to'] is not None
         ])
     ]
 
     has_land_transformation_indicators = any([
-        indicator.get('term', {}).get('@id').startswith('landTransformation')
+        _is_valid_indicator(indicator)
         for indicator in resource_uses
     ])
 
     all_transformations_are_valid = all(
         [
-            all([t['area-is-valid'], t['good-land-cover-term']])
+            all([t['area-is-valid'], t['indicator-is-valid'], t['good-land-cover-term']])
             for t in found_transformations_with_coefficient
         ]
     ) if found_transformations_with_coefficient else False

hestia_earth/models/hestia/landCover.py

@@ -34,7 +34,7 @@ from .utils import (
     crop_ipcc_land_use_category,
 )
 from . import MODEL
-from ..utils.blank_node import _node_date, DatestrFormat
+from ..utils.blank_node import _node_date, DatestrFormat, _gapfill_datestr, DatestrGapfillMode
 from ..utils.constant import DAYS_IN_YEAR
 
 REQUIREMENTS = {
@@ -697,7 +697,7 @@ def _collect_land_use_types(nodes: list) -> list:
         {
             "id": node.get("term", {}).get("@id"),
             "land-use-type": _get_land_use_term_from_node(node),
-            "endDate": node.get("endDate")
+            "endDate": _gapfill_datestr(datestr=node.get("endDate"), mode=DatestrGapfillMode.END)[:10]
         } for node in nodes
     ]