hestia-earth-models 0.70.3__py3-none-any.whl → 0.70.5__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. hestia_earth/models/geospatialDatabase/altitude.py +1 -0
  2. hestia_earth/models/geospatialDatabase/clayContent.py +3 -3
  3. hestia_earth/models/geospatialDatabase/sandContent.py +3 -3
  4. hestia_earth/models/geospatialDatabase/utils.py +1 -2
  5. hestia_earth/models/hestia/landCover.py +25 -12
  6. hestia_earth/models/hestia/management.py +2 -0
  7. hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py +7 -7
  8. hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py +5 -4
  9. hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationDirect.py +7 -7
  10. hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py +2 -2
  11. hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py +11 -3
  12. hestia_earth/models/mocking/search-results.json +1298 -1312
  13. hestia_earth/models/utils/site.py +2 -1
  14. hestia_earth/models/version.py +1 -1
  15. {hestia_earth_models-0.70.3.dist-info → hestia_earth_models-0.70.5.dist-info}/METADATA +1 -1
  16. {hestia_earth_models-0.70.3.dist-info → hestia_earth_models-0.70.5.dist-info}/RECORD +24 -24
  17. tests/models/hestia/test_landCover.py +24 -1
  18. tests/models/ipcc2019/test_ch4ToAirOrganicSoilCultivation.py +2 -1
  19. tests/models/ipcc2019/test_co2ToAirOrganicSoilCultivation.py +2 -1
  20. tests/models/ipcc2019/test_n2OToAirOrganicSoilCultivationDirect.py +2 -1
  21. tests/models/ipcc2019/test_organicCarbonPerHa_tier_1.py +8 -3
  22. {hestia_earth_models-0.70.3.dist-info → hestia_earth_models-0.70.5.dist-info}/LICENSE +0 -0
  23. {hestia_earth_models-0.70.3.dist-info → hestia_earth_models-0.70.5.dist-info}/WHEEL +0 -0
  24. {hestia_earth_models-0.70.3.dist-info → hestia_earth_models-0.70.5.dist-info}/top_level.txt +0 -0
@@ -97,7 +97,8 @@ def related_cycles(site: dict, cycles_mapping: Optional[dict[str, dict]] = None)
97
97
 
98
98
 
99
99
  def related_years(site: dict):
100
- return cached_value(site, CACHE_YEARS_KEY) or years_from_cycles(related_cycles(site))
100
+ years = cached_value(site, CACHE_YEARS_KEY) or years_from_cycles(related_cycles(site))
101
+ return sorted(years) if years else []
101
102
 
102
103
 
103
104
  def related_months(site: dict):
@@ -1 +1 @@
1
- VERSION = '0.70.3'
1
+ VERSION = '0.70.5'
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: hestia-earth-models
3
- Version: 0.70.3
3
+ Version: 0.70.5
4
4
  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.).
5
5
  Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
6
6
  Author: HESTIA Team
@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=BOhLkkdVWLJ-4Z7kxfQ8swqrYgZ43sACn1uzxY
4
4
  hestia_earth/models/log.py,sha256=eRuH86v7Thuw-QXdKqaqVmA_MkwnOCo0UBEwtuDq4Oc,3554
5
5
  hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
6
6
  hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
7
- hestia_earth/models/version.py,sha256=jUQOtVONNdxYTZJhNPAQhnoFAofSEOWuStWZoZfrmEc,19
7
+ hestia_earth/models/version.py,sha256=-JgBQt5n6gG1CCXDecGH4FNOIQ7MDx7slt4WV4DuX9k,19
8
8
  hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
9
9
  hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=1ngl8pdxeNhlVV8keAeWRwGorr_1uFXM9EoPUWx-uSc,4382
10
10
  hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=queToXuzq0tQ9_XuUJ2pJgSywXmbt9uX3ZoIKgqkROM,2660
@@ -145,9 +145,9 @@ hestia_earth/models/faostat2018/product/price.py,sha256=EdshQnQLYLnRawsDYEBKr1Ki
145
145
  hestia_earth/models/frischknechtEtAl2000/__init__.py,sha256=Fixyy9UwoCGP5-MHyJu_ctS40SQ2imfvZo8a547029U,421
146
146
  hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=W2R5rjnorfWhderyDy3iGpcIZdL3rYvRh5wh0wlvI0k,4430
147
147
  hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
148
- hestia_earth/models/geospatialDatabase/altitude.py,sha256=TDo9_8fmvRsI2GvvdX63HFDndPnvLykeJexBmcp-P4Q,1960
148
+ hestia_earth/models/geospatialDatabase/altitude.py,sha256=Y0XOZLnmfpEPh_fGnHdWDM190T1ZaC1yp-VH-90k9G4,1983
149
149
  hestia_earth/models/geospatialDatabase/awareWaterBasinId.py,sha256=_4HFoZR5PQrEYZegMjj33rjUFR_kktt69D4J_moZXHo,1249
150
- hestia_earth/models/geospatialDatabase/clayContent.py,sha256=u8SQKx-zu3vhMQ-XOJgqyUn-tlCCIy-VG7zpl5AyjtY,3386
150
+ hestia_earth/models/geospatialDatabase/clayContent.py,sha256=Rre3QpoYXViJEZv8XqDdiC7_86LjYNt9DwQmhlLd0a4,3398
151
151
  hestia_earth/models/geospatialDatabase/croppingIntensity.py,sha256=d1WIrxO4rFj5Oj-k8f1eaVIOR6sfke2CYH8lwtuE_BM,2565
152
152
  hestia_earth/models/geospatialDatabase/drainageClass.py,sha256=CVagB2wxLnHgQQauDyYCJCfJw21OPB7Ry8BVyt2uPak,1883
153
153
  hestia_earth/models/geospatialDatabase/ecoClimateZone.py,sha256=WBeaYmzer3CeviHnnfK0xIn_3inpkDKqxszFluz0xPQ,2658
@@ -165,7 +165,7 @@ hestia_earth/models/geospatialDatabase/precipitationAnnual.py,sha256=VMrz4z4FmA0
165
165
  hestia_earth/models/geospatialDatabase/precipitationLongTermAnnualMean.py,sha256=wZ_QprRT9ILSNpiUhPdKtTERUsGofQT1kqUaHuJjDOs,2390
166
166
  hestia_earth/models/geospatialDatabase/precipitationMonthly.py,sha256=jQ3XLN8Zh7q2LZgLmybzvwR0X2vdi6IDz301EUVbAmE,3261
167
167
  hestia_earth/models/geospatialDatabase/region.py,sha256=55tjxaffUaQnJ_kqWd-eejhLMs-5N2CjUQd9FU1wWoU,1448
168
- hestia_earth/models/geospatialDatabase/sandContent.py,sha256=dzaefKcnMeBRu7b1X11MG_-I6iDuXkHVCrkdbawB3Tw,3386
168
+ hestia_earth/models/geospatialDatabase/sandContent.py,sha256=qOMmL6MRMyVYm3PXy94Sp0ILm8iFicKB_7t57vHOyA8,3398
169
169
  hestia_earth/models/geospatialDatabase/siltContent.py,sha256=rFUlQ3SlwCJFcMYQd5F6t3bnDMjcRilsXk2rShoa5Tk,3786
170
170
  hestia_earth/models/geospatialDatabase/slope.py,sha256=g1SpuYks60injv2w-CMjESNfu8KM1JsiYnRT9XZfSuY,1859
171
171
  hestia_earth/models/geospatialDatabase/slopeLength.py,sha256=6pGr1qR0EiiUKkeflpYut7eI6UsnXAzHDoHhAzXKFJk,1864
@@ -175,7 +175,7 @@ hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=y
175
175
  hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=E2k2kkhVDtmeFEB4_AZhhq5od57lRDMWu6AqaurgqvQ,3194
176
176
  hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=DrjiPyakM1SJ1XO-arhvjLDj2qb3M-i58gJ1kFFM6kI,2821
177
177
  hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=5oasLMYgfnPwSse0D8EEe_pV57AMusac853BgVSUh5E,2070
178
- hestia_earth/models/geospatialDatabase/utils.py,sha256=tQW1r_0xSFY8IVnptz3PljXPonmceFUY8Amh2kJLfW8,6744
178
+ hestia_earth/models/geospatialDatabase/utils.py,sha256=IYLJbnGJSHpsb1eoKR9usgaWctr44fmPN7WmR4ydsjw,6714
179
179
  hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=Xy2UxwAJrgdOkcw59NetEHMt5vgRYE6qg4fgXb1ptlU,1643
180
180
  hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
181
181
  hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=5HXiZHk5iFOhOIB-0OnatgJ4PHJVvV0gH47U3EvQ6Y0,4081
@@ -200,12 +200,12 @@ hestia_earth/models/hestia/flowingWater.py,sha256=Iy5PCWun7GMrr0zszd0zpp9lKADpXe
200
200
  hestia_earth/models/hestia/freshWater.py,sha256=EHUWNFmgIqr9y7DTcn1_HcpJdI7WP1cv4LMrkpaf8zQ,1262
201
201
  hestia_earth/models/hestia/inorganicFertiliser.py,sha256=SQv5X4vkgmvUIUV79dJ71Y9u2EW3T5Scu2GoTr3K0Yw,8930
202
202
  hestia_earth/models/hestia/irrigatedTypeUnspecified.py,sha256=VdYzfYxcRzWv21qxRkDn9HBid7-Bt_CgIv4iyXJH03g,1929
203
- hestia_earth/models/hestia/landCover.py,sha256=S72I3GhQdrW_FcJc0s49l14T3LMyWgjNEZSIYjbI_Js,31742
203
+ hestia_earth/models/hestia/landCover.py,sha256=Bt7zQzp8gS0oL8ljsXLYPBG5cQzxOkFaJnKwrcTDlxQ,32360
204
204
  hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=7KWgpAo2gILzsxdgnO8gI3tAf3tF0IhyGkneYI6PEDc,1018
205
205
  hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=1StzrYhMsX-hdwBTeLnLMZWl5EEnCoEYpGPRkqy8a-A,1016
206
206
  hestia_earth/models/hestia/liveAnimal.py,sha256=95HfqgFA_qRhdIeR2X5MJ9zzIm4nMHDvJ0BCnuTYe5Q,3860
207
207
  hestia_earth/models/hestia/longFallowRatio.py,sha256=LkJaER1VNDI5351-oC8tru-LgiPK3sNMg0NhB5ic9RE,1690
208
- hestia_earth/models/hestia/management.py,sha256=e1horZLE0th9hazG1sGod_yWs8Hk8FiHFYzJXLNTzFA,10975
208
+ hestia_earth/models/hestia/management.py,sha256=MhZ7eIE6jMReGbZqGKEZ6Gj7Zug4wceEdFm4MU9y36U,11060
209
209
  hestia_earth/models/hestia/materialAndSubstrate.py,sha256=abmM_7FOY5yaNb2yZEm-ncI4wFFcbzaebtnG9XWEA6M,5130
210
210
  hestia_earth/models/hestia/milkYield.py,sha256=__3AdxRTUTWwS_GsqxFpPGklmTnnpADiN0khlRCMAss,5541
211
211
  hestia_earth/models/hestia/netPrimaryProduction.py,sha256=uU4AZ7X6tbtWgR5YClA_aLpYWtlivq9lPQGZgt3-qoQ,1856
@@ -290,12 +290,12 @@ hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=q6yyEiYQhHJ2Vy
290
290
  hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=8w78X5nJkPmoXuTy1WMxSGj-D5ubajNeqnyBknSqEtA,12477
291
291
  hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=UTTx7US4mGTGW9dX6OAgbhDSwtHfsbWJ5d0iF0TGMpE,6564
292
292
  hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=26WZtckmb7b3sbUN7hpshEdaSdvJpL3-Oer60III_KU,10225
293
- hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=zLQklxpdgP2I_vuzUmUGfjXzXCnYkjogUltdtxtfva8,9509
293
+ hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=Asv-IafB12smWg4MALIbGlEHxHPdoE1qpwPHRkah4WU,9568
294
294
  hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=YRNjJgi_aBKwi-nDd0b20w3ebQ33vNgdf4zCLyTFcBw,6516
295
295
  hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=5HdFdHkvMdwmA4ppSqbrAoASQaSX-Znq7WZqAaekqjk,6564
296
296
  hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=pJCdb8hysUbG9t8lOB4Nd2xGdlac_6Tg74k2CMU078o,58533
297
297
  hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=X3-M4Mn3fdGsUR7ZGjBXXWrPFBGD1ipV8_4O94lB7Z8,2487
298
- hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py,sha256=xTN9Vy62bmzuPqSt7VS3tSVNnHYHtycDoi87UV8NfdQ,7568
298
+ hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py,sha256=e-hUmPMv_UxUM5otGkwToa8GheHzNbmYOlG9A8Lbw7M,7633
299
299
  hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=4aRBzNpDNSw20IKNzz7zOq28sorrJUB5gxmHemgOZT0,6576
300
300
  hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=3TXZa2zuj-Df54qAPz3CUcml5T3MpAvGH8vDPIGha_c,3738
301
301
  hestia_earth/models/ipcc2019/croppingDuration.py,sha256=wgXzEHsl2demqzKnZK6Ak7UKUu_CVU41ZsmwxG2uiOg,3055
@@ -308,7 +308,7 @@ hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserDirect.py,sha256=vmUhlNG
308
308
  hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserIndirect.py,sha256=ilc6D3cgmvmdkmPbdbxS-SzsG2RQRNKaQooxbeLl43w,3714
309
309
  hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserDirect.py,sha256=Tq0lw-zGqA6S9ZWi2OTSWXA7nVp_STJeNT4X8Cra2rU,4358
310
310
  hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py,sha256=g2ssg9GEH2ShuNtY4g4R5GUIHf85u1azx4c264Hdoag,3700
311
- hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationDirect.py,sha256=6H9mIJI-g0M6LeLaHxWM3yIBObAUL6uDBuVJCEfQ3Qg,5881
311
+ hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationDirect.py,sha256=msMxD6m1OuVLj5eXPzD3UA-trM_W185Oy1iSvuYZkPM,5976
312
312
  hestia_earth/models/ipcc2019/nh3ToAirInorganicFertiliser.py,sha256=gvfv4VBHmEkppEMoHUIicAelYICdOjKxKBUw5f3meiQ,4480
313
313
  hestia_earth/models/ipcc2019/nh3ToAirOrganicFertiliser.py,sha256=Oih-34cGl7AZ_sIYWXktOWrzmj3_onvk3EW5f8-7QKI,4152
314
314
  hestia_earth/models/ipcc2019/nitrogenContent.py,sha256=YxlcDF0D9F79rYHTeuhl5kEtmb01UcspFInKi6I_zKM,7209
@@ -320,10 +320,10 @@ hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha
320
320
  hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=fmmFgjtvOD2TrrLY03jYly_KvDnCsAXqhL_tmZQQt-A,4480
321
321
  hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=9dx_MRTwJGxJRq6mj2EJQMdQ2w6j7lw0fQk0If_cIGc,4152
322
322
  hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=D8Lph5clGjXb5F7sk-jlnqE30C2lokhqndpA0hUMwTk,7791
323
- hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py,sha256=8g1kJbxCnXAOFUdbB9zzMsuDOzMgvVy7A5MwtJvGUaY,78547
323
+ hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py,sha256=bG2djvq4_C1mxkuLIL2DNmNU1Fk8tTmPJfGnS85JVlQ,78565
324
324
  hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py,sha256=5_AltohTyRMBT8dFdULOdTS79Ydpbb2CaYZGlYQEFQY,69244
325
325
  hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=s_F3fyHhPuqragrHxluqdK0GCGnEor17jGlGKue0UsA,9867
326
- hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=hRMzbGqscOcIO1MvD_31mbgxhVcPsvHtjJRcOCkEOhI,5405
326
+ hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=mJCKYZxqk5vFknckjIjGw478BjZbvKC_xQ-zYpvJ8xM,5628
327
327
  hestia_earth/models/ipcc2019/pastureGrass.py,sha256=_EwlAooSfrkcSy4rl_rk4PpeX1pcIiQcb7HE2lQkyn8,9847
328
328
  hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=KvjIQ3xwbq1rk3thHlkGgQaWKgh0hCkNnzC53JW9634,14178
329
329
  hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
@@ -444,7 +444,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=S1zlux02gU2Lajrtoq-zQ
444
444
  hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
445
445
  hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
446
446
  hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
447
- hestia_earth/models/mocking/search-results.json,sha256=ENYYYNBFWQ0jSSQpY_cf-ychVMeM6UOT2SQZBVtkF8k,162883
447
+ hestia_earth/models/mocking/search-results.json,sha256=IhD3vmuKGB5U2y3b_jQbiKjaWKeQaToZIhWqbK9o9KI,162459
448
448
  hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
449
449
  hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
450
450
  hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -623,7 +623,7 @@ hestia_earth/models/utils/practice.py,sha256=GEu2G2yMPbcIHldOzgv5OFp8bQ1Jt9OFgj0
623
623
  hestia_earth/models/utils/product.py,sha256=Oha4lMvediC1Lc5DksA6sAUT94Q1Cs9F4LFVe_uaqP4,11177
624
624
  hestia_earth/models/utils/productivity.py,sha256=rTJX_nemxHpOcPN7jiM2hFHknoLUIW8y-hFxVxIkg70,593
625
625
  hestia_earth/models/utils/property.py,sha256=oz3x-sJkNmORlDwb4o1q5I-azj0hteriUSZBP7S5idc,5390
626
- hestia_earth/models/utils/site.py,sha256=ZYCxaBXZ3Zh4judbzOM_E5SNROiMH-S2LEkkklN5HK4,4041
626
+ hestia_earth/models/utils/site.py,sha256=88b30OI2rly_2YJTps7x4JrAg4TuoqlzcG5-w2F-J5c,4084
627
627
  hestia_earth/models/utils/source.py,sha256=D_QlW7Ul_NV1iOucMNE3szT64b1RdSdecIEm6OukYhw,2459
628
628
  hestia_earth/models/utils/stats.py,sha256=-0vvhSDAhp4ZYXD1l6sO2hdok8_HgUM6OjCSYGSTHqU,15291
629
629
  hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
@@ -836,7 +836,7 @@ tests/models/hestia/test_flowingWater.py,sha256=0-70Iyr0HKQHHC5jFEF9LUQQZ23spOo5
836
836
  tests/models/hestia/test_freshWater.py,sha256=v2UD69csKrniKP3MXkOEHxQeE6O3-lvIViCvLA7Zgws,984
837
837
  tests/models/hestia/test_inorganicFertiliser.py,sha256=v2Zs1Ig-ChOaq9gXuurcBt12izkH2bRUUuzW6rh3rqQ,643
838
838
  tests/models/hestia/test_irrigatedTypeUnspecified.py,sha256=bluZADFagxfXW4QyI0CIJzG97D2V33w333Z9Vwjqo0M,2015
839
- tests/models/hestia/test_landCover.py,sha256=I1ASRtGgLK02VQqHWrDdo9S19ID5ZMgKoBo_uptV8aY,6775
839
+ tests/models/hestia/test_landCover.py,sha256=XwzHCbJQt-jBpCnXcWLumTREyMNEEkUAuM2GViJl3iU,7492
840
840
  tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3qa4rWUFqP1VM5-vm_182rhiBYJDxPqJwWtBqJ5K028,956
841
841
  tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=bUByojQuVeuCfko1_2YtNJi1PT9yktHlcbPi_p-MPvk,1001
842
842
  tests/models/hestia/test_liveAnimal.py,sha256=3K9cL1fwr6LlBl1_D8zIaeCOuiExqkDEU7BXx1JK_dk,2139
@@ -919,12 +919,12 @@ tests/models/ipcc2019/test_ch4ToAirAquacultureSystems.py,sha256=o7bHOS4JkwexRrDh
919
919
  tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py,sha256=nmmxxJFX_VFOgvNxmj4q825vVEtEq-B61DVNo3inirs,8567
920
920
  tests/models/ipcc2019/test_ch4ToAirExcreta.py,sha256=e58NXmBW2SNVLUqQO9A66Xq6jiGTyhdFZDZk51JApF8,2902
921
921
  tests/models/ipcc2019/test_ch4ToAirFloodedRice.py,sha256=YRyxNaGPAgsCJBRXhwhEsZ6r44dawHMSN-Qmi-yS0xI,1025
922
- tests/models/ipcc2019/test_ch4ToAirOrganicSoilCultivation.py,sha256=HJNE-M38eXCvjTDfOj70XlevSQgXut8w5EDzj1HKeyY,1703
922
+ tests/models/ipcc2019/test_ch4ToAirOrganicSoilCultivation.py,sha256=7AzKbCrNa3C2miC98ALCtlkIBMV12cOTSIvxxHjLSgw,1759
923
923
  tests/models/ipcc2019/test_co2ToAirAboveGroundBiomassStockChange.py,sha256=1lei99xqneCU3a_2fOTcnAmRKKN6_mYU7uOyfLhXqJ4,4546
924
924
  tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py,sha256=ZoxBDNmNXutv5MUfKzoASCeBTEavjRC75ZSI0irWSG0,4481
925
925
  tests/models/ipcc2019/test_co2ToAirCarbonStockChange_utils.py,sha256=wCEtrbMl6zef8V-n_Ci_rtlQAlfuKm3khUVltr8eAcc,2173
926
926
  tests/models/ipcc2019/test_co2ToAirLimeHydrolysis.py,sha256=r7QmCH0YURS41JZxH2mFAC0J29WqmdkKG9EoEgv27AA,1350
927
- tests/models/ipcc2019/test_co2ToAirOrganicSoilCultivation.py,sha256=7LVoMpEP_byDXlaHARUJsjJA1JJ9btF0CU4rX3v8Y3w,1705
927
+ tests/models/ipcc2019/test_co2ToAirOrganicSoilCultivation.py,sha256=w4MBn2bYwyiv001xEU2RI9Q8L2Eu9lFC0CoxBcOzkWU,1761
928
928
  tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py,sha256=gPT_yyQBRoISSizW-7qE32VEeFXxsc55K3-3eZMJlOU,5688
929
929
  tests/models/ipcc2019/test_co2ToAirUreaHydrolysis.py,sha256=MmtEME0xjsa3KojFk_fxOLK6RZM_6p5HIpY2DOFHVu4,1530
930
930
  tests/models/ipcc2019/test_croppingDuration.py,sha256=1oRW1QaEwQvBadyVhaDi-jlkjuNqodyAinl88TdPmiY,1879
@@ -937,7 +937,7 @@ tests/models/ipcc2019/test_n2OToAirInorganicFertiliserDirect.py,sha256=uSdklDRTx
937
937
  tests/models/ipcc2019/test_n2OToAirInorganicFertiliserIndirect.py,sha256=RnU8CkUCYBBO1bgJALnoVgjTHLL1L1sja2nsyeVA_cg,2113
938
938
  tests/models/ipcc2019/test_n2OToAirOrganicFertiliserDirect.py,sha256=ofEcYrwvvXfoZHRWaaMtKMK2NbEtX_67laDeu_lDTXg,2714
939
939
  tests/models/ipcc2019/test_n2OToAirOrganicFertiliserIndirect.py,sha256=hW84sTlhB8mKRSFJX_iQS4gYo74zCtY-9zr1VHLC5GU,2111
940
- tests/models/ipcc2019/test_n2OToAirOrganicSoilCultivationDirect.py,sha256=cuBSXRDJSjwsHtMTIVFyjFpWpivG0ZwLXKOMHaLDDWY,1710
940
+ tests/models/ipcc2019/test_n2OToAirOrganicSoilCultivationDirect.py,sha256=VrBvbs9AVrRDwjGQAYfr_5rpB-fas0QQBGwQJBEax0o,1766
941
941
  tests/models/ipcc2019/test_nh3ToAirInorganicFertiliser.py,sha256=xmRHSTmyh--EZX29Z5NHD4LqEZl7Lkc5HntBCXlIRHE,1537
942
942
  tests/models/ipcc2019/test_nh3ToAirOrganicFertiliser.py,sha256=Z4a20I2UnZdzm6FqHnlHRXXVCY993_SHT7nG-zAhx-c,1104
943
943
  tests/models/ipcc2019/test_nitrogenContent.py,sha256=rKl_05PCC0OSsAhG0cHJOqnt9LsCaFnRpJorkm1TShA,3704
@@ -949,7 +949,7 @@ tests/models/ipcc2019/test_nonCo2EmissionsToAirNaturalVegetationBurning.py,sha25
949
949
  tests/models/ipcc2019/test_noxToAirInorganicFertiliser.py,sha256=NZBSBJLM_j2PEpHRON2ysgKNF8x5sHfQVoAKQdGsfzk,1537
950
950
  tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8kYRp_ij4CHInzgaDS6EggQuBiw,1104
951
951
  tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=g_uOqzj6EiyvoAZRpd4PakMYQ7Vfn0QiDGLCTVz92A8,15607
952
- tests/models/ipcc2019/test_organicCarbonPerHa_tier_1.py,sha256=7ISfBTgFqZLyU7l_UW3Hxpx8dNi1X3UurNS5I7DhH-U,20432
952
+ tests/models/ipcc2019/test_organicCarbonPerHa_tier_1.py,sha256=7vmjes9efXPCUcRDZ6HuW8CNFGXnbpmyfXdgBPGbZEE,20621
953
953
  tests/models/ipcc2019/test_organicCarbonPerHa_tier_2.py,sha256=OKkISE_gcF1yrEHzHowk65MbDRdgy-ILdzGWIy6X8JU,5502
954
954
  tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=Zd2QlN_Q3k9djuByOH62A00tryVzlvNtsd46N79TTeU,1778
955
955
  tests/models/ipcc2019/test_pastureGrass.py,sha256=6B8ZmuI1w4rA4wGduWx0l6e0BgGz8b2knTUIcT0GDOg,2725
@@ -1243,8 +1243,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
1243
1243
  tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
1244
1244
  tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
1245
1245
  tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
1246
- hestia_earth_models-0.70.3.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
1247
- hestia_earth_models-0.70.3.dist-info/METADATA,sha256=9u8GduYX4WwwaaEc7Tdis5CggZOQB2YImDLZQSYU2gk,4045
1248
- hestia_earth_models-0.70.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
1249
- hestia_earth_models-0.70.3.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
1250
- hestia_earth_models-0.70.3.dist-info/RECORD,,
1246
+ hestia_earth_models-0.70.5.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
1247
+ hestia_earth_models-0.70.5.dist-info/METADATA,sha256=eP_74Ax32zchMTjyt6wWEglIFGifvoFlt5jIXXofrNo,4045
1248
+ hestia_earth_models-0.70.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
1249
+ hestia_earth_models-0.70.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
1250
+ hestia_earth_models-0.70.5.dist-info/RECORD,,
@@ -7,7 +7,8 @@ from tests.utils import fixtures_path, fake_new_management
7
7
  from hestia_earth.models.faostat2018.utils import MODEL as FAOSTAT_MODEL
8
8
  from hestia_earth.models.hestia.landCover import (
9
9
  MODEL, MODEL_KEY, get_changes, _estimate_maximum_forest_change,
10
- run, site_area_sum_to_100, _get_sums_of_crop_expansion, _get_sum_for_land_category, scale_values_to_one
10
+ run, site_area_sum_to_100, _get_sums_of_crop_expansion, _get_sum_for_land_category, scale_values_to_one,
11
+ _get_most_common_or_alphabetically_first
11
12
  )
12
13
 
13
14
  CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
@@ -42,6 +43,28 @@ BRAZIL_SITE = {
42
43
  }
43
44
 
44
45
 
46
+ @pytest.mark.parametrize(
47
+ "terms,expected_output",
48
+ [
49
+ ( # Only term
50
+ ["Annual crops", "Annual crops"],
51
+ "Annual crops"
52
+ ),
53
+ ( # Most common
54
+ ["Perennial crops", "Perennial crops", "Annual crops"],
55
+ "Perennial crops"
56
+ ),
57
+ ( # Tied frequency, Alphabetically first
58
+ ["Perennial crops", "Perennial crops", "Annual crops", "Annual crops"],
59
+ "Annual crops"
60
+ )
61
+ ]
62
+ )
63
+ def test_get_most_common_or_alphabetically_first(terms, expected_output):
64
+ actual_result = _get_most_common_or_alphabetically_first(terms)
65
+ assert actual_result == expected_output
66
+
67
+
45
68
  def test_get_changes():
46
69
  result, missing_values = get_changes(
47
70
  country_id="GADM-AFG",
@@ -21,7 +21,8 @@ PARAMS_SHOULD_RUN = [
21
21
  ("polar", False),
22
22
  ("mineral-soil", True),
23
23
  ("unknown-soil", False),
24
- ("unknown-land-occupation", False)
24
+ ("unknown-land-occupation", False),
25
+ ("unknown-eco-climate-zone", False) # Closes 1233
25
26
  ]
26
27
  IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
27
28
 
@@ -22,7 +22,8 @@ PARAMS_SHOULD_RUN = [
22
22
  ("polar", False),
23
23
  ("mineral-soil", True),
24
24
  ("unknown-soil", False),
25
- ("unknown-land-occupation", False)
25
+ ("unknown-land-occupation", False),
26
+ ("unknown-eco-climate-zone", False) # Closes 1233
26
27
  ]
27
28
  IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
28
29
 
@@ -21,7 +21,8 @@ PARAMS_SHOULD_RUN = [
21
21
  ("polar", False),
22
22
  ("mineral-soil", True),
23
23
  ("unknown-soil", False),
24
- ("unknown-land-occupation", False)
24
+ ("unknown-land-occupation", False),
25
+ ("unknown-eco-climate-zone", False) # Closes 1233
25
26
  ]
26
27
  IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
27
28
 
@@ -196,13 +196,18 @@ MANAGEMENT_CATEGORY_PARAMS = [
196
196
  ("high-intensity-grazing", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.HIGH_INTENSITY_GRAZING),
197
197
  ("improved-grassland", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.IMPROVED_GRASSLAND),
198
198
  ("no-tillage", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.NO_TILLAGE),
199
- ("nominally-managed", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.NOMINALLY_MANAGED),
199
+ ("nominally-managed/native-pasture", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.NOMINALLY_MANAGED),
200
+ (
201
+ "nominally-managed/nominally-managed-pasture",
202
+ IpccLandUseCategory.GRASSLAND,
203
+ IpccManagementCategory.NOMINALLY_MANAGED
204
+ ),
205
+ ("nominally-managed/unknown", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.NOMINALLY_MANAGED),
200
206
  ("not-relevant", IpccLandUseCategory.OTHER, IpccManagementCategory.NOT_RELEVANT),
201
207
  ("reduced-tillage", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.REDUCED_TILLAGE),
202
208
  ("severely-degraded", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.SEVERELY_DEGRADED),
203
209
  ("unknown/annual-crops", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.UNKNOWN),
204
- ("unknown/annual-crops-wet", IpccLandUseCategory.ANNUAL_CROPS_WET, IpccManagementCategory.UNKNOWN),
205
- ("unknown/grassland", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.UNKNOWN)
210
+ ("unknown/annual-crops-wet", IpccLandUseCategory.ANNUAL_CROPS_WET, IpccManagementCategory.UNKNOWN)
206
211
  ]
207
212
 
208
213