hestia-earth-models 0.64.5__py3-none-any.whl → 0.64.6__py3-none-any.whl

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/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/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/version.py

@@ -1 +1 @@
-VERSION = '0.64.5'
+VERSION = '0.64.6'

{hestia_earth_models-0.64.5.dist-info → hestia_earth_models-0.64.6.dist-info}/METADATA

@@ -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.dist-info → hestia_earth_models-0.64.6.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoW
 hestia_earth/models/log.py,sha256=DbfNcGzaC5hzkuMDxQqW6XYoNBI4Uxw4SIoOYoZA6og,3474
 hestia_earth/models/preload_requests.py,sha256=Ibx-YOhR_1yuyFBxsLUbvJHVK7PLyMLoPu5l9jDN_Qk,1342
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=CYd0D6vc7EuWRoOk67dhRjY9k0ez3s-7552UUgvJqLU,19
+hestia_earth/models/version.py,sha256=zKnLZtyskCFM1o4QvK1WYD9h60tOljr4jMaMTzDcp9Q,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=tnGxBmJdPfPFfehLUQcefEqy1lHvzsSpx_s7O8nf3Zs,4412
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -138,7 +138,7 @@ hestia_earth/models/emepEea2019/utils.py,sha256=oTHjbRRwJZv_tpO9MOlfpyQRmN0a1kvE
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=nIuPIkQR1ghv_T_Ab4Ckq5wmGdWVmgbaOjhtKfIJ-WE,2183
 hestia_earth/models/environmentalFootprintV3/__init__.py,sha256=lzg9qccwd9tbspw0lQ58YPprnvvSLTn3QV5T2-tPcC4,425
 hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py,sha256=X62-4v0NJdM_Z5kLK3NuU4GNEeSrXlKlMZQB_o4JZ6c,1018
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py,sha256=6fT2pB8nkI1JM9BqVx1n_Ja8wjqDR7l2BM44eGUJm9k,4271
+hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py,sha256=33lGSdexLPZGEMCm09xzr4myp74B5-hG8pb7HhPvaGk,4278
 hestia_earth/models/environmentalFootprintV3/utils.py,sha256=HKz_ckzuMZvo8YL-laApyhiccl2NoJUxHs2npwBCMWw,712
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=fN4fOOcjBg3tl0lzNeJ8mzg6mrvQRxilx-R5Gc4l4Nw,1724
@@ -244,7 +244,7 @@ hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=lT2QVV5c2LvQq
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=7AFU2Q0qPAvv6uEKWByS38jl77FvjTPbGm2GQ53waGg,3499
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=tlQvu4Auhpjmaz7XrZz86xwxVrJhsYYf8DFA_aQeev4,7255
 hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=q6yyEiYQhHJ2VyQy2Fa84cuTl1D8bjBXOK3UpaRuo20,3196
-hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=khX90NjkmlvosyRZ77QxgwTKwg42Z_ftOWTTAanHViw,11420
+hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=7rA9thwYXbJkSFTEl71AbFVQfBz0CaJfblpJpO9s6D8,11611
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=eY_yb7ncTb_2HoUUgXZnnRHiybTXYj_DTe3CmDzD3fY,6717
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=TJ4J7VA5n4RPrJYZQeR3lc3ZoCw7T1E5Cb1XJewr834,7331
 hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=n87ghsqDEuZodeJOAHadfS2au4rqB-cuhZoZhrG55dw,32154
@@ -395,7 +395,7 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPastur
 hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
 hestia_earth/models/mocking/__init__.py,sha256=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,687
 hestia_earth/models/mocking/mock_search.py,sha256=qgABw-sZK37XtsALKt8AHF2VJPUrZSnHv5Qj1Dn93oA,2405
-hestia_earth/models/mocking/search-results.json,sha256=_ulYLViCygXSaulspT6Bnf85Sq0d6WEqdKnJ3_T3WOM,54788
+hestia_earth/models/mocking/search-results.json,sha256=Rr_kuhVrDnGcO6OcbNyiI3GhUjRiPB6Rofq-w3gKVWo,54779
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -1154,8 +1154,8 @@ tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapC
 tests/models/utils/test_time_series.py,sha256=LMhRPf8rp3nAriKAC-2K3FDkrMWntRTUUCERw7Lt68g,2686
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.64.5.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.64.5.dist-info/METADATA,sha256=zXgavHtoRldACaVQKBoTj6c1UoaCMSSpEEa1ef5Vk1k,3343
-hestia_earth_models-0.64.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-hestia_earth_models-0.64.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.64.5.dist-info/RECORD,,
+hestia_earth_models-0.64.6.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.64.6.dist-info/METADATA,sha256=taQ9SloAcfzJDxjgcUAZMjcjgHm4LwKkcIpm1m-c9-E,3343
+hestia_earth_models-0.64.6.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+hestia_earth_models-0.64.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.64.6.dist-info/RECORD,,