hestia-earth-models 0.64.5__tar.gz → 0.64.6__tar.gz

{hestia-earth-models-0.64.5/hestia_earth_models.egg-info → hestia-earth-models-0.64.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.5
+Version: 0.64.6
 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.64.5 → hestia-earth-models-0.64.6}/hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py

@@ -90,9 +90,9 @@ def _should_run(cycle: dict):
     sites = [
         site for site in sites
         if all([
-            site.get('area', 0) > 0,
-            site.get('duration', 0) > 0,
-            site.get('landCover-id'),
+            (site.get('area') or 0) > 0,
+            (site.get('duration') or 0) > 0,
+            site.get('landCover-id')
         ])
     ]
 

{hestia-earth-models-0.64.5 → hestia-earth-models-0.64.6}/hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py

@@ -68,7 +68,9 @@ LOOKUPS = {
         "defaultPercentageYmMethaneConversionFactorEntericFermentation-min",
         "defaultPercentageYmMethaneConversionFactorEntericFermentation-max"
     ],
-    "crop-property": ["neutralDetergentFibreContent", "energyContentHigherHeatingValue"]
+    "crop-property": ["neutralDetergentFibreContent", "energyContentHigherHeatingValue"],
+    "forage-property": ["neutralDetergentFibreContent", "energyContentHigherHeatingValue"],
+    "processedFood-property": ["neutralDetergentFibreContent", "energyContentHigherHeatingValue"]
 }
 RETURNS = {
     "Emission": [{

{hestia-earth-models-0.64.5 → hestia-earth-models-0.64.6}/hestia_earth/models/mocking/search-results.json

@@ -1302,11 +1302,11 @@
       },
       {
         "@type": "Term",
-        "@id": "residueRemoved"
+        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
+        "@id": "residueRemoved"
       },
       {
         "@type": "Term",
@@ -2004,133 +2004,133 @@
         "@type": "Term",
         "name": "Glass or high accessible cover",
         "@id": "glassOrHighAccessibleCover",
-        "_score": 58.436714
+        "_score": 58.4161
       },
       {
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 49.591667
+        "_score": 49.59658
       },
       {
         "@type": "Term",
         "name": "Other natural vegetation",
         "@id": "otherNaturalVegetation",
-        "_score": 38.99071
+        "_score": 38.991608
       },
       {
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 29.747608
+        "_score": 29.744726
       },
       {
         "@type": "Term",
         "name": "Permanent pasture",
         "@id": "permanentPasture",
-        "_score": 27.614195
+        "_score": 27.615036
       },
       {
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 26.394323
+        "_score": 26.396496
       },
       {
         "@type": "Term",
         "name": "Root or tuber crop plant",
         "@id": "rootOrTuberCropPlant",
-        "_score": 24.240013
+        "_score": 24.173046
       },
       {
         "@type": "Term",
         "name": "High intensity grazing pasture",
         "@id": "highIntensityGrazingPasture",
-        "_score": 22.772318
+        "_score": 22.774563
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 19.876554
+        "_score": 19.904846
       },
       {
         "@type": "Term",
         "name": "Forest",
         "@id": "forest",
-        "_score": 19.061693
+        "_score": 18.93229
       },
       {
         "@type": "Term",
         "name": "Pond",
         "@id": "pond",
-        "_score": 18.66575
+        "_score": 18.6627
       },
       {
         "@type": "Term",
         "name": "Plantation forest",
         "@id": "plantationForest",
-        "_score": 17.677816
+        "_score": 17.620533
       },
       {
         "@type": "Term",
         "name": "Lake",
         "@id": "lake",
-        "_score": 17.199095
+        "_score": 17.200394
       },
       {
         "@type": "Term",
         "name": "Improved pasture",
         "@id": "improvedPasture",
-        "_score": 16.506453
+        "_score": 16.5076
       },
       {
         "@type": "Term",
-        "name": "Native pasture",
-        "@id": "nativePasture",
-        "_score": 16.277918
+        "name": "Sea kale plant",
+        "@id": "seaKalePlant",
+        "_score": 16.2728
       },
       {
         "@type": "Term",
-        "name": "Sea kale plant",
-        "@id": "seaKalePlant",
-        "_score": 16.2723
+        "name": "Native pasture",
+        "@id": "nativePasture",
+        "_score": 16.256336
       },
       {
         "@type": "Term",
         "name": "Red sea plume alga",
         "@id": "redSeaPlumeAlga",
-        "_score": 16.117275
+        "_score": 16.11869
       },
       {
         "@type": "Term",
         "name": "River tamarind tree",
         "@id": "riverTamarindTree",
-        "_score": 15.6889305
+        "_score": 15.68997
       },
       {
         "@type": "Term",
         "name": "Severely degraded pasture",
         "@id": "severelyDegradedPasture",
-        "_score": 15.326931
+        "_score": 15.348995
       },
       {
         "@type": "Term",
         "name": "Nominally managed pasture",
         "@id": "nominallyManagedPasture",
-        "_score": 15.208204
+        "_score": 15.190864
       },
       {
         "@type": "Term",
         "name": "Cropland",
         "@id": "cropland",
-        "_score": 10.216188
+        "_score": 10.217111
       },
       {
         "@type": "Term",
         "name": "Annual cropland",
         "@id": "annualCropland",
-        "_score": 9.487412
+        "_score": 9.485406
       }
     ]
   },
@@ -2173,15 +2173,15 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "marineDieselOil"
+        "@id": "diesel1D"
       },
       {
         "@type": "Term",
-        "@id": "petrolBurntIn2StrokeEngine"
+        "@id": "marineDieselOil"
       },
       {
         "@type": "Term",
-        "@id": "diesel1D"
+        "@id": "petrolBurntIn2StrokeEngine"
       },
       {
         "@type": "Term",
@@ -2197,11 +2197,11 @@
       },
       {
         "@type": "Term",
-        "@id": "petrol"
+        "@id": "petrolBurntIn4StrokeEngine"
       },
       {
         "@type": "Term",
-        "@id": "petrolBurntIn4StrokeEngine"
+        "@id": "petrol"
       },
       {
         "@type": "Term",

hestia-earth-models-0.64.6/hestia_earth/models/version.py

@@ -0,0 +1 @@
+VERSION = '0.64.6'

{hestia-earth-models-0.64.5 → hestia-earth-models-0.64.6/hestia_earth_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.5
+Version: 0.64.6
 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.64.5/hestia_earth/models/version.py

@@ -1 +0,0 @@
-VERSION = '0.64.5'