diff --git a/.env.sample b/.env.sample new file mode 100644 index 0000000..aa0538e --- /dev/null +++ b/.env.sample @@ -0,0 +1,4 @@ +DB_NAME=soil_id +DB_HOST=0.0.0.0 +DB_USERNAME=postgres +DB_PASSWORD=postgres diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b32d528..c12240a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,19 +4,19 @@ default_install_hook_types: repos: - repo: https://gitlab.com/vojko.pribudic.foss/pre-commit-update - rev: v0.8.0 + rev: v0.9.0 hooks: - id: pre-commit-update - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.14.0 + rev: v0.14.6 hooks: - id: ruff-check args: [--fix] - id: ruff-format - repo: https://github.com/compilerla/conventional-pre-commit - rev: v4.2.0 + rev: v4.3.0 hooks: - id: conventional-pre-commit stages: [commit-msg] diff --git a/Makefile b/Makefile index 8f05170..e4c7d29 100644 --- a/Makefile +++ b/Makefile @@ -43,16 +43,16 @@ clean: test: clean check_rebuild if [ -z "$(PATTERN)" ]; then \ - $(DC_RUN_CMD) pytest soil_id -vv; \ + pytest soil_id -vv; \ else \ - $(DC_RUN_CMD) pytest soil_id -vv -k "$(PATTERN)"; \ + pytest soil_id -vv -k "$(PATTERN)"; \ fi test_update_snapshots: clean check_rebuild if [ -z "$(PATTERN)" ]; then \ - $(DC_RUN_CMD) pytest soil_id --snapshot-update; \ + pytest soil_id --snapshot-update; \ else \ - $(DC_RUN_CMD) pytest soil_id --snapshot-update -k "$(PATTERN)"; \ + pytest soil_id --snapshot-update -k "$(PATTERN)"; \ fi test-verbose: diff --git a/README.md b/README.md index 1e5f711..7056dc1 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,12 @@ $ source .venv/bin/activate $ make install && make install-dev ``` +Configure the `.env` file to connect to the local database: + +```sh +$ cp .env.sample .env +``` + ## explanation of algorithm ### terminology diff --git a/requirements-dev.txt b/requirements-dev.txt index 1caf19b..1a12c4c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,102 +4,136 @@ beautifulsoup4==4.14.2 \ --hash=sha256:2a98ab9f944a11acee9cc848508ec28d9228abfd522ef0fad6a02a72e0ded69e \ --hash=sha256:5ef6fa3a8cbece8488d66985560f97ed091e22bbc4e9c2338508a9d5de6d4515 # via gdown -certifi==2025.10.5 \ - --hash=sha256:0f212c2744a9bb6de0c56639a6f68afe01ecd92d91f14ae897c4fe7bbeeef0de \ - --hash=sha256:47c09d31ccf2acf0be3f701ea53595ee7e0b8fa08801c6624be771df09ae7b43 +certifi==2025.11.12 \ + --hash=sha256:97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b \ + --hash=sha256:d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316 # via requests -cfgv==3.4.0 \ - --hash=sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9 \ - --hash=sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560 +cfgv==3.5.0 \ + --hash=sha256:a8dc6b26ad22ff227d2634a65cb388215ce6cc96bbcc5cfde7641ae87e8dacc0 \ + --hash=sha256:d5b1034354820651caa73ede66a6294d6e95c1b00acc5e9b098e917404669132 # via pre-commit -charset-normalizer==3.4.3 \ - --hash=sha256:00237675befef519d9af72169d8604a067d92755e84fe76492fef5441db05b91 \ - --hash=sha256:02425242e96bcf29a49711b0ca9f37e451da7c70562bc10e8ed992a5a7a25cc0 \ - --hash=sha256:027b776c26d38b7f15b26a5da1044f376455fb3766df8fc38563b4efbc515154 \ - --hash=sha256:07a0eae9e2787b586e129fdcbe1af6997f8d0e5abaa0bc98c0e20e124d67e601 \ - --hash=sha256:0cacf8f7297b0c4fcb74227692ca46b4a5852f8f4f24b3c766dd94a1075c4884 \ - --hash=sha256:0e78314bdc32fa80696f72fa16dc61168fda4d6a0c014e0380f9d02f0e5d8a07 \ - --hash=sha256:0f2be7e0cf7754b9a30eb01f4295cc3d4358a479843b31f328afd210e2c7598c \ - --hash=sha256:13faeacfe61784e2559e690fc53fa4c5ae97c6fcedb8eb6fb8d0a15b475d2c64 \ - --hash=sha256:14c2a87c65b351109f6abfc424cab3927b3bdece6f706e4d12faaf3d52ee5efe \ - --hash=sha256:1606f4a55c0fd363d754049cdf400175ee96c992b1f8018b993941f221221c5f \ - --hash=sha256:16a8770207946ac75703458e2c743631c79c59c5890c80011d536248f8eaa432 \ - --hash=sha256:18343b2d246dc6761a249ba1fb13f9ee9a2bcd95decc767319506056ea4ad4dc \ - --hash=sha256:18b97b8404387b96cdbd30ad660f6407799126d26a39ca65729162fd810a99aa \ - --hash=sha256:1bb60174149316da1c35fa5233681f7c0f9f514509b8e399ab70fea5f17e45c9 \ - --hash=sha256:1e8ac75d72fa3775e0b7cb7e4629cec13b7514d928d15ef8ea06bca03ef01cae \ - --hash=sha256:1ef99f0456d3d46a50945c98de1774da86f8e992ab5c77865ea8b8195341fc19 \ - --hash=sha256:2001a39612b241dae17b4687898843f254f8748b796a2e16f1051a17078d991d \ - --hash=sha256:23b6b24d74478dc833444cbd927c338349d6ae852ba53a0d02a2de1fce45b96e \ - --hash=sha256:252098c8c7a873e17dd696ed98bbe91dbacd571da4b87df3736768efa7a792e4 \ - --hash=sha256:257f26fed7d7ff59921b78244f3cd93ed2af1800ff048c33f624c87475819dd7 \ - --hash=sha256:2c322db9c8c89009a990ef07c3bcc9f011a3269bc06782f916cd3d9eed7c9312 \ - --hash=sha256:30a96e1e1f865f78b030d65241c1ee850cdf422d869e9028e2fc1d5e4db73b92 \ - --hash=sha256:30d006f98569de3459c2fc1f2acde170b7b2bd265dc1943e87e1a4efe1b67c31 \ - --hash=sha256:31a9a6f775f9bcd865d88ee350f0ffb0e25936a7f930ca98995c05abf1faf21c \ - --hash=sha256:320e8e66157cc4e247d9ddca8e21f427efc7a04bbd0ac8a9faf56583fa543f9f \ - --hash=sha256:34a7f768e3f985abdb42841e20e17b330ad3aaf4bb7e7aeeb73db2e70f077b99 \ - --hash=sha256:3653fad4fe3ed447a596ae8638b437f827234f01a8cd801842e43f3d0a6b281b \ - --hash=sha256:3cd35b7e8aedeb9e34c41385fda4f73ba609e561faedfae0a9e75e44ac558a15 \ - --hash=sha256:3cfb2aad70f2c6debfbcb717f23b7eb55febc0bb23dcffc0f076009da10c6392 \ - --hash=sha256:416175faf02e4b0810f1f38bcb54682878a4af94059a1cd63b8747244420801f \ - --hash=sha256:41d1fc408ff5fdfb910200ec0e74abc40387bccb3252f3f27c0676731df2b2c8 \ - --hash=sha256:42e5088973e56e31e4fa58eb6bd709e42fc03799c11c42929592889a2e54c491 \ - --hash=sha256:4ca4c094de7771a98d7fbd67d9e5dbf1eb73efa4f744a730437d8a3a5cf994f0 \ - --hash=sha256:511729f456829ef86ac41ca78c63a5cb55240ed23b4b737faca0eb1abb1c41bc \ - --hash=sha256:53cd68b185d98dde4ad8990e56a58dea83a4162161b1ea9272e5c9182ce415e0 \ - --hash=sha256:585f3b2a80fbd26b048a0be90c5aae8f06605d3c92615911c3a2b03a8a3b796f \ - --hash=sha256:5b413b0b1bfd94dbf4023ad6945889f374cd24e3f62de58d6bb102c4d9ae534a \ - --hash=sha256:5d8d01eac18c423815ed4f4a2ec3b439d654e55ee4ad610e153cf02faf67ea40 \ - --hash=sha256:6aab0f181c486f973bc7262a97f5aca3ee7e1437011ef0c2ec04b5a11d16c927 \ - --hash=sha256:6cf8fd4c04756b6b60146d98cd8a77d0cdae0e1ca20329da2ac85eed779b6849 \ - --hash=sha256:6fb70de56f1859a3f71261cbe41005f56a7842cc348d3aeb26237560bfa5e0ce \ - --hash=sha256:6fce4b8500244f6fcb71465d4a4930d132ba9ab8e71a7859e6a5d59851068d14 \ - --hash=sha256:70bfc5f2c318afece2f5838ea5e4c3febada0be750fcf4775641052bbba14d05 \ - --hash=sha256:73dc19b562516fc9bcf6e5d6e596df0b4eb98d87e4f79f3ae71840e6ed21361c \ - --hash=sha256:74d77e25adda8581ffc1c720f1c81ca082921329452eba58b16233ab1842141c \ - --hash=sha256:78deba4d8f9590fe4dae384aeff04082510a709957e968753ff3c48399f6f92a \ - --hash=sha256:86df271bf921c2ee3818f0522e9a5b8092ca2ad8b065ece5d7d9d0e9f4849bcc \ - --hash=sha256:88ab34806dea0671532d3f82d82b85e8fc23d7b2dd12fa837978dad9bb392a34 \ - --hash=sha256:8999f965f922ae054125286faf9f11bc6932184b93011d138925a1773830bbe9 \ - --hash=sha256:8dcfc373f888e4fb39a7bc57e93e3b845e7f462dacc008d9749568b1c4ece096 \ - --hash=sha256:939578d9d8fd4299220161fdd76e86c6a251987476f5243e8864a7844476ba14 \ - --hash=sha256:96b2b3d1a83ad55310de8c7b4a2d04d9277d5591f40761274856635acc5fcb30 \ - --hash=sha256:a2d08ac246bb48479170408d6c19f6385fa743e7157d716e144cad849b2dd94b \ - --hash=sha256:b256ee2e749283ef3ddcff51a675ff43798d92d746d1a6e4631bf8c707d22d0b \ - --hash=sha256:b5e3b2d152e74e100a9e9573837aba24aab611d39428ded46f4e4022ea7d1942 \ - --hash=sha256:b89bc04de1d83006373429975f8ef9e7932534b8cc9ca582e4db7d20d91816db \ - --hash=sha256:bd28b817ea8c70215401f657edef3a8aa83c29d447fb0b622c35403780ba11d5 \ - --hash=sha256:c60e092517a73c632ec38e290eba714e9627abe9d301c8c8a12ec32c314a2a4b \ - --hash=sha256:c6dbd0ccdda3a2ba7c2ecd9d77b37f3b5831687d8dc1b6ca5f56a4880cc7b7ce \ - --hash=sha256:c6e490913a46fa054e03699c70019ab869e990270597018cef1d8562132c2669 \ - --hash=sha256:c6f162aabe9a91a309510d74eeb6507fab5fff92337a15acbe77753d88d9dcf0 \ - --hash=sha256:c6fd51128a41297f5409deab284fecbe5305ebd7e5a1f959bee1c054622b7018 \ - --hash=sha256:cc34f233c9e71701040d772aa7490318673aa7164a0efe3172b2981218c26d93 \ - --hash=sha256:cc9370a2da1ac13f0153780040f465839e6cccb4a1e44810124b4e22483c93fe \ - --hash=sha256:ccf600859c183d70eb47e05a44cd80a4ce77394d1ac0f79dbd2dd90a69a3a049 \ - --hash=sha256:ce571ab16d890d23b5c278547ba694193a45011ff86a9162a71307ed9f86759a \ - --hash=sha256:cf1ebb7d78e1ad8ec2a8c4732c7be2e736f6e5123a4146c5b89c9d1f585f8cef \ - --hash=sha256:d0e909868420b7049dafd3a31d45125b31143eec59235311fc4c57ea26a4acd2 \ - --hash=sha256:d22dbedd33326a4a5190dd4fe9e9e693ef12160c77382d9e87919bce54f3d4ca \ - --hash=sha256:d716a916938e03231e86e43782ca7878fb602a125a91e7acb8b5112e2e96ac16 \ - --hash=sha256:d79c198e27580c8e958906f803e63cddb77653731be08851c7df0b1a14a8fc0f \ - --hash=sha256:d95bfb53c211b57198bb91c46dd5a2d8018b3af446583aab40074bf7988401cb \ - --hash=sha256:e28e334d3ff134e88989d90ba04b47d84382a828c061d0d1027b1b12a62b39b1 \ - --hash=sha256:ec557499516fc90fd374bf2e32349a2887a876fbf162c160e3c01b6849eaf557 \ - --hash=sha256:fb6fecfd65564f208cbf0fba07f107fb661bcd1a7c389edbced3f7a493f70e37 \ - --hash=sha256:fb731e5deb0c7ef82d698b0f4c5bb724633ee2a489401594c5c88b02e6cb15f7 \ - --hash=sha256:fb7f67a1bfa6e40b438170ebdc8158b78dc465a5a67b6dde178a46987b244a72 \ - --hash=sha256:fd10de089bcdcd1be95a2f73dbe6254798ec1bda9f450d5828c96f93e2536b9c \ - --hash=sha256:fdabf8315679312cfa71302f9bd509ded4f2f263fb5b765cf1433b39106c3cc9 +charset-normalizer==3.4.4 \ + --hash=sha256:027f6de494925c0ab2a55eab46ae5129951638a49a34d87f4c3eda90f696b4ad \ + --hash=sha256:077fbb858e903c73f6c9db43374fd213b0b6a778106bc7032446a8e8b5b38b93 \ + --hash=sha256:0a98e6759f854bd25a58a73fa88833fba3b7c491169f86ce1180c948ab3fd394 \ + --hash=sha256:0d3d8f15c07f86e9ff82319b3d9ef6f4bf907608f53fe9d92b28ea9ae3d1fd89 \ + --hash=sha256:0f04b14ffe5fdc8c4933862d8306109a2c51e0704acfa35d51598eb45a1e89fc \ + --hash=sha256:11d694519d7f29d6cd09f6ac70028dba10f92f6cdd059096db198c283794ac86 \ + --hash=sha256:194f08cbb32dc406d6e1aea671a68be0823673db2832b38405deba2fb0d88f63 \ + --hash=sha256:1bee1e43c28aa63cb16e5c14e582580546b08e535299b8b6158a7c9c768a1f3d \ + --hash=sha256:21d142cc6c0ec30d2efee5068ca36c128a30b0f2c53c1c07bd78cb6bc1d3be5f \ + --hash=sha256:2437418e20515acec67d86e12bf70056a33abdacb5cb1655042f6538d6b085a8 \ + --hash=sha256:244bfb999c71b35de57821b8ea746b24e863398194a4014e4c76adc2bbdfeff0 \ + --hash=sha256:2677acec1a2f8ef614c6888b5b4ae4060cc184174a938ed4e8ef690e15d3e505 \ + --hash=sha256:277e970e750505ed74c832b4bf75dac7476262ee2a013f5574dd49075879e161 \ + --hash=sha256:2aaba3b0819274cc41757a1da876f810a3e4d7b6eb25699253a4effef9e8e4af \ + --hash=sha256:2b7d8f6c26245217bd2ad053761201e9f9680f8ce52f0fcd8d0755aeae5b2152 \ + --hash=sha256:2c9d3c380143a1fedbff95a312aa798578371eb29da42106a29019368a475318 \ + --hash=sha256:3162d5d8ce1bb98dd51af660f2121c55d0fa541b46dff7bb9b9f86ea1d87de72 \ + --hash=sha256:31fd66405eaf47bb62e8cd575dc621c56c668f27d46a61d975a249930dd5e2a4 \ + --hash=sha256:362d61fd13843997c1c446760ef36f240cf81d3ebf74ac62652aebaf7838561e \ + --hash=sha256:376bec83a63b8021bb5c8ea75e21c4ccb86e7e45ca4eb81146091b56599b80c3 \ + --hash=sha256:44c2a8734b333e0578090c4cd6b16f275e07aa6614ca8715e6c038e865e70576 \ + --hash=sha256:47cc91b2f4dd2833fddaedd2893006b0106129d4b94fdb6af1f4ce5a9965577c \ + --hash=sha256:4902828217069c3c5c71094537a8e623f5d097858ac6ca8252f7b4d10b7560f1 \ + --hash=sha256:4bd5d4137d500351a30687c2d3971758aac9a19208fc110ccb9d7188fbe709e8 \ + --hash=sha256:4fe7859a4e3e8457458e2ff592f15ccb02f3da787fcd31e0183879c3ad4692a1 \ + --hash=sha256:542d2cee80be6f80247095cc36c418f7bddd14f4a6de45af91dfad36d817bba2 \ + --hash=sha256:554af85e960429cf30784dd47447d5125aaa3b99a6f0683589dbd27e2f45da44 \ + --hash=sha256:5833d2c39d8896e4e19b689ffc198f08ea58116bee26dea51e362ecc7cd3ed26 \ + --hash=sha256:5947809c8a2417be3267efc979c47d76a079758166f7d43ef5ae8e9f92751f88 \ + --hash=sha256:5ae497466c7901d54b639cf42d5b8c1b6a4fead55215500d2f486d34db48d016 \ + --hash=sha256:5bd2293095d766545ec1a8f612559f6b40abc0eb18bb2f5d1171872d34036ede \ + --hash=sha256:5bfbb1b9acf3334612667b61bd3002196fe2a1eb4dd74d247e0f2a4d50ec9bbf \ + --hash=sha256:5cb4d72eea50c8868f5288b7f7f33ed276118325c1dfd3957089f6b519e1382a \ + --hash=sha256:5dbe56a36425d26d6cfb40ce79c314a2e4dd6211d51d6d2191c00bed34f354cc \ + --hash=sha256:5f819d5fe9234f9f82d75bdfa9aef3a3d72c4d24a6e57aeaebba32a704553aa0 \ + --hash=sha256:64b55f9dce520635f018f907ff1b0df1fdc31f2795a922fb49dd14fbcdf48c84 \ + --hash=sha256:6515f3182dbe4ea06ced2d9e8666d97b46ef4c75e326b79bb624110f122551db \ + --hash=sha256:65e2befcd84bc6f37095f5961e68a6f077bf44946771354a28ad434c2cce0ae1 \ + --hash=sha256:6aee717dcfead04c6eb1ce3bd29ac1e22663cdea57f943c87d1eab9a025438d7 \ + --hash=sha256:6b39f987ae8ccdf0d2642338faf2abb1862340facc796048b604ef14919e55ed \ + --hash=sha256:6e1fcf0720908f200cd21aa4e6750a48ff6ce4afe7ff5a79a90d5ed8a08296f8 \ + --hash=sha256:74018750915ee7ad843a774364e13a3db91682f26142baddf775342c3f5b1133 \ + --hash=sha256:74664978bb272435107de04e36db5a9735e78232b85b77d45cfb38f758efd33e \ + --hash=sha256:74bb723680f9f7a6234dcf67aea57e708ec1fbdf5699fb91dfd6f511b0a320ef \ + --hash=sha256:752944c7ffbfdd10c074dc58ec2d5a8a4cd9493b314d367c14d24c17684ddd14 \ + --hash=sha256:778d2e08eda00f4256d7f672ca9fef386071c9202f5e4607920b86d7803387f2 \ + --hash=sha256:780236ac706e66881f3b7f2f32dfe90507a09e67d1d454c762cf642e6e1586e0 \ + --hash=sha256:798d75d81754988d2565bff1b97ba5a44411867c0cf32b77a7e8f8d84796b10d \ + --hash=sha256:799a7a5e4fb2d5898c60b640fd4981d6a25f1c11790935a44ce38c54e985f828 \ + --hash=sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f \ + --hash=sha256:7c308f7e26e4363d79df40ca5b2be1c6ba9f02bdbccfed5abddb7859a6ce72cf \ + --hash=sha256:7fa17817dc5625de8a027cb8b26d9fefa3ea28c8253929b8d6649e705d2835b6 \ + --hash=sha256:81d5eb2a312700f4ecaa977a8235b634ce853200e828fbadf3a9c50bab278328 \ + --hash=sha256:82004af6c302b5d3ab2cfc4cc5f29db16123b1a8417f2e25f9066f91d4411090 \ + --hash=sha256:837c2ce8c5a65a2035be9b3569c684358dfbf109fd3b6969630a87535495ceaa \ + --hash=sha256:840c25fb618a231545cbab0564a799f101b63b9901f2569faecd6b222ac72381 \ + --hash=sha256:8a6562c3700cce886c5be75ade4a5db4214fda19fede41d9792d100288d8f94c \ + --hash=sha256:8af65f14dc14a79b924524b1e7fffe304517b2bff5a58bf64f30b98bbc5079eb \ + --hash=sha256:8ef3c867360f88ac904fd3f5e1f902f13307af9052646963ee08ff4f131adafc \ + --hash=sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a \ + --hash=sha256:99ae2cffebb06e6c22bdc25801d7b30f503cc87dbd283479e7b606f70aff57ec \ + --hash=sha256:9a26f18905b8dd5d685d6d07b0cdf98a79f3c7a918906af7cc143ea2e164c8bc \ + --hash=sha256:9b35f4c90079ff2e2edc5b26c0c77925e5d2d255c42c74fdb70fb49b172726ac \ + --hash=sha256:9cd98cdc06614a2f768d2b7286d66805f94c48cde050acdbbb7db2600ab3197e \ + --hash=sha256:9d1bb833febdff5c8927f922386db610b49db6e0d4f4ee29601d71e7c2694313 \ + --hash=sha256:9f7fcd74d410a36883701fafa2482a6af2ff5ba96b9a620e9e0721e28ead5569 \ + --hash=sha256:a59cb51917aa591b1c4e6a43c132f0cdc3c76dbad6155df4e28ee626cc77a0a3 \ + --hash=sha256:a61900df84c667873b292c3de315a786dd8dac506704dea57bc957bd31e22c7d \ + --hash=sha256:a79cfe37875f822425b89a82333404539ae63dbdddf97f84dcbc3d339aae9525 \ + --hash=sha256:a8a8b89589086a25749f471e6a900d3f662d1d3b6e2e59dcecf787b1cc3a1894 \ + --hash=sha256:a8bf8d0f749c5757af2142fe7903a9df1d2e8aa3841559b2bad34b08d0e2bcf3 \ + --hash=sha256:a9768c477b9d7bd54bc0c86dbaebdec6f03306675526c9927c0e8a04e8f94af9 \ + --hash=sha256:ac1c4a689edcc530fc9d9aa11f5774b9e2f33f9a0c6a57864e90908f5208d30a \ + --hash=sha256:af2d8c67d8e573d6de5bc30cdb27e9b95e49115cd9baad5ddbd1a6207aaa82a9 \ + --hash=sha256:b435cba5f4f750aa6c0a0d92c541fb79f69a387c91e61f1795227e4ed9cece14 \ + --hash=sha256:b5b290ccc2a263e8d185130284f8501e3e36c5e02750fc6b6bdeb2e9e96f1e25 \ + --hash=sha256:b5d84d37db046c5ca74ee7bb47dd6cbc13f80665fdde3e8040bdd3fb015ecb50 \ + --hash=sha256:b7cf1017d601aa35e6bb650b6ad28652c9cd78ee6caff19f3c28d03e1c80acbf \ + --hash=sha256:bc7637e2f80d8530ee4a78e878bce464f70087ce73cf7c1caf142416923b98f1 \ + --hash=sha256:c0463276121fdee9c49b98908b3a89c39be45d86d1dbaa22957e38f6321d4ce3 \ + --hash=sha256:c4ef880e27901b6cc782f1b95f82da9313c0eb95c3af699103088fa0ac3ce9ac \ + --hash=sha256:c8ae8a0f02f57a6e61203a31428fa1d677cbe50c93622b4149d5c0f319c1d19e \ + --hash=sha256:ca5862d5b3928c4940729dacc329aa9102900382fea192fc5e52eb69d6093815 \ + --hash=sha256:cb01158d8b88ee68f15949894ccc6712278243d95f344770fa7593fa2d94410c \ + --hash=sha256:cb6254dc36b47a990e59e1068afacdcd02958bdcce30bb50cc1700a8b9d624a6 \ + --hash=sha256:cc00f04ed596e9dc0da42ed17ac5e596c6ccba999ba6bd92b0e0aef2f170f2d6 \ + --hash=sha256:cd09d08005f958f370f539f186d10aec3377d55b9eeb0d796025d4886119d76e \ + --hash=sha256:cd4b7ca9984e5e7985c12bc60a6f173f3c958eae74f3ef6624bb6b26e2abbae4 \ + --hash=sha256:ce8a0633f41a967713a59c4139d29110c07e826d131a316b50ce11b1d79b4f84 \ + --hash=sha256:cead0978fc57397645f12578bfd2d5ea9138ea0fac82b2f63f7f7c6877986a69 \ + --hash=sha256:d055ec1e26e441f6187acf818b73564e6e6282709e9bcb5b63f5b23068356a15 \ + --hash=sha256:d1f13550535ad8cff21b8d757a3257963e951d96e20ec82ab44bc64aeb62a191 \ + --hash=sha256:d9c7f57c3d666a53421049053eaacdd14bbd0a528e2186fcb2e672effd053bb0 \ + --hash=sha256:d9e45d7faa48ee908174d8fe84854479ef838fc6a705c9315372eacbc2f02897 \ + --hash=sha256:da3326d9e65ef63a817ecbcc0df6e94463713b754fe293eaa03da99befb9a5bd \ + --hash=sha256:de00632ca48df9daf77a2c65a484531649261ec9f25489917f09e455cb09ddb2 \ + --hash=sha256:e1f185f86a6f3403aa2420e815904c67b2f9ebc443f045edd0de921108345794 \ + --hash=sha256:e824f1492727fa856dd6eda4f7cee25f8518a12f3c4a56a74e8095695089cf6d \ + --hash=sha256:e912091979546adf63357d7e2ccff9b44f026c075aeaf25a52d0e95ad2281074 \ + --hash=sha256:eaabd426fe94daf8fd157c32e571c85cb12e66692f15516a83a03264b08d06c3 \ + --hash=sha256:ebf3e58c7ec8a8bed6d66a75d7fb37b55e5015b03ceae72a8e7c74495551e224 \ + --hash=sha256:ecaae4149d99b1c9e7b88bb03e3221956f68fd6d50be2ef061b2381b61d20838 \ + --hash=sha256:eecbc200c7fd5ddb9a7f16c7decb07b566c29fa2161a16cf67b8d068bd21690a \ + --hash=sha256:f155a433c2ec037d4e8df17d18922c3a0d9b3232a396690f17175d2946f0218d \ + --hash=sha256:f1e34719c6ed0b92f418c7c780480b26b5d9c50349e9a9af7d76bf757530350d \ + --hash=sha256:f34be2938726fc13801220747472850852fe6b1ea75869a048d6f896838c896f \ + --hash=sha256:f820802628d2694cb7e56db99213f930856014862f3fd943d290ea8438d07ca8 \ + --hash=sha256:f8bf04158c6b607d747e93949aa60618b61312fe647a6369f88ce2ff16043490 \ + --hash=sha256:f8e160feb2aed042cd657a72acc0b481212ed28b1b9a95c0cee1621b524e1966 \ + --hash=sha256:f9d332f8c2a2fcbffe1378594431458ddbef721c1769d78e2cbc06280d8155f9 \ + --hash=sha256:fa09f53c465e532f4d3db095e0c55b615f010ad81803d383195b6b5ca6cbf5f3 \ + --hash=sha256:faa3a41b2b66b6e50f84ae4a68c64fcd0c44355741c6374813a800cd6695db9e \ + --hash=sha256:fd44c878ea55ba351104cb93cc85e74916eb8fa440ca7903e57575e97394f608 # via requests distlib==0.4.0 \ --hash=sha256:9659f7d87e46584a30b5780e43ac7a2143098441670ff0a49d5f9034c54a6c16 \ --hash=sha256:feec40075be03a04501a973d81f633735b4b69f98b05450592310c0f401a4e0d # via virtualenv -filelock==3.19.1 \ - --hash=sha256:66eda1888b0171c998b35be2bcc0f6d75c388a7ce20c3f3f37aa8e96c2dddf58 \ - --hash=sha256:d38e30481def20772f5baf097c122c3babc4fcdb7e14e57049eb9d88c6dc017d +filelock==3.20.0 \ + --hash=sha256:339b4732ffda5cd79b13f4e2711a31b0365ce445d95d243bb996273d072546a2 \ + --hash=sha256:711e943b4ec6be42e1d4e6690b48dc175c822967466bb31c0c293f34334c13f4 # via # gdown # virtualenv @@ -118,13 +152,13 @@ identify==2.6.15 \ --hash=sha256:1181ef7608e00704db228516541eb83a88a9f94433a8c80bb9b5bd54b1d81757 \ --hash=sha256:e4f4864b96c6557ef2a1e1c951771838f4edc9df3a72ec7118b338801b11c7bf # via pre-commit -idna==3.10 \ - --hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \ - --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3 +idna==3.11 \ + --hash=sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea \ + --hash=sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902 # via requests -iniconfig==2.1.0 \ - --hash=sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7 \ - --hash=sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760 +iniconfig==2.3.0 \ + --hash=sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730 \ + --hash=sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12 # via pytest nodeenv==1.9.1 \ --hash=sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f \ @@ -134,17 +168,17 @@ packaging==25.0 \ --hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \ --hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f # via pytest -platformdirs==4.4.0 \ - --hash=sha256:abd01743f24e5287cd7a5db3752faf1a2d65353f38ec26d98e25a6db65958c85 \ - --hash=sha256:ca753cf4d81dc309bc67b0ea38fd15dc97bc30ce419a7f58d13eb3bf14c4febf +platformdirs==4.5.0 \ + --hash=sha256:70ddccdd7c99fc5942e9fc25636a8b34d04c24b335100223152c2803e4063312 \ + --hash=sha256:e578a81bb873cbb89a41fcc904c7ef523cc18284b7e3b3ccf06aca1403b7ebd3 # via virtualenv pluggy==1.6.0 \ --hash=sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3 \ --hash=sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746 # via pytest -pre-commit==4.3.0 \ - --hash=sha256:2b0747ad7e6e967169136edffee14c16e148a778a54e4f967921aa1ebf2308d8 \ - --hash=sha256:499fe450cc9d42e9d58e606262795ecb64dd05438943c62b66f6a8673da30b16 +pre-commit==4.5.0 \ + --hash=sha256:25e2ce09595174d9c97860a95609f9f852c0614ba602de3561e267547f2335e1 \ + --hash=sha256:dc5a065e932b19fc1d4c653c6939068fe54325af8e741e74e88db4d28a4dd66b # via -r requirements/dev.in pygments==2.19.2 \ --hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \ @@ -155,9 +189,9 @@ pysocks==1.7.1 \ --hash=sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5 \ --hash=sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0 # via requests -pytest==8.4.2 \ - --hash=sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01 \ - --hash=sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79 +pytest==9.0.1 \ + --hash=sha256:3e9c069ea73583e255c3b21cf46b8d3c56f6e3a1a8f6da94ccb0fcf57b9d73c8 \ + --hash=sha256:67be0030d194df2dfa7b556f2e56fb3c3315bd5c8822c6951162b92b32ce7dad # via # -r requirements/dev.in # pytest-profiling @@ -245,26 +279,26 @@ requests==2.32.5 \ --hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \ --hash=sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf # via gdown -ruff==0.14.0 \ - --hash=sha256:16b68e183a0e28e5c176d51004aaa40559e8f90065a10a559176713fcf435206 \ - --hash=sha256:30a58c087aef4584c193aebf2700f0fbcfc1e77b89c7385e3139956fa90434e2 \ - --hash=sha256:3ba9a8925e90f861502f7d974cc60e18ca29c72bb0ee8bfeabb6ade35a3abde7 \ - --hash=sha256:4c63b2d99fafa05efca0ab198fd48fa6030d57e4423df3f18e03aa62518c565f \ - --hash=sha256:58e15bffa7054299becf4bab8a1187062c6f8cafbe9f6e39e0d5aface455d6b3 \ - --hash=sha256:62ec8969b7510f77945df916de15da55311fade8d6050995ff7f680afe582c57 \ - --hash=sha256:668fce701b7a222f3f5327f86909db2bbe99c30877c8001ff934c5413812ac02 \ - --hash=sha256:703799d059ba50f745605b04638fa7e9682cc3da084b2092feee63500ff3d9b8 \ - --hash=sha256:7450a243d7125d1c032cb4b93d9625dea46c8c42b4f06c6b709baac168e10543 \ - --hash=sha256:7eb0499a2e01f6e0c285afc5bac43ab380cbfc17cd43a2e1dd10ec97d6f2c42d \ - --hash=sha256:838d1b065f4df676b7c9957992f2304e41ead7a50a568185efd404297d5701e8 \ - --hash=sha256:a86bf575e05cb68dcb34e4c7dfe1064d44d3f0c04bbc0491949092192b515296 \ - --hash=sha256:c958f66ab884b7873e72df38dcabee03d556a8f2ee1b8538ee1c2bbd619883dd \ - --hash=sha256:e41f785498bd200ffc276eb9e1570c019c1d907b07cfb081092c8ad51975bbe7 \ - --hash=sha256:ea95da28cd874c4d9c922b39381cbd69cb7e7b49c21b8152b014bd4f52acddc2 \ - --hash=sha256:eb732d17db2e945cfcbbc52af0143eda1da36ca8ae25083dd4f66f1542fdf82e \ - --hash=sha256:eec3bbbf3a7d5482b5c1f42d5fc972774d71d107d447919fca620b0be3e3b75e \ - --hash=sha256:f42c9495f5c13ff841b1da4cb3c2a42075409592825dada7c5885c2c844ac730 \ - --hash=sha256:f8d07350bc7af0a5ce8812b7d5c1a7293cf02476752f23fdfc500d24b79b783c +ruff==0.14.6 \ + --hash=sha256:00169c0c8b85396516fdd9ce3446c7ca20c2a8f90a77aa945ba6b8f2bfe99e85 \ + --hash=sha256:0a8e7b9d73d8728b68f632aa8e824ef041d068d231d8dbc7808532d3629a6bef \ + --hash=sha256:118548dd121f8a21bfa8ab2c5b80e5b4aed67ead4b7567790962554f38e598ce \ + --hash=sha256:1432ab6e1ae2dc565a7eea707d3b03a0c234ef401482a6f1621bc1f427c2ff55 \ + --hash=sha256:167843a6f78680746d7e226f255d920aeed5e4ad9c03258094a2d49d3028b105 \ + --hash=sha256:16a33af621c9c523b1ae006b1b99b159bf5ac7e4b1f20b85b2572455018e0821 \ + --hash=sha256:29c4b7ec1e66a105d5c27bd57fa93203637d66a26d10ca9809dc7fc18ec58440 \ + --hash=sha256:344d97172576d75dc6afc0e9243376dbe1668559c72de1864439c4fc95f78185 \ + --hash=sha256:390e6480c5e3659f8a4c8d6a0373027820419ac14fa0d2713bd8e6c3e125b8b9 \ + --hash=sha256:4c55cfbbe7abb61eb914bfd20683d14cdfb38a6d56c6c66efa55ec6570ee4e71 \ + --hash=sha256:57256efafbfefcb8748df9d1d766062f62b20150691021f8ab79e2d919f7c11f \ + --hash=sha256:6f0c742ca6a7783a736b867a263b9a7a80a45ce9bee391eeda296895f1b4e1cc \ + --hash=sha256:7f6007e55b90a2a7e93083ba48a9f23c3158c433591c33ee2e99a49b889c6332 \ + --hash=sha256:9f7539ea257aa4d07b7ce87aed580e485c40143f2473ff2f2b75aee003186004 \ + --hash=sha256:d43c81fbeae52cfa8728d8766bbf46ee4298c888072105815b392da70ca836b2 \ + --hash=sha256:d50d45d4553a3ebcbd33e7c5e0fe6ca4aafd9a9122492de357205c2c48f00775 \ + --hash=sha256:d724ac2f1c240dbd01a2ae98db5d1d9a5e1d9e96eba999d1c48e30062df578a3 \ + --hash=sha256:efea3c0f21901a685fff4befda6d61a1bf4cb43de16da87e8226a281d614350b \ + --hash=sha256:ff18134841e5c68f8e5df1999a64429a02d5549036b394fafbe410f886e1989d # via -r requirements/dev.in six==1.17.0 \ --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \ @@ -290,7 +324,7 @@ urllib3==2.5.0 \ --hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \ --hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc # via requests -virtualenv==20.34.0 \ - --hash=sha256:341f5afa7eee943e4984a9207c025feedd768baff6753cd660c857ceb3e36026 \ - --hash=sha256:44815b2c9dee7ed86e387b842a84f20b93f7f417f95886ca1996a72a4138eb1a +virtualenv==20.35.4 \ + --hash=sha256:643d3914d73d3eeb0c552cbb12d7e82adf0e504dbf86a3182f8771a153a1971c \ + --hash=sha256:c21c9cede36c9753eeade68ba7d523529f228a403463376cf821eaae2b650f1b # via pre-commit diff --git a/requirements.txt b/requirements.txt index e71ade0..6cab0f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,113 +10,147 @@ cattrs==25.3.0 \ --hash=sha256:1ac88d9e5eda10436c4517e390a4142d88638fe682c436c93db7ce4a277b884a \ --hash=sha256:9896e84e0a5bf723bc7b4b68f4481785367ce07a8a02e7e9ee6eb2819bc306ff # via requests-cache -certifi==2025.10.5 \ - --hash=sha256:0f212c2744a9bb6de0c56639a6f68afe01ecd92d91f14ae897c4fe7bbeeef0de \ - --hash=sha256:47c09d31ccf2acf0be3f701ea53595ee7e0b8fa08801c6624be771df09ae7b43 +certifi==2025.11.12 \ + --hash=sha256:97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b \ + --hash=sha256:d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316 # via # pyogrio # pyproj # requests -charset-normalizer==3.4.3 \ - --hash=sha256:00237675befef519d9af72169d8604a067d92755e84fe76492fef5441db05b91 \ - --hash=sha256:02425242e96bcf29a49711b0ca9f37e451da7c70562bc10e8ed992a5a7a25cc0 \ - --hash=sha256:027b776c26d38b7f15b26a5da1044f376455fb3766df8fc38563b4efbc515154 \ - --hash=sha256:07a0eae9e2787b586e129fdcbe1af6997f8d0e5abaa0bc98c0e20e124d67e601 \ - --hash=sha256:0cacf8f7297b0c4fcb74227692ca46b4a5852f8f4f24b3c766dd94a1075c4884 \ - --hash=sha256:0e78314bdc32fa80696f72fa16dc61168fda4d6a0c014e0380f9d02f0e5d8a07 \ - --hash=sha256:0f2be7e0cf7754b9a30eb01f4295cc3d4358a479843b31f328afd210e2c7598c \ - --hash=sha256:13faeacfe61784e2559e690fc53fa4c5ae97c6fcedb8eb6fb8d0a15b475d2c64 \ - --hash=sha256:14c2a87c65b351109f6abfc424cab3927b3bdece6f706e4d12faaf3d52ee5efe \ - --hash=sha256:1606f4a55c0fd363d754049cdf400175ee96c992b1f8018b993941f221221c5f \ - --hash=sha256:16a8770207946ac75703458e2c743631c79c59c5890c80011d536248f8eaa432 \ - --hash=sha256:18343b2d246dc6761a249ba1fb13f9ee9a2bcd95decc767319506056ea4ad4dc \ - --hash=sha256:18b97b8404387b96cdbd30ad660f6407799126d26a39ca65729162fd810a99aa \ - --hash=sha256:1bb60174149316da1c35fa5233681f7c0f9f514509b8e399ab70fea5f17e45c9 \ - --hash=sha256:1e8ac75d72fa3775e0b7cb7e4629cec13b7514d928d15ef8ea06bca03ef01cae \ - --hash=sha256:1ef99f0456d3d46a50945c98de1774da86f8e992ab5c77865ea8b8195341fc19 \ - --hash=sha256:2001a39612b241dae17b4687898843f254f8748b796a2e16f1051a17078d991d \ - --hash=sha256:23b6b24d74478dc833444cbd927c338349d6ae852ba53a0d02a2de1fce45b96e \ - --hash=sha256:252098c8c7a873e17dd696ed98bbe91dbacd571da4b87df3736768efa7a792e4 \ - --hash=sha256:257f26fed7d7ff59921b78244f3cd93ed2af1800ff048c33f624c87475819dd7 \ - --hash=sha256:2c322db9c8c89009a990ef07c3bcc9f011a3269bc06782f916cd3d9eed7c9312 \ - --hash=sha256:30a96e1e1f865f78b030d65241c1ee850cdf422d869e9028e2fc1d5e4db73b92 \ - --hash=sha256:30d006f98569de3459c2fc1f2acde170b7b2bd265dc1943e87e1a4efe1b67c31 \ - --hash=sha256:31a9a6f775f9bcd865d88ee350f0ffb0e25936a7f930ca98995c05abf1faf21c \ - --hash=sha256:320e8e66157cc4e247d9ddca8e21f427efc7a04bbd0ac8a9faf56583fa543f9f \ - --hash=sha256:34a7f768e3f985abdb42841e20e17b330ad3aaf4bb7e7aeeb73db2e70f077b99 \ - --hash=sha256:3653fad4fe3ed447a596ae8638b437f827234f01a8cd801842e43f3d0a6b281b \ - --hash=sha256:3cd35b7e8aedeb9e34c41385fda4f73ba609e561faedfae0a9e75e44ac558a15 \ - --hash=sha256:3cfb2aad70f2c6debfbcb717f23b7eb55febc0bb23dcffc0f076009da10c6392 \ - --hash=sha256:416175faf02e4b0810f1f38bcb54682878a4af94059a1cd63b8747244420801f \ - --hash=sha256:41d1fc408ff5fdfb910200ec0e74abc40387bccb3252f3f27c0676731df2b2c8 \ - --hash=sha256:42e5088973e56e31e4fa58eb6bd709e42fc03799c11c42929592889a2e54c491 \ - --hash=sha256:4ca4c094de7771a98d7fbd67d9e5dbf1eb73efa4f744a730437d8a3a5cf994f0 \ - --hash=sha256:511729f456829ef86ac41ca78c63a5cb55240ed23b4b737faca0eb1abb1c41bc \ - --hash=sha256:53cd68b185d98dde4ad8990e56a58dea83a4162161b1ea9272e5c9182ce415e0 \ - --hash=sha256:585f3b2a80fbd26b048a0be90c5aae8f06605d3c92615911c3a2b03a8a3b796f \ - --hash=sha256:5b413b0b1bfd94dbf4023ad6945889f374cd24e3f62de58d6bb102c4d9ae534a \ - --hash=sha256:5d8d01eac18c423815ed4f4a2ec3b439d654e55ee4ad610e153cf02faf67ea40 \ - --hash=sha256:6aab0f181c486f973bc7262a97f5aca3ee7e1437011ef0c2ec04b5a11d16c927 \ - --hash=sha256:6cf8fd4c04756b6b60146d98cd8a77d0cdae0e1ca20329da2ac85eed779b6849 \ - --hash=sha256:6fb70de56f1859a3f71261cbe41005f56a7842cc348d3aeb26237560bfa5e0ce \ - --hash=sha256:6fce4b8500244f6fcb71465d4a4930d132ba9ab8e71a7859e6a5d59851068d14 \ - --hash=sha256:70bfc5f2c318afece2f5838ea5e4c3febada0be750fcf4775641052bbba14d05 \ - --hash=sha256:73dc19b562516fc9bcf6e5d6e596df0b4eb98d87e4f79f3ae71840e6ed21361c \ - --hash=sha256:74d77e25adda8581ffc1c720f1c81ca082921329452eba58b16233ab1842141c \ - --hash=sha256:78deba4d8f9590fe4dae384aeff04082510a709957e968753ff3c48399f6f92a \ - --hash=sha256:86df271bf921c2ee3818f0522e9a5b8092ca2ad8b065ece5d7d9d0e9f4849bcc \ - --hash=sha256:88ab34806dea0671532d3f82d82b85e8fc23d7b2dd12fa837978dad9bb392a34 \ - --hash=sha256:8999f965f922ae054125286faf9f11bc6932184b93011d138925a1773830bbe9 \ - --hash=sha256:8dcfc373f888e4fb39a7bc57e93e3b845e7f462dacc008d9749568b1c4ece096 \ - --hash=sha256:939578d9d8fd4299220161fdd76e86c6a251987476f5243e8864a7844476ba14 \ - --hash=sha256:96b2b3d1a83ad55310de8c7b4a2d04d9277d5591f40761274856635acc5fcb30 \ - --hash=sha256:a2d08ac246bb48479170408d6c19f6385fa743e7157d716e144cad849b2dd94b \ - --hash=sha256:b256ee2e749283ef3ddcff51a675ff43798d92d746d1a6e4631bf8c707d22d0b \ - --hash=sha256:b5e3b2d152e74e100a9e9573837aba24aab611d39428ded46f4e4022ea7d1942 \ - --hash=sha256:b89bc04de1d83006373429975f8ef9e7932534b8cc9ca582e4db7d20d91816db \ - --hash=sha256:bd28b817ea8c70215401f657edef3a8aa83c29d447fb0b622c35403780ba11d5 \ - --hash=sha256:c60e092517a73c632ec38e290eba714e9627abe9d301c8c8a12ec32c314a2a4b \ - --hash=sha256:c6dbd0ccdda3a2ba7c2ecd9d77b37f3b5831687d8dc1b6ca5f56a4880cc7b7ce \ - --hash=sha256:c6e490913a46fa054e03699c70019ab869e990270597018cef1d8562132c2669 \ - --hash=sha256:c6f162aabe9a91a309510d74eeb6507fab5fff92337a15acbe77753d88d9dcf0 \ - --hash=sha256:c6fd51128a41297f5409deab284fecbe5305ebd7e5a1f959bee1c054622b7018 \ - --hash=sha256:cc34f233c9e71701040d772aa7490318673aa7164a0efe3172b2981218c26d93 \ - --hash=sha256:cc9370a2da1ac13f0153780040f465839e6cccb4a1e44810124b4e22483c93fe \ - --hash=sha256:ccf600859c183d70eb47e05a44cd80a4ce77394d1ac0f79dbd2dd90a69a3a049 \ - --hash=sha256:ce571ab16d890d23b5c278547ba694193a45011ff86a9162a71307ed9f86759a \ - --hash=sha256:cf1ebb7d78e1ad8ec2a8c4732c7be2e736f6e5123a4146c5b89c9d1f585f8cef \ - --hash=sha256:d0e909868420b7049dafd3a31d45125b31143eec59235311fc4c57ea26a4acd2 \ - --hash=sha256:d22dbedd33326a4a5190dd4fe9e9e693ef12160c77382d9e87919bce54f3d4ca \ - --hash=sha256:d716a916938e03231e86e43782ca7878fb602a125a91e7acb8b5112e2e96ac16 \ - --hash=sha256:d79c198e27580c8e958906f803e63cddb77653731be08851c7df0b1a14a8fc0f \ - --hash=sha256:d95bfb53c211b57198bb91c46dd5a2d8018b3af446583aab40074bf7988401cb \ - --hash=sha256:e28e334d3ff134e88989d90ba04b47d84382a828c061d0d1027b1b12a62b39b1 \ - --hash=sha256:ec557499516fc90fd374bf2e32349a2887a876fbf162c160e3c01b6849eaf557 \ - --hash=sha256:fb6fecfd65564f208cbf0fba07f107fb661bcd1a7c389edbced3f7a493f70e37 \ - --hash=sha256:fb731e5deb0c7ef82d698b0f4c5bb724633ee2a489401594c5c88b02e6cb15f7 \ - --hash=sha256:fb7f67a1bfa6e40b438170ebdc8158b78dc465a5a67b6dde178a46987b244a72 \ - --hash=sha256:fd10de089bcdcd1be95a2f73dbe6254798ec1bda9f450d5828c96f93e2536b9c \ - --hash=sha256:fdabf8315679312cfa71302f9bd509ded4f2f263fb5b765cf1433b39106c3cc9 +charset-normalizer==3.4.4 \ + --hash=sha256:027f6de494925c0ab2a55eab46ae5129951638a49a34d87f4c3eda90f696b4ad \ + --hash=sha256:077fbb858e903c73f6c9db43374fd213b0b6a778106bc7032446a8e8b5b38b93 \ + --hash=sha256:0a98e6759f854bd25a58a73fa88833fba3b7c491169f86ce1180c948ab3fd394 \ + --hash=sha256:0d3d8f15c07f86e9ff82319b3d9ef6f4bf907608f53fe9d92b28ea9ae3d1fd89 \ + --hash=sha256:0f04b14ffe5fdc8c4933862d8306109a2c51e0704acfa35d51598eb45a1e89fc \ + --hash=sha256:11d694519d7f29d6cd09f6ac70028dba10f92f6cdd059096db198c283794ac86 \ + --hash=sha256:194f08cbb32dc406d6e1aea671a68be0823673db2832b38405deba2fb0d88f63 \ + --hash=sha256:1bee1e43c28aa63cb16e5c14e582580546b08e535299b8b6158a7c9c768a1f3d \ + --hash=sha256:21d142cc6c0ec30d2efee5068ca36c128a30b0f2c53c1c07bd78cb6bc1d3be5f \ + --hash=sha256:2437418e20515acec67d86e12bf70056a33abdacb5cb1655042f6538d6b085a8 \ + --hash=sha256:244bfb999c71b35de57821b8ea746b24e863398194a4014e4c76adc2bbdfeff0 \ + --hash=sha256:2677acec1a2f8ef614c6888b5b4ae4060cc184174a938ed4e8ef690e15d3e505 \ + --hash=sha256:277e970e750505ed74c832b4bf75dac7476262ee2a013f5574dd49075879e161 \ + --hash=sha256:2aaba3b0819274cc41757a1da876f810a3e4d7b6eb25699253a4effef9e8e4af \ + --hash=sha256:2b7d8f6c26245217bd2ad053761201e9f9680f8ce52f0fcd8d0755aeae5b2152 \ + --hash=sha256:2c9d3c380143a1fedbff95a312aa798578371eb29da42106a29019368a475318 \ + --hash=sha256:3162d5d8ce1bb98dd51af660f2121c55d0fa541b46dff7bb9b9f86ea1d87de72 \ + --hash=sha256:31fd66405eaf47bb62e8cd575dc621c56c668f27d46a61d975a249930dd5e2a4 \ + --hash=sha256:362d61fd13843997c1c446760ef36f240cf81d3ebf74ac62652aebaf7838561e \ + --hash=sha256:376bec83a63b8021bb5c8ea75e21c4ccb86e7e45ca4eb81146091b56599b80c3 \ + --hash=sha256:44c2a8734b333e0578090c4cd6b16f275e07aa6614ca8715e6c038e865e70576 \ + --hash=sha256:47cc91b2f4dd2833fddaedd2893006b0106129d4b94fdb6af1f4ce5a9965577c \ + --hash=sha256:4902828217069c3c5c71094537a8e623f5d097858ac6ca8252f7b4d10b7560f1 \ + --hash=sha256:4bd5d4137d500351a30687c2d3971758aac9a19208fc110ccb9d7188fbe709e8 \ + --hash=sha256:4fe7859a4e3e8457458e2ff592f15ccb02f3da787fcd31e0183879c3ad4692a1 \ + --hash=sha256:542d2cee80be6f80247095cc36c418f7bddd14f4a6de45af91dfad36d817bba2 \ + --hash=sha256:554af85e960429cf30784dd47447d5125aaa3b99a6f0683589dbd27e2f45da44 \ + --hash=sha256:5833d2c39d8896e4e19b689ffc198f08ea58116bee26dea51e362ecc7cd3ed26 \ + --hash=sha256:5947809c8a2417be3267efc979c47d76a079758166f7d43ef5ae8e9f92751f88 \ + --hash=sha256:5ae497466c7901d54b639cf42d5b8c1b6a4fead55215500d2f486d34db48d016 \ + --hash=sha256:5bd2293095d766545ec1a8f612559f6b40abc0eb18bb2f5d1171872d34036ede \ + --hash=sha256:5bfbb1b9acf3334612667b61bd3002196fe2a1eb4dd74d247e0f2a4d50ec9bbf \ + --hash=sha256:5cb4d72eea50c8868f5288b7f7f33ed276118325c1dfd3957089f6b519e1382a \ + --hash=sha256:5dbe56a36425d26d6cfb40ce79c314a2e4dd6211d51d6d2191c00bed34f354cc \ + --hash=sha256:5f819d5fe9234f9f82d75bdfa9aef3a3d72c4d24a6e57aeaebba32a704553aa0 \ + --hash=sha256:64b55f9dce520635f018f907ff1b0df1fdc31f2795a922fb49dd14fbcdf48c84 \ + --hash=sha256:6515f3182dbe4ea06ced2d9e8666d97b46ef4c75e326b79bb624110f122551db \ + --hash=sha256:65e2befcd84bc6f37095f5961e68a6f077bf44946771354a28ad434c2cce0ae1 \ + --hash=sha256:6aee717dcfead04c6eb1ce3bd29ac1e22663cdea57f943c87d1eab9a025438d7 \ + --hash=sha256:6b39f987ae8ccdf0d2642338faf2abb1862340facc796048b604ef14919e55ed \ + --hash=sha256:6e1fcf0720908f200cd21aa4e6750a48ff6ce4afe7ff5a79a90d5ed8a08296f8 \ + --hash=sha256:74018750915ee7ad843a774364e13a3db91682f26142baddf775342c3f5b1133 \ + --hash=sha256:74664978bb272435107de04e36db5a9735e78232b85b77d45cfb38f758efd33e \ + --hash=sha256:74bb723680f9f7a6234dcf67aea57e708ec1fbdf5699fb91dfd6f511b0a320ef \ + --hash=sha256:752944c7ffbfdd10c074dc58ec2d5a8a4cd9493b314d367c14d24c17684ddd14 \ + --hash=sha256:778d2e08eda00f4256d7f672ca9fef386071c9202f5e4607920b86d7803387f2 \ + --hash=sha256:780236ac706e66881f3b7f2f32dfe90507a09e67d1d454c762cf642e6e1586e0 \ + --hash=sha256:798d75d81754988d2565bff1b97ba5a44411867c0cf32b77a7e8f8d84796b10d \ + --hash=sha256:799a7a5e4fb2d5898c60b640fd4981d6a25f1c11790935a44ce38c54e985f828 \ + --hash=sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f \ + --hash=sha256:7c308f7e26e4363d79df40ca5b2be1c6ba9f02bdbccfed5abddb7859a6ce72cf \ + --hash=sha256:7fa17817dc5625de8a027cb8b26d9fefa3ea28c8253929b8d6649e705d2835b6 \ + --hash=sha256:81d5eb2a312700f4ecaa977a8235b634ce853200e828fbadf3a9c50bab278328 \ + --hash=sha256:82004af6c302b5d3ab2cfc4cc5f29db16123b1a8417f2e25f9066f91d4411090 \ + --hash=sha256:837c2ce8c5a65a2035be9b3569c684358dfbf109fd3b6969630a87535495ceaa \ + --hash=sha256:840c25fb618a231545cbab0564a799f101b63b9901f2569faecd6b222ac72381 \ + --hash=sha256:8a6562c3700cce886c5be75ade4a5db4214fda19fede41d9792d100288d8f94c \ + --hash=sha256:8af65f14dc14a79b924524b1e7fffe304517b2bff5a58bf64f30b98bbc5079eb \ + --hash=sha256:8ef3c867360f88ac904fd3f5e1f902f13307af9052646963ee08ff4f131adafc \ + --hash=sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a \ + --hash=sha256:99ae2cffebb06e6c22bdc25801d7b30f503cc87dbd283479e7b606f70aff57ec \ + --hash=sha256:9a26f18905b8dd5d685d6d07b0cdf98a79f3c7a918906af7cc143ea2e164c8bc \ + --hash=sha256:9b35f4c90079ff2e2edc5b26c0c77925e5d2d255c42c74fdb70fb49b172726ac \ + --hash=sha256:9cd98cdc06614a2f768d2b7286d66805f94c48cde050acdbbb7db2600ab3197e \ + --hash=sha256:9d1bb833febdff5c8927f922386db610b49db6e0d4f4ee29601d71e7c2694313 \ + --hash=sha256:9f7fcd74d410a36883701fafa2482a6af2ff5ba96b9a620e9e0721e28ead5569 \ + --hash=sha256:a59cb51917aa591b1c4e6a43c132f0cdc3c76dbad6155df4e28ee626cc77a0a3 \ + --hash=sha256:a61900df84c667873b292c3de315a786dd8dac506704dea57bc957bd31e22c7d \ + --hash=sha256:a79cfe37875f822425b89a82333404539ae63dbdddf97f84dcbc3d339aae9525 \ + --hash=sha256:a8a8b89589086a25749f471e6a900d3f662d1d3b6e2e59dcecf787b1cc3a1894 \ + --hash=sha256:a8bf8d0f749c5757af2142fe7903a9df1d2e8aa3841559b2bad34b08d0e2bcf3 \ + --hash=sha256:a9768c477b9d7bd54bc0c86dbaebdec6f03306675526c9927c0e8a04e8f94af9 \ + --hash=sha256:ac1c4a689edcc530fc9d9aa11f5774b9e2f33f9a0c6a57864e90908f5208d30a \ + --hash=sha256:af2d8c67d8e573d6de5bc30cdb27e9b95e49115cd9baad5ddbd1a6207aaa82a9 \ + --hash=sha256:b435cba5f4f750aa6c0a0d92c541fb79f69a387c91e61f1795227e4ed9cece14 \ + --hash=sha256:b5b290ccc2a263e8d185130284f8501e3e36c5e02750fc6b6bdeb2e9e96f1e25 \ + --hash=sha256:b5d84d37db046c5ca74ee7bb47dd6cbc13f80665fdde3e8040bdd3fb015ecb50 \ + --hash=sha256:b7cf1017d601aa35e6bb650b6ad28652c9cd78ee6caff19f3c28d03e1c80acbf \ + --hash=sha256:bc7637e2f80d8530ee4a78e878bce464f70087ce73cf7c1caf142416923b98f1 \ + --hash=sha256:c0463276121fdee9c49b98908b3a89c39be45d86d1dbaa22957e38f6321d4ce3 \ + --hash=sha256:c4ef880e27901b6cc782f1b95f82da9313c0eb95c3af699103088fa0ac3ce9ac \ + --hash=sha256:c8ae8a0f02f57a6e61203a31428fa1d677cbe50c93622b4149d5c0f319c1d19e \ + --hash=sha256:ca5862d5b3928c4940729dacc329aa9102900382fea192fc5e52eb69d6093815 \ + --hash=sha256:cb01158d8b88ee68f15949894ccc6712278243d95f344770fa7593fa2d94410c \ + --hash=sha256:cb6254dc36b47a990e59e1068afacdcd02958bdcce30bb50cc1700a8b9d624a6 \ + --hash=sha256:cc00f04ed596e9dc0da42ed17ac5e596c6ccba999ba6bd92b0e0aef2f170f2d6 \ + --hash=sha256:cd09d08005f958f370f539f186d10aec3377d55b9eeb0d796025d4886119d76e \ + --hash=sha256:cd4b7ca9984e5e7985c12bc60a6f173f3c958eae74f3ef6624bb6b26e2abbae4 \ + --hash=sha256:ce8a0633f41a967713a59c4139d29110c07e826d131a316b50ce11b1d79b4f84 \ + --hash=sha256:cead0978fc57397645f12578bfd2d5ea9138ea0fac82b2f63f7f7c6877986a69 \ + --hash=sha256:d055ec1e26e441f6187acf818b73564e6e6282709e9bcb5b63f5b23068356a15 \ + --hash=sha256:d1f13550535ad8cff21b8d757a3257963e951d96e20ec82ab44bc64aeb62a191 \ + --hash=sha256:d9c7f57c3d666a53421049053eaacdd14bbd0a528e2186fcb2e672effd053bb0 \ + --hash=sha256:d9e45d7faa48ee908174d8fe84854479ef838fc6a705c9315372eacbc2f02897 \ + --hash=sha256:da3326d9e65ef63a817ecbcc0df6e94463713b754fe293eaa03da99befb9a5bd \ + --hash=sha256:de00632ca48df9daf77a2c65a484531649261ec9f25489917f09e455cb09ddb2 \ + --hash=sha256:e1f185f86a6f3403aa2420e815904c67b2f9ebc443f045edd0de921108345794 \ + --hash=sha256:e824f1492727fa856dd6eda4f7cee25f8518a12f3c4a56a74e8095695089cf6d \ + --hash=sha256:e912091979546adf63357d7e2ccff9b44f026c075aeaf25a52d0e95ad2281074 \ + --hash=sha256:eaabd426fe94daf8fd157c32e571c85cb12e66692f15516a83a03264b08d06c3 \ + --hash=sha256:ebf3e58c7ec8a8bed6d66a75d7fb37b55e5015b03ceae72a8e7c74495551e224 \ + --hash=sha256:ecaae4149d99b1c9e7b88bb03e3221956f68fd6d50be2ef061b2381b61d20838 \ + --hash=sha256:eecbc200c7fd5ddb9a7f16c7decb07b566c29fa2161a16cf67b8d068bd21690a \ + --hash=sha256:f155a433c2ec037d4e8df17d18922c3a0d9b3232a396690f17175d2946f0218d \ + --hash=sha256:f1e34719c6ed0b92f418c7c780480b26b5d9c50349e9a9af7d76bf757530350d \ + --hash=sha256:f34be2938726fc13801220747472850852fe6b1ea75869a048d6f896838c896f \ + --hash=sha256:f820802628d2694cb7e56db99213f930856014862f3fd943d290ea8438d07ca8 \ + --hash=sha256:f8bf04158c6b607d747e93949aa60618b61312fe647a6369f88ce2ff16043490 \ + --hash=sha256:f8e160feb2aed042cd657a72acc0b481212ed28b1b9a95c0cee1621b524e1966 \ + --hash=sha256:f9d332f8c2a2fcbffe1378594431458ddbef721c1769d78e2cbc06280d8155f9 \ + --hash=sha256:fa09f53c465e532f4d3db095e0c55b615f010ad81803d383195b6b5ca6cbf5f3 \ + --hash=sha256:faa3a41b2b66b6e50f84ae4a68c64fcd0c44355741c6374813a800cd6695db9e \ + --hash=sha256:fd44c878ea55ba351104cb93cc85e74916eb8fa440ca7903e57575e97394f608 # via requests composition-stats==2.0.0 \ --hash=sha256:d0f741ca968ef45a0c70d7a4ed68f4d140e82fddb4664a33f34ce213ddc66f6c # via -r requirements/base.in -gdal==3.11.3 \ - --hash=sha256:4c3ad0fae393b5ddb093a7e4b890077839b2a6acdbd19202657fe4e881886efa +gdal==3.11.4 \ + --hash=sha256:c28cd5ffda3df98555e21083d922762b0a095d8f10292e2ec60ee0d55651d74a # via -r requirements/base.in geopandas==1.1.1 \ --hash=sha256:1745713f64d095c43e72e08e753dbd271678254b24f2e01db8cdb8debe1d293d \ --hash=sha256:589e61aaf39b19828843df16cb90234e72897e2579be236f10eee0d052ad98e8 # via -r requirements/base.in -idna==3.10 \ - --hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \ - --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3 +idna==3.11 \ + --hash=sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea \ + --hash=sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902 # via # requests # url-normalize -imageio==2.37.0 \ - --hash=sha256:11efa15b87bc7871b61590326b2d635439acc321cf7f8ce996f812543ce10eed \ - --hash=sha256:71b57b3669666272c818497aebba2b4c5f20d5b37c81720e5e1a56d59c492996 +imageio==2.37.2 \ + --hash=sha256:0212ef2727ac9caa5ca4b2c75ae89454312f440a756fcfc8ef1993e718f50f8a \ + --hash=sha256:ad9adfb20335d718c03de457358ed69f141021a333c40a53e57273d8a5bd0b9b # via scikit-image joblib==1.5.2 \ --hash=sha256:3faa5c39054b2f03ca547da9b2f52fde67c06240c31853f306aea97f13647b55 \ @@ -126,85 +160,85 @@ lazy-loader==0.4 \ --hash=sha256:342aa8e14d543a154047afb4ba8ef17f5563baad3fc610d7b15b213b0f119efc \ --hash=sha256:47c75182589b91a4e1a85a136c074285a5ad4d9f39c63e0d7fb76391c4574cd1 # via scikit-image -networkx==3.5 \ - --hash=sha256:0030d386a9a06dee3565298b4a734b68589749a544acbb6c412dc9e2489ec6ec \ - --hash=sha256:d4c6f9cf81f52d69230866796b82afbccdec3db7ae4fbd1b65ea750feed50037 +networkx==3.6 \ + --hash=sha256:285276002ad1f7f7da0f7b42f004bcba70d381e936559166363707fdad3d72ad \ + --hash=sha256:cdb395b105806062473d3be36458d8f1459a4e4b98e236a66c3a48996e07684f # via scikit-image -numpy==2.3.3 \ - --hash=sha256:067e3d7159a5d8f8a0b46ee11148fc35ca9b21f61e3c49fbd0a027450e65a33b \ - --hash=sha256:0edd58682a399824633b66885d699d7de982800053acf20be1eaa46d92009c54 \ - --hash=sha256:0ffc4f5caba7dfcbe944ed674b7eef683c7e94874046454bb79ed7ee0236f59d \ - --hash=sha256:1250c5d3d2562ec4174bce2e3a1523041595f9b651065e4a4473f5f48a6bc8a5 \ - --hash=sha256:179a42101b845a816d464b6fe9a845dfaf308fdfc7925387195570789bb2c970 \ - --hash=sha256:1c02d0629d25d426585fb2e45a66154081b9fa677bc92a881ff1d216bc9919a8 \ - --hash=sha256:1e02c7159791cd481e1e6d5ddd766b62a4d5acf8df4d4d1afe35ee9c5c33a41e \ - --hash=sha256:2990adf06d1ecee3b3dcbb4977dfab6e9f09807598d647f04d385d29e7a3c3d3 \ - --hash=sha256:2e267c7da5bf7309670523896df97f93f6e469fb931161f483cd6882b3b1a5dc \ - --hash=sha256:367ad5d8fbec5d9296d18478804a530f1191e24ab4d75ab408346ae88045d25e \ - --hash=sha256:396b254daeb0a57b1fe0ecb5e3cff6fa79a380fa97c8f7781a6d08cd429418fe \ - --hash=sha256:3c7cf302ac6e0b76a64c4aecf1a09e51abd9b01fc7feee80f6c43e3ab1b1dbc5 \ - --hash=sha256:40051003e03db4041aa325da2a0971ba41cf65714e65d296397cc0e32de6018b \ - --hash=sha256:414a97499480067d305fcac9716c29cf4d0d76db6ebf0bf3cbce666677f12652 \ - --hash=sha256:433bf137e338677cebdd5beac0199ac84712ad9d630b74eceeb759eaa45ddf30 \ - --hash=sha256:4384a169c4d8f97195980815d6fcad04933a7e1ab3b530921c3fef7a1c63426d \ - --hash=sha256:497d7cad08e7092dba36e3d296fe4c97708c93daf26643a1ae4b03f6294d30eb \ - --hash=sha256:50a5fe69f135f88a2be9b6ca0481a68a136f6febe1916e4920e12f1a34e708a7 \ - --hash=sha256:533ca5f6d325c80b6007d4d7fb1984c303553534191024ec6a524a4c92a5935a \ - --hash=sha256:5534ed6b92f9b7dca6c0a19d6df12d41c68b991cef051d108f6dbff3babc4ebf \ - --hash=sha256:5b83648633d46f77039c29078751f80da65aa64d5622a3cd62aaef9d835b6c93 \ - --hash=sha256:691808c2b26b0f002a032c73255d0bd89751425f379f7bcd22d140db593a96e8 \ - --hash=sha256:6ee9086235dd6ab7ae75aba5662f582a81ced49f0f1c6de4260a78d8f2d91a19 \ - --hash=sha256:74c2a948d02f88c11a3c075d9733f1ae67d97c6bdb97f2bb542f980458b257e7 \ - --hash=sha256:75370986cc0bc66f4ce5110ad35aae6d182cc4ce6433c40ad151f53690130bf1 \ - --hash=sha256:78c9f6560dc7e6b3990e32df7ea1a50bbd0e2a111e05209963f5ddcab7073b0b \ - --hash=sha256:7af05ed4dc19f308e1d9fc759f36f21921eb7bbfc82843eeec6b2a2863a0aefa \ - --hash=sha256:7f025652034199c301049296b59fa7d52c7e625017cae4c75d8662e377bf487d \ - --hash=sha256:823d04112bc85ef5c4fda73ba24e6096c8f869931405a80aa8b0e604510a26bc \ - --hash=sha256:8596ba2f8af5f93b01d97563832686d20206d303024777f6dfc2e7c7c3f1850e \ - --hash=sha256:8e9aced64054739037d42fb84c54dd38b81ee238816c948c8f3ed134665dcd86 \ - --hash=sha256:8f6ac61a217437946a1fa48d24c47c91a0c4f725237871117dea264982128097 \ - --hash=sha256:901bf6123879b7f251d3631967fd574690734236075082078e0571977c6a8e6a \ - --hash=sha256:93d4962d8f82af58f0b2eb85daaf1b3ca23fe0a85d0be8f1f2b7bb46034e56d7 \ - --hash=sha256:94fcaa68757c3e2e668ddadeaa86ab05499a70725811e582b6a9858dd472fb30 \ - --hash=sha256:952cfd0748514ea7c3afc729a0fc639e61655ce4c55ab9acfab14bda4f402b4c \ - --hash=sha256:9591e1221db3f37751e6442850429b3aabf7026d3b05542d102944ca7f00c8a8 \ - --hash=sha256:99683cbe0658f8271b333a1b1b4bb3173750ad59c0c61f5bbdc5b318918fffe3 \ - --hash=sha256:9ad12e976ca7b10f1774b03615a2a4bab8addce37ecc77394d8e986927dc0dfe \ - --hash=sha256:9cc48e09feb11e1db00b320e9d30a4151f7369afb96bd0e48d942d09da3a0d00 \ - --hash=sha256:9dc13c6a5829610cc07422bc74d3ac083bd8323f14e2827d992f9e52e22cd6a6 \ - --hash=sha256:9e318ee0596d76d4cb3d78535dc005fa60e5ea348cd131a51e99d0bdbe0b54fe \ - --hash=sha256:a333b4ed33d8dc2b373cc955ca57babc00cd6f9009991d9edc5ddbc1bac36bcd \ - --hash=sha256:afd07d377f478344ec6ca2b8d4ca08ae8bd44706763d1efb56397de606393f48 \ - --hash=sha256:b001bae8cea1c7dfdb2ae2b017ed0a6f2102d7a70059df1e338e307a4c78a8ae \ - --hash=sha256:b37a0b2e5935409daebe82c1e42274d30d9dd355852529eab91dab8dcca7419f \ - --hash=sha256:b912f2ed2b67a129e6a601e9d93d4fa37bef67e54cac442a2f588a54afe5c67a \ - --hash=sha256:bc92a5dedcc53857249ca51ef29f5e5f2f8c513e22cfb90faeb20343b8c6f7a6 \ - --hash=sha256:ca0309a18d4dfea6fc6262a66d06c26cfe4640c3926ceec90e57791a82b6eee5 \ - --hash=sha256:cb248499b0bc3be66ebd6578b83e5acacf1d6cb2a77f2248ce0e40fbec5a76d0 \ - --hash=sha256:cb32e3cf0f762aee47ad1ddc6672988f7f27045b0783c887190545baba73aa25 \ - --hash=sha256:cd052f1fa6a78dee696b58a914b7229ecfa41f0a6d96dc663c1220a55e137593 \ - --hash=sha256:cd4260f64bc794c3390a63bf0728220dd1a68170c169088a1e0dfa2fde1be12f \ - --hash=sha256:cd7de500a5b66319db419dc3c345244404a164beae0d0937283b907d8152e6ea \ - --hash=sha256:ce020080e4a52426202bdb6f7691c65bb55e49f261f31a8f506c9f6bc7450421 \ - --hash=sha256:cfdd09f9c84a1a934cde1eec2267f0a43a7cd44b2cca4ff95b7c0d14d144b0bf \ - --hash=sha256:d00de139a3324e26ed5b95870ce63be7ec7352171bc69a4cf1f157a48e3eb6b7 \ - --hash=sha256:d79715d95f1894771eb4e60fb23f065663b2298f7d22945d66877aadf33d00c7 \ - --hash=sha256:d8f3b1080782469fdc1718c4ed1d22549b5fb12af0d57d35e992158a772a37cf \ - --hash=sha256:d9192da52b9745f7f0766531dcfa978b7763916f158bb63bdb8a1eca0068ab20 \ - --hash=sha256:d9d537a39cc9de668e5cd0e25affb17aec17b577c6b3ae8a3d866b479fbe88d0 \ - --hash=sha256:da1a74b90e7483d6ce5244053399a614b1d6b7bc30a60d2f570e5071f8959d3e \ - --hash=sha256:dca2d0fc80b3893ae72197b39f69d55a3cd8b17ea1b50aa4c62de82419936150 \ - --hash=sha256:ddc7c39727ba62b80dfdbedf400d1c10ddfa8eefbd7ec8dcb118be8b56d31029 \ - --hash=sha256:e1ec5615b05369925bd1125f27df33f3b6c8bc10d788d5999ecd8769a1fa04db \ - --hash=sha256:e6687dc183aa55dae4a705b35f9c0f8cb178bcaa2f029b241ac5356221d5c021 \ - --hash=sha256:e7e946c7170858a0295f79a60214424caac2ffdb0063d4d79cb681f9aa0aa569 \ - --hash=sha256:eb63d443d7b4ffd1e873f8155260d7f58e7e4b095961b01c91062935c2491e57 \ - --hash=sha256:ec9d249840f6a565f58d8f913bccac2444235025bbb13e9a4681783572ee3caa \ - --hash=sha256:ed635ff692483b8e3f0fcaa8e7eb8a75ee71aa6d975388224f70821421800cea \ - --hash=sha256:eda59e44957d272846bb407aad19f89dc6f58fecf3504bd144f4c5cf81a7eacc \ - --hash=sha256:f0dadeb302887f07431910f67a14d57209ed91130be0adea2f9793f1a4f817cf \ - --hash=sha256:f0ddb4b96a87b6728df9362135e764eac3cfa674499943ebc44ce96c478ab125 \ - --hash=sha256:f5415fb78995644253370985342cd03572ef8620b934da27d77377a2285955bf +numpy==2.3.5 \ + --hash=sha256:00dc4e846108a382c5869e77c6ed514394bdeb3403461d25a829711041217d5b \ + --hash=sha256:0472f11f6ec23a74a906a00b48a4dcf3849209696dff7c189714511268d103ae \ + --hash=sha256:04822c00b5fd0323c8166d66c701dc31b7fbd252c100acd708c48f763968d6a3 \ + --hash=sha256:052e8c42e0c49d2575621c158934920524f6c5da05a1d3b9bab5d8e259e045f0 \ + --hash=sha256:09a1bea522b25109bf8e6f3027bd810f7c1085c64a0c7ce050c1676ad0ba010b \ + --hash=sha256:0cd00b7b36e35398fa2d16af7b907b65304ef8bb4817a550e06e5012929830fa \ + --hash=sha256:0d8163f43acde9a73c2a33605353a4f1bc4798745a8b1d73183b28e5b435ae28 \ + --hash=sha256:1062fde1dcf469571705945b0f221b73928f34a20c904ffb45db101907c3454e \ + --hash=sha256:11e06aa0af8c0f05104d56450d6093ee639e15f24ecf62d417329d06e522e017 \ + --hash=sha256:17531366a2e3a9e30762c000f2c43a9aaa05728712e25c11ce1dbe700c53ad41 \ + --hash=sha256:1978155dd49972084bd6ef388d66ab70f0c323ddee6f693d539376498720fb7e \ + --hash=sha256:1ed1ec893cff7040a02c8aa1c8611b94d395590d553f6b53629a4461dc7f7b63 \ + --hash=sha256:2dcd0808a421a482a080f89859a18beb0b3d1e905b81e617a188bd80422d62e9 \ + --hash=sha256:2e2eb32ddb9ccb817d620ac1d8dae7c3f641c1e5f55f531a33e8ab97960a75b8 \ + --hash=sha256:2feae0d2c91d46e59fcd62784a3a83b3fb677fead592ce51b5a6fbb4f95965ff \ + --hash=sha256:3095bdb8dd297e5920b010e96134ed91d852d81d490e787beca7e35ae1d89cf7 \ + --hash=sha256:30bc11310e8153ca664b14c5f1b73e94bd0503681fcf136a163de856f3a50139 \ + --hash=sha256:3101e5177d114a593d79dd79658650fe28b5a0d8abeb8ce6f437c0e6df5be1a4 \ + --hash=sha256:396084a36abdb603546b119d96528c2f6263921c50df3c8fd7cb28873a237748 \ + --hash=sha256:3997b5b3c9a771e157f9aae01dd579ee35ad7109be18db0e85dbdbe1de06e952 \ + --hash=sha256:414802f3b97f3c1eef41e530aaba3b3c1620649871d8cb38c6eaff034c2e16bd \ + --hash=sha256:51c1e14eb1e154ebd80e860722f9e6ed6ec89714ad2db2d3aa33c31d7c12179b \ + --hash=sha256:51c55fe3451421f3a6ef9a9c1439e82101c57a2c9eab9feb196a62b1a10b58ce \ + --hash=sha256:5ee6609ac3604fa7780e30a03e5e241a7956f8e2fcfe547d51e3afa5247ac47f \ + --hash=sha256:612a95a17655e213502f60cfb9bf9408efdc9eb1d5f50535cc6eb365d11b42b5 \ + --hash=sha256:6203fdf9f3dc5bdaed7319ad8698e685c7a3be10819f41d32a0723e611733b42 \ + --hash=sha256:63c0e9e7eea69588479ebf4a8a270d5ac22763cc5854e9a7eae952a3908103f7 \ + --hash=sha256:66f85ce62c70b843bab1fb14a05d5737741e74e28c7b8b5a064de10142fad248 \ + --hash=sha256:6cf9b429b21df6b99f4dee7a1218b8b7ffbbe7df8764dc0bd60ce8a0708fed1e \ + --hash=sha256:70b37199913c1bd300ff6e2693316c6f869c7ee16378faf10e4f5e3275b299c3 \ + --hash=sha256:727fd05b57df37dc0bcf1a27767a3d9a78cbbc92822445f32cc3436ba797337b \ + --hash=sha256:74ae7b798248fe62021dbf3c914245ad45d1a6b0cb4a29ecb4b31d0bfbc4cc3e \ + --hash=sha256:784db1dcdab56bf0517743e746dfb0f885fc68d948aba86eeec2cba234bdf1c0 \ + --hash=sha256:86945f2ee6d10cdfd67bcb4069c1662dd711f7e2a4343db5cecec06b87cf31aa \ + --hash=sha256:86d835afea1eaa143012a2d7a3f45a3adce2d7adc8b4961f0b362214d800846a \ + --hash=sha256:872a5cf366aec6bb1147336480fef14c9164b154aeb6542327de4970282cd2f5 \ + --hash=sha256:8b973c57ff8e184109db042c842423ff4f60446239bd585a5131cc47f06f789d \ + --hash=sha256:8cba086a43d54ca804ce711b2a940b16e452807acebe7852ff327f1ecd49b0d4 \ + --hash=sha256:8f7f0e05112916223d3f438f293abf0727e1181b5983f413dfa2fefc4098245c \ + --hash=sha256:900218e456384ea676e24ea6a0417f030a3b07306d29d7ad843957b40a9d8d52 \ + --hash=sha256:93eebbcf1aafdf7e2ddd44c2923e2672e1010bddc014138b229e49725b4d6be5 \ + --hash=sha256:9c75442b2209b8470d6d5d8b1c25714270686f14c749028d2199c54e29f20b4d \ + --hash=sha256:9ee2197ef8c4f0dfe405d835f3b6a14f5fee7782b5de51ba06fb65fc9b36e9f1 \ + --hash=sha256:a414504bef8945eae5f2d7cb7be2d4af77c5d1cb5e20b296c2c25b61dff2900c \ + --hash=sha256:a4b9159734b326535f4dd01d947f919c6eefd2d9827466a696c44ced82dfbc18 \ + --hash=sha256:a80afd79f45f3c4a7d341f13acbe058d1ca8ac017c165d3fa0d3de6bc1a079d7 \ + --hash=sha256:aa5bc7c5d59d831d9773d1170acac7893ce3a5e130540605770ade83280e7188 \ + --hash=sha256:acfd89508504a19ed06ef963ad544ec6664518c863436306153e13e94605c218 \ + --hash=sha256:aeffcab3d4b43712bb7a60b65f6044d444e75e563ff6180af8f98dd4b905dfd2 \ + --hash=sha256:afaffc4393205524af9dfa400fa250143a6c3bc646c08c9f5e25a9f4b4d6a903 \ + --hash=sha256:b0c7088a73aef3d687c4deef8452a3ac7c1be4e29ed8bf3b366c8111128ac60c \ + --hash=sha256:b46b4ec24f7293f23adcd2d146960559aaf8020213de8ad1909dba6c013bf89c \ + --hash=sha256:b501b5fa195cc9e24fe102f21ec0a44dffc231d2af79950b451e0d99cea02234 \ + --hash=sha256:bf06bc2af43fa8d32d30fae16ad965663e966b1a3202ed407b84c989c3221e82 \ + --hash=sha256:c804e3a5aba5460c73955c955bdbd5c08c354954e9270a2c1565f62e866bdc39 \ + --hash=sha256:c8a9958e88b65c3b27e22ca2a076311636850b612d6bbfb76e8d156aacde2aaf \ + --hash=sha256:cc0a57f895b96ec78969c34f682c602bf8da1a0270b09bc65673df2e7638ec20 \ + --hash=sha256:cc8920d2ec5fa99875b670bb86ddeb21e295cb07aa331810d9e486e0b969d946 \ + --hash=sha256:ccc933afd4d20aad3c00bcef049cb40049f7f196e0397f1109dba6fed63267b0 \ + --hash=sha256:ce581db493ea1a96c0556360ede6607496e8bf9b3a8efa66e06477267bc831e9 \ + --hash=sha256:d0f23b44f57077c1ede8c5f26b30f706498b4862d3ff0a7298b8411dd2f043ff \ + --hash=sha256:d21644de1b609825ede2f48be98dfde4656aefc713654eeee280e37cadc4e0ad \ + --hash=sha256:d6889ec4ec662a1a37eb4b4fb26b6100841804dac55bd9df579e326cdc146227 \ + --hash=sha256:de5672f4a7b200c15a4127042170a694d4df43c992948f5e1af57f0174beed10 \ + --hash=sha256:e6a0bc88393d65807d751a614207b7129a310ca4fe76a74e5c7da5fa5671417e \ + --hash=sha256:ed89927b86296067b4f81f108a2271d8926467a8868e554eaf370fc27fa3ccaf \ + --hash=sha256:ee3888d9ff7c14604052b2ca5535a30216aa0a58e948cdd3eeb8d3415f638769 \ + --hash=sha256:f0963b55cdd70fad460fa4c1341f12f976bb26cb66021a5580329bd498988310 \ + --hash=sha256:f16417ec91f12f814b10bafe79ef77e70113a2f5f7018640e7425ff979253425 \ + --hash=sha256:f28620fe26bee16243be2b7b874da327312240a7cdc38b769a697578d2100013 \ + --hash=sha256:f4255143f5160d0de972d28c8f9665d882b5f61309d8362fdd3e103cf7bf010c \ + --hash=sha256:ffac52f28a7849ad7576293c0cb7b9f08304e8f7d738a8cb8a90ec4c55a998eb \ + --hash=sha256:ffe22d2b05504f786c867c8395de703937f934272eb67586817b46188b4ded6d \ + --hash=sha256:fffe29a1ef00883599d1dc2c51aa2e5d80afe49523c261a74933df395c15c520 # via # -r requirements/base.in # composition-stats @@ -285,119 +319,104 @@ pandas==2.3.3 \ # via # -r requirements/base.in # geopandas -pillow==11.3.0 \ - --hash=sha256:023f6d2d11784a465f09fd09a34b150ea4672e85fb3d05931d89f373ab14abb2 \ - --hash=sha256:02a723e6bf909e7cea0dac1b0e0310be9d7650cd66222a5f1c571455c0a45214 \ - --hash=sha256:040a5b691b0713e1f6cbe222e0f4f74cd233421e105850ae3b3c0ceda520f42e \ - --hash=sha256:05f6ecbeff5005399bb48d198f098a9b4b6bdf27b8487c7f38ca16eeb070cd59 \ - --hash=sha256:068d9c39a2d1b358eb9f245ce7ab1b5c3246c7c8c7d9ba58cfa5b43146c06e50 \ - --hash=sha256:0743841cabd3dba6a83f38a92672cccbd69af56e3e91777b0ee7f4dba4385632 \ - --hash=sha256:092c80c76635f5ecb10f3f83d76716165c96f5229addbd1ec2bdbbda7d496e06 \ - --hash=sha256:0b275ff9b04df7b640c59ec5a3cb113eefd3795a8df80bac69646ef699c6981a \ - --hash=sha256:0bce5c4fd0921f99d2e858dc4d4d64193407e1b99478bc5cacecba2311abde51 \ - --hash=sha256:1019b04af07fc0163e2810167918cb5add8d74674b6267616021ab558dc98ced \ - --hash=sha256:106064daa23a745510dabce1d84f29137a37224831d88eb4ce94bb187b1d7e5f \ - --hash=sha256:118ca10c0d60b06d006be10a501fd6bbdfef559251ed31b794668ed569c87e12 \ - --hash=sha256:13f87d581e71d9189ab21fe0efb5a23e9f28552d5be6979e84001d3b8505abe8 \ - --hash=sha256:155658efb5e044669c08896c0c44231c5e9abcaadbc5cd3648df2f7c0b96b9a6 \ - --hash=sha256:1904e1264881f682f02b7f8167935cce37bc97db457f8e7849dc3a6a52b99580 \ - --hash=sha256:19d2ff547c75b8e3ff46f4d9ef969a06c30ab2d4263a9e287733aa8b2429ce8f \ - --hash=sha256:1a992e86b0dd7aeb1f053cd506508c0999d710a8f07b4c791c63843fc6a807ac \ - --hash=sha256:1b9c17fd4ace828b3003dfd1e30bff24863e0eb59b535e8f80194d9cc7ecf860 \ - --hash=sha256:1c627742b539bba4309df89171356fcb3cc5a9178355b2727d1b74a6cf155fbd \ - --hash=sha256:1cd110edf822773368b396281a2293aeb91c90a2db00d78ea43e7e861631b722 \ - --hash=sha256:1f85acb69adf2aaee8b7da124efebbdb959a104db34d3a2cb0f3793dbae422a8 \ - --hash=sha256:23cff760a9049c502721bdb743a7cb3e03365fafcdfc2ef9784610714166e5a4 \ - --hash=sha256:2465a69cf967b8b49ee1b96d76718cd98c4e925414ead59fdf75cf0fd07df673 \ - --hash=sha256:2a3117c06b8fb646639dce83694f2f9eac405472713fcb1ae887469c0d4f6788 \ - --hash=sha256:2aceea54f957dd4448264f9bf40875da0415c83eb85f55069d89c0ed436e3542 \ - --hash=sha256:2d6fcc902a24ac74495df63faad1884282239265c6839a0a6416d33faedfae7e \ - --hash=sha256:30807c931ff7c095620fe04448e2c2fc673fcbb1ffe2a7da3fb39613489b1ddd \ - --hash=sha256:30b7c02f3899d10f13d7a48163c8969e4e653f8b43416d23d13d1bbfdc93b9f8 \ - --hash=sha256:3828ee7586cd0b2091b6209e5ad53e20d0649bbe87164a459d0676e035e8f523 \ - --hash=sha256:3cee80663f29e3843b68199b9d6f4f54bd1d4a6b59bdd91bceefc51238bcb967 \ - --hash=sha256:3e184b2f26ff146363dd07bde8b711833d7b0202e27d13540bfe2e35a323a809 \ - --hash=sha256:41342b64afeba938edb034d122b2dda5db2139b9a4af999729ba8818e0056477 \ - --hash=sha256:41742638139424703b4d01665b807c6468e23e699e8e90cffefe291c5832b027 \ - --hash=sha256:4445fa62e15936a028672fd48c4c11a66d641d2c05726c7ec1f8ba6a572036ae \ - --hash=sha256:45dfc51ac5975b938e9809451c51734124e73b04d0f0ac621649821a63852e7b \ - --hash=sha256:465b9e8844e3c3519a983d58b80be3f668e2a7a5db97f2784e7079fbc9f9822c \ - --hash=sha256:48d254f8a4c776de343051023eb61ffe818299eeac478da55227d96e241de53f \ - --hash=sha256:4c834a3921375c48ee6b9624061076bc0a32a60b5532b322cc0ea64e639dd50e \ - --hash=sha256:4c96f993ab8c98460cd0c001447bff6194403e8b1d7e149ade5f00594918128b \ - --hash=sha256:504b6f59505f08ae014f724b6207ff6222662aab5cc9542577fb084ed0676ac7 \ - --hash=sha256:527b37216b6ac3a12d7838dc3bd75208ec57c1c6d11ef01902266a5a0c14fc27 \ - --hash=sha256:5418b53c0d59b3824d05e029669efa023bbef0f3e92e75ec8428f3799487f361 \ - --hash=sha256:59a03cdf019efbfeeed910bf79c7c93255c3d54bc45898ac2a4140071b02b4ae \ - --hash=sha256:5e05688ccef30ea69b9317a9ead994b93975104a677a36a8ed8106be9260aa6d \ - --hash=sha256:6359a3bc43f57d5b375d1ad54a0074318a0844d11b76abccf478c37c986d3cfc \ - --hash=sha256:643f189248837533073c405ec2f0bb250ba54598cf80e8c1e043381a60632f58 \ - --hash=sha256:65dc69160114cdd0ca0f35cb434633c75e8e7fad4cf855177a05bf38678f73ad \ - --hash=sha256:67172f2944ebba3d4a7b54f2e95c786a3a50c21b88456329314caaa28cda70f6 \ - --hash=sha256:676b2815362456b5b3216b4fd5bd89d362100dc6f4945154ff172e206a22c024 \ - --hash=sha256:6a418691000f2a418c9135a7cf0d797c1bb7d9a485e61fe8e7722845b95ef978 \ - --hash=sha256:6abdbfd3aea42be05702a8dd98832329c167ee84400a1d1f61ab11437f1717eb \ - --hash=sha256:6be31e3fc9a621e071bc17bb7de63b85cbe0bfae91bb0363c893cbe67247780d \ - --hash=sha256:7107195ddc914f656c7fc8e4a5e1c25f32e9236ea3ea860f257b0436011fddd0 \ - --hash=sha256:71f511f6b3b91dd543282477be45a033e4845a40278fa8dcdbfdb07109bf18f9 \ - --hash=sha256:7859a4cc7c9295f5838015d8cc0a9c215b77e43d07a25e460f35cf516df8626f \ - --hash=sha256:7966e38dcd0fa11ca390aed7c6f20454443581d758242023cf36fcb319b1a874 \ - --hash=sha256:79ea0d14d3ebad43ec77ad5272e6ff9bba5b679ef73375ea760261207fa8e0aa \ - --hash=sha256:7aee118e30a4cf54fdd873bd3a29de51e29105ab11f9aad8c32123f58c8f8081 \ - --hash=sha256:7b161756381f0918e05e7cb8a371fff367e807770f8fe92ecb20d905d0e1c149 \ - --hash=sha256:7c8ec7a017ad1bd562f93dbd8505763e688d388cde6e4a010ae1486916e713e6 \ - --hash=sha256:7d1aa4de119a0ecac0a34a9c8bde33f34022e2e8f99104e47a3ca392fd60e37d \ - --hash=sha256:7db51d222548ccfd274e4572fdbf3e810a5e66b00608862f947b163e613b67dd \ - --hash=sha256:819931d25e57b513242859ce1876c58c59dc31587847bf74cfe06b2e0cb22d2f \ - --hash=sha256:83e1b0161c9d148125083a35c1c5a89db5b7054834fd4387499e06552035236c \ - --hash=sha256:857844335c95bea93fb39e0fa2726b4d9d758850b34075a7e3ff4f4fa3aa3b31 \ - --hash=sha256:8797edc41f3e8536ae4b10897ee2f637235c94f27404cac7297f7b607dd0716e \ - --hash=sha256:8924748b688aa210d79883357d102cd64690e56b923a186f35a82cbc10f997db \ - --hash=sha256:89bd777bc6624fe4115e9fac3352c79ed60f3bb18651420635f26e643e3dd1f6 \ - --hash=sha256:8dc70ca24c110503e16918a658b869019126ecfe03109b754c402daff12b3d9f \ - --hash=sha256:91da1d88226663594e3f6b4b8c3c8d85bd504117d043740a8e0ec449087cc494 \ - --hash=sha256:921bd305b10e82b4d1f5e802b6850677f965d8394203d182f078873851dada69 \ - --hash=sha256:932c754c2d51ad2b2271fd01c3d121daaa35e27efae2a616f77bf164bc0b3e94 \ - --hash=sha256:93efb0b4de7e340d99057415c749175e24c8864302369e05914682ba642e5d77 \ - --hash=sha256:97afb3a00b65cc0804d1c7abddbf090a81eaac02768af58cbdcaaa0a931e0b6d \ - --hash=sha256:97f07ed9f56a3b9b5f49d3661dc9607484e85c67e27f3e8be2c7d28ca032fec7 \ - --hash=sha256:98a9afa7b9007c67ed84c57c9e0ad86a6000da96eaa638e4f8abe5b65ff83f0a \ - --hash=sha256:9ab6ae226de48019caa8074894544af5b53a117ccb9d3b3dcb2871464c829438 \ - --hash=sha256:9c412fddd1b77a75aa904615ebaa6001f169b26fd467b4be93aded278266b288 \ - --hash=sha256:a1bc6ba083b145187f648b667e05a2534ecc4b9f2784c2cbe3089e44868f2b9b \ - --hash=sha256:a418486160228f64dd9e9efcd132679b7a02a5f22c982c78b6fc7dab3fefb635 \ - --hash=sha256:a4d336baed65d50d37b88ca5b60c0fa9d81e3a87d4a7930d3880d1624d5b31f3 \ - --hash=sha256:a6444696fce635783440b7f7a9fc24b3ad10a9ea3f0ab66c5905be1c19ccf17d \ - --hash=sha256:a7bc6e6fd0395bc052f16b1a8670859964dbd7003bd0af2ff08342eb6e442cfe \ - --hash=sha256:b4b8f3efc8d530a1544e5962bd6b403d5f7fe8b9e08227c6b255f98ad82b4ba0 \ - --hash=sha256:b5f56c3f344f2ccaf0dd875d3e180f631dc60a51b314295a3e681fe8cf851fbe \ - --hash=sha256:be5463ac478b623b9dd3937afd7fb7ab3d79dd290a28e2b6df292dc75063eb8a \ - --hash=sha256:c37d8ba9411d6003bba9e518db0db0c58a680ab9fe5179f040b0463644bc9805 \ - --hash=sha256:c84d689db21a1c397d001aa08241044aa2069e7587b398c8cc63020390b1c1b8 \ - --hash=sha256:c96d333dcf42d01f47b37e0979b6bd73ec91eae18614864622d9b87bbd5bbf36 \ - --hash=sha256:cadc9e0ea0a2431124cde7e1697106471fc4c1da01530e679b2391c37d3fbb3a \ - --hash=sha256:cc3e831b563b3114baac7ec2ee86819eb03caa1a2cef0b481a5675b59c4fe23b \ - --hash=sha256:cd8ff254faf15591e724dc7c4ddb6bf4793efcbe13802a4ae3e863cd300b493e \ - --hash=sha256:d000f46e2917c705e9fb93a3606ee4a819d1e3aa7a9b442f6444f07e77cf5e25 \ - --hash=sha256:d9da3df5f9ea2a89b81bb6087177fb1f4d1c7146d583a3fe5c672c0d94e55e12 \ - --hash=sha256:e5c5858ad8ec655450a7c7df532e9842cf8df7cc349df7225c60d5d348c8aada \ - --hash=sha256:e67d793d180c9df62f1f40aee3accca4829d3794c95098887edc18af4b8b780c \ - --hash=sha256:ea944117a7974ae78059fcc1800e5d3295172bb97035c0c1d9345fca1419da71 \ - --hash=sha256:eb76541cba2f958032d79d143b98a3a6b3ea87f0959bbe256c0b5e416599fd5d \ - --hash=sha256:ec1ee50470b0d050984394423d96325b744d55c701a439d2bd66089bff963d3c \ - --hash=sha256:ee92f2fd10f4adc4b43d07ec5e779932b4eb3dbfbc34790ada5a6669bc095aa6 \ - --hash=sha256:f0f5d8f4a08090c6d6d578351a2b91acf519a54986c055af27e7a93feae6d3f1 \ - --hash=sha256:f1f182ebd2303acf8c380a54f615ec883322593320a9b00438eb842c1f37ae50 \ - --hash=sha256:f8a5827f84d973d8636e9dc5764af4f0cf2318d26744b3d902931701b0d46653 \ - --hash=sha256:f944255db153ebb2b19c51fe85dd99ef0ce494123f21b9db4877ffdfc5590c7c \ - --hash=sha256:fdae223722da47b024b867c1ea0be64e0df702c5e0a60e27daad39bf960dd1e4 \ - --hash=sha256:fe27fb049cdcca11f11a7bfda64043c37b30e6b91f10cb5bab275806c32f6ab3 +pillow==12.0.0 \ + --hash=sha256:0869154a2d0546545cde61d1789a6524319fc1897d9ee31218eae7a60ccc5643 \ + --hash=sha256:09f2d0abef9e4e2f349305a4f8cc784a8a6c2f58a8c4892eea13b10a943bd26e \ + --hash=sha256:0b817e7035ea7f6b942c13aa03bb554fc44fea70838ea21f8eb31c638326584e \ + --hash=sha256:0fd00cac9c03256c8b2ff58f162ebcd2587ad3e1f2e397eab718c47e24d231cc \ + --hash=sha256:110486b79f2d112cf6add83b28b627e369219388f64ef2f960fef9ebaf54c642 \ + --hash=sha256:1979f4566bb96c1e50a62d9831e2ea2d1211761e5662afc545fa766f996632f6 \ + --hash=sha256:1ac11e8ea4f611c3c0147424eae514028b5e9077dd99ab91e1bd7bc33ff145e1 \ + --hash=sha256:1b1b133e6e16105f524a8dec491e0586d072948ce15c9b914e41cdadd209052b \ + --hash=sha256:1ee80a59f6ce048ae13cda1abf7fbd2a34ab9ee7d401c46be3ca685d1999a399 \ + --hash=sha256:21f241bdd5080a15bc86d3466a9f6074a9c2c2b314100dd896ac81ee6db2f1ba \ + --hash=sha256:266cd5f2b63ff316d5a1bba46268e603c9caf5606d44f38c2873c380950576ad \ + --hash=sha256:26d9f7d2b604cd23aba3e9faf795787456ac25634d82cd060556998e39c6fa47 \ + --hash=sha256:27f95b12453d165099c84f8a8bfdfd46b9e4bda9e0e4b65f0635430027f55739 \ + --hash=sha256:2c54c1a783d6d60595d3514f0efe9b37c8808746a66920315bfd34a938d7994b \ + --hash=sha256:2fa5f0b6716fc88f11380b88b31fe591a06c6315e955c096c35715788b339e3f \ + --hash=sha256:32ed80ea8a90ee3e6fa08c21e2e091bba6eda8eccc83dbc34c95169507a91f10 \ + --hash=sha256:3830c769decf88f1289680a59d4f4c46c72573446352e2befec9a8512104fa52 \ + --hash=sha256:38df9b4bfd3db902c9c2bd369bcacaf9d935b2fff73709429d95cc41554f7b3d \ + --hash=sha256:3adfb466bbc544b926d50fe8f4a4e6abd8c6bffd28a26177594e6e9b2b76572b \ + --hash=sha256:3e42edad50b6909089750e65c91aa09aaf1e0a71310d383f11321b27c224ed8a \ + --hash=sha256:4078242472387600b2ce8d93ade8899c12bf33fa89e55ec89fe126e9d6d5d9e9 \ + --hash=sha256:455247ac8a4cfb7b9bc45b7e432d10421aea9fc2e74d285ba4072688a74c2e9d \ + --hash=sha256:4cc6b3b2efff105c6a1656cfe59da4fdde2cda9af1c5e0b58529b24525d0a098 \ + --hash=sha256:4cf7fed4b4580601c4345ceb5d4cbf5a980d030fd5ad07c4d2ec589f95f09905 \ + --hash=sha256:5193fde9a5f23c331ea26d0cf171fbf67e3f247585f50c08b3e205c7aeb4589b \ + --hash=sha256:5269cc1caeedb67e6f7269a42014f381f45e2e7cd42d834ede3c703a1d915fe3 \ + --hash=sha256:53561a4ddc36facb432fae7a9d8afbfaf94795414f5cdc5fc52f28c1dca90371 \ + --hash=sha256:55f818bd74fe2f11d4d7cbc65880a843c4075e0ac7226bc1a23261dbea531953 \ + --hash=sha256:58eea5ebe51504057dd95c5b77d21700b77615ab0243d8152793dc00eb4faf01 \ + --hash=sha256:5d5c411a8eaa2299322b647cd932586b1427367fd3184ffbb8f7a219ea2041ca \ + --hash=sha256:6846bd2d116ff42cba6b646edf5bf61d37e5cbd256425fa089fee4ff5c07a99e \ + --hash=sha256:6ace95230bfb7cd79ef66caa064bbe2f2a1e63d93471c3a2e1f1348d9f22d6b7 \ + --hash=sha256:6e51b71417049ad6ab14c49608b4a24d8fb3fe605e5dfabfe523b58064dc3d27 \ + --hash=sha256:71db6b4c1653045dacc1585c1b0d184004f0d7e694c7b34ac165ca70c0838082 \ + --hash=sha256:7438839e9e053ef79f7112c881cef684013855016f928b168b81ed5835f3e75e \ + --hash=sha256:759de84a33be3b178a64c8ba28ad5c135900359e85fb662bc6e403ad4407791d \ + --hash=sha256:792a2c0be4dcc18af9d4a2dfd8a11a17d5e25274a1062b0ec1c2d79c76f3e7f8 \ + --hash=sha256:7d87ef5795da03d742bf49439f9ca4d027cde49c82c5371ba52464aee266699a \ + --hash=sha256:7dfb439562f234f7d57b1ac6bc8fe7f838a4bd49c79230e0f6a1da93e82f1fad \ + --hash=sha256:7fa22993bac7b77b78cae22bad1e2a987ddf0d9015c63358032f84a53f23cdc3 \ + --hash=sha256:805ebf596939e48dbb2e4922a1d3852cfc25c38160751ce02da93058b48d252a \ + --hash=sha256:82240051c6ca513c616f7f9da06e871f61bfd7805f566275841af15015b8f98d \ + --hash=sha256:87d4f8125c9988bfbed67af47dd7a953e2fc7b0cc1e7800ec6d2080d490bb353 \ + --hash=sha256:8d8ca2b210ada074d57fcee40c30446c9562e542fc46aedc19baf758a93532ee \ + --hash=sha256:8dc232e39d409036af549c86f24aed8273a40ffa459981146829a324e0848b4b \ + --hash=sha256:90387104ee8400a7b4598253b4c406f8958f59fcf983a6cea2b50d59f7d63d0b \ + --hash=sha256:905b0365b210c73afb0ebe9101a32572152dfd1c144c7e28968a331b9217b94a \ + --hash=sha256:99353a06902c2e43b43e8ff74ee65a7d90307d82370604746738a1e0661ccca7 \ + --hash=sha256:99a7f72fb6249302aa62245680754862a44179b545ded638cf1fef59befb57ef \ + --hash=sha256:9f0b04c6b8584c2c193babcccc908b38ed29524b29dd464bc8801bf10d746a3a \ + --hash=sha256:9fe611163f6303d1619bbcb653540a4d60f9e55e622d60a3108be0d5b441017a \ + --hash=sha256:a3475b96f5908b3b16c47533daaa87380c491357d197564e0ba34ae75c0f3257 \ + --hash=sha256:a6597ff2b61d121172f5844b53f21467f7082f5fb385a9a29c01414463f93b07 \ + --hash=sha256:a7921c5a6d31b3d756ec980f2f47c0cfdbce0fc48c22a39347a895f41f4a6ea4 \ + --hash=sha256:aa5129de4e174daccbc59d0a3b6d20eaf24417d59851c07ebb37aeb02947987c \ + --hash=sha256:aeaefa96c768fc66818730b952a862235d68825c178f1b3ffd4efd7ad2edcb7c \ + --hash=sha256:afbefa430092f71a9593a99ab6a4e7538bc9eabbf7bf94f91510d3503943edc4 \ + --hash=sha256:aff9e4d82d082ff9513bdd6acd4f5bd359f5b2c870907d2b0a9c5e10d40c88fe \ + --hash=sha256:b22bd8c974942477156be55a768f7aa37c46904c175be4e158b6a86e3a6b7ca8 \ + --hash=sha256:b290fd8aa38422444d4b50d579de197557f182ef1068b75f5aa8558638b8d0a5 \ + --hash=sha256:b2e4b27a6e15b04832fe9bf292b94b5ca156016bbc1ea9c2c20098a0320d6cf6 \ + --hash=sha256:b583dc9070312190192631373c6c8ed277254aa6e6084b74bdd0a6d3b221608e \ + --hash=sha256:b87843e225e74576437fd5b6a4c2205d422754f84a06942cfaf1dc32243e45a8 \ + --hash=sha256:bc91a56697869546d1b8f0a3ff35224557ae7f881050e99f615e0119bf934b4e \ + --hash=sha256:bd87e140e45399c818fac4247880b9ce719e4783d767e030a883a970be632275 \ + --hash=sha256:bde737cff1a975b70652b62d626f7785e0480918dece11e8fef3c0cf057351c3 \ + --hash=sha256:bdee52571a343d721fb2eb3b090a82d959ff37fc631e3f70422e0c2e029f3e76 \ + --hash=sha256:bee2a6db3a7242ea309aa7ee8e2780726fed67ff4e5b40169f2c940e7eb09227 \ + --hash=sha256:beeae3f27f62308f1ddbcfb0690bf44b10732f2ef43758f169d5e9303165d3f9 \ + --hash=sha256:c50f36a62a22d350c96e49ad02d0da41dbd17ddc2e29750dbdba4323f85eb4a5 \ + --hash=sha256:c607c90ba67533e1b2355b821fef6764d1dd2cbe26b8c1005ae84f7aea25ff79 \ + --hash=sha256:c7b2a63fd6d5246349f3d3f37b14430d73ee7e8173154461785e43036ffa96ca \ + --hash=sha256:c828a1ae702fc712978bda0320ba1b9893d99be0badf2647f693cc01cf0f04fa \ + --hash=sha256:c85de1136429c524e55cfa4e033b4a7940ac5c8ee4d9401cc2d1bf48154bbc7b \ + --hash=sha256:c98fa880d695de164b4135a52fd2e9cd7b7c90a9d8ac5e9e443a24a95ef9248e \ + --hash=sha256:cae81479f77420d217def5f54b5b9d279804d17e982e0f2fa19b1d1e14ab5197 \ + --hash=sha256:d034140032870024e6b9892c692fe2968493790dd57208b2c37e3fb35f6df3ab \ + --hash=sha256:d120c38a42c234dc9a8c5de7ceaaf899cf33561956acb4941653f8bdc657aa79 \ + --hash=sha256:d4827615da15cd59784ce39d3388275ec093ae3ee8d7f0c089b76fa87af756c2 \ + --hash=sha256:d49e2314c373f4c2b39446fb1a45ed333c850e09d0c59ac79b72eb3b95397363 \ + --hash=sha256:d52610d51e265a51518692045e372a4c363056130d922a7351429ac9f27e70b0 \ + --hash=sha256:d64317d2587c70324b79861babb9c09f71fbb780bad212018874b2c013d8600e \ + --hash=sha256:d77153e14b709fd8b8af6f66a3afbb9ed6e9fc5ccf0b6b7e1ced7b036a228782 \ + --hash=sha256:d7e091d464ac59d2c7ad8e7e08105eaf9dafbc3883fd7265ffccc2baad6ac925 \ + --hash=sha256:dd333073e0cacdc3089525c7df7d39b211bcdf31fc2824e49d01c6b6187b07d0 \ + --hash=sha256:e5d8efac84c9afcb40914ab49ba063d94f5dbdf5066db4482c66a992f47a3a3b \ + --hash=sha256:f135c702ac42262573fe9714dfe99c944b4ba307af5eb507abef1667e2cbbced \ + --hash=sha256:f13711b1a5ba512d647a0e4ba79280d3a9a045aaf7e0cc6fbe96b91d4cdf6b0c \ + --hash=sha256:f4f1231b7dec408e8670264ce63e9c71409d9583dd21d32c163e25213ee2a344 \ + --hash=sha256:fa3ed2a29a9e9d2d488b4da81dcb54720ac3104a20bf0bd273f1e4648aff5af9 \ + --hash=sha256:fb3096c30df99fd01c7bf8e544f392103d0795b9f98ba71a8054bcbf56b255f1 # via # imageio # scikit-image -platformdirs==4.4.0 \ - --hash=sha256:abd01743f24e5287cd7a5db3752faf1a2d65353f38ec26d98e25a6db65958c85 \ - --hash=sha256:ca753cf4d81dc309bc67b0ea38fd15dc97bc30ce419a7f58d13eb3bf14c4febf +platformdirs==4.5.0 \ + --hash=sha256:70ddccdd7c99fc5942e9fc25636a8b34d04c24b335100223152c2803e4063312 \ + --hash=sha256:e578a81bb873cbb89a41fcc904c7ef523cc18284b7e3b3ccf06aca1403b7ebd3 # via # -r requirements/base.in # requests-cache @@ -405,9 +424,9 @@ profilehooks==1.13.0 \ --hash=sha256:54a541cad49ddccee97b61a617404d7d736bf0bf79d36fbe2ac7caa3a1d9daaf \ --hash=sha256:869f63862b3d85e8af44ad7eb01a00203cc7a27a376ed3a51e409399062659c6 # via -r requirements/base.in -psycopg==3.2.10 \ - --hash=sha256:0bce99269d16ed18401683a8569b2c5abd94f72f8364856d56c0389bcd50972a \ - --hash=sha256:ab5caf09a9ec42e314a21f5216dbcceac528e0e05142e42eea83a3b28b320ac3 +psycopg==3.2.13 \ + --hash=sha256:309adaeda61d44556046ec9a83a93f42bbe5310120b1995f3af49ab6d9f13c1d \ + --hash=sha256:a481374514f2da627157f767a9336705ebefe93ea7a0522a6cbacba165da179a # via -r requirements/base.in pyogrio==0.11.1 \ --hash=sha256:0cfd79caf0b8cb7bbf30b419dff7f21509169efcf4d431172c61b44fe1029dba \ @@ -505,9 +524,9 @@ python-dateutil==2.9.0.post0 \ --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \ --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427 # via pandas -python-dotenv==1.1.1 \ - --hash=sha256:31f23644fe2602f88ff55e1f5c79ba497e01224ee7737937930c448e4d0e24dc \ - --hash=sha256:a8a6399716257f45be6a007360200409fce5cda2661e3dec71d23dc15f6189ab +python-dotenv==1.2.1 \ + --hash=sha256:42667e897e16ab0d66954af0e60a9caa94f0fd4ecf3aaf6d2d260eec1aa36ad6 \ + --hash=sha256:b81ee9561e9ca4004139c6cbba3a238c32b03e4894671e181b671e8cb8425d61 # via -r requirements/base.in pytz==2025.2 \ --hash=sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3 \ @@ -595,68 +614,68 @@ scikit-learn==1.7.2 \ --hash=sha256:f95dc55b7902b91331fa4e5845dd5bde0580c9cd9612b1b2791b7e80c3d32615 \ --hash=sha256:fa8f63940e29c82d1e67a45d5297bdebbcb585f5a5a50c4914cc2e852ab77f33 # via -r requirements/base.in -scipy==1.16.2 \ - --hash=sha256:024dd4a118cccec09ca3209b7e8e614931a6ffb804b2a601839499cb88bdf925 \ - --hash=sha256:033570f1dcefd79547a88e18bccacff025c8c647a330381064f561d43b821232 \ - --hash=sha256:03dfc75e52f72cf23ec2ced468645321407faad8f0fe7b1f5b49264adbc29cb1 \ - --hash=sha256:0a17541827a9b78b777d33b623a6dcfe2ef4a25806204d08ead0768f4e529a88 \ - --hash=sha256:0ce54e07bbb394b417457409a64fd015be623f36e330ac49306433ffe04bc97e \ - --hash=sha256:116296e89fba96f76353a8579820c2512f6e55835d3fad7780fece04367de351 \ - --hash=sha256:17d9bb346194e8967296621208fcdfd39b55498ef7d2f376884d5ac47cec1a70 \ - --hash=sha256:26284797e38b8a75e14ea6631d29bda11e76ceaa6ddb6fdebbfe4c4d90faf2f9 \ - --hash=sha256:2a8ffaa4ac0df81a0b94577b18ee079f13fecdb924df3328fc44a7dc5ac46851 \ - --hash=sha256:2cc73a33305b4b24556957d5857d6253ce1e2dcd67fa0ff46d87d1670b3e1e1d \ - --hash=sha256:2f5350da923ccfd0b00e07c3e5cfb316c1c0d6c1d864c07a72d092e9f20db104 \ - --hash=sha256:4e409eac067dcee96a57fbcf424c13f428037827ec7ee3cb671ff525ca4fc34d \ - --hash=sha256:5221c0b2a4b58aa7c4ed0387d360fd90ee9086d383bb34d9f2789fafddc8a936 \ - --hash=sha256:53d8d2ee29b925344c13bda64ab51785f016b1b9617849dac10897f0701b20c1 \ - --hash=sha256:567e77755019bb7461513c87f02bb73fb65b11f049aaaa8ca17cfaa5a5c45d77 \ - --hash=sha256:5c39026d12edc826a1ef2ad35ad1e6d7f087f934bb868fc43fa3049c8b8508f9 \ - --hash=sha256:5c66511f29aa8d233388e7416a3f20d5cae7a2744d5cee2ecd38c081f4e861b3 \ - --hash=sha256:5e9feab931bd2aea4a23388c962df6468af3d808ddf2d40f94a81c5dc38f32ef \ - --hash=sha256:63870a84cd15c44e65220eaed2dac0e8f8b26bbb991456a033c1d9abfe8a94f8 \ - --hash=sha256:6406d2ac6d40b861cccf57f49592f9779071655e9f75cd4f977fa0bdd09cb2e4 \ - --hash=sha256:654324826654d4d9133e10675325708fb954bc84dae6e9ad0a52e75c6b1a01d7 \ - --hash=sha256:6ab88ea43a57da1af33292ebd04b417e8e2eaf9d5aa05700be8d6e1b6501cd92 \ - --hash=sha256:70327d6aa572a17c2941cdfb20673f82e536e91850a2e4cb0c5b858b690e1548 \ - --hash=sha256:7280d926f11ca945c3ef92ba960fa924e1465f8d07ce3a9923080363390624c4 \ - --hash=sha256:7a5dc7ee9c33019973a470556081b0fd3c9f4c44019191039f9769183141a4d9 \ - --hash=sha256:7f3a337d9ae06a1e8d655ee9d8ecb835ea5ddcdcbd8d23012afa055ab014f374 \ - --hash=sha256:7fe65b36036357003b3ef9d37547abeefaa353b237e989c21027b8ed62b12d4f \ - --hash=sha256:84f7bf944b43e20b8a894f5fe593976926744f6c185bacfcbdfbb62736b5cc70 \ - --hash=sha256:87eb178db04ece7c698220d523c170125dbffebb7af0345e66c3554f6f60c173 \ - --hash=sha256:89d6c100fa5c48472047632e06f0876b3c4931aac1f4291afc81a3644316bb0d \ - --hash=sha256:8afae1756f6a1fe04636407ef7dbece33d826a5d462b74f3d0eb82deabefd831 \ - --hash=sha256:912f46667d2d3834bc3d57361f854226475f695eb08c08a904aadb1c936b6a88 \ - --hash=sha256:91e9e8a37befa5a69e9cacbe0bcb79ae5afb4a0b130fd6db6ee6cc0d491695fa \ - --hash=sha256:9702c4c023227785c779cba2e1d6f7635dbb5b2e0936cdd3a4ecb98d78fd41eb \ - --hash=sha256:98e22834650be81d42982360382b43b17f7ba95e0e6993e2a4f5b9ad9283a94d \ - --hash=sha256:9e05e33657efb4c6a9d23bd8300101536abd99c85cca82da0bffff8d8764d08a \ - --hash=sha256:9ea2a3fed83065d77367775d689401a703d0f697420719ee10c0780bcab594d8 \ - --hash=sha256:9fb1eb735fe3d6ed1f89918224e3385fbf6f9e23757cacc35f9c78d3b712dd6e \ - --hash=sha256:af029b153d243a80afb6eabe40b0a07f8e35c9adc269c019f364ad747f826a6b \ - --hash=sha256:af80196eaa84f033e48444d2e0786ec47d328ba00c71e4299b602235ffef9acb \ - --hash=sha256:b0348d8ddb55be2a844c518cd8cc8deeeb8aeba707cf834db5758fc89b476a2c \ - --hash=sha256:bab3605795d269067d8ce78a910220262711b753de8913d3deeaedb5dded3bb6 \ - --hash=sha256:c2275ff105e508942f99d4e3bc56b6ef5e4b3c0af970386ca56b777608ce95b7 \ - --hash=sha256:c95e96c7305c96ede73a7389f46ccd6c659c4da5ef1b2789466baeaed3622b6e \ - --hash=sha256:ca748936cd579d3f01928b30a17dc474550b01272d8046e3e1ee593f23620371 \ - --hash=sha256:d1cdf0ac28948d225decdefcc45ad7dd91716c29ab56ef32f8e0d50657dffcc7 \ - --hash=sha256:d2a4472c231328d4de38d5f1f68fdd6d28a615138f842580a8a321b5845cf779 \ - --hash=sha256:d7d4c6ba016ffc0f9568d012f5f1eb77ddd99412aea121e6fa8b4c3b7cbad91f \ - --hash=sha256:e52729ffd45b68777c5319560014d6fd251294200625d9d70fd8626516fc49f5 \ - --hash=sha256:e574be127bb760f0dad24ff6e217c80213d153058372362ccb9555a10fc5e8d2 \ - --hash=sha256:ea3421209bf00c8a5ef2227de496601087d8f638a2363ee09af059bd70976dc1 \ - --hash=sha256:ec6e74c4e884104ae006d34110677bfe0098203a3fec2f3faf349f4cb05165e3 \ - --hash=sha256:efe6305aeaa0e96b0ccca5ff647a43737d9a092064a3894e46c414db84bc54ac \ - --hash=sha256:f3bf75a6dcecab62afde4d1f973f1692be013110cad5338007927db8da73249c \ - --hash=sha256:f5a85d7b2b708025af08f060a496dd261055b617d776fc05a1a1cc69e09fe9ff \ - --hash=sha256:f5db5ba6188d698ba7abab982ad6973265b74bb40a1efe1821b58c87f73892b9 \ - --hash=sha256:f66bd07ba6f84cd4a380b41d1bf3c59ea488b590a2ff96744845163309ee8e2f \ - --hash=sha256:fa01f0f6a3050fa6a9771a95d5faccc8e2f5a92b4a2e5440a0fa7264a2398472 \ - --hash=sha256:fac4f8ce2ddb40e2e3d0f7ec36d2a1e7f92559a2471e59aec37bd8d9de01fec0 \ - --hash=sha256:fda714cf45ba43c9d3bae8f2585c777f64e3f89a2e073b668b32ede412d8f52c \ - --hash=sha256:ff4dc42bd321991fbf611c23fc35912d690f731c9914bf3af8f417e64aca0f21 +scipy==1.16.3 \ + --hash=sha256:0151a0749efeaaab78711c78422d413c583b8cdd2011a3c1d6c794938ee9fdb2 \ + --hash=sha256:01e87659402762f43bd2fee13370553a17ada367d42e7487800bf2916535aecb \ + --hash=sha256:03192a35e661470197556de24e7cb1330d84b35b94ead65c46ad6f16f6b28f2a \ + --hash=sha256:0553371015692a898e1aa858fed67a3576c34edefa6b7ebdb4e9dde49ce5c203 \ + --hash=sha256:062246acacbe9f8210de8e751b16fc37458213f124bef161a5a02c7a39284304 \ + --hash=sha256:0c3b4dd3d9b08dbce0f3440032c52e9e2ab9f96ade2d3943313dfe51a7056959 \ + --hash=sha256:0c623a54f7b79dd88ef56da19bc2873afec9673a48f3b85b18e4d402bdd29a5a \ + --hash=sha256:16b8bc35a4cc24db80a0ec836a9286d0e31b2503cb2fd7ff7fb0e0374a97081d \ + --hash=sha256:1fb2472e72e24d1530debe6ae078db70fb1605350c88a3d14bc401d6306dbffe \ + --hash=sha256:21d9d6b197227a12dcbf9633320a4e34c6b0e51c57268df255a0942983bac562 \ + --hash=sha256:2a207a6ce9c24f1951241f4693ede2d393f59c07abc159b2cb2be980820e01fb \ + --hash=sha256:2b71d93c8a9936046866acebc915e2af2e292b883ed6e2cbe5c34beb094b82d9 \ + --hash=sha256:2d1ae2cf0c350e7705168ff2429962a89ad90c2d49d1dd300686d8b2a5af22fc \ + --hash=sha256:3a4c460301fb2cffb7f88528f30b3127742cff583603aa7dc964a52c463b385d \ + --hash=sha256:3d4a07a8e785d80289dfe66b7c27d8634a773020742ec7187b85ccc4b0e7b686 \ + --hash=sha256:40be6cf99e68b6c4321e9f8782e7d5ff8265af28ef2cd56e9c9b2638fa08ad97 \ + --hash=sha256:4aff59800a3b7f786b70bfd6ab551001cb553244988d7d6b8299cb1ea653b353 \ + --hash=sha256:50a3dbf286dbc7d84f176f9a1574c705f277cb6565069f88f60db9eafdbe3ee2 \ + --hash=sha256:532fb5ad6a87e9e9cd9c959b106b73145a03f04c7d57ea3e6f6bb60b86ab0876 \ + --hash=sha256:53c3844d527213631e886621df5695d35e4f6a75f620dca412bcd292f6b87d78 \ + --hash=sha256:56edc65510d1331dae01ef9b658d428e33ed48b4f77b1d51caf479a0253f96dc \ + --hash=sha256:57d01cb6f85e34f0946b33caa66e892aae072b64b034183f3d87c4025802a119 \ + --hash=sha256:5803c5fadd29de0cf27fa08ccbfe7a9e5d741bf63e4ab1085437266f12460ff9 \ + --hash=sha256:6020470b9d00245926f2d5bb93b119ca0340f0d564eb6fbaad843eaebf9d690f \ + --hash=sha256:63d3cdacb8a824a295191a723ee5e4ea7768ca5ca5f2838532d9f2e2b3ce2135 \ + --hash=sha256:663b8d66a8748051c3ee9c96465fb417509315b99c71550fda2591d7dd634234 \ + --hash=sha256:72d1717fd3b5e6ec747327ce9bda32d5463f472c9dce9f54499e81fbd50245a1 \ + --hash=sha256:7dc1360c06535ea6116a2220f760ae572db9f661aba2d88074fe30ec2aa1ff88 \ + --hash=sha256:7f68154688c515cdb541a31ef8eb66d8cd1050605be9dcd74199cbd22ac739bc \ + --hash=sha256:81fc5827606858cf71446a5e98715ba0e11f0dbc83d71c7409d05486592a45d6 \ + --hash=sha256:875555ce62743e1d54f06cdf22c1e0bc47b91130ac40fe5d783b6dfa114beeb6 \ + --hash=sha256:8b3c820ddb80029fe9f43d61b81d8b488d3ef8ca010d15122b152db77dc94c22 \ + --hash=sha256:8be1ca9170fcb6223cc7c27f4305d680ded114a1567c0bd2bfcbf947d1b17511 \ + --hash=sha256:8d09d72dc92742988b0e7750bddb8060b0c7079606c0d24a8cc8e9c9c11f9079 \ + --hash=sha256:9452781bd879b14b6f055b26643703551320aa8d79ae064a71df55c00286a184 \ + --hash=sha256:96491a6a54e995f00a28a3c3badfff58fd093bf26cd5fb34a2188c8c756a3a2c \ + --hash=sha256:9b9c9c07b6d56a35777a1b4cc8966118fb16cfd8daf6743867d17d36cfad2d40 \ + --hash=sha256:a8a26c78ef223d3e30920ef759e25625a0ecdd0d60e5a8818b7513c3e5384cf2 \ + --hash=sha256:aadd23f98f9cb069b3bd64ddc900c4d277778242e961751f77a8cb5c4b946fb0 \ + --hash=sha256:b7180967113560cca57418a7bc719e30366b47959dd845a93206fbed693c867e \ + --hash=sha256:b7c5f1bda1354d6a19bc6af73a649f8285ca63ac6b52e64e658a5a11d4d69800 \ + --hash=sha256:b81c27fc41954319a943d43b20e07c40bdcd3ff7cf013f4fb86286faefe546c4 \ + --hash=sha256:bb61878c18a470021fb515a843dc7a76961a8daceaaaa8bad1332f1bf4b54657 \ + --hash=sha256:bea0a62734d20d67608660f69dcda23e7f90fb4ca20974ab80b6ed40df87a005 \ + --hash=sha256:c5192722cffe15f9329a3948c4b1db789fbb1f05c97899187dcf009b283aea70 \ + --hash=sha256:c97176013d404c7346bf57874eaac5187d969293bf40497140b0a2b2b7482e07 \ + --hash=sha256:cd13e354df9938598af2be05822c323e97132d5e6306b83a3b4ee6724c6e522e \ + --hash=sha256:d2ec56337675e61b312179a1ad124f5f570c00f920cc75e1000025451b88241c \ + --hash=sha256:d3837938ae715fc0fe3c39c0202de3a8853aff22ca66781ddc2ade7554b7e2cc \ + --hash=sha256:d9f48cafc7ce94cf9b15c6bffdc443a81a27bf7075cf2dcd5c8b40f85d10c4e7 \ + --hash=sha256:da7763f55885045036fabcebd80144b757d3db06ab0861415d1c3b7c69042146 \ + --hash=sha256:deb3841c925eeddb6afc1e4e4a45e418d19ec7b87c5df177695224078e8ec733 \ + --hash=sha256:e1d27cbcb4602680a49d787d90664fa4974063ac9d4134813332a8c53dbe667c \ + --hash=sha256:e5d42a9472e7579e473879a1990327830493a7047506d58d73fc429b84c1d49d \ + --hash=sha256:e7efa2681ea410b10dde31a52b18b0154d66f2485328830e45fdf183af5aefc6 \ + --hash=sha256:eab43fae33a0c39006a88096cd7b4f4ef545ea0447d250d5ac18202d40b6611d \ + --hash=sha256:f2622206f5559784fa5c4b53a950c3c7c1cf3e84ca1b9c4b6c03f062f289ca26 \ + --hash=sha256:f379b54b77a597aa7ee5e697df0d66903e41b9c85a6dd7946159e356319158e8 \ + --hash=sha256:f667a4542cc8917af1db06366d3f78a5c8e83badd56409f94d1eac8d8d9133fa \ + --hash=sha256:fb4b29f4cf8cc5a8d628bc8d8e26d12d7278cd1f219f22698a378c3d67db5e4b \ + --hash=sha256:ffa6eea95283b2b8079b821dc11f50a17d0571c92b43e2b5b12764dc5f9b285d # via # -r requirements/base.in # composition-stats @@ -731,14 +750,16 @@ threadpoolctl==3.6.0 \ --hash=sha256:43a0b8fd5a2928500110039e43a5eed8480b918967083ea48dc3ab9f13c4a7fb \ --hash=sha256:8ab8b4aa3491d812b623328249fab5302a68d2d71745c8a4c719a2fcaba9f44e # via scikit-learn -tifffile==2025.10.4 \ - --hash=sha256:2e437c16ab211be5bcdc79f71b4907359115f1f83b5d919e7c297c29725d3e38 \ - --hash=sha256:7687d691e49026053181470cec70fa9250e3a586b2041041297e38b10bbd34e1 +tifffile==2025.10.16 \ + --hash=sha256:41463d979c1c262b0a5cdef2a7f95f0388a072ad82d899458b154a48609d759c \ + --hash=sha256:425179ec7837ac0e07bc95d2ea5bea9b179ce854967c12ba07fc3f093e58efc1 # via scikit-image typing-extensions==4.15.0 \ --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \ --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548 - # via cattrs + # via + # cattrs + # psycopg tzdata==2025.2 \ --hash=sha256:1a403fada01ff9221ca8044d701868fa132215d84beb92242d9acd2147f667a8 \ --hash=sha256:b60a638fcc0daffadf82fe0f57e53d06bdec2f36c4df66280ae79bce6bd6f2b9 diff --git a/requirements/base.in b/requirements/base.in index 9e98759..662a2bb 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,5 +1,5 @@ composition_stats -gdal==3.11.3 +gdal==3.11.4 geopandas numpy pandas diff --git a/soil_id/tests/global/__snapshots__/test_global/test_soil_location[7.3318,-1.4631].json b/soil_id/tests/global/__snapshots__/test_global/test_soil_location[7.3318,-1.4631].json index ecf0bdf..2e480b0 100644 --- a/soil_id/tests/global/__snapshots__/test_global/test_soil_location[7.3318,-1.4631].json +++ b/soil_id/tests/global/__snapshots__/test_global/test_soil_location[7.3318,-1.4631].json @@ -665,11 +665,11 @@ }, "site": { "siteData": { - "componentID": 133621, + "componentID": 133618, "distance": 3154.198, "mapunitID": 36084, "minCompDistance": 3154.19808851, - "share": 10, + "share": 20, "soilDepth": 40 }, "siteDescription": { @@ -1410,7 +1410,7 @@ { "component": "Dystric leptosols", "componentData": "Missing Data", - "componentID": 133621, + "componentID": 133618, "name": "Dystric leptosols", "not_displayed": false, "rank_data": "7", diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[33.81246789,-101.9733687].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[33.81246789,-101.9733687].json index 9eb9fbc..8b1a6bf 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[33.81246789,-101.9733687].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[33.81246789,-101.9733687].json @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623332", + "componentID": "27108933", "componentKind": "Series", "componentPct": 80, "dataSource": "SSURGO", @@ -97,13 +97,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R077CY036TX" + "R077CY022TX" ], "ecoclassname": [ - "Sandy Loam 16-21 Pz" + "Deep Hardland 16-21 Pz" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/077C/R077CY036TX" + "https://edit.sc.egov.usda.gov/catalogs/esd/077C/R077CY022TX" ] } }, @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623211", + "componentID": "27108889", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623299", + "componentID": "27108854", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623333", + "componentID": "27108934", "componentKind": "Series", "componentPct": 10, "dataSource": "SSURGO", @@ -265,13 +265,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R077CY022TX" + "R077CY036TX" ], "ecoclassname": [ - "Deep Hardland 16-21 Pz" + "Sandy Loam 16-21 Pz" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/077C/R077CY022TX" + "https://edit.sc.egov.usda.gov/catalogs/esd/077C/R077CY036TX" ] } }, @@ -288,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623334", + "componentID": "27108935", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -344,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623213", + "componentID": "27108891", "componentKind": "Series", "componentPct": 6, "dataSource": "SSURGO", @@ -400,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623214", + "componentID": "27108892", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -456,7 +456,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623212", + "componentID": "27108890", "componentKind": "Series", "componentPct": 4, "dataSource": "SSURGO", @@ -512,7 +512,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623298", + "componentID": "27108856", "componentKind": "Series", "componentPct": 7, "dataSource": "SSURGO", @@ -568,7 +568,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623297", + "componentID": "27108855", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -624,7 +624,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25623296", + "componentID": "27108857", "componentKind": "Series", "componentPct": 3, "dataSource": "SSURGO", @@ -660,68 +660,68 @@ { "component": "Randall", "componentData": "Missing Data", - "componentID": 25623332, + "componentID": 27108933, "name": "Randall", "not_displayed": false, - "rank_data": "8", - "rank_data_group": "8", + "rank_data": "5", + "rank_data_group": "5", "rank_data_loc": "1", "rank_data_loc_group": "1", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.427, - "score_data_group": 0.427, - "score_data_loc": 0.451, - "score_data_loc_group": 0.451, + "score_data": 0.533, + "score_data_group": 0.533, + "score_data_loc": 0.504, + "score_data_loc_group": 0.504, "score_loc": 0.474, "score_loc_group": 0.474 }, { "component": "Acuff", "componentData": "Data Complete", - "componentID": 25623297, + "componentID": 27108855, "name": "Acuff2", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", + "rank_data": "6", + "rank_data_group": "6", "rank_data_loc": "2", "rank_data_loc_group": "2", "rank_loc": "Not Displayed", "rank_loc_group": "2", - "score_data": 0.593, - "score_data_group": 0.593, - "score_data_loc": 0.423, - "score_data_loc_group": 0.423, + "score_data": 0.504, + "score_data_group": 0.504, + "score_data_loc": 0.379, + "score_data_loc_group": 0.379, "score_loc": 0.253, "score_loc_group": 0.253 }, { "component": "Olton", "componentData": "Data Complete", - "componentID": 25623299, + "componentID": 27108854, "name": "Olton", "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", + "rank_data": "4", + "rank_data_group": "4", "rank_data_loc": "3", "rank_data_loc_group": "3", "rank_loc": "3", "rank_loc_group": "3", - "score_data": 0.46, - "score_data_group": 0.46, - "score_data_loc": 0.293, - "score_data_loc_group": 0.293, + "score_data": 0.546, + "score_data_group": 0.546, + "score_data_loc": 0.336, + "score_data_loc_group": 0.336, "score_loc": 0.126, "score_loc_group": 0.126 }, { "component": "Friona", "componentData": "Data Complete", - "componentID": 25623214, + "componentID": 27108892, "name": "Friona", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "1", + "rank_data_group": "1", "rank_data_loc": "4", "rank_data_loc_group": "4", "rank_loc": "7", @@ -734,15 +734,34 @@ "score_loc_group": 0.014 }, { - "component": "Amarillo", + "component": "Estacado", "componentData": "Data Complete", - "componentID": 25623212, - "name": "Amarillo", + "componentID": 27108891, + "name": "Estacado", "not_displayed": false, "rank_data": "3", "rank_data_group": "3", "rank_data_loc": "5", "rank_data_loc_group": "5", + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.548, + "score_data_group": 0.548, + "score_data_loc": 0.285, + "score_data_loc_group": 0.285, + "score_loc": 0.021, + "score_loc_group": 0.021 + }, + { + "component": "Amarillo", + "componentData": "Data Complete", + "componentID": 27108890, + "name": "Amarillo", + "not_displayed": false, + "rank_data": "2", + "rank_data_group": "2", + "rank_data_loc": "6", + "rank_data_loc_group": "6", "rank_loc": "8", "rank_loc_group": "8", "score_data": 0.553, @@ -752,117 +771,98 @@ "score_loc": 0.011, "score_loc_group": 0.011 }, + { + "component": "Mclean", + "componentData": "Missing Data", + "componentID": 27108934, + "name": "Mclean", + "not_displayed": false, + "rank_data": "7", + "rank_data_group": "7", + "rank_data_loc": "7", + "rank_data_loc_group": "7", + "rank_loc": "4", + "rank_loc_group": "4", + "score_data": 0.5, + "score_data_group": 0.5, + "score_data_loc": 0.28, + "score_data_loc_group": 0.28, + "score_loc": 0.059, + "score_loc_group": 0.059 + }, { "component": "Lockney", "componentData": "Missing Data", - "componentID": 25623334, + "componentID": 27108935, "name": "Lockney", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", - "rank_data_loc": "6", - "rank_data_loc_group": "6", + "rank_data": "9", + "rank_data_group": "9", + "rank_data_loc": "8", + "rank_data_loc_group": "8", "rank_loc": "5", "rank_loc_group": "5", - "score_data": 0.533, - "score_data_group": 0.533, - "score_data_loc": 0.281, - "score_data_loc_group": 0.281, + "score_data": 0.447, + "score_data_group": 0.447, + "score_data_loc": 0.239, + "score_data_loc_group": 0.239, "score_loc": 0.03, "score_loc_group": 0.03 }, { "component": "Pullman", "componentData": "Data Complete", - "componentID": 25623298, + "componentID": 27108856, "name": "Pullman", "not_displayed": false, - "rank_data": "4", - "rank_data_group": "4", - "rank_data_loc": "7", - "rank_data_loc_group": "7", + "rank_data": "8", + "rank_data_group": "8", + "rank_data_loc": "9", + "rank_data_loc_group": "9", "rank_loc": "9", "rank_loc_group": "9", - "score_data": 0.539, - "score_data_group": 0.539, - "score_data_loc": 0.275, - "score_data_loc_group": 0.275, + "score_data": 0.462, + "score_data_group": 0.462, + "score_data_loc": 0.237, + "score_data_loc_group": 0.237, "score_loc": 0.011, "score_loc_group": 0.011 }, - { - "component": "Estacado", - "componentData": "Data Complete", - "componentID": 25623213, - "name": "Estacado", - "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", - "rank_data_loc": "8", - "rank_data_loc_group": "8", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.492, - "score_data_group": 0.492, - "score_data_loc": 0.257, - "score_data_loc_group": 0.257, - "score_loc": 0.021, - "score_loc_group": 0.021 - }, - { - "component": "Mclean", - "componentData": "Missing Data", - "componentID": 25623333, - "name": "Mclean", - "not_displayed": false, - "rank_data": "9", - "rank_data_group": "9", - "rank_data_loc": "9", - "rank_data_loc_group": "9", - "rank_loc": "4", - "rank_loc_group": "4", - "score_data": 0.411, - "score_data_group": 0.411, - "score_data_loc": 0.235, - "score_data_loc_group": 0.235, - "score_loc": 0.059, - "score_loc_group": 0.059 - }, { "component": "Acuff", "componentData": "Data Complete", - "componentID": 25623211, + "componentID": 27108889, "name": "Acuff", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "1", + "rank_data_group": "6", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "2", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.576, - "score_data_group": 0.593, - "score_data_loc": 0.414, - "score_data_loc_group": 0.423, + "score_data": 0.49, + "score_data_group": 0.504, + "score_data_loc": 0.372, + "score_data_loc_group": 0.379, "score_loc": 0.253, "score_loc_group": 0.253 }, { "component": "Estacado", "componentData": "Data Complete", - "componentID": 25623296, + "componentID": 27108857, "name": "Estacado2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "6", + "rank_data_group": "3", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "8", + "rank_data_loc_group": "5", "rank_loc": "Not Displayed", "rank_loc_group": "6", "score_data": 0.441, - "score_data_group": 0.492, + "score_data_group": 0.548, "score_data_loc": 0.231, - "score_data_loc_group": 0.257, + "score_data_loc_group": 0.285, "score_loc": 0.021, "score_loc_group": 0.021 } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[34.92816,-114.80764].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[34.92816,-114.80764].json index 1b917d7..787dc2c 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[34.92816,-114.80764].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[34.92816,-114.80764].json @@ -1,22 +1,22 @@ { "list": { - "AWS_PIW90": 12.66, + "AWS_PIW90": 9.72, "Soil Data Value": [ [ "rfv_class_30", - 0.5074815208577954 - ], - [ - "texture_30", - 0.38007948871089425 + 1.7725548033578953 ], [ "rfv_class_0", - 0.3160432490369194 + 1.368995593589281 ], [ "texture_0", 0.0 + ], + [ + "texture_30", + 0.0 ] ], "metadata": { @@ -46,10 +46,10 @@ } }, "id": { - "component": "Carrizo", - "name": "Carrizo", + "component": "Torriorthents", + "name": "Torriorthents", "rank_loc": "1", - "score_loc": 0.269 + "score_loc": 0.45 }, "lab": {}, "munsell": {}, @@ -58,15 +58,15 @@ "sand": {}, "site": { "siteData": { - "componentID": "14185637", - "componentKind": "Series", - "componentPct": 6, - "dataSource": "STATSGO", + "componentID": "27420738", + "componentKind": "Taxon above family", + "componentPct": 45, + "dataSource": "SSURGO", "distance": 0.0, - "irrcapcl": "None", + "irrcapcl": "nan", "irrcapscl": "None", "irrcapunit": "None", - "mapunitID": "660587", + "mapunitID": "3457453", "minCompDistance": 0.0, "nirrcapcl": "7", "nirrcapscl": "s", @@ -74,8 +74,8 @@ "rfvInfill": "No", "sdeURL": "", "seeURL": "", - "slope": 1.0, - "taxsubgrp": "Typic Torriorthents", + "slope": 3.0, + "taxsubgrp": "None", "textureInfill": "No" }, "siteDescription": "" @@ -96,10 +96,10 @@ } }, "id": { - "component": "Gunsight", - "name": "Gunsight", + "component": "Torripsamments", + "name": "Torripsamments", "rank_loc": "2", - "score_loc": 0.18 + "score_loc": 0.3 }, "lab": {}, "munsell": {}, @@ -108,24 +108,24 @@ "sand": {}, "site": { "siteData": { - "componentID": "14185636", - "componentKind": "Series", - "componentPct": 27, - "dataSource": "STATSGO", + "componentID": "27420739", + "componentKind": "Taxon above family", + "componentPct": 30, + "dataSource": "SSURGO", "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", + "irrcapcl": "3", + "irrcapscl": "e", "irrcapunit": "None", - "mapunitID": "660587", + "mapunitID": "3457453", "minCompDistance": 0.0, "nirrcapcl": "7", - "nirrcapscl": "s", + "nirrcapscl": "c", "nirrcapunit": "None", "rfvInfill": "No", "sdeURL": "", "seeURL": "", - "slope": 21.0, - "taxsubgrp": "Typic Haplocalcids", + "slope": 2.0, + "taxsubgrp": "None", "textureInfill": "No" }, "siteDescription": "" @@ -146,10 +146,10 @@ } }, "id": { - "component": "Chuckawalla", - "name": "Chuckawalla", + "component": "Haplargids", + "name": "Haplargids", "rank_loc": "3", - "score_loc": 0.051 + "score_loc": 0.15 }, "lab": {}, "munsell": {}, @@ -158,524 +158,24 @@ "sand": {}, "site": { "siteData": { - "componentID": "14185642", - "componentKind": "Series", - "componentPct": 8, - "dataSource": "STATSGO", + "componentID": "27420740", + "componentKind": "Taxon above family", + "componentPct": 15, + "dataSource": "SSURGO", "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "660587", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 15.0, - "taxsubgrp": "Typic Calciargids", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Beeline", - "name": "Beeline", - "rank_loc": "4", - "score_loc": 0.026 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185640", - "componentKind": "Series", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "660587", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 24.0, - "taxsubgrp": "Typic Torriorthents", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Cipriano", - "name": "Cipriano", - "rank_loc": "5", - "score_loc": 0.026 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185643", - "componentKind": "Series", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "660587", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 18.0, - "taxsubgrp": "Typic Haplodurids", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Denure", - "name": "Denure", - "rank_loc": "6", - "score_loc": 0.026 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185639", - "componentKind": "Series", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "660587", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 4.0, - "taxsubgrp": "Typic Haplocambids", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Gilman", - "name": "Gilman", - "rank_loc": "7", - "score_loc": 0.026 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185646", - "componentKind": "Series", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "2", - "irrcapscl": "w", - "irrcapunit": "None", - "mapunitID": "660587", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "w", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 3.0, - "taxsubgrp": "Typic Torrifluvents", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Mohall", - "name": "Mohall", - "rank_loc": "8", - "score_loc": 0.026 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185644", - "componentKind": "Series", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "660587", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 4.0, - "taxsubgrp": "Typic Calciargids", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Antho", - "name": "Antho", - "rank_loc": "9", - "score_loc": 0.009 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185610", - "componentKind": "Series", - "componentPct": 2, - "dataSource": "STATSGO", - "distance": 353.554689070506, - "irrcapcl": "2", - "irrcapscl": "e", - "irrcapunit": "None", - "mapunitID": "660584", - "minCompDistance": 353.554689070506, - "nirrcapcl": "7", - "nirrcapscl": "w", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 3.0, - "taxsubgrp": "Typic Torrifluvents", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Aco", - "name": "Aco", - "rank_loc": "10", - "score_loc": 0.005 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185609", - "componentKind": "Series", - "componentPct": 1, - "dataSource": "STATSGO", - "distance": 353.554689070506, - "irrcapcl": "2", - "irrcapscl": "e", - "irrcapunit": "None", - "mapunitID": "660584", - "minCompDistance": 353.554689070506, - "nirrcapcl": "7", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 4.0, - "taxsubgrp": "Typic Haplocalcids", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Indio", - "name": "Indio", - "rank_loc": "11", - "score_loc": 0.005 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185607", - "componentKind": "Series", - "componentPct": 1, - "dataSource": "STATSGO", - "distance": 353.554689070506, - "irrcapcl": "2", - "irrcapscl": "e", - "irrcapunit": "None", - "mapunitID": "660584", - "minCompDistance": 353.554689070506, - "nirrcapcl": "7", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 3.0, - "taxsubgrp": "Typic Torrifluvents", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Lethent", - "name": "Lethent", - "rank_loc": "12", - "score_loc": 0.005 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185608", - "componentKind": "Series", - "componentPct": 1, - "dataSource": "STATSGO", - "distance": 353.554689070506, "irrcapcl": "3", "irrcapscl": "s", "irrcapunit": "None", - "mapunitID": "660584", - "minCompDistance": 353.554689070506, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 1.0, - "taxsubgrp": "Typic Natrargids", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Carrizo", - "name": "Carrizo2", - "rank_loc": "Not Displayed", - "score_loc": 0.269 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185597", - "componentKind": "Series", - "componentPct": 10, - "dataSource": "STATSGO", - "distance": 353.554689070506, - "irrcapcl": "6", - "irrcapscl": "w", - "irrcapunit": "None", - "mapunitID": "660584", + "mapunitID": "3457453", "minCompDistance": 0.0, "nirrcapcl": "7", - "nirrcapscl": "w", + "nirrcapscl": "c", "nirrcapunit": "None", "rfvInfill": "No", "sdeURL": "", "seeURL": "", "slope": 1.0, - "taxsubgrp": "Typic Torriorthents", + "taxsubgrp": "None", "textureInfill": "No" }, "siteDescription": "" @@ -696,10 +196,10 @@ } }, "id": { - "component": "Carrizo", - "name": "Carrizo3", - "rank_loc": "Not Displayed", - "score_loc": 0.269 + "component": "Haplocalcids", + "name": "Haplocalcids", + "rank_loc": "4", + "score_loc": 0.1 }, "lab": {}, "munsell": {}, @@ -708,74 +208,24 @@ "sand": {}, "site": { "siteData": { - "componentID": "14185605", - "componentKind": "Series", - "componentPct": 40, - "dataSource": "STATSGO", - "distance": 353.554689070506, - "irrcapcl": "None", - "irrcapscl": "None", + "componentID": "27420741", + "componentKind": "Taxon above family", + "componentPct": 10, + "dataSource": "SSURGO", + "distance": 0.0, + "irrcapcl": "4", + "irrcapscl": "s", "irrcapunit": "None", - "mapunitID": "660584", + "mapunitID": "3457453", "minCompDistance": 0.0, "nirrcapcl": "7", - "nirrcapscl": "s", + "nirrcapscl": "c", "nirrcapunit": "None", "rfvInfill": "No", "sdeURL": "", "seeURL": "", - "slope": 4.0, - "taxsubgrp": "Typic Torriorthents", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Gunsight", - "name": "Gunsight2", - "rank_loc": "Not Displayed", - "score_loc": 0.18 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14185602", - "componentKind": "Series", - "componentPct": 8, - "dataSource": "STATSGO", - "distance": 353.554689070506, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "660584", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "Yes", - "sdeURL": "", - "seeURL": "", - "slope": 5.0, - "taxsubgrp": "Typic Haplocalcids", + "slope": 3.0, + "taxsubgrp": "None", "textureInfill": "No" }, "siteDescription": "" @@ -792,289 +242,80 @@ }, "soilRank": [ { - "component": "Carrizo", + "component": "Torriorthents", "componentData": "Missing Data", - "componentID": 14185605, - "name": "Carrizo3", + "componentID": 27420738, + "name": "Torriorthents", "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", + "rank_data": "1", + "rank_data_group": "1", "rank_data_loc": "1", "rank_data_loc_group": "1", - "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "score_data": 0.752, - "score_data_group": 0.752, - "score_data_loc": 0.511, - "score_data_loc_group": 0.511, - "score_loc": 0.269, - "score_loc_group": 0.269 + "rank_loc": 1, + "rank_loc_group": 1, + "score_data": 0.365, + "score_data_group": 0.365, + "score_data_loc": 0.408, + "score_data_loc_group": 0.408, + "score_loc": 0.45, + "score_loc_group": 0.45 }, { - "component": "Gunsight", + "component": "Haplocalcids", "componentData": "Missing Data", - "componentID": 14185636, - "name": "Gunsight", + "componentID": 27420741, + "name": "Haplocalcids", "not_displayed": false, "rank_data": "2", "rank_data_group": "2", "rank_data_loc": "2", "rank_data_loc_group": "2", - "rank_loc": "2", - "rank_loc_group": "2", - "score_data": 0.793, - "score_data_group": 0.793, - "score_data_loc": 0.487, - "score_data_loc_group": 0.487, - "score_loc": 0.18, - "score_loc_group": 0.18 + "rank_loc": 4, + "rank_loc_group": 4, + "score_data": 0.281, + "score_data_group": 0.281, + "score_data_loc": 0.19, + "score_data_loc_group": 0.19, + "score_loc": 0.1, + "score_loc_group": 0.1 }, { - "component": "Chuckawalla", + "component": "Torripsamments", "componentData": "Missing Data", - "componentID": 14185642, - "name": "Chuckawalla", + "componentID": 27420739, + "name": "Torripsamments", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", + "rank_data": "3", + "rank_data_group": "3", "rank_data_loc": "3", "rank_data_loc_group": "3", - "rank_loc": "3", - "rank_loc_group": "3", - "score_data": 0.804, - "score_data_group": 0.804, - "score_data_loc": 0.427, - "score_data_loc_group": 0.427, - "score_loc": 0.051, - "score_loc_group": 0.051 + "rank_loc": 2, + "rank_loc_group": 2, + "score_data": 0.058, + "score_data_group": 0.058, + "score_data_loc": 0.179, + "score_data_loc_group": 0.179, + "score_loc": 0.3, + "score_loc_group": 0.3 }, { - "component": "Gilman", + "component": "Haplargids", "componentData": "Missing Data", - "componentID": 14185646, - "name": "Gilman", + "componentID": 27420740, + "name": "Haplargids", "not_displayed": false, "rank_data": "4", "rank_data_group": "4", "rank_data_loc": "4", "rank_data_loc_group": "4", - "rank_loc": "7", - "rank_loc_group": "7", - "score_data": 0.746, - "score_data_group": 0.746, - "score_data_loc": 0.386, - "score_data_loc_group": 0.386, - "score_loc": 0.026, - "score_loc_group": 0.026 - }, - { - "component": "Cipriano", - "componentData": "Missing Data", - "componentID": 14185643, - "name": "Cipriano", - "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", - "rank_data_loc": "5", - "rank_data_loc_group": "5", - "rank_loc": "5", - "rank_loc_group": "5", - "score_data": 0.733, - "score_data_group": 0.733, - "score_data_loc": 0.38, - "score_data_loc_group": 0.38, - "score_loc": 0.026, - "score_loc_group": 0.026 - }, - { - "component": "Antho", - "componentData": "Missing Data", - "componentID": 14185610, - "name": "Antho", - "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", - "rank_data_loc": "6", - "rank_data_loc_group": "6", - "rank_loc": "9", - "rank_loc_group": "9", - "score_data": 0.746, - "score_data_group": 0.746, - "score_data_loc": 0.378, - "score_data_loc_group": 0.378, - "score_loc": 0.009, - "score_loc_group": 0.009 - }, - { - "component": "Mohall", - "componentData": "Missing Data", - "componentID": 14185644, - "name": "Mohall", - "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", - "rank_data_loc": "7", - "rank_data_loc_group": "7", - "rank_loc": "8", - "rank_loc_group": "8", - "score_data": 0.726, - "score_data_group": 0.726, - "score_data_loc": 0.376, - "score_data_loc_group": 0.376, - "score_loc": 0.026, - "score_loc_group": 0.026 - }, - { - "component": "Indio", - "componentData": "Missing Data", - "componentID": 14185607, - "name": "Indio", - "not_displayed": false, - "rank_data": "8", - "rank_data_group": "8", - "rank_data_loc": "8", - "rank_data_loc_group": "8", - "rank_loc": "11", - "rank_loc_group": "11", - "score_data": 0.723, - "score_data_group": 0.723, - "score_data_loc": 0.364, - "score_data_loc_group": 0.364, - "score_loc": 0.005, - "score_loc_group": 0.005 - }, - { - "component": "Lethent", - "componentData": "Missing Data", - "componentID": 14185608, - "name": "Lethent", - "not_displayed": false, - "rank_data": "9", - "rank_data_group": "9", - "rank_data_loc": "9", - "rank_data_loc_group": "9", - "rank_loc": "12", - "rank_loc_group": "12", - "score_data": 0.722, - "score_data_group": 0.722, - "score_data_loc": 0.364, - "score_data_loc_group": 0.364, - "score_loc": 0.005, - "score_loc_group": 0.005 - }, - { - "component": "Beeline", - "componentData": "Missing Data", - "componentID": 14185640, - "name": "Beeline", - "not_displayed": false, - "rank_data": "11", - "rank_data_group": "11", - "rank_data_loc": "10", - "rank_data_loc_group": "10", - "rank_loc": "4", - "rank_loc_group": "4", - "score_data": 0.695, - "score_data_group": 0.695, - "score_data_loc": 0.36, - "score_data_loc_group": 0.36, - "score_loc": 0.026, - "score_loc_group": 0.026 - }, - { - "component": "Aco", - "componentData": "Missing Data", - "componentID": 14185609, - "name": "Aco", - "not_displayed": false, - "rank_data": "10", - "rank_data_group": "10", - "rank_data_loc": "11", - "rank_data_loc_group": "11", - "rank_loc": "10", - "rank_loc_group": "10", - "score_data": 0.715, - "score_data_group": 0.715, - "score_data_loc": 0.36, - "score_data_loc_group": 0.36, - "score_loc": 0.005, - "score_loc_group": 0.005 - }, - { - "component": "Denure", - "componentData": "Missing Data", - "componentID": 14185639, - "name": "Denure", - "not_displayed": false, - "rank_data": "12", - "rank_data_group": "12", - "rank_data_loc": "12", - "rank_data_loc_group": "12", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.687, - "score_data_group": 0.687, - "score_data_loc": 0.356, - "score_data_loc_group": 0.356, - "score_loc": 0.026, - "score_loc_group": 0.026 - }, - { - "component": "Carrizo", - "componentData": "Missing Data", - "componentID": 14185637, - "name": "Carrizo", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "3", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "1", - "rank_loc": "1", - "rank_loc_group": "1", - "score_data": 0.723, - "score_data_group": 0.752, - "score_data_loc": 0.496, - "score_data_loc_group": 0.511, - "score_loc": 0.269, - "score_loc_group": 0.269 - }, - { - "component": "Carrizo", - "componentData": "Missing Data", - "componentID": 14185597, - "name": "Carrizo2", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "3", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "1", - "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "score_data": 0.681, - "score_data_group": 0.752, - "score_data_loc": 0.475, - "score_data_loc_group": 0.511, - "score_loc": 0.269, - "score_loc_group": 0.269 - }, - { - "component": "Gunsight", - "componentData": "Missing Data", - "componentID": 14185602, - "name": "Gunsight2", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "2", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "2", - "rank_loc": "Not Displayed", - "rank_loc_group": "2", - "score_data": 0.768, - "score_data_group": 0.793, - "score_data_loc": 0.474, - "score_data_loc_group": 0.487, - "score_loc": 0.18, - "score_loc_group": 0.18 + "rank_loc": 3, + "rank_loc_group": 3, + "score_data": 0.001, + "score_data_group": 0.001, + "score_data_loc": 0.075, + "score_data_loc_group": 0.075, + "score_loc": 0.15, + "score_loc_group": 0.15 } ] } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[35.59918,-120.491439].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[35.59918,-120.491439].json index bc3b64e..8583b38 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[35.59918,-120.491439].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[35.59918,-120.491439].json @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26027166", + "componentID": "26734862", "componentKind": "Series", "componentPct": 45, "dataSource": "SSURGO", @@ -82,7 +82,7 @@ "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#balcom", "slope": 40.0, "taxsubgrp": "Calcixerollic Xerochrepts", - "textureInfill": "No" + "textureInfill": "Yes" }, "siteDescription": "The Balcom series consists of moderately deep, well drained soils that formed in material that weathered from soft, calcareous shale and sandstone. Balcom soils are on hills and have slopes of 5 to 75 percent. The mean annual precipitation is about 18 inches and the mean annual air temperature is about 61 degrees F." }, @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26027683", + "componentID": "26735232", "componentKind": "Series", "componentPct": 20, "dataSource": "SSURGO", @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26027125", + "componentID": "26734851", "componentKind": "Series", "componentPct": 45, "dataSource": "SSURGO", @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26027715", + "componentID": "26735225", "componentKind": "Series", "componentPct": 20, "dataSource": "SSURGO", @@ -268,76 +268,76 @@ { "component": "Balcom", "componentData": "Data Complete", - "componentID": 26027125, + "componentID": 26734851, "name": "Balcom3", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", + "rank_data": "2", + "rank_data_group": "2", "rank_data_loc": "1", "rank_data_loc_group": "1", "rank_loc": "Not Displayed", "rank_loc_group": "1", - "score_data": 0.552, - "score_data_group": 0.552, - "score_data_loc": 0.402, - "score_data_loc_group": 0.402, + "score_data": 0.541, + "score_data_group": 0.541, + "score_data_loc": 0.396, + "score_data_loc_group": 0.396, "score_loc": 0.252, "score_loc_group": 0.252 }, { "component": "Los osos", "componentData": NaN, - "componentID": 26027715, + "componentID": 26735225, "name": "Los osos2", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "1", + "rank_data_group": "1", "rank_data_loc": "2", "rank_data_loc_group": "2", "rank_loc": "Not Displayed", "rank_loc_group": "2", - "score_data": 0.535, - "score_data_group": 0.535, - "score_data_loc": 0.33, - "score_data_loc_group": 0.33, + "score_data": 0.558, + "score_data_group": 0.558, + "score_data_loc": 0.341, + "score_data_loc_group": 0.341, "score_loc": 0.125, "score_loc_group": 0.125 }, { "component": "Balcom", - "componentData": "Data Complete", - "componentID": 26027166, + "componentData": NaN, + "componentID": 26734862, "name": "Balcom2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "1", + "rank_data_group": "2", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "1", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.345, - "score_data_group": 0.552, - "score_data_loc": 0.299, - "score_data_loc_group": 0.402, + "score_data": 0.37, + "score_data_group": 0.541, + "score_data_loc": 0.311, + "score_data_loc_group": 0.396, "score_loc": 0.252, "score_loc_group": 0.252 }, { "component": "Los osos", "componentData": NaN, - "componentID": 26027683, + "componentID": 26735232, "name": "Los osos", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "2", + "rank_data_group": "1", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "2", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.37, - "score_data_group": 0.535, - "score_data_loc": 0.248, - "score_data_loc_group": 0.33, + "score_data": 0.363, + "score_data_group": 0.558, + "score_data_loc": 0.244, + "score_data_loc_group": 0.341, "score_loc": 0.125, "score_loc_group": 0.125 } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[37.422,-122.084].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[37.422,-122.084].json index 5445f66..48f4cb3 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[37.422,-122.084].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[37.422,-122.084].json @@ -41,13 +41,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R014XG903CA" + "R014XG904CA" ], "ecoclassname": [ - "Salt Marsh" + "Dry Clayey Bottom" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/014X/R014XG903CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/014X/R014XG904CA" ] } }, @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26038467", + "componentID": "26701950", "componentKind": "Series", "componentPct": 25, "dataSource": "SSURGO", @@ -97,13 +97,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R014XG903CA" + "" ], "ecoclassname": [ - "Salt Marsh" + "" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/014X/R014XG903CA" + "" ] } }, @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26038503", + "componentID": "26701975", "componentKind": "Taxon above family", "componentPct": 100, "dataSource": "SSURGO", @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26038456", + "componentID": "26701978", "componentKind": "Family", "componentPct": 95, "dataSource": "SSURGO", @@ -209,13 +209,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R014XG904CA" + "R014XG903CA" ], "ecoclassname": [ - "Dry Clayey Bottom" + "Salt Marsh" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/014X/R014XG904CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/014X/R014XG903CA" ] } }, @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26038466", + "componentID": "26701951", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -265,13 +265,13 @@ "esd": { "ESD": { "ecoclassid": [ - "" + "R014XG903CA" ], "ecoclassname": [ - "" + "Salt Marsh" ], "edit_url": [ - "" + "https://edit.sc.egov.usda.gov/catalogs/esd/014X/R014XG903CA" ] } }, @@ -288,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26038468", + "componentID": "26701953", "componentKind": "Taxadjunct", "componentPct": 2, "dataSource": "SSURGO", @@ -344,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26038464", + "componentID": "26701952", "componentKind": "Series", "componentPct": 1, "dataSource": "SSURGO", @@ -400,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26038454", + "componentID": "26701976", "componentKind": "Taxon above family", "componentPct": 100, "dataSource": "SSURGO", @@ -436,7 +436,7 @@ { "component": "Xerorthents", "componentData": "Data Complete", - "componentID": 26038503, + "componentID": 26701975, "name": "Xerorthents", "not_displayed": false, "rank_data": "1", @@ -445,17 +445,17 @@ "rank_data_loc_group": "1", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.76, - "score_data_group": 0.76, - "score_data_loc": 0.573, - "score_data_loc_group": 0.573, + "score_data": 0.75, + "score_data_group": 0.75, + "score_data_loc": 0.568, + "score_data_loc_group": 0.568, "score_loc": 0.386, "score_loc_group": 0.386 }, { "component": "Hangerone", "componentData": "Data Complete", - "componentID": 26038467, + "componentID": 26701950, "name": "Hangerone", "not_displayed": false, "rank_data": "6", @@ -464,17 +464,17 @@ "rank_data_loc_group": "2", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.554, - "score_data_group": 0.554, - "score_data_loc": 0.472, - "score_data_loc_group": 0.472, + "score_data": 0.534, + "score_data_group": 0.534, + "score_data_loc": 0.462, + "score_data_loc_group": 0.462, "score_loc": 0.39, "score_loc_group": 0.39 }, { "component": "Aquic xerorthents", - "componentData": "Missing Data", - "componentID": 26038456, + "componentData": "Data Complete", + "componentID": 26701978, "name": "Aquic xerorthents", "not_displayed": false, "rank_data": "3", @@ -491,32 +491,32 @@ "score_loc_group": 0.165 }, { - "component": "Embarcadero", + "component": "Bayshore", "componentData": "Missing Data", - "componentID": 26038464, - "name": "Embarcadero", + "componentID": 26701953, + "name": "Bayshore", "not_displayed": false, "rank_data": "2", "rank_data_group": "2", "rank_data_loc": "4", "rank_data_loc_group": "4", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.712, - "score_data_group": 0.712, - "score_data_loc": 0.362, - "score_data_loc_group": 0.362, - "score_loc": 0.012, - "score_loc_group": 0.012 + "rank_loc": "5", + "rank_loc_group": "5", + "score_data": 0.709, + "score_data_group": 0.709, + "score_data_loc": 0.364, + "score_data_loc_group": 0.364, + "score_loc": 0.019, + "score_loc_group": 0.019 }, { "component": "Clear lake", "componentData": "Missing Data", - "componentID": 26038466, + "componentID": 26701951, "name": "Clear lake", "not_displayed": false, - "rank_data": "4", - "rank_data_group": "4", + "rank_data": "5", + "rank_data_group": "5", "rank_data_loc": "5", "rank_data_loc_group": "5", "rank_loc": "4", @@ -529,28 +529,28 @@ "score_loc_group": 0.029 }, { - "component": "Bayshore", - "componentData": "Data Complete", - "componentID": 26038468, - "name": "Bayshore", + "component": "Embarcadero", + "componentData": "Missing Data", + "componentID": 26701952, + "name": "Embarcadero", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", + "rank_data": "4", + "rank_data_group": "4", "rank_data_loc": "6", "rank_data_loc_group": "6", - "rank_loc": "5", - "rank_loc_group": "5", - "score_data": 0.607, - "score_data_group": 0.607, - "score_data_loc": 0.313, - "score_data_loc_group": 0.313, - "score_loc": 0.019, - "score_loc_group": 0.019 + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.62, + "score_data_group": 0.62, + "score_data_loc": 0.316, + "score_data_loc_group": 0.316, + "score_loc": 0.012, + "score_loc_group": 0.012 }, { "component": "Xerorthents", "componentData": "Data Complete", - "componentID": 26038454, + "componentID": 26701976, "name": "Xerorthents2", "not_displayed": true, "rank_data": "Not Displayed", @@ -559,10 +559,10 @@ "rank_data_loc_group": "1", "rank_loc": "Not Displayed", "rank_loc_group": "2", - "score_data": 0.652, - "score_data_group": 0.76, - "score_data_loc": 0.519, - "score_data_loc_group": 0.573, + "score_data": 0.672, + "score_data_group": 0.75, + "score_data_loc": 0.529, + "score_data_loc_group": 0.568, "score_loc": 0.386, "score_loc_group": 0.386 } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[37.48216451,-99.55016693].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[37.48216451,-99.55016693].json index 979dea8..f28d357 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[37.48216451,-99.55016693].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[37.48216451,-99.55016693].json @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865345", + "componentID": "26356233", "componentKind": "Series", "componentPct": 90, "dataSource": "SSURGO", @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865346", + "componentID": "26356234", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -153,13 +153,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R073XY108KS" + "R073XY101KS" ], "ecoclassname": [ - "Loamy Floodplain" + "Limy Slopes" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY108KS" + "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY101KS" ] } }, @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865492", + "componentID": "26356379", "componentKind": "Series", "componentPct": 40, "dataSource": "SSURGO", @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865493", + "componentID": "26356377", "componentKind": "Taxadjunct", "componentPct": 45, "dataSource": "SSURGO", @@ -288,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865519", + "componentID": "26356404", "componentKind": "Series", "componentPct": 30, "dataSource": "SSURGO", @@ -321,13 +321,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R073XY100KS" + "R073XY101KS" ], "ecoclassname": [ - "Loamy Plains" + "Limy Slopes" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY100KS" + "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY101KS" ] } }, @@ -344,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865495", + "componentID": "26356380", "componentKind": "Series", "componentPct": 10, "dataSource": "SSURGO", @@ -400,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865344", + "componentID": "26356232", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -433,13 +433,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R073XY101KS" + "R073XY100KS" ], "ecoclassname": [ - "Limy Slopes" + "Loamy Plains" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY101KS" + "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY100KS" ] } }, @@ -456,7 +456,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865494", + "componentID": "26356378", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -489,13 +489,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R073XY100KS" + "R073XY101KS" ], "ecoclassname": [ - "Loamy Plains" + "Limy Slopes" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY100KS" + "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY101KS" ] } }, @@ -512,7 +512,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865551", + "componentID": "26356435", "componentKind": "Series", "componentPct": 4, "dataSource": "SSURGO", @@ -545,13 +545,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R073XY101KS" + "R073XY100KS" ], "ecoclassname": [ - "Limy Slopes" + "Loamy Plains" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY101KS" + "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY100KS" ] } }, @@ -568,7 +568,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865552", + "componentID": "26356437", "componentKind": "Taxon above family", "componentPct": 1, "dataSource": "SSURGO", @@ -624,7 +624,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865520", + "componentID": "26356405", "componentKind": "Series", "componentPct": 1, "dataSource": "SSURGO", @@ -680,7 +680,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865522", + "componentID": "26356407", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -713,13 +713,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R073XY101KS" + "R073XY100KS" ], "ecoclassname": [ - "Limy Slopes" + "Loamy Plains" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY101KS" + "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY100KS" ] } }, @@ -736,7 +736,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865550", + "componentID": "26356436", "componentKind": "Series", "componentPct": 95, "dataSource": "SSURGO", @@ -769,13 +769,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R073XY100KS" + "R073XY108KS" ], "ecoclassname": [ - "Loamy Plains" + "Loamy Floodplain" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY100KS" + "https://edit.sc.egov.usda.gov/catalogs/esd/073X/R073XY108KS" ] } }, @@ -792,7 +792,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865521", + "componentID": "26356408", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -848,7 +848,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25865523", + "componentID": "26356406", "componentKind": "Series", "componentPct": 65, "dataSource": "SSURGO", @@ -884,7 +884,7 @@ { "component": "Harney", "componentData": "Data Complete", - "componentID": 25865346, + "componentID": 26356234, "name": "Harney", "not_displayed": false, "rank_data": "4", @@ -893,40 +893,40 @@ "rank_data_loc_group": "1", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.649, - "score_data_group": 0.649, - "score_data_loc": 0.456, - "score_data_loc_group": 0.456, + "score_data": 0.65, + "score_data_group": 0.65, + "score_data_loc": 0.457, + "score_data_loc_group": 0.457, "score_loc": 0.263, "score_loc_group": 0.263 }, { "component": "Coly", "componentData": "Data Complete", - "componentID": 25865523, + "componentID": 26356406, "name": "Coly2", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", + "rank_data": "2", + "rank_data_group": "2", "rank_data_loc": "2", "rank_data_loc_group": "2", "rank_loc": "Not Displayed", "rank_loc_group": "3", - "score_data": 0.677, - "score_data_group": 0.677, - "score_data_loc": 0.446, - "score_data_loc_group": 0.446, + "score_data": 0.662, + "score_data_group": 0.662, + "score_data_loc": 0.439, + "score_data_loc_group": 0.439, "score_loc": 0.215, "score_loc_group": 0.215 }, { "component": "Uly", "componentData": "Data Complete", - "componentID": 25865522, + "componentID": 26356407, "name": "Uly2", "not_displayed": false, - "rank_data": "8", - "rank_data_group": "8", + "rank_data": "7", + "rank_data_group": "7", "rank_data_loc": "3", "rank_data_loc_group": "3", "rank_loc": "Not Displayed", @@ -941,11 +941,11 @@ { "component": "Penden", "componentData": "Data Complete", - "componentID": 25865344, + "componentID": 26356232, "name": "Penden", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "1", + "rank_data_group": "1", "rank_data_loc": "4", "rank_data_loc_group": "4", "rank_loc": "7", @@ -960,7 +960,7 @@ { "component": "Canlon", "componentData": "Data Complete", - "componentID": 25865520, + "componentID": 26356405, "name": "Canlon", "not_displayed": false, "rank_data": "3", @@ -977,32 +977,32 @@ "score_loc_group": 0.002 }, { - "component": "Case", + "component": "Wakeen", "componentData": "Data Complete", - "componentID": 25865495, - "name": "Case", + "componentID": 26356435, + "name": "Wakeen", "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", + "rank_data": "5", + "rank_data_group": "5", "rank_data_loc": "6", "rank_data_loc_group": "6", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.58, - "score_data_group": 0.58, - "score_data_loc": 0.302, - "score_data_loc_group": 0.302, - "score_loc": 0.023, - "score_loc_group": 0.023 + "rank_loc": "9", + "rank_loc_group": "9", + "score_data": 0.612, + "score_data_group": 0.612, + "score_data_loc": 0.311, + "score_data_loc_group": 0.311, + "score_loc": 0.01, + "score_loc_group": 0.01 }, { "component": "Aquolls", "componentData": "Data Complete", - "componentID": 25865552, + "componentID": 26356437, "name": "Aquolls", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", + "rank_data": "6", + "rank_data_group": "6", "rank_data_loc": "7", "rank_data_loc_group": "7", "rank_loc": "10", @@ -1014,67 +1014,67 @@ "score_loc": 0.003, "score_loc_group": 0.003 }, - { - "component": "Wakeen", - "componentData": "Missing Data", - "componentID": 25865551, - "name": "Wakeen", - "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", - "rank_data_loc": "8", - "rank_data_loc_group": "8", - "rank_loc": "9", - "rank_loc_group": "9", - "score_data": 0.585, - "score_data_group": 0.585, - "score_data_loc": 0.298, - "score_data_loc_group": 0.298, - "score_loc": 0.01, - "score_loc_group": 0.01 - }, { "component": "Tobin", "componentData": "Data Complete", - "componentID": 25865519, + "componentID": 26356404, "name": "Tobin", "not_displayed": false, "rank_data": "10", "rank_data_group": "10", - "rank_data_loc": "9", - "rank_data_loc_group": "9", + "rank_data_loc": "8", + "rank_data_loc_group": "8", "rank_loc": "5", "rank_loc_group": "5", "score_data": 0.538, "score_data_group": 0.538, - "score_data_loc": 0.298, - "score_data_loc_group": 0.298, + "score_data_loc": 0.297, + "score_data_loc_group": 0.297, "score_loc": 0.057, "score_loc_group": 0.057 }, { "component": "Bridgeport", "componentData": "Data Complete", - "componentID": 25865494, + "componentID": 26356378, "name": "Bridgeport", "not_displayed": false, - "rank_data": "9", - "rank_data_group": "9", - "rank_data_loc": "10", - "rank_data_loc_group": "10", + "rank_data": "8", + "rank_data_group": "8", + "rank_data_loc": "9", + "rank_data_loc_group": "9", "rank_loc": "8", "rank_loc_group": "8", - "score_data": 0.551, - "score_data_group": 0.551, - "score_data_loc": 0.282, - "score_data_loc_group": 0.282, + "score_data": 0.566, + "score_data_group": 0.566, + "score_data_loc": 0.289, + "score_data_loc_group": 0.289, "score_loc": 0.012, "score_loc_group": 0.012 }, + { + "component": "Case", + "componentData": "Data Complete", + "componentID": 26356380, + "name": "Case", + "not_displayed": false, + "rank_data": "9", + "rank_data_group": "9", + "rank_data_loc": "10", + "rank_data_loc_group": "10", + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.553, + "score_data_group": 0.553, + "score_data_loc": 0.288, + "score_data_loc_group": 0.288, + "score_loc": 0.023, + "score_loc_group": 0.023 + }, { "component": "Holdrege", "componentData": "Data Complete", - "componentID": 25865493, + "componentID": 26356377, "name": "Holdrege", "not_displayed": false, "rank_data": "11", @@ -1093,7 +1093,7 @@ { "component": "Harney", "componentData": "Data Complete", - "componentID": 25865521, + "componentID": 26356408, "name": "Harney3", "not_displayed": true, "rank_data": "Not Displayed", @@ -1103,20 +1103,20 @@ "rank_loc": "Not Displayed", "rank_loc_group": "2", "score_data": 0.585, - "score_data_group": 0.649, + "score_data_group": 0.65, "score_data_loc": 0.424, - "score_data_loc_group": 0.456, + "score_data_loc_group": 0.457, "score_loc": 0.263, "score_loc_group": 0.263 }, { "component": "Uly", "componentData": "Data Complete", - "componentID": 25865345, + "componentID": 26356233, "name": "Uly", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "8", + "rank_data_group": "7", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "3", "rank_loc": "1", @@ -1130,8 +1130,8 @@ }, { "component": "Harney", - "componentData": "Data Complete", - "componentID": 25865550, + "componentData": "Missing Data", + "componentID": 26356436, "name": "Harney2", "not_displayed": true, "rank_data": "Not Displayed", @@ -1141,28 +1141,28 @@ "rank_loc": "Not Displayed", "rank_loc_group": "2", "score_data": 0.55, - "score_data_group": 0.649, + "score_data_group": 0.65, "score_data_loc": 0.407, - "score_data_loc_group": 0.456, + "score_data_loc_group": 0.457, "score_loc": 0.263, "score_loc_group": 0.263 }, { "component": "Coly", "componentData": "Data Complete", - "componentID": 25865492, + "componentID": 26356379, "name": "Coly", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "1", + "rank_data_group": "2", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "2", "rank_loc": "3", "rank_loc_group": "3", "score_data": 0.597, - "score_data_group": 0.677, + "score_data_group": 0.662, "score_data_loc": 0.406, - "score_data_loc_group": 0.446, + "score_data_loc_group": 0.439, "score_loc": 0.215, "score_loc_group": 0.215 } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[39.26009312,-85.50621214].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[39.26009312,-85.50621214].json index c70dc9a..025084d 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[39.26009312,-85.50621214].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[39.26009312,-85.50621214].json @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325347", + "componentID": "26772442", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325308", + "componentID": "26772402", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325331", + "componentID": "26772425", "componentKind": "Series", "componentPct": 87, "dataSource": "SSURGO", @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325341", + "componentID": "26772436", "componentKind": "Series", "componentPct": 9, "dataSource": "SSURGO", @@ -288,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325348", + "componentID": "26772441", "componentKind": "Series", "componentPct": 3, "dataSource": "SSURGO", @@ -321,13 +321,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F111XA007IN" + "F111XA008IN" ], "ecoclassname": [ - "Till Depression Flatwood" + "Wet Till Ridge" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/111X/F111XA007IN" + "https://edit.sc.egov.usda.gov/catalogs/esd/111X/F111XA008IN" ] } }, @@ -344,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325342", + "componentID": "26772434", "componentKind": "Series", "componentPct": 4, "dataSource": "SSURGO", @@ -377,13 +377,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F111XA009IN" + "F111XA007IN" ], "ecoclassname": [ - "Till Ridge" + "Till Depression Flatwood" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/111X/F111XA009IN" + "https://edit.sc.egov.usda.gov/catalogs/esd/111X/F111XA007IN" ] } }, @@ -400,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325406", + "componentID": "26772498", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -433,13 +433,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F111XA007IN" + "F111XA009IN" ], "ecoclassname": [ - "Till Depression Flatwood" + "Till Ridge" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/111X/F111XA007IN" + "https://edit.sc.egov.usda.gov/catalogs/esd/111X/F111XA009IN" ] } }, @@ -456,7 +456,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325333", + "componentID": "26772424", "componentKind": "Series", "componentPct": 4, "dataSource": "SSURGO", @@ -512,7 +512,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325330", + "componentID": "26772426", "componentKind": "Series", "componentPct": 3, "dataSource": "SSURGO", @@ -568,7 +568,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325332", + "componentID": "26772423", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -624,7 +624,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325329", + "componentID": "26772427", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -680,7 +680,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325334", + "componentID": "26772428", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -736,7 +736,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325325", + "componentID": "26772420", "componentKind": "Series", "componentPct": 90, "dataSource": "SSURGO", @@ -792,7 +792,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325355", + "componentID": "26772448", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -848,7 +848,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325351", + "componentID": "26772444", "componentKind": "Series", "componentPct": 4, "dataSource": "SSURGO", @@ -904,7 +904,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325353", + "componentID": "26772446", "componentKind": "Series", "componentPct": 7, "dataSource": "SSURGO", @@ -937,13 +937,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F111XA008IN" + "F111XA007IN" ], "ecoclassname": [ - "Wet Till Ridge" + "Till Depression Flatwood" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/111X/F111XA008IN" + "https://edit.sc.egov.usda.gov/catalogs/esd/111X/F111XA007IN" ] } }, @@ -960,7 +960,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25325310", + "componentID": "26772403", "componentKind": "Series", "componentPct": 10, "dataSource": "SSURGO", @@ -996,26 +996,26 @@ { "component": "Fincastle", "componentData": "Data Complete", - "componentID": 25325308, + "componentID": 26772402, "name": "Fincastle", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", + "rank_data": "2", + "rank_data_group": "2", "rank_data_loc": "1", "rank_data_loc_group": "1", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.671, - "score_data_group": 0.671, - "score_data_loc": 0.363, - "score_data_loc_group": 0.363, + "score_data": 0.653, + "score_data_group": 0.653, + "score_data_loc": 0.353, + "score_data_loc_group": 0.353, "score_loc": 0.054, "score_loc_group": 0.054 }, { "component": "Crosby", "componentData": "Data Complete", - "componentID": 25325341, + "componentID": 26772436, "name": "Crosby", "not_displayed": false, "rank_data": "3", @@ -1024,21 +1024,21 @@ "rank_data_loc_group": "2", "rank_loc": "4", "rank_loc_group": "4", - "score_data": 0.662, - "score_data_group": 0.662, - "score_data_loc": 0.355, - "score_data_loc_group": 0.355, + "score_data": 0.651, + "score_data_group": 0.651, + "score_data_loc": 0.349, + "score_data_loc_group": 0.349, "score_loc": 0.048, "score_loc_group": 0.048 }, { "component": "Bonnell", "componentData": "Data Complete", - "componentID": 25325330, + "componentID": 26772426, "name": "Bonnell", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "1", + "rank_data_group": "1", "rank_data_loc": "3", "rank_data_loc_group": "3", "rank_loc": "9", @@ -1051,104 +1051,104 @@ "score_loc_group": 0.002 }, { - "component": "Holton", + "component": "Grayford", "componentData": "Data Complete", - "componentID": 25325333, - "name": "Holton", + "componentID": 26772427, + "name": "Grayford", "not_displayed": false, "rank_data": "4", "rank_data_group": "4", "rank_data_loc": "4", "rank_data_loc_group": "4", - "rank_loc": "8", - "rank_loc_group": "8", - "score_data": 0.643, - "score_data_group": 0.643, - "score_data_loc": 0.323, - "score_data_loc_group": 0.323, - "score_loc": 0.002, - "score_loc_group": 0.002 + "rank_loc": "11", + "rank_loc_group": "11", + "score_data": 0.648, + "score_data_group": 0.648, + "score_data_loc": 0.325, + "score_data_loc_group": 0.325, + "score_loc": 0.001, + "score_loc_group": 0.001 }, { - "component": "Grayford", + "component": "Hennepin", "componentData": "Data Complete", - "componentID": 25325329, - "name": "Grayford", + "componentID": 26772442, + "name": "Hennepin", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", + "rank_data": "9", + "rank_data_group": "9", "rank_data_loc": "5", "rank_data_loc_group": "5", - "rank_loc": "11", - "rank_loc_group": "11", - "score_data": 0.637, - "score_data_group": 0.637, - "score_data_loc": 0.319, - "score_data_loc_group": 0.319, - "score_loc": 0.001, - "score_loc_group": 0.001 + "rank_loc": "1", + "rank_loc_group": "1", + "score_data": 0.582, + "score_data_group": 0.582, + "score_data_loc": 0.322, + "score_data_loc_group": 0.322, + "score_loc": 0.061, + "score_loc_group": 0.061 }, { - "component": "Brookston", + "component": "Holton", "componentData": "Data Complete", - "componentID": 25325342, - "name": "Brookston", + "componentID": 26772424, + "name": "Holton", "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", + "rank_data": "5", + "rank_data_group": "5", "rank_data_loc": "6", "rank_data_loc_group": "6", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.61, - "score_data_group": 0.61, - "score_data_loc": 0.31, - "score_data_loc_group": 0.31, - "score_loc": 0.009, - "score_loc_group": 0.009 + "rank_loc": "8", + "rank_loc_group": "8", + "score_data": 0.634, + "score_data_group": 0.634, + "score_data_loc": 0.318, + "score_data_loc_group": 0.318, + "score_loc": 0.002, + "score_loc_group": 0.002 }, { "component": "Cyclone", "componentData": "Data Complete", - "componentID": 25325348, + "componentID": 26772441, "name": "Cyclone", "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", + "rank_data": "6", + "rank_data_group": "6", "rank_data_loc": "7", "rank_data_loc_group": "7", "rank_loc": "5", "rank_loc_group": "5", - "score_data": 0.596, - "score_data_group": 0.596, - "score_data_loc": 0.303, - "score_data_loc_group": 0.303, + "score_data": 0.614, + "score_data_group": 0.614, + "score_data_loc": 0.312, + "score_data_loc_group": 0.312, "score_loc": 0.011, "score_loc_group": 0.011 }, { - "component": "Hennepin", + "component": "Brookston", "componentData": "Data Complete", - "componentID": 25325355, - "name": "Hennepin3", + "componentID": 26772434, + "name": "Brookston", "not_displayed": false, - "rank_data": "10", - "rank_data_group": "10", + "rank_data": "7", + "rank_data_group": "7", "rank_data_loc": "8", "rank_data_loc_group": "8", - "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "score_data": 0.54, - "score_data_group": 0.54, - "score_data_loc": 0.301, - "score_data_loc_group": 0.301, - "score_loc": 0.061, - "score_loc_group": 0.061 + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.61, + "score_data_group": 0.61, + "score_data_loc": 0.31, + "score_data_loc_group": 0.31, + "score_loc": 0.009, + "score_loc_group": 0.009 }, { "component": "Cincinnati", "componentData": "Data Complete", - "componentID": 25325332, + "componentID": 26772423, "name": "Cincinnati", "not_displayed": false, "rank_data": "8", @@ -1167,11 +1167,11 @@ { "component": "Celina", "componentData": "Data Complete", - "componentID": 25325406, + "componentID": 26772498, "name": "Celina", "not_displayed": false, - "rank_data": "9", - "rank_data_group": "9", + "rank_data": "10", + "rank_data_group": "10", "rank_data_loc": "10", "rank_data_loc_group": "10", "rank_loc": "7", @@ -1186,7 +1186,7 @@ { "component": "Hickory", "componentData": "Data Complete", - "componentID": 25325331, + "componentID": 26772425, "name": "Hickory", "not_displayed": false, "rank_data": "12", @@ -1205,7 +1205,7 @@ { "component": "Jessietown", "componentData": "Data Complete", - "componentID": 25325334, + "componentID": 26772428, "name": "Jessietown", "not_displayed": false, "rank_data": "11", @@ -1214,18 +1214,18 @@ "rank_data_loc_group": "12", "rank_loc": "12", "rank_loc_group": "12", - "score_data": 0.522, - "score_data_group": 0.522, - "score_data_loc": 0.262, - "score_data_loc_group": 0.262, + "score_data": 0.531, + "score_data_group": 0.531, + "score_data_loc": 0.266, + "score_data_loc_group": 0.266, "score_loc": 0.001, "score_loc_group": 0.001 }, { "component": "Crosby", "componentData": "Data Complete", - "componentID": 25325353, - "name": "Crosby3", + "componentID": 26772444, + "name": "Crosby2", "not_displayed": true, "rank_data": "Not Displayed", "rank_data_group": "3", @@ -1233,18 +1233,18 @@ "rank_data_loc_group": "2", "rank_loc": "Not Displayed", "rank_loc_group": "4", - "score_data": 0.654, - "score_data_group": 0.662, - "score_data_loc": 0.351, - "score_data_loc_group": 0.355, + "score_data": 0.609, + "score_data_group": 0.651, + "score_data_loc": 0.328, + "score_data_loc_group": 0.349, "score_loc": 0.048, "score_loc_group": 0.048 }, { "component": "Crosby", "componentData": "Data Complete", - "componentID": 25325351, - "name": "Crosby2", + "componentID": 26772446, + "name": "Crosby3", "not_displayed": true, "rank_data": "Not Displayed", "rank_data_group": "3", @@ -1252,67 +1252,67 @@ "rank_data_loc_group": "2", "rank_loc": "Not Displayed", "rank_loc_group": "4", - "score_data": 0.609, - "score_data_group": 0.662, - "score_data_loc": 0.328, - "score_data_loc_group": 0.355, + "score_data": 0.597, + "score_data_group": 0.651, + "score_data_loc": 0.322, + "score_data_loc_group": 0.349, "score_loc": 0.048, "score_loc_group": 0.048 }, { "component": "Hennepin", "componentData": "Data Complete", - "componentID": 25325325, - "name": "Hennepin2", + "componentID": 26772448, + "name": "Hennepin3", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "10", + "rank_data_group": "9", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "8", + "rank_data_loc_group": "5", "rank_loc": "Not Displayed", "rank_loc_group": "1", - "score_data": 0.536, - "score_data_group": 0.54, - "score_data_loc": 0.299, - "score_data_loc_group": 0.301, + "score_data": 0.54, + "score_data_group": 0.582, + "score_data_loc": 0.301, + "score_data_loc_group": 0.322, "score_loc": 0.061, "score_loc_group": 0.061 }, { "component": "Hennepin", "componentData": "Data Complete", - "componentID": 25325347, - "name": "Hennepin", + "componentID": 26772420, + "name": "Hennepin2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "10", + "rank_data_group": "9", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "8", - "rank_loc": "1", + "rank_data_loc_group": "5", + "rank_loc": "Not Displayed", "rank_loc_group": "1", - "score_data": 0.525, - "score_data_group": 0.54, - "score_data_loc": 0.293, - "score_data_loc_group": 0.301, + "score_data": 0.536, + "score_data_group": 0.582, + "score_data_loc": 0.299, + "score_data_loc_group": 0.322, "score_loc": 0.061, "score_loc_group": 0.061 }, { "component": "Cyclone", "componentData": "Data Complete", - "componentID": 25325310, + "componentID": 26772403, "name": "Cyclone2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "7", + "rank_data_group": "6", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "7", "rank_loc": "Not Displayed", "rank_loc_group": "5", "score_data": 0.555, - "score_data_group": 0.596, + "score_data_group": 0.614, "score_data_loc": 0.283, - "score_data_loc_group": 0.303, + "score_data_loc_group": 0.312, "score_loc": 0.011, "score_loc_group": 0.011 } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[42.494912,-123.064531].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[42.494912,-123.064531].json index 54bd61f..e45e872 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[42.494912,-123.064531].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[42.494912,-123.064531].json @@ -4,11 +4,11 @@ "Soil Data Value": [ [ "rfv_class_30", - 1.490207948287594 + 1.4893140246267844 ], [ "rfv_class_0", - 0.8817108392902311 + 0.8825277371828062 ], [ "texture_0", @@ -41,13 +41,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F005XZ018CA" + "F005XZ014CA" ], "ecoclassname": [ - "Moderately Deep Gravelly Mesic Mountains 40-60Ppt" + "Mesic Mountains <40Ppt" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ018CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ014CA" ] } }, @@ -55,7 +55,7 @@ "component": "Ruch", "name": "Ruch", "rank_loc": "1", - "score_loc": 0.267 + "score_loc": 0.266 }, "lab": {}, "munsell": {}, @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443415", + "componentID": "27529401", "componentKind": "Series", "componentPct": 80, "dataSource": "SSURGO", @@ -97,13 +97,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F005XZ018CA" + "F005XZ014CA" ], "ecoclassname": [ - "Moderately Deep Gravelly Mesic Mountains 40-60Ppt" + "Mesic Mountains <40Ppt" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ018CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ014CA" ] } }, @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443480", + "componentID": "27529336", "componentKind": "Series", "componentPct": 40, "dataSource": "SSURGO", @@ -153,13 +153,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F005XZ003CA" + "F005XZ024CA" ], "ecoclassname": [ - "Terraces" + "Ridges" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ003CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ024CA" ] } }, @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443548", + "componentID": "27529265", "componentKind": "Series", "componentPct": 83, "dataSource": "SSURGO", @@ -209,13 +209,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F005XZ024CA" + "R005XY016OR" ], "ecoclassname": [ - "Ridges" + "Poorly Drained Bottom" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ024CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/R005XY016OR" ] } }, @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443598", + "componentID": "27529223", "componentKind": "Series", "componentPct": 60, "dataSource": "SSURGO", @@ -288,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443287", + "componentID": "27529518", "componentKind": "Series", "componentPct": 55, "dataSource": "SSURGO", @@ -321,13 +321,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F005XZ014CA" + "F005XZ018CA" ], "ecoclassname": [ - "Mesic Mountains <40Ppt" + "Moderately Deep Gravelly Mesic Mountains 40-60Ppt" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ014CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ018CA" ] } }, @@ -344,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443286", + "componentID": "27529517", "componentKind": "Series", "componentPct": 30, "dataSource": "SSURGO", @@ -377,13 +377,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F005XZ014CA" + "F005XZ018CA" ], "ecoclassname": [ - "Mesic Mountains <40Ppt" + "Moderately Deep Gravelly Mesic Mountains 40-60Ppt" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ014CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ018CA" ] } }, @@ -400,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443850", + "componentID": "27529611", "componentKind": "Series", "componentPct": 30, "dataSource": "SSURGO", @@ -433,13 +433,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F005XZ024CA" + "F005XZ009CA" ], "ecoclassname": [ - "Ridges" + "Very Deep Mesic Hills 40-60Ppt" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ024CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ009CA" ] } }, @@ -456,7 +456,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443597", + "componentID": "27529224", "componentKind": "Series", "componentPct": 20, "dataSource": "SSURGO", @@ -489,13 +489,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F005XZ009CA" + "F005XZ024CA" ], "ecoclassname": [ - "Very Deep Mesic Hills 40-60Ppt" + "Ridges" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ009CA" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ024CA" ] } }, @@ -512,7 +512,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443414", + "componentID": "27529400", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -545,13 +545,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R005XY016OR" + "F005XZ003CA" ], "ecoclassname": [ - "Poorly Drained Bottom" + "Terraces" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/005X/R005XY016OR" + "https://edit.sc.egov.usda.gov/catalogs/esd/005X/F005XZ003CA" ] } }, @@ -568,7 +568,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443848", + "componentID": "27529612", "componentKind": "Series", "componentPct": 55, "dataSource": "SSURGO", @@ -604,121 +604,121 @@ { "component": "Ruch", "componentData": "Data Complete", - "componentID": 25443415, + "componentID": 27529401, "name": "Ruch", "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", + "rank_data": "5", + "rank_data_group": "5", "rank_data_loc": "1", "rank_data_loc_group": "1", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.671, - "score_data_group": 0.671, - "score_data_loc": 0.469, - "score_data_loc_group": 0.469, - "score_loc": 0.267, - "score_loc_group": 0.267 + "score_data": 0.54, + "score_data_group": 0.54, + "score_data_loc": 0.403, + "score_data_loc_group": 0.403, + "score_loc": 0.266, + "score_loc_group": 0.266 }, { "component": "Josephine", "componentData": NaN, - "componentID": 25443848, + "componentID": 27529612, "name": "Josephine2", "not_displayed": false, - "rank_data": "4", - "rank_data_group": "4", + "rank_data": "2", + "rank_data_group": "2", "rank_data_loc": "2", "rank_data_loc_group": "2", "rank_loc": "Not Displayed", "rank_loc_group": "2", - "score_data": 0.664, - "score_data_group": 0.664, - "score_data_loc": 0.395, - "score_data_loc_group": 0.395, + "score_data": 0.669, + "score_data_group": 0.669, + "score_data_loc": 0.397, + "score_data_loc_group": 0.397, "score_loc": 0.125, "score_loc_group": 0.125 }, { "component": "Abegg", "componentData": "Data Complete", - "componentID": 25443548, + "componentID": 27529265, "name": "Abegg", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "1", + "rank_data_group": "1", "rank_data_loc": "3", "rank_data_loc_group": "3", "rank_loc": "3", "rank_loc_group": "3", - "score_data": 0.709, - "score_data_group": 0.709, - "score_data_loc": 0.389, - "score_data_loc_group": 0.389, + "score_data": 0.708, + "score_data_group": 0.708, + "score_data_loc": 0.388, + "score_data_loc_group": 0.388, "score_loc": 0.069, "score_loc_group": 0.069 }, - { - "component": "Gregory", - "componentData": "Data Complete", - "componentID": 25443414, - "name": "Gregory", - "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", - "rank_data_loc": "4", - "rank_data_loc_group": "4", - "rank_loc": "9", - "rank_loc_group": "9", - "score_data": 0.746, - "score_data_group": 0.746, - "score_data_loc": 0.376, - "score_data_loc_group": 0.376, - "score_loc": 0.007, - "score_loc_group": 0.007 - }, { "component": "Pollard", "componentData": NaN, - "componentID": 25443850, + "componentID": 27529611, "name": "Pollard", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", - "rank_data_loc": "5", - "rank_data_loc_group": "5", + "rank_data": "3", + "rank_data_group": "3", + "rank_data_loc": "4", + "rank_data_loc_group": "4", "rank_loc": "7", "rank_loc_group": "7", - "score_data": 0.626, - "score_data_group": 0.626, - "score_data_loc": 0.326, - "score_data_loc_group": 0.326, + "score_data": 0.665, + "score_data_group": 0.665, + "score_data_loc": 0.345, + "score_data_loc_group": 0.345, "score_loc": 0.025, "score_loc_group": 0.025 }, { - "component": "Offenbacher", + "component": "Gregory", "componentData": "Data Complete", - "componentID": 25443597, - "name": "Offenbacher", + "componentID": 27529400, + "name": "Gregory", + "not_displayed": false, + "rank_data": "4", + "rank_data_group": "4", + "rank_data_loc": "5", + "rank_data_loc_group": "5", + "rank_loc": "9", + "rank_loc_group": "9", + "score_data": 0.615, + "score_data_group": 0.615, + "score_data_loc": 0.311, + "score_data_loc_group": 0.311, + "score_loc": 0.007, + "score_loc_group": 0.007 + }, + { + "component": "Colestine", + "componentData": "Data Complete", + "componentID": 27529517, + "name": "Colestine", "not_displayed": false, "rank_data": "6", "rank_data_group": "6", "rank_data_loc": "6", "rank_data_loc_group": "6", - "rank_loc": "8", - "rank_loc_group": "8", - "score_data": 0.473, - "score_data_group": 0.473, - "score_data_loc": 0.245, - "score_data_loc_group": 0.245, - "score_loc": 0.017, - "score_loc_group": 0.017 + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.528, + "score_data_group": 0.528, + "score_data_loc": 0.277, + "score_data_loc_group": 0.277, + "score_loc": 0.025, + "score_loc_group": 0.025 }, { "component": "Caris", - "componentData": NaN, - "componentID": 25443598, + "componentData": "Data Complete", + "componentID": 27529223, "name": "Caris", "not_displayed": false, "rank_data": "7", @@ -727,67 +727,67 @@ "rank_data_loc_group": "7", "rank_loc": "4", "rank_loc_group": "4", - "score_data": 0.406, - "score_data_group": 0.406, - "score_data_loc": 0.228, - "score_data_loc_group": 0.228, + "score_data": 0.475, + "score_data_group": 0.475, + "score_data_loc": 0.263, + "score_data_loc_group": 0.263, "score_loc": 0.05, "score_loc_group": 0.05 }, { - "component": "Beekman", + "component": "Offenbacher", "componentData": "Data Complete", - "componentID": 25443287, - "name": "Beekman", + "componentID": 27529224, + "name": "Offenbacher", "not_displayed": false, - "rank_data": "9", - "rank_data_group": "9", + "rank_data": "8", + "rank_data_group": "8", "rank_data_loc": "8", "rank_data_loc_group": "8", - "rank_loc": "5", - "rank_loc_group": "5", - "score_data": 0.388, - "score_data_group": 0.388, - "score_data_loc": 0.217, - "score_data_loc_group": 0.217, - "score_loc": 0.046, - "score_loc_group": 0.046 + "rank_loc": "8", + "rank_loc_group": "8", + "score_data": 0.473, + "score_data_group": 0.473, + "score_data_loc": 0.245, + "score_data_loc_group": 0.245, + "score_loc": 0.017, + "score_loc_group": 0.017 }, { - "component": "Colestine", - "componentData": "Data Complete", - "componentID": 25443286, - "name": "Colestine", + "component": "Beekman", + "componentData": NaN, + "componentID": 27529518, + "name": "Beekman", "not_displayed": false, - "rank_data": "8", - "rank_data_group": "8", + "rank_data": "9", + "rank_data_group": "9", "rank_data_loc": "9", "rank_data_loc_group": "9", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.392, - "score_data_group": 0.392, - "score_data_loc": 0.209, - "score_data_loc_group": 0.209, - "score_loc": 0.025, - "score_loc_group": 0.025 + "rank_loc": "5", + "rank_loc_group": "5", + "score_data": 0.366, + "score_data_group": 0.366, + "score_data_loc": 0.206, + "score_data_loc_group": 0.206, + "score_loc": 0.046, + "score_loc_group": 0.046 }, { "component": "Josephine", "componentData": "Data Complete", - "componentID": 25443480, + "componentID": 27529336, "name": "Josephine", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "4", + "rank_data_group": "2", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "2", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.531, - "score_data_group": 0.664, - "score_data_loc": 0.328, - "score_data_loc_group": 0.395, + "score_data": 0.542, + "score_data_group": 0.669, + "score_data_loc": 0.334, + "score_data_loc_group": 0.397, "score_loc": 0.125, "score_loc_group": 0.125 } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[42.63413723,-94.31005777].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[42.63413723,-94.31005777].json index 2259fa6..b650423 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[42.63413723,-94.31005777].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[42.63413723,-94.31005777].json @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25584956", + "componentID": "27398757", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25584954", + "componentID": "27398758", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -153,13 +153,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R103XY015MN" + "R103XY001MN" ], "ecoclassname": [ - "Depressional Marsh" + "Loamy Wet Prairies" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY015MN" + "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY001MN" ] } }, @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25584950", + "componentID": "27398759", "componentKind": "Taxadjunct", "componentPct": 5, "dataSource": "SSURGO", @@ -209,13 +209,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R103XY001MN" + "R103XY004MN" ], "ecoclassname": [ - "Loamy Wet Prairies" + "Loamy Upland Prairies" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY001MN" + "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY004MN" ] } }, @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25584952", + "componentID": "27398760", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -265,13 +265,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R103XY004MN" + "R103XY015MN" ], "ecoclassname": [ - "Loamy Upland Prairies" + "Depressional Marsh" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY004MN" + "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY015MN" ] } }, @@ -288,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25584960", + "componentID": "27398765", "componentKind": "Series", "componentPct": 3, "dataSource": "SSURGO", @@ -321,13 +321,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R103XY015MN" + "R103XY001MN" ], "ecoclassname": [ - "Depressional Marsh" + "Loamy Wet Prairies" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY015MN" + "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY001MN" ] } }, @@ -344,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25584602", + "componentID": "27398742", "componentKind": "Series", "componentPct": 5, "dataSource": "SSURGO", @@ -377,13 +377,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R103XY001MN" + "R103XY015MN" ], "ecoclassname": [ - "Loamy Wet Prairies" + "Depressional Marsh" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY001MN" + "https://edit.sc.egov.usda.gov/catalogs/esd/103X/R103XY015MN" ] } }, @@ -400,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25584962", + "componentID": "27398763", "componentKind": "Series", "componentPct": 2, "dataSource": "SSURGO", @@ -433,92 +433,73 @@ "model": "v2" }, "soilRank": [ - { - "component": "Clarion", - "componentData": "Data Complete", - "componentID": 25584950, - "name": "Clarion", - "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", - "rank_data_loc": "1", - "rank_data_loc_group": "1", - "rank_loc": 3, - "rank_loc_group": 3, - "score_data": 0.517, - "score_data_group": 0.517, - "score_data_loc": 0.358, - "score_data_loc_group": 0.358, - "score_loc": 0.2, - "score_loc_group": 0.2 - }, { "component": "Nicollet", "componentData": "Data Complete", - "componentID": 25584956, + "componentID": 27398757, "name": "Nicollet", "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", - "rank_data_loc": "2", - "rank_data_loc_group": "2", + "rank_data": "3", + "rank_data_group": "3", + "rank_data_loc": "1", + "rank_data_loc_group": "1", "rank_loc": 1, "rank_loc_group": 1, - "score_data": 0.22, - "score_data_group": 0.22, - "score_data_loc": 0.311, - "score_data_loc_group": 0.311, + "score_data": 0.369, + "score_data_group": 0.369, + "score_data_loc": 0.385, + "score_data_loc_group": 0.385, "score_loc": 0.402, "score_loc_group": 0.402 }, { "component": "Webster", "componentData": "Data Complete", - "componentID": 25584954, + "componentID": 27398758, "name": "Webster", "not_displayed": false, "rank_data": "6", "rank_data_group": "6", - "rank_data_loc": "3", - "rank_data_loc_group": "3", + "rank_data_loc": "2", + "rank_data_loc_group": "2", "rank_loc": 2, "rank_loc_group": 2, - "score_data": 0.268, - "score_data_group": 0.268, - "score_data_loc": 0.299, - "score_data_loc_group": 0.299, + "score_data": 0.287, + "score_data_group": 0.287, + "score_data_loc": 0.309, + "score_data_loc_group": 0.309, "score_loc": 0.331, "score_loc_group": 0.331 }, { - "component": "Glencoe", + "component": "Clarion", "componentData": "Data Complete", - "componentID": 25584960, - "name": "Glencoe", + "componentID": 27398759, + "name": "Clarion", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", - "rank_data_loc": "4", - "rank_data_loc_group": "4", - "rank_loc": 5, - "rank_loc_group": 5, - "score_data": 0.451, - "score_data_group": 0.451, - "score_data_loc": 0.231, - "score_data_loc_group": 0.231, - "score_loc": 0.011, - "score_loc_group": 0.011 + "rank_data": "4", + "rank_data_group": "4", + "rank_data_loc": "3", + "rank_data_loc_group": "3", + "rank_loc": 3, + "rank_loc_group": 3, + "score_data": 0.367, + "score_data_group": 0.367, + "score_data_loc": 0.283, + "score_data_loc_group": 0.283, + "score_loc": 0.2, + "score_loc_group": 0.2 }, { "component": "Storden", "componentData": "Data Complete", - "componentID": 25584602, + "componentID": 27398742, "name": "Storden", "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", - "rank_data_loc": "5", - "rank_data_loc_group": "5", + "rank_data": "1", + "rank_data_group": "1", + "rank_data_loc": "4", + "rank_data_loc_group": "4", "rank_loc": 6, "rank_loc_group": 6, "score_data": 0.433, @@ -529,42 +510,61 @@ "score_loc_group": 0.011 }, { - "component": "Okoboji", - "componentData": "Missing Data", - "componentID": 25584952, - "name": "Okoboji", + "component": "Glencoe", + "componentData": "Data Complete", + "componentID": 27398765, + "name": "Glencoe", "not_displayed": false, - "rank_data": "4", - "rank_data_group": "4", - "rank_data_loc": "6", - "rank_data_loc_group": "6", - "rank_loc": 4, - "rank_loc_group": 4, - "score_data": 0.303, - "score_data_group": 0.303, - "score_data_loc": 0.171, - "score_data_loc_group": 0.171, - "score_loc": 0.04, - "score_loc_group": 0.04 + "rank_data": "2", + "rank_data_group": "2", + "rank_data_loc": "5", + "rank_data_loc_group": "5", + "rank_loc": 5, + "rank_loc_group": 5, + "score_data": 0.433, + "score_data_group": 0.433, + "score_data_loc": 0.222, + "score_data_loc_group": 0.222, + "score_loc": 0.011, + "score_loc_group": 0.011 }, { "component": "Canisteo", "componentData": "Data Complete", - "componentID": 25584962, + "componentID": 27398763, "name": "Canisteo", "not_displayed": false, "rank_data": "5", "rank_data_group": "5", - "rank_data_loc": "7", - "rank_data_loc_group": "7", + "rank_data_loc": "6", + "rank_data_loc_group": "6", "rank_loc": 7, "rank_loc_group": 7, - "score_data": 0.287, - "score_data_group": 0.287, - "score_data_loc": 0.147, - "score_data_loc_group": 0.147, + "score_data": 0.336, + "score_data_group": 0.336, + "score_data_loc": 0.171, + "score_data_loc_group": 0.171, "score_loc": 0.007, "score_loc_group": 0.007 + }, + { + "component": "Okoboji", + "componentData": "Missing Data", + "componentID": 27398760, + "name": "Okoboji", + "not_displayed": false, + "rank_data": "7", + "rank_data_group": "7", + "rank_data_loc": "7", + "rank_data_loc_group": "7", + "rank_loc": 4, + "rank_loc_group": 4, + "score_data": 0.253, + "score_data_group": 0.253, + "score_data_loc": 0.146, + "score_data_loc_group": 0.146, + "score_loc": 0.04, + "score_loc_group": 0.04 } ] } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[43.06450312,-119.4596489].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[43.06450312,-119.4596489].json index 99acf53..2d68de0 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[43.06450312,-119.4596489].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[43.06450312,-119.4596489].json @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25442849", + "componentID": "27631144", "componentKind": "Series", "componentPct": 50, "dataSource": "SSURGO", @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25442848", + "componentID": "27631143", "componentKind": "Series", "componentPct": 35, "dataSource": "SSURGO", @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443068", + "componentID": "27631363", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25442630", + "componentID": "27630925", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -288,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25442616", + "componentID": "27630911", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -344,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25443055", + "componentID": "27631350", "componentKind": "Series", "componentPct": 65, "dataSource": "SSURGO", @@ -400,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25442636", + "componentID": "27630931", "componentKind": "Series", "componentPct": 50, "dataSource": "SSURGO", @@ -456,7 +456,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25442637", + "componentID": "27630932", "componentKind": "Series", "componentPct": 35, "dataSource": "SSURGO", @@ -512,7 +512,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25442629", + "componentID": "27630924", "componentKind": "Series", "componentPct": 4, "dataSource": "SSURGO", @@ -548,7 +548,7 @@ { "component": "Lonely", "componentData": "Data Complete", - "componentID": 25442849, + "componentID": 27631144, "name": "Lonely", "not_displayed": false, "rank_data": "6", @@ -567,7 +567,7 @@ { "component": "Robson", "componentData": "Data Complete", - "componentID": 25442848, + "componentID": 27631143, "name": "Robson", "not_displayed": false, "rank_data": "2", @@ -586,7 +586,7 @@ { "component": "Actem", "componentData": "Data Complete", - "componentID": 25443068, + "componentID": 27631363, "name": "Actem", "not_displayed": false, "rank_data": "1", @@ -605,7 +605,7 @@ { "component": "Rinconflat", "componentData": "Data Complete", - "componentID": 25442616, + "componentID": 27630911, "name": "Rinconflat", "not_displayed": false, "rank_data": "5", @@ -624,7 +624,7 @@ { "component": "Brace", "componentData": "Data Complete", - "componentID": 25442637, + "componentID": 27630932, "name": "Brace", "not_displayed": false, "rank_data": "3", @@ -643,7 +643,7 @@ { "component": "Raz", "componentData": "Data Complete", - "componentID": 25442636, + "componentID": 27630931, "name": "Raz", "not_displayed": false, "rank_data": "4", @@ -662,7 +662,7 @@ { "component": "Reallis", "componentData": "Data Complete", - "componentID": 25442630, + "componentID": 27630925, "name": "Reallis", "not_displayed": false, "rank_data": "8", @@ -681,7 +681,7 @@ { "component": "Ausmus", "componentData": "Data Complete", - "componentID": 25442629, + "componentID": 27630924, "name": "Ausmus", "not_displayed": false, "rank_data": "7", @@ -700,7 +700,7 @@ { "component": "Lonegrave", "componentData": "Data Complete", - "componentID": 25443055, + "componentID": 27631350, "name": "Lonegrave", "not_displayed": false, "rank_data": "9", diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[45.6508331,-121.5111084].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[45.6508331,-121.5111084].json index 37653eb..8fc2ae6 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[45.6508331,-121.5111084].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[45.6508331,-121.5111084].json @@ -47,7 +47,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25279329", + "componentID": "27032519", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -103,7 +103,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25279333", + "componentID": "27032515", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -159,7 +159,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25279330", + "componentID": "27032518", "componentKind": "Series", "componentPct": 85, "dataSource": "SSURGO", @@ -195,7 +195,7 @@ { "component": "Hood", "componentData": "Data Complete", - "componentID": 25279330, + "componentID": 27032518, "name": "Hood3", "not_displayed": false, "rank_data": "1", @@ -214,7 +214,7 @@ { "component": "Hood", "componentData": "Data Complete", - "componentID": 25279329, + "componentID": 27032519, "name": "Hood", "not_displayed": true, "rank_data": "Not Displayed", @@ -233,7 +233,7 @@ { "component": "Hood", "componentData": "Data Complete", - "componentID": 25279333, + "componentID": 27032515, "name": "Hood2", "not_displayed": true, "rank_data": "Not Displayed", diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[45.88932423,-121.0347381].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[45.88932423,-121.0347381].json index 0e395df..995ee95 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[45.88932423,-121.0347381].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[45.88932423,-121.0347381].json @@ -47,7 +47,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25483307", + "componentID": "26581758", "componentKind": "Series", "componentPct": 95, "dataSource": "SSURGO", @@ -65,7 +65,7 @@ "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#gunn", "slope": 5.0, "taxsubgrp": "Ultic Haploxeralfs", - "textureInfill": "No" + "textureInfill": "Yes" }, "siteDescription": "Landscape--plateaus, hills\nLandform--structural benches, hillslopes, ridgetops\nSlope--0 to 65 percent\nParent material--loess mixed with colluvium and residuum derived from basalt\nMean annual precipitation--about 530 mm\nMean annual air temperature--about 9 degrees C\nDepth class--deep, very deep\nDrainage class--well drained\nSoil moisture regime--xeric\nSoil temperature regime--mesic\nSoil moisture subclass--typic" }, @@ -103,7 +103,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25483316", + "componentID": "26581766", "componentKind": "Series", "componentPct": 90, "dataSource": "SSURGO", @@ -139,7 +139,7 @@ { "component": "Gunn", "componentData": NaN, - "componentID": 25483316, + "componentID": 26581766, "name": "Gunn2", "not_displayed": false, "rank_data": "1", @@ -157,8 +157,8 @@ }, { "component": "Gunn", - "componentData": "Data Complete", - "componentID": 25483307, + "componentData": NaN, + "componentID": 26581758, "name": "Gunn", "not_displayed": true, "rank_data": "Not Displayed", diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[47.213922,-69.28246582].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[47.213922,-69.28246582].json index 29539b8..be13f50 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[47.213922,-69.28246582].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[47.213922,-69.28246582].json @@ -1,18 +1,18 @@ { "list": { - "AWS_PIW90": 10.31, + "AWS_PIW90": 4.73, "Soil Data Value": [ [ - "rfv_class_30", - 1.3229420838347168 + "rfv_class_0", + 1.561554765729544 ], [ - "rfv_class_0", - 1.1105001941281816 + "rfv_class_30", + 1.543062149933733 ], [ "texture_30", - 0.9931611211632956 + 0.9908959471041263 ], [ "texture_0", @@ -41,13 +41,13 @@ "esd": { "ESD": { "ecoclassid": [ - "" + "F143XY704ME" ], "ecoclassname": [ - "" + "Shallow Organic Rock Pocket" ], "edit_url": [ - "" + "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY704ME" ] } }, @@ -55,7 +55,7 @@ "component": "Knob lock", "name": "Knob lock", "rank_loc": "1", - "score_loc": 0.325 + "score_loc": 0.372 }, "lab": {}, "munsell": {}, @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25208412", + "componentID": "26560861", "componentKind": "Series", "componentPct": 46, "dataSource": "SSURGO", @@ -97,13 +97,13 @@ "esd": { "ESD": { "ecoclassid": [ - "" + "F143XY501ME" ], "ecoclassname": [ - "" + "Loamy Slope" ], "edit_url": [ - "" + "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY501ME" ] } }, @@ -111,7 +111,7 @@ "component": "Chesuncook", "name": "Chesuncook", "rank_loc": "2", - "score_loc": 0.277 + "score_loc": 0.306 }, "lab": {}, "munsell": {}, @@ -120,9 +120,9 @@ "sand": {}, "site": { "siteData": { - "componentID": "25209552", + "componentID": "26560912", "componentKind": "Series", - "componentPct": 3, + "componentPct": 50, "dataSource": "SSURGO", "distance": 19.0, "irrcapcl": "None", @@ -136,7 +136,7 @@ "rfvInfill": "No", "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=chesuncook", "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#chesuncook", - "slope": 12.0, + "slope": 20.0, "taxsubgrp": "Aquic Haplorthods", "textureInfill": "No" }, @@ -153,13 +153,13 @@ "esd": { "ESD": { "ecoclassid": [ - "" + "F143XY704ME" ], "ecoclassname": [ - "" + "Shallow Organic Rock Pocket" ], "edit_url": [ - "" + "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY704ME" ] } }, @@ -167,7 +167,7 @@ "component": "Elliottsville", "name": "Elliottsville", "rank_loc": "3", - "score_loc": 0.211 + "score_loc": 0.25 }, "lab": {}, "munsell": {}, @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25209557", + "componentID": "26560911", "componentKind": "Series", "componentPct": 35, "dataSource": "SSURGO", @@ -209,13 +209,13 @@ "esd": { "ESD": { "ecoclassid": [ - "" + "F143XY702ME" ], "ecoclassname": [ - "" + "Shallow And Moderately Deep Till" ], "edit_url": [ - "" + "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY702ME" ] } }, @@ -223,7 +223,7 @@ "component": "Monson", "name": "Monson", "rank_loc": "4", - "score_loc": 0.092 + "score_loc": 0.071 }, "lab": {}, "munsell": {}, @@ -232,23 +232,23 @@ "sand": {}, "site": { "siteData": { - "componentID": "25209554", + "componentID": "26560914", "componentKind": "Series", - "componentPct": 6, + "componentPct": 40, "dataSource": "SSURGO", - "distance": 19.0, + "distance": 192.0, "irrcapcl": "None", "irrcapscl": "None", "irrcapunit": "None", - "mapunitID": "2549860", - "minCompDistance": 19.0, + "mapunitID": "2549867", + "minCompDistance": 192.0, "nirrcapcl": "6", "nirrcapscl": "s", "nirrcapunit": "None", "rfvInfill": "No", "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=monson", "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#monson", - "slope": 25.0, + "slope": 40.0, "taxsubgrp": "Lithic Haplorthods", "textureInfill": "No" }, @@ -265,181 +265,13 @@ "esd": { "ESD": { "ecoclassid": [ - "" - ], - "ecoclassname": [ - "" - ], - "edit_url": [ - "" - ] - } - }, - "id": { - "component": "Abram", - "name": "Abram", - "rank_loc": "5", - "score_loc": 0.036 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "25209553", - "componentKind": "Series", - "componentPct": 4, - "dataSource": "SSURGO", - "distance": 19.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "2549860", - "minCompDistance": 19.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=abram", - "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#abram", - "slope": 30.0, - "taxsubgrp": "Lithic Haplorthods", - "textureInfill": "No" - }, - "siteDescription": "The Abram series consists of very shallow, excessively drained soils formed in a thin mantle of glacial till on ridges and mountains. Permeability is moderately rapid. Slope ranges from 0 to 80 percent. Mean annual temperature is about 7 degrees C, and mean annual precipitation is about 1118 mm at the type location." - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": [ - "F143XY702ME" - ], - "ecoclassname": [ - "Shallow And Moderately Deep Till" - ], - "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY702ME" - ] - } - }, - "id": { - "component": "Hogback", - "name": "Hogback", - "rank_loc": "6", - "score_loc": 0.03 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "25208410", - "componentKind": "Series", - "componentPct": 5, - "dataSource": "SSURGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "2549870", - "minCompDistance": 0.0, - "nirrcapcl": "6", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=hogback", - "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#hogback", - "slope": 50.0, - "taxsubgrp": "Lithic Haplohumods", - "textureInfill": "No" - }, - "siteDescription": "The Hogback series consists of shallow, well drained soils on glaciated uplands. They formed in loamy till. Estimated saturated hydraulic conductivity is moderately high to high throughout the mineral soil. Slope ranges from 3 to 70 percent. Mean annual precipitation is about 50 inches, and mean annual temperature is about 43 degrees F." - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": [ - "F143XY702ME" - ], - "ecoclassname": [ - "Shallow And Moderately Deep Till" - ], - "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY702ME" - ] - } - }, - "id": { - "component": "Rawsonville", - "name": "Rawsonville", - "rank_loc": "7", - "score_loc": 0.03 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "25208409", - "componentKind": "Series", - "componentPct": 5, - "dataSource": "SSURGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "2549870", - "minCompDistance": 0.0, - "nirrcapcl": "4", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=rawsonville", - "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#rawsonville", - "slope": 20.0, - "taxsubgrp": "Typic Haplohumods", - "textureInfill": "No" - }, - "siteDescription": "The Rawsonville series consists of moderately deep, well drained soils on glaciated uplands. They formed in loamy till. Estimated saturated hydraulic conductivity is moderately high or high in the mineral soil. Slope ranges from 3 to 70 percent. Mean annual precipitation is about 1,270 mm, and mean annual temperature is about 6 degrees C." - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": [ - "" + "F143XY501ME" ], "ecoclassname": [ - "" + "Loamy Slope" ], "edit_url": [ - "" + "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY501ME" ] } }, @@ -447,7 +279,7 @@ "component": "Knob lock", "name": "Knob lock2", "rank_loc": "Not Displayed", - "score_loc": 0.325 + "score_loc": 0.372 }, "lab": {}, "munsell": {}, @@ -456,63 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25209556", - "componentKind": "Series", - "componentPct": 2, - "dataSource": "SSURGO", - "distance": 19.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "2549860", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=knob_lock", - "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#knob_lock", - "slope": 30.0, - "taxsubgrp": "Lithic Udifolists", - "textureInfill": "No" - }, - "siteDescription": "The Knob Lock series consists of very shallow and shallow, well drained through excessively drained organic soils on mountains and hills. They formed in thin organic deposits underlain in most places by a very thin mineral horizon over bedrock. Saturated hydraulic conductivity is moderately high through very high throughout the soil. Slope ranges from 3 through 80 percent. Mean annual precipitation is about 1092 mm and mean annual temperature is about 5 degrees C." - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": [ - "F143XY704ME" - ], - "ecoclassname": [ - "Shallow Organic Rock Pocket" - ], - "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY704ME" - ] - } - }, - "id": { - "component": "Knob lock", - "name": "Knob lock3", - "rank_loc": "Not Displayed", - "score_loc": 0.325 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "25209692", + "componentID": "26560913", "componentKind": "Series", "componentPct": 25, "dataSource": "SSURGO", @@ -545,69 +321,13 @@ "esd": { "ESD": { "ecoclassid": [ - "" - ], - "ecoclassname": [ - "" - ], - "edit_url": [ - "" - ] - } - }, - "id": { - "component": "Chesuncook", - "name": "Chesuncook2", - "rank_loc": "Not Displayed", - "score_loc": 0.277 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "25209555", - "componentKind": "Series", - "componentPct": 50, - "dataSource": "SSURGO", - "distance": 19.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "2549860", - "minCompDistance": 19.0, - "nirrcapcl": "6", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=chesuncook", - "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#chesuncook", - "slope": 20.0, - "taxsubgrp": "Aquic Haplorthods", - "textureInfill": "No" - }, - "siteDescription": "The Chesuncook series consists of very deep, moderately well drained soils on till plains, hills, ridges, and mountains. These soils formed in dense glacial till. Saturated hydraulic conductivity is moderately high or high in the solum, and low to moderately high in the dense substratum. Slope ranges from 3 to 45 percent. Mean annual temperature is about 4 degrees C, and mean annual precipitation is about 1092 mm at the type location." - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": [ - "F143XY501ME" + "F143XY702ME" ], "ecoclassname": [ - "Loamy Slope" + "Shallow And Moderately Deep Till" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY501ME" + "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY702ME" ] } }, @@ -615,7 +335,7 @@ "component": "Elliottsville", "name": "Elliottsville2", "rank_loc": "Not Displayed", - "score_loc": 0.211 + "score_loc": 0.25 }, "lab": {}, "munsell": {}, @@ -624,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "25209694", + "componentID": "26560915", "componentKind": "Series", "componentPct": 20, "dataSource": "SSURGO", @@ -648,118 +368,6 @@ }, "texture": {}, "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": [ - "F143XY501ME" - ], - "ecoclassname": [ - "Loamy Slope" - ], - "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY501ME" - ] - } - }, - "id": { - "component": "Monson", - "name": "Monson2", - "rank_loc": "Not Displayed", - "score_loc": 0.092 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "25209693", - "componentKind": "Series", - "componentPct": 40, - "dataSource": "SSURGO", - "distance": 192.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "2549867", - "minCompDistance": 19.0, - "nirrcapcl": "6", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=monson", - "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#monson", - "slope": 40.0, - "taxsubgrp": "Lithic Haplorthods", - "textureInfill": "No" - }, - "siteDescription": "The Monson series consists of shallow, somewhat excessively drained soils formed in glacial till on knolls of till plains, and on hills, ridges and mountains. Estimated saturated hydraulic conductivity is moderate or high. Slope ranges from 3 to 60 percent. Mean annual temperature is about 3 degrees C, and mean annual precipitation is about 965 mm at the type location." - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": [ - "F143XY704ME" - ], - "ecoclassname": [ - "Shallow Organic Rock Pocket" - ], - "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/143X/F143XY704ME" - ] - } - }, - "id": { - "component": "Abram", - "name": "Abram2", - "rank_loc": "Not Displayed", - "score_loc": 0.036 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "25209690", - "componentKind": "Series", - "componentPct": 10, - "dataSource": "SSURGO", - "distance": 192.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "2549867", - "minCompDistance": 19.0, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=abram", - "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#abram", - "slope": 45.0, - "taxsubgrp": "Lithic Haplorthods", - "textureInfill": "No" - }, - "siteDescription": "The Abram series consists of very shallow, excessively drained soils formed in a thin mantle of glacial till on ridges and mountains. Permeability is moderately rapid. Slope ranges from 0 to 80 percent. Mean annual temperature is about 7 degrees C, and mean annual precipitation is about 1118 mm at the type location." - }, - "texture": {}, - "top_depth": {} } ] }, @@ -772,7 +380,7 @@ { "component": "Chesuncook", "componentData": "Data Complete", - "componentID": 25209552, + "componentID": 26560912, "name": "Chesuncook", "not_displayed": false, "rank_data": "1", @@ -781,240 +389,107 @@ "rank_data_loc_group": "1", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.729, - "score_data_group": 0.729, - "score_data_loc": 0.503, - "score_data_loc_group": 0.503, - "score_loc": 0.277, - "score_loc_group": 0.277 + "score_data": 0.737, + "score_data_group": 0.737, + "score_data_loc": 0.521, + "score_data_loc_group": 0.521, + "score_loc": 0.306, + "score_loc_group": 0.306 }, { - "component": "Knob lock", + "component": "Elliottsville", "componentData": "Data Complete", - "componentID": 25209556, - "name": "Knob lock2", + "componentID": 26560911, + "name": "Elliottsville", "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", + "rank_data": "2", + "rank_data_group": "2", "rank_data_loc": "2", "rank_data_loc_group": "2", - "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "score_data": 0.667, - "score_data_group": 0.667, - "score_data_loc": 0.496, - "score_data_loc_group": 0.496, - "score_loc": 0.325, - "score_loc_group": 0.325 + "rank_loc": "3", + "rank_loc_group": "3", + "score_data": 0.697, + "score_data_group": 0.697, + "score_data_loc": 0.474, + "score_data_loc_group": 0.474, + "score_loc": 0.25, + "score_loc_group": 0.25 }, { - "component": "Elliottsville", + "component": "Knob lock", "componentData": "Data Complete", - "componentID": 25209557, - "name": "Elliottsville", + "componentID": 26560913, + "name": "Knob lock2", "not_displayed": false, "rank_data": "4", "rank_data_group": "4", "rank_data_loc": "3", "rank_data_loc_group": "3", - "rank_loc": "3", - "rank_loc_group": "3", - "score_data": 0.648, - "score_data_group": 0.648, - "score_data_loc": 0.43, - "score_data_loc_group": 0.43, - "score_loc": 0.211, - "score_loc_group": 0.211 + "rank_loc": "Not Displayed", + "rank_loc_group": "1", + "score_data": 0.475, + "score_data_group": 0.475, + "score_data_loc": 0.424, + "score_data_loc_group": 0.424, + "score_loc": 0.372, + "score_loc_group": 0.372 }, { "component": "Monson", "componentData": "Data Complete", - "componentID": 25209554, + "componentID": 26560914, "name": "Monson", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", + "rank_data": "3", + "rank_data_group": "3", "rank_data_loc": "4", "rank_data_loc_group": "4", "rank_loc": "4", "rank_loc_group": "4", - "score_data": 0.616, - "score_data_group": 0.616, - "score_data_loc": 0.354, - "score_data_loc_group": 0.354, - "score_loc": 0.092, - "score_loc_group": 0.092 - }, - { - "component": "Abram", - "componentData": "Data Complete", - "componentID": 25209553, - "name": "Abram", - "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", - "rank_data_loc": "5", - "rank_data_loc_group": "5", - "rank_loc": "5", - "rank_loc_group": "5", - "score_data": 0.671, - "score_data_group": 0.671, - "score_data_loc": 0.353, - "score_data_loc_group": 0.353, - "score_loc": 0.036, - "score_loc_group": 0.036 + "score_data": 0.608, + "score_data_group": 0.608, + "score_data_loc": 0.34, + "score_data_loc_group": 0.34, + "score_loc": 0.071, + "score_loc_group": 0.071 }, { - "component": "Rawsonville", - "componentData": "Data Complete", - "componentID": 25208409, - "name": "Rawsonville", - "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", - "rank_data_loc": "6", - "rank_data_loc_group": "6", - "rank_loc": "7", - "rank_loc_group": "7", - "score_data": 0.615, - "score_data_group": 0.615, - "score_data_loc": 0.322, - "score_data_loc_group": 0.322, - "score_loc": 0.03, - "score_loc_group": 0.03 - }, - { - "component": "Hogback", - "componentData": "Data Complete", - "componentID": 25208410, - "name": "Hogback", - "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", - "rank_data_loc": "7", - "rank_data_loc_group": "7", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.484, - "score_data_group": 0.484, - "score_data_loc": 0.257, - "score_data_loc_group": 0.257, - "score_loc": 0.03, - "score_loc_group": 0.03 - }, - { - "component": "Chesuncook", + "component": "Elliottsville", "componentData": "Data Complete", - "componentID": 25209555, - "name": "Chesuncook2", + "componentID": 26560915, + "name": "Elliottsville2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "1", + "rank_data_group": "2", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "1", + "rank_data_loc_group": "2", "rank_loc": "Not Displayed", - "rank_loc_group": "2", - "score_data": 0.715, - "score_data_group": 0.729, - "score_data_loc": 0.496, - "score_data_loc_group": 0.503, - "score_loc": 0.277, - "score_loc_group": 0.277 + "rank_loc_group": "3", + "score_data": 0.536, + "score_data_group": 0.697, + "score_data_loc": 0.393, + "score_data_loc_group": 0.474, + "score_loc": 0.25, + "score_loc_group": 0.25 }, { "component": "Knob lock", "componentData": "Data Complete", - "componentID": 25208412, + "componentID": 26560861, "name": "Knob lock", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "3", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "2", - "rank_loc": "1", - "rank_loc_group": "1", - "score_data": 0.558, - "score_data_group": 0.667, - "score_data_loc": 0.441, - "score_data_loc_group": 0.496, - "score_loc": 0.325, - "score_loc_group": 0.325 - }, - { - "component": "Knob lock", - "componentData": "Data Complete", - "componentID": 25209692, - "name": "Knob lock3", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "3", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "2", - "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "score_data": 0.539, - "score_data_group": 0.667, - "score_data_loc": 0.432, - "score_data_loc_group": 0.496, - "score_loc": 0.325, - "score_loc_group": 0.325 - }, - { - "component": "Elliottsville", - "componentData": "Data Complete", - "componentID": 25209694, - "name": "Elliottsville2", - "not_displayed": true, - "rank_data": "Not Displayed", "rank_data_group": "4", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "3", - "rank_loc": "Not Displayed", - "rank_loc_group": "3", - "score_data": 0.546, - "score_data_group": 0.648, - "score_data_loc": 0.379, - "score_data_loc_group": 0.43, - "score_loc": 0.211, - "score_loc_group": 0.211 - }, - { - "component": "Monson", - "componentData": "Data Complete", - "componentID": 25209693, - "name": "Monson2", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "5", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "4", - "rank_loc": "Not Displayed", - "rank_loc_group": "4", - "score_data": 0.598, - "score_data_group": 0.616, - "score_data_loc": 0.345, - "score_data_loc_group": 0.354, - "score_loc": 0.092, - "score_loc_group": 0.092 - }, - { - "component": "Abram", - "componentData": "Data Complete", - "componentID": 25209690, - "name": "Abram2", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "2", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "5", - "rank_loc": "Not Displayed", - "rank_loc_group": "5", - "score_data": 0.469, - "score_data_group": 0.671, - "score_data_loc": 0.252, - "score_data_loc_group": 0.353, - "score_loc": 0.036, - "score_loc_group": 0.036 + "rank_loc": "1", + "rank_loc_group": "1", + "score_data": 0.406, + "score_data_group": 0.475, + "score_data_loc": 0.389, + "score_data_loc_group": 0.424, + "score_loc": 0.372, + "score_loc_group": 0.372 } ] } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[48.6956,-121.8166].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[48.6956,-121.8166].json index a40863b..5cb63cf 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[48.6956,-121.8166].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[48.6956,-121.8166].json @@ -1,22 +1,22 @@ { "list": { - "AWS_PIW90": 14.78, + "AWS_PIW90": 17.67, "Soil Data Value": [ - [ - "rfv_class_30", - 1.1951984103352893 - ], [ "rfv_class_0", - 0.9036969260198578 + 0.6201391749943385 ], [ - "texture_30", - 0.7502956564979291 + "rfv_class_30", + 0.6201391749943385 ], [ "texture_0", 0.0 + ], + [ + "texture_30", + 0.0 ] ], "metadata": { @@ -40,16 +40,22 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "F003XN924WA" + ], + "ecoclassname": [ + "Low Cryic/Udic West Coniferous " + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/003X/F003XN924WA" + ] } }, "id": { - "component": "Nimue", - "name": "Nimue", + "component": "Typic vitricryands", + "name": "Typic vitricryands", "rank_loc": "1", - "score_loc": 0.131 + "score_loc": 0.486 }, "lab": {}, "munsell": {}, @@ -58,15 +64,15 @@ "sand": {}, "site": { "siteData": { - "componentID": "14268930", - "componentKind": "Series", - "componentPct": 7, - "dataSource": "STATSGO", + "componentID": "26612815", + "componentKind": "Taxon above family", + "componentPct": 80, + "dataSource": "SSURGO", "distance": 0.0, "irrcapcl": "None", "irrcapscl": "None", "irrcapunit": "None", - "mapunitID": "675975", + "mapunitID": "3418436", "minCompDistance": 0.0, "nirrcapcl": "7", "nirrcapscl": "e", @@ -74,8 +80,8 @@ "rfvInfill": "No", "sdeURL": "", "seeURL": "", - "slope": 45.0, - "taxsubgrp": "Andic Haplocryods", + "slope": 35.0, + "taxsubgrp": "Typic Vitricryands", "textureInfill": "No" }, "siteDescription": "" @@ -90,16 +96,22 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "R003XN613WA" + ], + "ecoclassname": [ + "Low Mountain Unforested Wetlands" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/003X/R003XN613WA" + ] } }, "id": { - "component": "Andic cryumbrepts", - "name": "Andic cryumbrepts", + "component": "Vitrandic dystrocryepts", + "name": "Vitrandic dystrocryepts", "rank_loc": "2", - "score_loc": 0.086 + "score_loc": 0.36 }, "lab": {}, "munsell": {}, @@ -108,24 +120,24 @@ "sand": {}, "site": { "siteData": { - "componentID": "14269504", + "componentID": "26612824", "componentKind": "Taxon above family", - "componentPct": 20, - "dataSource": "STATSGO", - "distance": 994.2109898924772, + "componentPct": 70, + "dataSource": "SSURGO", + "distance": 21.0, "irrcapcl": "None", "irrcapscl": "None", "irrcapunit": "None", - "mapunitID": "676031", - "minCompDistance": 994.2109898924772, - "nirrcapcl": "7", - "nirrcapscl": "s", + "mapunitID": "3418433", + "minCompDistance": 21.0, + "nirrcapcl": "6", + "nirrcapscl": "c", "nirrcapunit": "None", "rfvInfill": "No", "sdeURL": "", "seeURL": "", - "slope": 53.0, - "taxsubgrp": "None", + "slope": 8.0, + "taxsubgrp": "Vitrandic Dystrocryepts", "textureInfill": "No" }, "siteDescription": "" @@ -140,16 +152,22 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "F003XA305WA" + ], + "ecoclassname": [ + "Low Glacial Trough Valleys Moist Forest Western Hemlock" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/003X/F003XA305WA" + ] } }, "id": { - "component": "Cryorthods", - "name": "Cryorthods", + "component": "Histic cryaquepts", + "name": "Histic cryaquepts", "rank_loc": "3", - "score_loc": 0.065 + "score_loc": 0.154 }, "lab": {}, "munsell": {}, @@ -158,624 +176,24 @@ "sand": {}, "site": { "siteData": { - "componentID": "14269505", + "componentID": "26612823", "componentKind": "Taxon above family", - "componentPct": 15, - "dataSource": "STATSGO", - "distance": 994.2109898924772, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "676031", - "minCompDistance": 994.2109898924772, - "nirrcapcl": "7", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 60.0, - "taxsubgrp": "None", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Getchell", - "name": "Getchell", - "rank_loc": "4", - "score_loc": 0.062 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14268944", - "componentKind": "Series", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 0.0, + "componentPct": 30, + "dataSource": "SSURGO", + "distance": 21.0, "irrcapcl": "None", "irrcapscl": "None", "irrcapunit": "None", - "mapunitID": "675975", - "minCompDistance": 0.0, + "mapunitID": "3418433", + "minCompDistance": 21.0, "nirrcapcl": "6", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 17.0, - "taxsubgrp": "Aquic Haplocryands", - "textureInfill": "Yes" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Cryumbrepts", - "name": "Cryumbrepts", - "rank_loc": "5", - "score_loc": 0.043 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14269506", - "componentKind": "Taxon above family", - "componentPct": 10, - "dataSource": "STATSGO", - "distance": 994.2109898924772, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "676031", - "minCompDistance": 994.2109898924772, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 60.0, - "taxsubgrp": "None", - "textureInfill": "Yes" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Diobsud", - "name": "Diobsud", - "rank_loc": "6", - "score_loc": 0.023 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14268932", - "componentKind": "Series", - "componentPct": 4, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "675975", - "minCompDistance": 0.0, - "nirrcapcl": "6", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 48.0, - "taxsubgrp": "Andic Humicryods", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Cryaquepts", - "name": "Cryaquepts", - "rank_loc": "7", - "score_loc": 0.022 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14269507", - "componentKind": "Taxon above family", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 994.2109898924772, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "676031", - "minCompDistance": 994.2109898924772, - "nirrcapcl": "7", "nirrcapscl": "w", "nirrcapunit": "None", "rfvInfill": "No", "sdeURL": "", "seeURL": "", - "slope": 2.0, - "taxsubgrp": "None", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Cryohumods", - "name": "Cryohumods", - "rank_loc": "8", - "score_loc": 0.022 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14269509", - "componentKind": "Taxon above family", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 994.2109898924772, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "676031", - "minCompDistance": 994.2109898924772, - "nirrcapcl": "7", - "nirrcapscl": "s", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 60.0, - "taxsubgrp": "None", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Haplocryods", - "name": "Haplocryods", - "rank_loc": "9", - "score_loc": 0.022 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14269511", - "componentKind": "Taxon above family", - "componentPct": 5, - "dataSource": "STATSGO", - "distance": 994.2109898924772, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "676031", - "minCompDistance": 994.2109898924772, - "nirrcapcl": "7", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 53.0, - "taxsubgrp": "None", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Kindy", - "name": "Kindy", - "rank_loc": "10", - "score_loc": 0.017 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14268935", - "componentKind": "Series", - "componentPct": 3, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "675975", - "minCompDistance": 0.0, - "nirrcapcl": "6", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 17.0, - "taxsubgrp": "Andic Haplocryods", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Nagrom", - "name": "Nagrom", - "rank_loc": "11", - "score_loc": 0.017 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14268945", - "componentKind": "Series", - "componentPct": 3, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "675975", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 48.0, - "taxsubgrp": "Andic Haplocryods", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Andic xerochrepts", - "name": "Andic xerochrepts", - "rank_loc": "12", - "score_loc": 0.011 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14268948", - "componentKind": "Taxon above family", - "componentPct": 2, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "675975", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 75.0, - "taxsubgrp": "None", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Nimue", - "name": "Nimue2", - "rank_loc": "Not Displayed", - "score_loc": 0.131 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14268934", - "componentKind": "Series", - "componentPct": 3, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "675975", - "minCompDistance": 0.0, - "nirrcapcl": "6", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 19.0, - "taxsubgrp": "Andic Haplocryods", - "textureInfill": "Yes" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Nimue", - "name": "Nimue3", - "rank_loc": "Not Displayed", - "score_loc": 0.131 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14268942", - "componentKind": "Series", - "componentPct": 13, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "675975", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 48.0, - "taxsubgrp": "Andic Haplocryods", - "textureInfill": "No" - }, - "siteDescription": "" - }, - "texture": {}, - "top_depth": {} - }, - { - "bottom_depth": {}, - "cec": {}, - "clay": {}, - "ec": {}, - "esd": { - "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" - } - }, - "id": { - "component": "Getchell", - "name": "Getchell2", - "rank_loc": "Not Displayed", - "score_loc": 0.062 - }, - "lab": {}, - "munsell": {}, - "ph": {}, - "rock_fragments": {}, - "sand": {}, - "site": { - "siteData": { - "componentID": "14268946", - "componentKind": "Series", - "componentPct": 6, - "dataSource": "STATSGO", - "distance": 0.0, - "irrcapcl": "None", - "irrcapscl": "None", - "irrcapunit": "None", - "mapunitID": "675975", - "minCompDistance": 0.0, - "nirrcapcl": "7", - "nirrcapscl": "e", - "nirrcapunit": "None", - "rfvInfill": "No", - "sdeURL": "", - "seeURL": "", - "slope": 48.0, - "taxsubgrp": "Aquic Haplocryands", + "slope": 4.0, + "taxsubgrp": "Histic Cryaquepts", "textureInfill": "No" }, "siteDescription": "" @@ -792,289 +210,61 @@ }, "soilRank": [ { - "component": "Nagrom", + "component": "Typic vitricryands", "componentData": "Missing Data", - "componentID": 14268945, - "name": "Nagrom", + "componentID": 26612815, + "name": "Typic vitricryands", "not_displayed": false, "rank_data": "1", "rank_data_group": "1", "rank_data_loc": "1", "rank_data_loc_group": "1", - "rank_loc": "11", - "rank_loc_group": "11", - "score_data": 0.876, - "score_data_group": 0.876, - "score_data_loc": 0.447, - "score_data_loc_group": 0.447, - "score_loc": 0.017, - "score_loc_group": 0.017 + "rank_loc": 1, + "rank_loc_group": 1, + "score_data": 0.496, + "score_data_group": 0.496, + "score_data_loc": 0.491, + "score_data_loc_group": 0.491, + "score_loc": 0.486, + "score_loc_group": 0.486 }, { - "component": "Kindy", + "component": "Vitrandic dystrocryepts", "componentData": "Missing Data", - "componentID": 14268935, - "name": "Kindy", + "componentID": 26612824, + "name": "Vitrandic dystrocryepts", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "3", + "rank_data_group": "3", "rank_data_loc": "2", "rank_data_loc_group": "2", - "rank_loc": "10", - "rank_loc_group": "10", - "score_data": 0.818, - "score_data_group": 0.818, - "score_data_loc": 0.418, - "score_data_loc_group": 0.418, - "score_loc": 0.017, - "score_loc_group": 0.017 + "rank_loc": 2, + "rank_loc_group": 2, + "score_data": 0.229, + "score_data_group": 0.229, + "score_data_loc": 0.294, + "score_data_loc_group": 0.294, + "score_loc": 0.36, + "score_loc_group": 0.36 }, { - "component": "Nimue", + "component": "Histic cryaquepts", "componentData": "Missing Data", - "componentID": 14268934, - "name": "Nimue2", + "componentID": 26612823, + "name": "Histic cryaquepts", "not_displayed": false, - "rank_data": "4", - "rank_data_group": "4", + "rank_data": "2", + "rank_data_group": "2", "rank_data_loc": "3", "rank_data_loc_group": "3", - "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "score_data": 0.662, - "score_data_group": 0.662, - "score_data_loc": 0.396, - "score_data_loc_group": 0.396, - "score_loc": 0.131, - "score_loc_group": 0.131 - }, - { - "component": "Andic xerochrepts", - "componentData": "Missing Data", - "componentID": 14268948, - "name": "Andic xerochrepts", - "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", - "rank_data_loc": "4", - "rank_data_loc_group": "4", - "rank_loc": "12", - "rank_loc_group": "12", - "score_data": 0.719, - "score_data_group": 0.719, - "score_data_loc": 0.365, - "score_data_loc_group": 0.365, - "score_loc": 0.011, - "score_loc_group": 0.011 - }, - { - "component": "Cryorthods", - "componentData": "Missing Data", - "componentID": 14269505, - "name": "Cryorthods", - "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", - "rank_data_loc": "5", - "rank_data_loc_group": "5", - "rank_loc": "3", - "rank_loc_group": "3", - "score_data": 0.631, - "score_data_group": 0.631, - "score_data_loc": 0.348, - "score_data_loc_group": 0.348, - "score_loc": 0.065, - "score_loc_group": 0.065 - }, - { - "component": "Diobsud", - "componentData": "Missing Data", - "componentID": 14268932, - "name": "Diobsud", - "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", - "rank_data_loc": "6", - "rank_data_loc_group": "6", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.648, - "score_data_group": 0.648, - "score_data_loc": 0.335, - "score_data_loc_group": 0.335, - "score_loc": 0.023, - "score_loc_group": 0.023 - }, - { - "component": "Getchell", - "componentData": "Missing Data", - "componentID": 14268946, - "name": "Getchell2", - "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", - "rank_data_loc": "7", - "rank_data_loc_group": "7", - "rank_loc": "Not Displayed", - "rank_loc_group": "4", - "score_data": 0.591, - "score_data_group": 0.591, - "score_data_loc": 0.327, - "score_data_loc_group": 0.327, - "score_loc": 0.062, - "score_loc_group": 0.062 - }, - { - "component": "Andic cryumbrepts", - "componentData": "Missing Data", - "componentID": 14269504, - "name": "Andic cryumbrepts", - "not_displayed": false, - "rank_data": "8", - "rank_data_group": "8", - "rank_data_loc": "8", - "rank_data_loc_group": "8", - "rank_loc": "2", - "rank_loc_group": "2", - "score_data": 0.493, - "score_data_group": 0.493, - "score_data_loc": 0.289, - "score_data_loc_group": 0.289, - "score_loc": 0.086, - "score_loc_group": 0.086 - }, - { - "component": "Cryaquepts", - "componentData": "Missing Data", - "componentID": 14269507, - "name": "Cryaquepts", - "not_displayed": false, - "rank_data": "9", - "rank_data_group": "9", - "rank_data_loc": "9", - "rank_data_loc_group": "9", - "rank_loc": "7", - "rank_loc_group": "7", - "score_data": 0.469, - "score_data_group": 0.469, - "score_data_loc": 0.245, - "score_data_loc_group": 0.245, - "score_loc": 0.022, - "score_loc_group": 0.022 - }, - { - "component": "Cryumbrepts", - "componentData": "Missing Data", - "componentID": 14269506, - "name": "Cryumbrepts", - "not_displayed": false, - "rank_data": "11", - "rank_data_group": "11", - "rank_data_loc": "10", - "rank_data_loc_group": "10", - "rank_loc": "5", - "rank_loc_group": "5", - "score_data": 0.372, - "score_data_group": 0.372, - "score_data_loc": 0.207, - "score_data_loc_group": 0.207, - "score_loc": 0.043, - "score_loc_group": 0.043 - }, - { - "component": "Cryohumods", - "componentData": "Missing Data", - "componentID": 14269509, - "name": "Cryohumods", - "not_displayed": false, - "rank_data": "10", - "rank_data_group": "10", - "rank_data_loc": "11", - "rank_data_loc_group": "11", - "rank_loc": "8", - "rank_loc_group": "8", - "score_data": 0.372, - "score_data_group": 0.372, - "score_data_loc": 0.197, - "score_data_loc_group": 0.197, - "score_loc": 0.022, - "score_loc_group": 0.022 - }, - { - "component": "Haplocryods", - "componentData": "Missing Data", - "componentID": 14269511, - "name": "Haplocryods", - "not_displayed": false, - "rank_data": "12", - "rank_data_group": "12", - "rank_data_loc": "12", - "rank_data_loc_group": "12", - "rank_loc": "9", - "rank_loc_group": "9", - "score_data": 0.362, - "score_data_group": 0.362, - "score_data_loc": 0.192, - "score_data_loc_group": 0.192, - "score_loc": 0.022, - "score_loc_group": 0.022 - }, - { - "component": "Nimue", - "componentData": "Missing Data", - "componentID": 14268942, - "name": "Nimue3", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "4", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "3", - "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "score_data": 0.582, - "score_data_group": 0.662, - "score_data_loc": 0.356, - "score_data_loc_group": 0.396, - "score_loc": 0.131, - "score_loc_group": 0.131 - }, - { - "component": "Getchell", - "componentData": "Missing Data", - "componentID": 14268944, - "name": "Getchell", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "7", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "7", - "rank_loc": "4", - "rank_loc_group": "4", - "score_data": 0.503, - "score_data_group": 0.591, - "score_data_loc": 0.283, - "score_data_loc_group": 0.327, - "score_loc": 0.062, - "score_loc_group": 0.062 - }, - { - "component": "Nimue", - "componentData": "Missing Data", - "componentID": 14268930, - "name": "Nimue", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "4", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "3", - "rank_loc": "1", - "rank_loc_group": "1", - "score_data": 0.408, - "score_data_group": 0.662, - "score_data_loc": 0.27, - "score_data_loc_group": 0.396, - "score_loc": 0.131, - "score_loc_group": 0.131 + "rank_loc": 3, + "rank_loc_group": 3, + "score_data": 0.352, + "score_data_group": 0.352, + "score_data_loc": 0.253, + "score_data_loc_group": 0.253, + "score_loc": 0.154, + "score_loc_group": 0.154 } ] } diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[60.42282639,-158.4018264].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[60.42282639,-158.4018264].json index c8dd081..a554547 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[60.42282639,-158.4018264].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[60.42282639,-158.4018264].json @@ -41,13 +41,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R236XY109AK" + "R236XY107AK" ], "ecoclassname": [ - "Subarctic Low Scrub Peat Drainages" + "Western Alaska Maritime Scrub Gravelly Drainages" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY109AK" + "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY107AK" ] } }, @@ -64,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26176414", + "componentID": "26723599", "componentKind": "Taxon above family", "componentPct": 24, "dataSource": "SSURGO", @@ -97,13 +97,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R236XY107AK" + "R236XY132AK" ], "ecoclassname": [ - "Western Alaska Maritime Scrub Gravelly Drainages" + "Subarctic Dwarf Scrub Dry Loamy Slopes" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY107AK" + "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY132AK" ] } }, @@ -120,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26176416", + "componentID": "26723596", "componentKind": "Taxon above family", "componentPct": 23, "dataSource": "SSURGO", @@ -153,13 +153,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R236XY140AK" + "F236XY139AK" ], "ecoclassname": [ - "Subarctic Tussock Tundra Wet Loamy Plains" + "Boreal Woodland Loamy Rises" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY140AK" + "https://edit.sc.egov.usda.gov/catalogs/esd/236X/F236XY139AK" ] } }, @@ -176,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26176412", + "componentID": "26723600", "componentKind": "Taxon above family", "componentPct": 20, "dataSource": "SSURGO", @@ -209,13 +209,13 @@ "esd": { "ESD": { "ecoclassid": [ - "F236XY139AK" + "R236XY131AK" ], "ecoclassname": [ - "Boreal Woodland Loamy Rises" + "Subarctic Tussock-Scrub Frozen Plains" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/236X/F236XY139AK" + "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY131AK" ] } }, @@ -232,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26176417", + "componentID": "26723598", "componentKind": "Taxon above family", "componentPct": 17, "dataSource": "SSURGO", @@ -265,13 +265,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R236XY132AK" + "R236XY140AK" ], "ecoclassname": [ - "Subarctic Dwarf Scrub Dry Loamy Slopes" + "Subarctic Tussock Tundra Wet Loamy Plains" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY132AK" + "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY140AK" ] } }, @@ -288,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26176415", + "componentID": "26723597", "componentKind": "Taxon above family", "componentPct": 10, "dataSource": "SSURGO", @@ -321,13 +321,13 @@ "esd": { "ESD": { "ecoclassid": [ - "R236XY131AK" + "R236XY109AK" ], "ecoclassname": [ - "Subarctic Tussock-Scrub Frozen Plains" + "Subarctic Low Scrub Peat Drainages" ], "edit_url": [ - "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY131AK" + "https://edit.sc.egov.usda.gov/catalogs/esd/236X/R236XY109AK" ] } }, @@ -344,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "26176413", + "componentID": "26723595", "componentKind": "Taxon above family", "componentPct": 1, "dataSource": "SSURGO", @@ -380,7 +380,7 @@ { "component": "D36-western maritime tussock scrub loamy eolian slopes", "componentData": "Missing Data", - "componentID": 26176414, + "componentID": 26723599, "name": "D36-western maritime tussock scrub loamy eolian slopes", "not_displayed": false, "rank_data": "1", @@ -399,7 +399,7 @@ { "component": "D36-western maritime dwarf scrub loamy glaciated slopes", "componentData": "Missing Data", - "componentID": 26176416, + "componentID": 26723596, "name": "D36-western maritime dwarf scrub loamy glaciated slopes", "not_displayed": false, "rank_data": "5", @@ -418,7 +418,7 @@ { "component": "D36-boreal forest loamy eolian slopes", "componentData": "Missing Data", - "componentID": 26176415, + "componentID": 26723597, "name": "D36-boreal forest loamy eolian slopes", "not_displayed": false, "rank_data": "2", @@ -437,7 +437,7 @@ { "component": "D36-western maritime scrub organic peat mounds", "componentData": "Missing Data", - "componentID": 26176417, + "componentID": 26723598, "name": "D36-western maritime scrub organic peat mounds", "not_displayed": false, "rank_data": "4", @@ -456,7 +456,7 @@ { "component": "D36-western maritime sedge organic depressions", "componentData": "Missing Data", - "componentID": 26176412, + "componentID": 26723600, "name": "D36-western maritime sedge organic depressions", "not_displayed": false, "rank_data": "6", @@ -475,7 +475,7 @@ { "component": "D36-western maritime scrub drainageways", "componentData": "Missing Data", - "componentID": 26176413, + "componentID": 26723595, "name": "D36-western maritime scrub drainageways", "not_displayed": false, "rank_data": "3", diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[62.32776717,-157.2767099].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[62.32776717,-157.2767099].json index e2b2d1d..a6913fb 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[62.32776717,-157.2767099].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[62.32776717,-157.2767099].json @@ -40,9 +40,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "F230XY612AK" + ], + "ecoclassname": [ + "Boreal Forest Loamy Slopes" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/F230XY612AK" + ] } }, "id": { @@ -58,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913863", + "componentID": "27026711", "componentKind": "Taxon above family", "componentPct": 30, "dataSource": "SSURGO", @@ -90,9 +96,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -108,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913856", + "componentID": "27026717", "componentKind": "Taxon above family", "componentPct": 29, "dataSource": "SSURGO", @@ -140,9 +152,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -158,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913864", + "componentID": "27026716", "componentKind": "Taxon above family", "componentPct": 13, "dataSource": "SSURGO", @@ -190,9 +208,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -208,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913862", + "componentID": "27026714", "componentKind": "Taxon above family", "componentPct": 7, "dataSource": "SSURGO", @@ -240,9 +264,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -258,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913861", + "componentID": "27026715", "componentKind": "Taxon above family", "componentPct": 6, "dataSource": "SSURGO", @@ -290,9 +320,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "F230XY611AK" + ], + "ecoclassname": [ + "Boreal Forest Loamy Frozen Slopes" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/F230XY611AK" + ] } }, "id": { @@ -308,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913860", + "componentID": "27026713", "componentKind": "Taxon above family", "componentPct": 5, "dataSource": "SSURGO", @@ -340,9 +376,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "R230XY630AK" + ], + "ecoclassname": [ + "Alpine Dwarf Scrub Gravelly Slopes" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/R230XY630AK" + ] } }, "id": { @@ -358,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913859", + "componentID": "27026712", "componentKind": "Taxon above family", "componentPct": 4, "dataSource": "SSURGO", @@ -390,9 +432,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -408,7 +456,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913857", + "componentID": "27026718", "componentKind": "Taxon above family", "componentPct": 3, "dataSource": "SSURGO", @@ -440,9 +488,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -458,7 +512,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24913858", + "componentID": "27026719", "componentKind": "Taxon above family", "componentPct": 3, "dataSource": "SSURGO", @@ -494,7 +548,7 @@ { "component": "E30-boreal forest-silty slopes", "componentData": "Missing Data", - "componentID": 24913863, + "componentID": 27026711, "name": "E30-boreal forest-silty slopes", "not_displayed": false, "rank_data": "1", @@ -513,7 +567,7 @@ { "component": "E30-boreal alpine scrub-gravelly colluvial slopes", "componentData": "Missing Data", - "componentID": 24913856, + "componentID": 27026717, "name": "E30-boreal alpine scrub-gravelly colluvial slopes", "not_displayed": false, "rank_data": "4", @@ -532,7 +586,7 @@ { "component": "E30-boreal taiga-loamy frozen colluvial slopes", "componentData": "Missing Data", - "componentID": 24913864, + "componentID": 27026716, "name": "E30-boreal taiga-loamy frozen colluvial slopes", "not_displayed": false, "rank_data": "2", @@ -551,7 +605,7 @@ { "component": "E30-boreal taiga-silty slopes", "componentData": "Missing Data", - "componentID": 24913862, + "componentID": 27026714, "name": "E30-boreal taiga-silty slopes", "not_displayed": false, "rank_data": "3", @@ -570,7 +624,7 @@ { "component": "E30-boreal taiga/tussock-silty frozen slopes", "componentData": "Missing Data", - "componentID": 24913861, + "componentID": 27026715, "name": "E30-boreal taiga/tussock-silty frozen slopes", "not_displayed": false, "rank_data": "6", @@ -589,7 +643,7 @@ { "component": "E30-boreal scrub-silty frozen drainageways", "componentData": "Missing Data", - "componentID": 24913859, + "componentID": 27026712, "name": "E30-boreal scrub-silty frozen drainageways", "not_displayed": false, "rank_data": "5", @@ -608,7 +662,7 @@ { "component": "E30-boreal subalpine woodland-gravelly colluvial slopes", "componentData": "Missing Data", - "componentID": 24913858, + "componentID": 27026719, "name": "E30-boreal subalpine woodland-gravelly colluvial slopes", "not_displayed": false, "rank_data": "7", @@ -627,7 +681,7 @@ { "component": "E30-boreal alpine dwarf scrub-gravelly colluvial slopes", "componentData": "Missing Data", - "componentID": 24913857, + "componentID": 27026718, "name": "E30-boreal alpine dwarf scrub-gravelly colluvial slopes", "not_displayed": false, "rank_data": "8", @@ -646,7 +700,7 @@ { "component": "E30-boreal subalpine scrub-loamy colluvial slopes", "componentData": "Missing Data", - "componentID": 24913860, + "componentID": 27026713, "name": "E30-boreal subalpine scrub-loamy colluvial slopes", "not_displayed": false, "rank_data": "9", diff --git a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[63.52666854,-156.4422738].json b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[63.52666854,-156.4422738].json index a2a8118..18e6aea 100644 --- a/soil_id/tests/us/__snapshots__/test_us/test_soil_location[63.52666854,-156.4422738].json +++ b/soil_id/tests/us/__snapshots__/test_us/test_soil_location[63.52666854,-156.4422738].json @@ -40,9 +40,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "F230XY612AK" + ], + "ecoclassname": [ + "Boreal Forest Loamy Slopes" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/F230XY612AK" + ] } }, "id": { @@ -58,7 +64,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914406", + "componentID": "26837483", "componentKind": "Taxon above family", "componentPct": 34, "dataSource": "SSURGO", @@ -90,9 +96,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "R230XY610AK" + ], + "ecoclassname": [ + "Boreal Scrub Silty Frozen Drainages" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/R230XY610AK" + ] } }, "id": { @@ -108,7 +120,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914408", + "componentID": "26837485", "componentKind": "Taxon above family", "componentPct": 19, "dataSource": "SSURGO", @@ -140,9 +152,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -158,7 +176,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914411", + "componentID": "26837488", "componentKind": "Taxon above family", "componentPct": 12, "dataSource": "SSURGO", @@ -190,9 +208,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "F230XY611AK" + ], + "ecoclassname": [ + "Boreal Forest Loamy Frozen Slopes" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/F230XY611AK" + ] } }, "id": { @@ -208,7 +232,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914462", + "componentID": "26837434", "componentKind": "Taxon above family", "componentPct": 43, "dataSource": "SSURGO", @@ -240,9 +264,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -258,7 +288,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914409", + "componentID": "26837486", "componentKind": "Taxon above family", "componentPct": 9, "dataSource": "SSURGO", @@ -290,9 +320,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "R230XY620AK" + ], + "ecoclassname": [ + "Boreal Peat Frozen Flats Complex" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/R230XY620AK" + ] } }, "id": { @@ -308,7 +344,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914405", + "componentID": "26837482", "componentKind": "Taxon above family", "componentPct": 7, "dataSource": "SSURGO", @@ -340,9 +376,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -358,7 +400,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914386", + "componentID": "26837431", "componentKind": "Taxon above family", "componentPct": 23, "dataSource": "SSURGO", @@ -390,9 +432,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "F230XY611AK" + ], + "ecoclassname": [ + "Boreal Forest Loamy Frozen Slopes" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/F230XY611AK" + ] } }, "id": { @@ -408,7 +456,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914410", + "componentID": "26837487", "componentKind": "Taxon above family", "componentPct": 3, "dataSource": "SSURGO", @@ -440,9 +488,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "R230XY601AK" + ], + "ecoclassname": [ + "Boreal Forest Flood Plain Complex" + ], + "edit_url": [ + "https://edit.sc.egov.usda.gov/catalogs/esd/230X/R230XY601AK" + ] } }, "id": { @@ -458,7 +512,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914464", + "componentID": "26837436", "componentKind": "Taxon above family", "componentPct": 12, "dataSource": "SSURGO", @@ -490,9 +544,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -508,7 +568,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914387", + "componentID": "26837432", "componentKind": "Taxon above family", "componentPct": 11, "dataSource": "SSURGO", @@ -540,9 +600,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -558,7 +624,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914388", + "componentID": "26837433", "componentKind": "Taxon above family", "componentPct": 1, "dataSource": "SSURGO", @@ -590,9 +656,15 @@ "ec": {}, "esd": { "ESD": { - "ecoclassid": "", - "ecoclassname": "", - "edit_url": "" + "ecoclassid": [ + "" + ], + "ecoclassname": [ + "" + ], + "edit_url": [ + "" + ] } }, "id": { @@ -608,7 +680,7 @@ "sand": {}, "site": { "siteData": { - "componentID": "24914463", + "componentID": "26837435", "componentKind": "Taxon above family", "componentPct": 1, "dataSource": "SSURGO", @@ -644,7 +716,7 @@ { "component": "E30-boreal taiga-organic frozen peat plateaus", "componentData": "Missing Data", - "componentID": 24914411, + "componentID": 26837488, "name": "E30-boreal taiga-organic frozen peat plateaus", "not_displayed": false, "rank_data": "4", @@ -663,7 +735,7 @@ { "component": "E30-boreal taiga-loamy frozen colluvial slopes", "componentData": "Missing Data", - "componentID": 24914406, + "componentID": 26837483, "name": "E30-boreal taiga-loamy frozen colluvial slopes", "not_displayed": false, "rank_data": "8", @@ -682,7 +754,7 @@ { "component": "E30-boreal forest-silty loess slopes", "componentData": "Missing Data", - "componentID": 24914386, + "componentID": 26837431, "name": "E30-boreal forest-silty loess slopes", "not_displayed": false, "rank_data": "1", @@ -701,7 +773,7 @@ { "component": "E30-boreal forest-loamy flood plains", "componentData": "Missing Data", - "componentID": 24914409, + "componentID": 26837486, "name": "E30-boreal forest-loamy flood plains", "not_displayed": false, "rank_data": "5", @@ -720,7 +792,7 @@ { "component": "E30-boreal scrub-gravelly low flood plains", "componentData": "Missing Data", - "componentID": 24914408, + "componentID": 26837485, "name": "E30-boreal scrub-gravelly low flood plains", "not_displayed": false, "rank_data": "7", @@ -739,7 +811,7 @@ { "component": "E30-boreal subalpine woodland-gravelly colluvial slopes", "componentData": "Missing Data", - "componentID": 24914463, + "componentID": 26837435, "name": "E30-boreal subalpine woodland-gravelly colluvial slopes", "not_displayed": false, "rank_data": "2", @@ -758,7 +830,7 @@ { "component": "E30-boreal subalpine scrub-loamy colluvial slopes", "componentData": "Missing Data", - "componentID": 24914388, + "componentID": 26837433, "name": "E30-boreal subalpine scrub-loamy colluvial slopes", "not_displayed": false, "rank_data": "3", @@ -777,7 +849,7 @@ { "component": "E30-boreal taiga/tussock-silty frozen slopes", "componentData": "Missing Data", - "componentID": 24914464, + "componentID": 26837436, "name": "E30-boreal taiga/tussock-silty frozen slopes", "not_displayed": false, "rank_data": "6", @@ -796,7 +868,7 @@ { "component": "E30-boreal forest-silty slopes", "componentData": "Missing Data", - "componentID": 24914405, + "componentID": 26837482, "name": "E30-boreal forest-silty slopes", "not_displayed": false, "rank_data": "10", @@ -815,7 +887,7 @@ { "component": "E30-boreal scrub/sphagnum-organic depressions", "componentData": "Missing Data", - "componentID": 24914410, + "componentID": 26837487, "name": "E30-boreal scrub/sphagnum-organic depressions", "not_displayed": false, "rank_data": "9", @@ -834,7 +906,7 @@ { "component": "E30-boreal scrub-silty frozen drainageways", "componentData": "Missing Data", - "componentID": 24914387, + "componentID": 26837432, "name": "E30-boreal scrub-silty frozen drainageways", "not_displayed": false, "rank_data": "11", @@ -853,7 +925,7 @@ { "component": "E30-boreal taiga-silty frozen loess slopes", "componentData": "Missing Data", - "componentID": 24914462, + "componentID": 26837434, "name": "E30-boreal taiga-silty frozen loess slopes", "not_displayed": false, "rank_data": "12",