From 6642f728a6bc89cc4b79714e6fc8bc8b5bc66256 Mon Sep 17 00:00:00 2001 From: garo Date: Wed, 1 Oct 2025 13:04:28 -0700 Subject: [PATCH 1/3] fix: resolve URL mapping and non-deterministic ordering issues in US soil identification - Replace index-based URL storage with component key mapping to fix URL mismatches - Add deterministic sorting to groupby operations for consistent component ordering - Improve component name duplication handling with sorted processing - Fix Series URL generation logic to properly match components with their URLs Resolves issues where soil components received incorrect SDE/SEE URLs due to sorting misalignment between URL lists and component data ordering. --- soil_id/us_soil.py | 78 +++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/soil_id/us_soil.py b/soil_id/us_soil.py index 51a268c..3c6e0ab 100644 --- a/soil_id/us_soil.py +++ b/soil_id/us_soil.py @@ -218,7 +218,7 @@ def list_soils(lon, lat): # Add distance column from mucompdata_pd using cokey link muhorzdata_pd = pd.merge( muhorzdata_pd, - mucompdata_pd[["cokey", "distance", "distance_score"]], + mucompdata_pd[["cokey", "distance", "distance_score"]], on="cokey", how="left", ) @@ -235,9 +235,7 @@ def list_soils(lon, lat): mucompdata_pd = mucompdata_pd[mucompdata_pd["cokey"].isin(comp_key)] # Sort mucompdata_pd based on 'cond_prob' and 'distance' - mucompdata_pd.sort_values( - ["cond_prob", "distance", "compname"], ascending=[False, True, True], inplace=True - ) + mucompdata_pd.sort_values(["cond_prob", "distance", "compname"], ascending=[False, True, True], inplace=True) mucompdata_pd.reset_index(drop=True, inplace=True) # Duplicate the 'compname' column for grouping purposes @@ -261,13 +259,16 @@ def list_soils(lon, lat): component_names = mucompdata_pd["compname"].tolist() name_counts = collections.Counter(component_names) + # Track which indices have been processed for each name + processed_indices = {} + for name, count in sorted(name_counts.items()): # Sort for deterministic order if count > 1: # If a component name is duplicated # Find all indices for this name indices = [i for i, comp_name in enumerate(component_names) if comp_name == name] # Sort indices for deterministic order indices.sort() - + # Add suffixes to all occurrences except the first for i, idx in enumerate(indices): if i > 0: # Skip the first occurrence (keep original name) @@ -665,9 +666,7 @@ def list_soils(lon, lat): if mucompdata_pd["compkind"].isin(OSD_compkind).any(): # Group data by cokey - OSDhorzdata_group_cokey = [ - group for _, group in OSDhorzdata_pd.groupby("cokey", sort=False) - ] + OSDhorzdata_group_cokey = [group for _, group in OSDhorzdata_pd.groupby("cokey")] # Initialize empty lists lab_lyrs = [] @@ -976,39 +975,39 @@ def list_soils(lon, lat): munsell_lyrs.append(dict(zip(hzb_lyrs[index].keys(), munsell_dummy))) # Series URL Generation - # Initialize lists to store series URLs - SDE_URL = [] - SEE_URL = [] + # Create a mapping of cokey to URLs for safe lookup + cokey_to_urls = {} - # Group data by 'cokey' - OSDhorzdata_group_cokey = [g for _, g in OSDhorzdata_pd.groupby("cokey", sort=False)] + # Group data by 'cokey' - use sort=True for deterministic ordering + OSDhorzdata_group_cokey = [g for _, g in OSDhorzdata_pd.groupby("cokey", sort=True)] for index, group in enumerate(OSDhorzdata_group_cokey): + cokey = group["cokey"].iloc[0] # Get the cokey for this group + # Check if compkind is not in OSD_compkind or if series contains any null values if ( - mucompdata_pd.loc[index]["compkind"] not in OSD_compkind + mucompdata_pd[mucompdata_pd["cokey"] == cokey]["compkind"].iloc[0] not in OSD_compkind or group["series"].isnull().any() ): - SDE_URL.append("") - SEE_URL.append("") + cokey_to_urls[cokey] = {"sde": "", "see": ""} else: - # Extract compname, convert to lowercase, remove trailing numbers, and replace - # spaces with underscores + # Extract compname, convert to lowercase, remove trailing numbers, and replace spaces with underscores comp = group["compname"].iloc[0].lower() comp = re.sub(r"\d+$", "", comp) comp = comp.replace(" ", "_") - # Create and append URLs - SDE_URL.append(f"https://casoilresource.lawr.ucdavis.edu/sde/?series={comp}") - SEE_URL.append(f"https://casoilresource.lawr.ucdavis.edu/see/#{comp}") + # Create URLs + cokey_to_urls[cokey] = { + "sde": f"https://casoilresource.lawr.ucdavis.edu/sde/?series={comp}", + "see": f"https://casoilresource.lawr.ucdavis.edu/see/#{comp}" + } else: # Initialize lists to store data layers and URLs lab_lyrs = [] lab_intpl_lyrs = [] munsell_lyrs = [] - SDE_URL = [] - SEE_URL = [] + cokey_to_urls = {} # Iterate over each entry in mucompdata_pd for i in range(len(mucompdata_pd)): @@ -1029,17 +1028,16 @@ def list_soils(lon, lat): lab_lyrs.append(dict(zip(keys, lab_dummy))) munsell_lyrs.append(dict(zip(keys, munsell_dummy))) - # Append empty URLs - SDE_URL.append("") - SEE_URL.append("") + # Create empty URLs for each component + cokey = mucompdata_pd.iloc[i]["cokey"] + cokey_to_urls[cokey] = {"sde": "", "see": ""} else: # Initialize lists to store data layers and URLs lab_lyrs = [] lab_intpl_lyrs = [] munsell_lyrs = [] - SDE_URL = [] - SEE_URL = [] + cokey_to_urls = {} # Iterate over each entry in mucompdata_pd for i in range(len(mucompdata_pd)): @@ -1060,9 +1058,9 @@ def list_soils(lon, lat): lab_lyrs.append(dict(zip(keys, lab_dummy))) munsell_lyrs.append(dict(zip(keys, munsell_dummy))) - # Append empty URLs - SDE_URL.append("") - SEE_URL.append("") + # Create empty URLs for each component + cokey = mucompdata_pd.iloc[i]["cokey"] + cokey_to_urls[cokey] = {"sde": "", "see": ""} # Subset datasets to exclude pedons without any depth information cokeys_with_depth = mucompdata_pd[mucompdata_pd["comp_max_bottom"] > 0].cokey.unique() @@ -1429,7 +1427,7 @@ def list_soils(lon, lat): # Replace NaN values with an empty string mucompdata_cond_prob = mucompdata_cond_prob.fillna("") - # Generate the Site list + # Generate the Site list using cokey-based URL lookup Site = [ { "siteData": { @@ -1450,8 +1448,8 @@ def list_soils(lon, lat): "irrcapscl": row["irrcapscl"], "irrcapunit": row["irrcapunit"], "taxsubgrp": row["taxsubgrp"], - "sdeURL": SDE_URL[idx], - "seeURL": SEE_URL[idx], + "sdeURL": cokey_to_urls.get(row["cokey"], {"sde": ""})["sde"], + "seeURL": cokey_to_urls.get(row["cokey"], {"see": ""})["see"], }, "siteDescription": row["brief_narrative"], } @@ -1583,7 +1581,7 @@ def rank_soils( # Check if list_output_data is a string (error message) instead of expected object if isinstance(list_output_data, str): return {"error": f"Cannot rank soils: {list_output_data}"} - + # --------------------------------------------------------------------------------------- # ------ Load in user data --------# # Initialize the DataFrame from the input data @@ -2070,14 +2068,12 @@ def rank_soils( # Concatenate the sorted and ranked groups D_final = pd.concat(soilIDList_data).reset_index(drop=True) - + # Merge with the Rank_Filter data D_final = pd.merge(D_final, Rank_Filter, on="compname", how="left") # Sort dataframe to correctly assign Rank_Data - D_final = D_final.sort_values( - by=["soilID_rank_data", "Score_Data", "compname"], ascending=[False, False, True] - ) + D_final = D_final.sort_values(by=["soilID_rank_data", "Score_Data", "compname"], ascending=[False, False, True]) # Assigning rank based on the soilID rank and rank status rank_id = 1 @@ -2171,9 +2167,7 @@ def rank_soils( soilIDList_out = [] for _, group in D_final_loc.groupby("compname_grp", sort=True): - group = group.sort_values( - ["Score_Data_Loc", "compname"], ascending=[False, True] - ).reset_index(drop=True) + group = group.sort_values(["Score_Data_Loc", "compname"], ascending=[False, True]).reset_index(drop=True) group["soilID_rank_final"] = [True if idx == 0 else False for idx in range(len(group))] soilIDList_out.append(group) From 339bbd67c73060d8763f0b8e5b130df7043753e7 Mon Sep 17 00:00:00 2001 From: jjmaynard Date: Tue, 30 Sep 2025 16:43:45 -0700 Subject: [PATCH 2/3] fix: refactor sorting and formatting for readability Improves code readability by reformatting long sort_values and other function calls across the file. No functional changes were made; only code style and formatting were updated for clarity and consistency. --- soil_id/us_soil.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/soil_id/us_soil.py b/soil_id/us_soil.py index 3c6e0ab..e3d6021 100644 --- a/soil_id/us_soil.py +++ b/soil_id/us_soil.py @@ -218,7 +218,7 @@ def list_soils(lon, lat): # Add distance column from mucompdata_pd using cokey link muhorzdata_pd = pd.merge( muhorzdata_pd, - mucompdata_pd[["cokey", "distance", "distance_score"]], + mucompdata_pd[["cokey", "distance", "distance_score"]], on="cokey", how="left", ) @@ -235,7 +235,9 @@ def list_soils(lon, lat): mucompdata_pd = mucompdata_pd[mucompdata_pd["cokey"].isin(comp_key)] # Sort mucompdata_pd based on 'cond_prob' and 'distance' - mucompdata_pd.sort_values(["cond_prob", "distance", "compname"], ascending=[False, True, True], inplace=True) + mucompdata_pd.sort_values( + ["cond_prob", "distance", "compname"], ascending=[False, True, True], inplace=True + ) mucompdata_pd.reset_index(drop=True, inplace=True) # Duplicate the 'compname' column for grouping purposes @@ -259,16 +261,13 @@ def list_soils(lon, lat): component_names = mucompdata_pd["compname"].tolist() name_counts = collections.Counter(component_names) - # Track which indices have been processed for each name - processed_indices = {} - for name, count in sorted(name_counts.items()): # Sort for deterministic order if count > 1: # If a component name is duplicated # Find all indices for this name indices = [i for i, comp_name in enumerate(component_names) if comp_name == name] # Sort indices for deterministic order indices.sort() - + # Add suffixes to all occurrences except the first for i, idx in enumerate(indices): if i > 0: # Skip the first occurrence (keep original name) @@ -983,10 +982,11 @@ def list_soils(lon, lat): for index, group in enumerate(OSDhorzdata_group_cokey): cokey = group["cokey"].iloc[0] # Get the cokey for this group - + # Check if compkind is not in OSD_compkind or if series contains any null values if ( - mucompdata_pd[mucompdata_pd["cokey"] == cokey]["compkind"].iloc[0] not in OSD_compkind + mucompdata_pd[mucompdata_pd["cokey"] == cokey]["compkind"].iloc[0] + not in OSD_compkind or group["series"].isnull().any() ): cokey_to_urls[cokey] = {"sde": "", "see": ""} @@ -999,7 +999,7 @@ def list_soils(lon, lat): # Create URLs cokey_to_urls[cokey] = { "sde": f"https://casoilresource.lawr.ucdavis.edu/sde/?series={comp}", - "see": f"https://casoilresource.lawr.ucdavis.edu/see/#{comp}" + "see": f"https://casoilresource.lawr.ucdavis.edu/see/#{comp}", } else: @@ -1581,7 +1581,7 @@ def rank_soils( # Check if list_output_data is a string (error message) instead of expected object if isinstance(list_output_data, str): return {"error": f"Cannot rank soils: {list_output_data}"} - + # --------------------------------------------------------------------------------------- # ------ Load in user data --------# # Initialize the DataFrame from the input data @@ -2068,12 +2068,14 @@ def rank_soils( # Concatenate the sorted and ranked groups D_final = pd.concat(soilIDList_data).reset_index(drop=True) - + # Merge with the Rank_Filter data D_final = pd.merge(D_final, Rank_Filter, on="compname", how="left") # Sort dataframe to correctly assign Rank_Data - D_final = D_final.sort_values(by=["soilID_rank_data", "Score_Data", "compname"], ascending=[False, False, True]) + D_final = D_final.sort_values( + by=["soilID_rank_data", "Score_Data", "compname"], ascending=[False, False, True] + ) # Assigning rank based on the soilID rank and rank status rank_id = 1 @@ -2167,7 +2169,9 @@ def rank_soils( soilIDList_out = [] for _, group in D_final_loc.groupby("compname_grp", sort=True): - group = group.sort_values(["Score_Data_Loc", "compname"], ascending=[False, True]).reset_index(drop=True) + group = group.sort_values( + ["Score_Data_Loc", "compname"], ascending=[False, True] + ).reset_index(drop=True) group["soilID_rank_final"] = [True if idx == 0 else False for idx in range(len(group))] soilIDList_out.append(group) From 099c4652173e85477f091d5318c84f4a70972b0f Mon Sep 17 00:00:00 2001 From: garo Date: Thu, 26 Feb 2026 16:27:07 -0800 Subject: [PATCH 3/3] chore: update snapshots --- ...il_location[33.81246789,-101.9733687].json | 208 ++++++------- ...t_soil_location[35.59918,-120.491439].json | 48 +-- .../test_soil_location[37.422,-122.084].json | 114 +++---- ...il_location[37.48216451,-99.55016693].json | 236 +++++++------- ...il_location[39.26009312,-85.50621214].json | 292 +++++++++--------- ..._soil_location[42.494912,-123.064531].json | 204 ++++++------ ...il_location[42.63413723,-94.31005777].json | 140 ++++----- ...il_location[43.06450312,-119.4596489].json | 158 +++++----- ...il_location[45.88932423,-121.0347381].json | 16 +- ...soil_location[47.213922,-69.28246582].json | 74 ++--- 10 files changed, 745 insertions(+), 745 deletions(-) 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 8b1a6bf..96f581b 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 @@ -663,16 +663,16 @@ "componentID": 27108933, "name": "Randall", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", + "rank_data": "9", + "rank_data_group": "9", "rank_data_loc": "1", "rank_data_loc_group": "1", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.533, - "score_data_group": 0.533, - "score_data_loc": 0.504, - "score_data_loc_group": 0.504, + "score_data": 0.415, + "score_data_group": 0.415, + "score_data_loc": 0.445, + "score_data_loc_group": 0.445, "score_loc": 0.474, "score_loc_group": 0.474 }, @@ -682,94 +682,56 @@ "componentID": 27108855, "name": "Acuff2", "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", + "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.504, - "score_data_group": 0.504, - "score_data_loc": 0.379, - "score_data_loc_group": 0.379, + "score_data": 0.617, + "score_data_group": 0.617, + "score_data_loc": 0.435, + "score_data_loc_group": 0.435, "score_loc": 0.253, "score_loc_group": 0.253 }, { - "component": "Olton", + "component": "Amarillo", "componentData": "Data Complete", - "componentID": 27108854, - "name": "Olton", + "componentID": 27108890, + "name": "Amarillo", "not_displayed": false, - "rank_data": "4", - "rank_data_group": "4", + "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.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 + "rank_loc": "8", + "rank_loc_group": "8", + "score_data": 0.645, + "score_data_group": 0.645, + "score_data_loc": 0.328, + "score_data_loc_group": 0.328, + "score_loc": 0.011, + "score_loc_group": 0.011 }, { - "component": "Friona", + "component": "Olton", "componentData": "Data Complete", - "componentID": 27108892, - "name": "Friona", + "componentID": 27108854, + "name": "Olton", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", + "rank_data": "7", + "rank_data_group": "7", "rank_data_loc": "4", "rank_data_loc_group": "4", - "rank_loc": "7", - "rank_loc_group": "7", - "score_data": 0.57, - "score_data_group": 0.57, - "score_data_loc": 0.292, - "score_data_loc_group": 0.292, - "score_loc": 0.014, - "score_loc_group": 0.014 - }, - { - "component": "Estacado", - "componentData": "Data Complete", - "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, - "score_data_group": 0.553, - "score_data_loc": 0.282, - "score_data_loc_group": 0.282, - "score_loc": 0.011, - "score_loc_group": 0.011 + "rank_loc": "3", + "rank_loc_group": "3", + "score_data": 0.487, + "score_data_group": 0.487, + "score_data_loc": 0.306, + "score_data_loc_group": 0.306, + "score_loc": 0.126, + "score_loc_group": 0.126 }, { "component": "Mclean", @@ -777,10 +739,10 @@ "componentID": 27108934, "name": "Mclean", "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", - "rank_data_loc": "7", - "rank_data_loc_group": "7", + "rank_data": "5", + "rank_data_group": "5", + "rank_data_loc": "5", + "rank_data_loc_group": "5", "rank_loc": "4", "rank_loc_group": "4", "score_data": 0.5, @@ -790,25 +752,63 @@ "score_loc": 0.059, "score_loc_group": 0.059 }, + { + "component": "Friona", + "componentData": "Data Complete", + "componentID": 27108892, + "name": "Friona", + "not_displayed": false, + "rank_data": "3", + "rank_data_group": "3", + "rank_data_loc": "6", + "rank_data_loc_group": "6", + "rank_loc": "7", + "rank_loc_group": "7", + "score_data": 0.543, + "score_data_group": 0.543, + "score_data_loc": 0.279, + "score_data_loc_group": 0.279, + "score_loc": 0.014, + "score_loc_group": 0.014 + }, { "component": "Lockney", "componentData": "Missing Data", "componentID": 27108935, "name": "Lockney", "not_displayed": false, - "rank_data": "9", - "rank_data_group": "9", - "rank_data_loc": "8", - "rank_data_loc_group": "8", + "rank_data": "4", + "rank_data_group": "4", + "rank_data_loc": "7", + "rank_data_loc_group": "7", "rank_loc": "5", "rank_loc_group": "5", - "score_data": 0.447, - "score_data_group": 0.447, - "score_data_loc": 0.239, - "score_data_loc_group": 0.239, + "score_data": 0.504, + "score_data_group": 0.504, + "score_data_loc": 0.267, + "score_data_loc_group": 0.267, "score_loc": 0.03, "score_loc_group": 0.03 }, + { + "component": "Estacado", + "componentData": "Data Complete", + "componentID": 27108857, + "name": "Estacado2", + "not_displayed": false, + "rank_data": "6", + "rank_data_group": "6", + "rank_data_loc": "8", + "rank_data_loc_group": "8", + "rank_loc": "Not Displayed", + "rank_loc_group": "6", + "score_data": 0.499, + "score_data_group": 0.499, + "score_data_loc": 0.26, + "score_data_loc_group": 0.26, + "score_loc": 0.021, + "score_loc_group": 0.021 + }, { "component": "Pullman", "componentData": "Data Complete", @@ -821,10 +821,10 @@ "rank_data_loc_group": "9", "rank_loc": "9", "rank_loc_group": "9", - "score_data": 0.462, - "score_data_group": 0.462, - "score_data_loc": 0.237, - "score_data_loc_group": 0.237, + "score_data": 0.483, + "score_data_group": 0.483, + "score_data_loc": 0.247, + "score_data_loc_group": 0.247, "score_loc": 0.011, "score_loc_group": 0.011 }, @@ -835,34 +835,34 @@ "name": "Acuff", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "6", + "rank_data_group": "2", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "2", "rank_loc": "2", "rank_loc_group": "2", "score_data": 0.49, - "score_data_group": 0.504, + "score_data_group": 0.617, "score_data_loc": 0.372, - "score_data_loc_group": 0.379, + "score_data_loc_group": 0.435, "score_loc": 0.253, "score_loc_group": 0.253 }, { "component": "Estacado", "componentData": "Data Complete", - "componentID": 27108857, - "name": "Estacado2", + "componentID": 27108891, + "name": "Estacado", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "3", + "rank_data_group": "6", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "5", - "rank_loc": "Not Displayed", + "rank_data_loc_group": "8", + "rank_loc": "6", "rank_loc_group": "6", - "score_data": 0.441, - "score_data_group": 0.548, - "score_data_loc": 0.231, - "score_data_loc_group": 0.285, + "score_data": 0.414, + "score_data_group": 0.499, + "score_data_loc": 0.218, + "score_data_loc_group": 0.26, "score_loc": 0.021, "score_loc_group": 0.021 } 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 8583b38..a48718f 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 @@ -134,8 +134,8 @@ "nirrcapscl": "e", "nirrcapunit": "nan", "rfvInfill": "No", - "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=balcom", - "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#balcom", + "sdeURL": "https://casoilresource.lawr.ucdavis.edu/sde/?series=los_osos", + "seeURL": "https://casoilresource.lawr.ucdavis.edu/see/#los_osos", "slope": 40.0, "taxsubgrp": "Typic Argixerolls", "textureInfill": "Yes" @@ -271,16 +271,16 @@ "componentID": 26734851, "name": "Balcom3", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "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.541, - "score_data_group": 0.541, - "score_data_loc": 0.396, - "score_data_loc_group": 0.396, + "score_data": 0.659, + "score_data_group": 0.659, + "score_data_loc": 0.455, + "score_data_loc_group": 0.455, "score_loc": 0.252, "score_loc_group": 0.252 }, @@ -290,16 +290,16 @@ "componentID": 26735225, "name": "Los osos2", "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": "2", - "score_data": 0.558, - "score_data_group": 0.558, - "score_data_loc": 0.341, - "score_data_loc_group": 0.341, + "score_data": 0.565, + "score_data_group": 0.565, + "score_data_loc": 0.345, + "score_data_loc_group": 0.345, "score_loc": 0.125, "score_loc_group": 0.125 }, @@ -310,15 +310,15 @@ "name": "Balcom2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "2", + "rank_data_group": "1", "rank_data_loc": "Not Displayed", "rank_data_loc_group": "1", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.37, - "score_data_group": 0.541, - "score_data_loc": 0.311, - "score_data_loc_group": 0.396, + "score_data": 0.435, + "score_data_group": 0.659, + "score_data_loc": 0.344, + "score_data_loc_group": 0.455, "score_loc": 0.252, "score_loc_group": 0.252 }, @@ -329,15 +329,15 @@ "name": "Los osos", "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": "2", "rank_loc_group": "2", - "score_data": 0.363, - "score_data_group": 0.558, - "score_data_loc": 0.244, - "score_data_loc_group": 0.341, + "score_data": 0.47, + "score_data_group": 0.565, + "score_data_loc": 0.298, + "score_data_loc_group": 0.345, "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 48f4cb3..2233be7 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 @@ -435,7 +435,7 @@ "soilRank": [ { "component": "Xerorthents", - "componentData": "Data Complete", + "componentData": "Missing Data", "componentID": 26701975, "name": "Xerorthents", "not_displayed": false, @@ -445,10 +445,10 @@ "rank_data_loc_group": "1", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.75, - "score_data_group": 0.75, - "score_data_loc": 0.568, - "score_data_loc_group": 0.568, + "score_data": 0.76, + "score_data_group": 0.76, + "score_data_loc": 0.573, + "score_data_loc_group": 0.573, "score_loc": 0.386, "score_loc_group": 0.386 }, @@ -458,46 +458,46 @@ "componentID": 26701950, "name": "Hangerone", "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", + "rank_data": "5", + "rank_data_group": "5", "rank_data_loc": "2", "rank_data_loc_group": "2", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.534, - "score_data_group": 0.534, - "score_data_loc": 0.462, - "score_data_loc_group": 0.462, + "score_data": 0.554, + "score_data_group": 0.554, + "score_data_loc": 0.472, + "score_data_loc_group": 0.472, "score_loc": 0.39, "score_loc_group": 0.39 }, { - "component": "Aquic xerorthents", + "component": "Embarcadero", "componentData": "Data Complete", - "componentID": 26701978, - "name": "Aquic xerorthents", + "componentID": 26701952, + "name": "Embarcadero", "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", + "rank_data": "2", + "rank_data_group": "2", "rank_data_loc": "3", "rank_data_loc_group": "3", - "rank_loc": "3", - "rank_loc_group": "3", - "score_data": 0.626, - "score_data_group": 0.626, - "score_data_loc": 0.395, - "score_data_loc_group": 0.395, - "score_loc": 0.165, - "score_loc_group": 0.165 + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.732, + "score_data_group": 0.732, + "score_data_loc": 0.372, + "score_data_loc_group": 0.372, + "score_loc": 0.012, + "score_loc_group": 0.012 }, { "component": "Bayshore", - "componentData": "Missing Data", + "componentData": "Data Complete", "componentID": 26701953, "name": "Bayshore", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "3", + "rank_data_group": "3", "rank_data_loc": "4", "rank_data_loc_group": "4", "rank_loc": "5", @@ -510,46 +510,46 @@ "score_loc_group": 0.019 }, { - "component": "Clear lake", + "component": "Aquic xerorthents", "componentData": "Missing Data", - "componentID": 26701951, - "name": "Clear lake", + "componentID": 26701978, + "name": "Aquic xerorthents", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", + "rank_data": "6", + "rank_data_group": "6", "rank_data_loc": "5", "rank_data_loc_group": "5", - "rank_loc": "4", - "rank_loc_group": "4", - "score_data": 0.617, - "score_data_group": 0.617, - "score_data_loc": 0.323, - "score_data_loc_group": 0.323, - "score_loc": 0.029, - "score_loc_group": 0.029 + "rank_loc": "3", + "rank_loc_group": "3", + "score_data": 0.514, + "score_data_group": 0.514, + "score_data_loc": 0.339, + "score_data_loc_group": 0.339, + "score_loc": 0.165, + "score_loc_group": 0.165 }, { - "component": "Embarcadero", - "componentData": "Missing Data", - "componentID": 26701952, - "name": "Embarcadero", + "component": "Clear lake", + "componentData": "Data Complete", + "componentID": 26701951, + "name": "Clear lake", "not_displayed": false, "rank_data": "4", "rank_data_group": "4", "rank_data_loc": "6", "rank_data_loc_group": "6", - "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 + "rank_loc": "4", + "rank_loc_group": "4", + "score_data": 0.597, + "score_data_group": 0.597, + "score_data_loc": 0.313, + "score_data_loc_group": 0.313, + "score_loc": 0.029, + "score_loc_group": 0.029 }, { "component": "Xerorthents", - "componentData": "Data Complete", + "componentData": "Missing Data", "componentID": 26701976, "name": "Xerorthents2", "not_displayed": true, @@ -559,10 +559,10 @@ "rank_data_loc_group": "1", "rank_loc": "Not Displayed", "rank_loc_group": "2", - "score_data": 0.672, - "score_data_group": 0.75, - "score_data_loc": 0.529, - "score_data_loc_group": 0.568, + "score_data": 0.662, + "score_data_group": 0.76, + "score_data_loc": 0.524, + "score_data_loc_group": 0.573, "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 f28d357..b170833 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 @@ -881,6 +881,25 @@ "model": "v2" }, "soilRank": [ + { + "component": "Uly", + "componentData": "Data Complete", + "componentID": 26356407, + "name": "Uly2", + "not_displayed": false, + "rank_data": "6", + "rank_data_group": "6", + "rank_data_loc": "1", + "rank_data_loc_group": "1", + "rank_loc": "Not Displayed", + "rank_loc_group": "1", + "score_data": 0.612, + "score_data_group": 0.612, + "score_data_loc": 0.453, + "score_data_loc_group": 0.453, + "score_loc": 0.295, + "score_loc_group": 0.295 + }, { "component": "Harney", "componentData": "Data Complete", @@ -889,14 +908,14 @@ "not_displayed": false, "rank_data": "4", "rank_data_group": "4", - "rank_data_loc": "1", - "rank_data_loc_group": "1", + "rank_data_loc": "2", + "rank_data_loc_group": "2", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.65, - "score_data_group": 0.65, - "score_data_loc": 0.457, - "score_data_loc_group": 0.457, + "score_data": 0.636, + "score_data_group": 0.636, + "score_data_loc": 0.45, + "score_data_loc_group": 0.45, "score_loc": 0.263, "score_loc_group": 0.263 }, @@ -906,10 +925,10 @@ "componentID": 26356406, "name": "Coly2", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", - "rank_data_loc": "2", - "rank_data_loc_group": "2", + "rank_data": "3", + "rank_data_group": "3", + "rank_data_loc": "3", + "rank_data_loc_group": "3", "rank_loc": "Not Displayed", "rank_loc_group": "3", "score_data": 0.662, @@ -920,23 +939,23 @@ "score_loc_group": 0.215 }, { - "component": "Uly", + "component": "Canlon", "componentData": "Data Complete", - "componentID": 26356407, - "name": "Uly2", + "componentID": 26356405, + "name": "Canlon", "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", - "rank_data_loc": "3", - "rank_data_loc_group": "3", - "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "score_data": 0.571, - "score_data_group": 0.571, - "score_data_loc": 0.433, - "score_data_loc_group": 0.433, - "score_loc": 0.295, - "score_loc_group": 0.295 + "rank_data": "1", + "rank_data_group": "1", + "rank_data_loc": "4", + "rank_data_loc_group": "4", + "rank_loc": "11", + "rank_loc_group": "11", + "score_data": 0.71, + "score_data_group": 0.71, + "score_data_loc": 0.356, + "score_data_loc_group": 0.356, + "score_loc": 0.002, + "score_loc_group": 0.002 }, { "component": "Penden", @@ -944,10 +963,10 @@ "componentID": 26356232, "name": "Penden", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", - "rank_data_loc": "4", - "rank_data_loc_group": "4", + "rank_data": "2", + "rank_data_group": "2", + "rank_data_loc": "5", + "rank_data_loc_group": "5", "rank_loc": "7", "rank_loc_group": "7", "score_data": 0.667, @@ -957,25 +976,6 @@ "score_loc": 0.016, "score_loc_group": 0.016 }, - { - "component": "Canlon", - "componentData": "Data Complete", - "componentID": 26356405, - "name": "Canlon", - "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", - "rank_data_loc": "5", - "rank_data_loc_group": "5", - "rank_loc": "11", - "rank_loc_group": "11", - "score_data": 0.659, - "score_data_group": 0.659, - "score_data_loc": 0.331, - "score_data_loc_group": 0.331, - "score_loc": 0.002, - "score_loc_group": 0.002 - }, { "component": "Wakeen", "componentData": "Data Complete", @@ -988,31 +988,31 @@ "rank_data_loc_group": "6", "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_data": 0.625, + "score_data_group": 0.625, + "score_data_loc": 0.318, + "score_data_loc_group": 0.318, "score_loc": 0.01, "score_loc_group": 0.01 }, { - "component": "Aquolls", + "component": "Case", "componentData": "Data Complete", - "componentID": 26356437, - "name": "Aquolls", + "componentID": 26356380, + "name": "Case", "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", + "rank_data": "7", + "rank_data_group": "7", "rank_data_loc": "7", "rank_data_loc_group": "7", - "rank_loc": "10", - "rank_loc_group": "10", - "score_data": 0.594, - "score_data_group": 0.594, - "score_data_loc": 0.298, - "score_data_loc_group": 0.298, - "score_loc": 0.003, - "score_loc_group": 0.003 + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.593, + "score_data_group": 0.593, + "score_data_loc": 0.308, + "score_data_loc_group": 0.308, + "score_loc": 0.023, + "score_loc_group": 0.023 }, { "component": "Tobin", @@ -1045,31 +1045,31 @@ "rank_data_loc_group": "9", "rank_loc": "8", "rank_loc_group": "8", - "score_data": 0.566, - "score_data_group": 0.566, - "score_data_loc": 0.289, - "score_data_loc_group": 0.289, + "score_data": 0.563, + "score_data_group": 0.563, + "score_data_loc": 0.288, + "score_data_loc_group": 0.288, "score_loc": 0.012, "score_loc_group": 0.012 }, { - "component": "Case", - "componentData": "Data Complete", - "componentID": 26356380, - "name": "Case", + "component": "Aquolls", + "componentData": "Missing Data", + "componentID": 26356437, + "name": "Aquolls", "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 + "rank_loc": "10", + "rank_loc_group": "10", + "score_data": 0.563, + "score_data_group": 0.563, + "score_data_loc": 0.283, + "score_data_loc_group": 0.283, + "score_loc": 0.003, + "score_loc_group": 0.003 }, { "component": "Holdrege", @@ -1083,32 +1083,13 @@ "rank_data_loc_group": "11", "rank_loc": "4", "rank_loc_group": "4", - "score_data": 0.44, - "score_data_group": 0.44, - "score_data_loc": 0.272, - "score_data_loc_group": 0.272, + "score_data": 0.4, + "score_data_group": 0.4, + "score_data_loc": 0.252, + "score_data_loc_group": 0.252, "score_loc": 0.104, "score_loc_group": 0.104 }, - { - "component": "Harney", - "componentData": "Data Complete", - "componentID": 26356408, - "name": "Harney3", - "not_displayed": true, - "rank_data": "Not Displayed", - "rank_data_group": "4", - "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "1", - "rank_loc": "Not Displayed", - "rank_loc_group": "2", - "score_data": 0.585, - "score_data_group": 0.65, - "score_data_loc": 0.424, - "score_data_loc_group": 0.457, - "score_loc": 0.263, - "score_loc_group": 0.263 - }, { "component": "Uly", "componentData": "Data Complete", @@ -1116,34 +1097,53 @@ "name": "Uly", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "7", + "rank_data_group": "6", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "3", + "rank_data_loc_group": "1", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.535, - "score_data_group": 0.571, - "score_data_loc": 0.415, - "score_data_loc_group": 0.433, + "score_data": 0.547, + "score_data_group": 0.612, + "score_data_loc": 0.421, + "score_data_loc_group": 0.453, "score_loc": 0.295, "score_loc_group": 0.295 }, { "component": "Harney", - "componentData": "Missing Data", + "componentData": "Data Complete", "componentID": 26356436, "name": "Harney2", "not_displayed": true, "rank_data": "Not Displayed", "rank_data_group": "4", "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.55, - "score_data_group": 0.65, + "score_data_group": 0.636, "score_data_loc": 0.407, - "score_data_loc_group": 0.457, + "score_data_loc_group": 0.45, + "score_loc": 0.263, + "score_loc_group": 0.263 + }, + { + "component": "Harney", + "componentData": "Data Complete", + "componentID": 26356408, + "name": "Harney3", + "not_displayed": true, + "rank_data": "Not Displayed", + "rank_data_group": "4", + "rank_data_loc": "Not Displayed", + "rank_data_loc_group": "2", + "rank_loc": "Not Displayed", + "rank_loc_group": "2", + "score_data": 0.534, + "score_data_group": 0.636, + "score_data_loc": 0.399, + "score_data_loc_group": 0.45, "score_loc": 0.263, "score_loc_group": 0.263 }, @@ -1154,14 +1154,14 @@ "name": "Coly", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "2", + "rank_data_group": "3", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "2", + "rank_data_loc_group": "3", "rank_loc": "3", "rank_loc_group": "3", - "score_data": 0.597, + "score_data": 0.578, "score_data_group": 0.662, - "score_data_loc": 0.406, + "score_data_loc": 0.396, "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 025084d..b3b6c6c 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 @@ -1005,32 +1005,13 @@ "rank_data_loc_group": "1", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.653, - "score_data_group": 0.653, - "score_data_loc": 0.353, - "score_data_loc_group": 0.353, + "score_data": 0.671, + "score_data_group": 0.671, + "score_data_loc": 0.363, + "score_data_loc_group": 0.363, "score_loc": 0.054, "score_loc_group": 0.054 }, - { - "component": "Crosby", - "componentData": "Data Complete", - "componentID": 26772436, - "name": "Crosby", - "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", - "rank_data_loc": "2", - "rank_data_loc_group": "2", - "rank_loc": "4", - "rank_loc_group": "4", - "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", @@ -1039,54 +1020,73 @@ "not_displayed": false, "rank_data": "1", "rank_data_group": "1", - "rank_data_loc": "3", - "rank_data_loc_group": "3", + "rank_data_loc": "2", + "rank_data_loc_group": "2", "rank_loc": "9", "rank_loc_group": "9", - "score_data": 0.671, - "score_data_group": 0.671, - "score_data_loc": 0.336, - "score_data_loc_group": 0.336, + "score_data": 0.689, + "score_data_group": 0.689, + "score_data_loc": 0.345, + "score_data_loc_group": 0.345, "score_loc": 0.002, "score_loc_group": 0.002 }, { - "component": "Grayford", + "component": "Hennepin", "componentData": "Data Complete", - "componentID": 26772427, - "name": "Grayford", + "componentID": 26772448, + "name": "Hennepin3", + "not_displayed": false, + "rank_data": "6", + "rank_data_group": "6", + "rank_data_loc": "3", + "rank_data_loc_group": "3", + "rank_loc": "Not Displayed", + "rank_loc_group": "1", + "score_data": 0.624, + "score_data_group": 0.624, + "score_data_loc": 0.343, + "score_data_loc_group": 0.343, + "score_loc": 0.061, + "score_loc_group": 0.061 + }, + { + "component": "Crosby", + "componentData": "Data Complete", + "componentID": 26772446, + "name": "Crosby3", "not_displayed": false, "rank_data": "4", "rank_data_group": "4", "rank_data_loc": "4", "rank_data_loc_group": "4", - "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 + "rank_loc": "Not Displayed", + "rank_loc_group": "4", + "score_data": 0.637, + "score_data_group": 0.637, + "score_data_loc": 0.342, + "score_data_loc_group": 0.342, + "score_loc": 0.048, + "score_loc_group": 0.048 }, { - "component": "Hennepin", + "component": "Brookston", "componentData": "Data Complete", - "componentID": 26772442, - "name": "Hennepin", + "componentID": 26772434, + "name": "Brookston", "not_displayed": false, - "rank_data": "9", - "rank_data_group": "9", + "rank_data": "3", + "rank_data_group": "3", "rank_data_loc": "5", "rank_data_loc_group": "5", - "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 + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.652, + "score_data_group": 0.652, + "score_data_loc": 0.33, + "score_data_loc_group": 0.33, + "score_loc": 0.009, + "score_loc_group": 0.009 }, { "component": "Holton", @@ -1100,10 +1100,10 @@ "rank_data_loc_group": "6", "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_data": 0.637, + "score_data_group": 0.637, + "score_data_loc": 0.32, + "score_data_loc_group": 0.32, "score_loc": 0.002, "score_loc_group": 0.002 }, @@ -1113,54 +1113,35 @@ "componentID": 26772441, "name": "Cyclone", "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", + "rank_data": "8", + "rank_data_group": "8", "rank_data_loc": "7", "rank_data_loc_group": "7", "rank_loc": "5", "rank_loc_group": "5", - "score_data": 0.614, - "score_data_group": 0.614, - "score_data_loc": 0.312, - "score_data_loc_group": 0.312, + "score_data": 0.618, + "score_data_group": 0.618, + "score_data_loc": 0.314, + "score_data_loc_group": 0.314, "score_loc": 0.011, "score_loc_group": 0.011 }, { - "component": "Brookston", + "component": "Cincinnati", "componentData": "Data Complete", - "componentID": 26772434, - "name": "Brookston", + "componentID": 26772423, + "name": "Cincinnati", "not_displayed": false, "rank_data": "7", "rank_data_group": "7", "rank_data_loc": "8", "rank_data_loc_group": "8", - "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": 26772423, - "name": "Cincinnati", - "not_displayed": false, - "rank_data": "8", - "rank_data_group": "8", - "rank_data_loc": "9", - "rank_data_loc_group": "9", "rank_loc": "10", "rank_loc_group": "10", - "score_data": 0.591, - "score_data_group": 0.591, - "score_data_loc": 0.296, - "score_data_loc_group": 0.296, + "score_data": 0.62, + "score_data_group": 0.62, + "score_data_loc": 0.311, + "score_data_loc_group": 0.311, "score_loc": 0.001, "score_loc_group": 0.001 }, @@ -1170,16 +1151,16 @@ "componentID": 26772498, "name": "Celina", "not_displayed": false, - "rank_data": "10", - "rank_data_group": "10", - "rank_data_loc": "10", - "rank_data_loc_group": "10", + "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.555, - "score_data_group": 0.555, - "score_data_loc": 0.279, - "score_data_loc_group": 0.279, + "score_data": 0.611, + "score_data_group": 0.611, + "score_data_loc": 0.307, + "score_data_loc_group": 0.307, "score_loc": 0.003, "score_loc_group": 0.003 }, @@ -1191,8 +1172,8 @@ "not_displayed": false, "rank_data": "12", "rank_data_group": "12", - "rank_data_loc": "11", - "rank_data_loc_group": "11", + "rank_data_loc": "10", + "rank_data_loc_group": "10", "rank_loc": "3", "rank_loc_group": "3", "score_data": 0.499, @@ -1202,6 +1183,25 @@ "score_loc": 0.051, "score_loc_group": 0.051 }, + { + "component": "Grayford", + "componentData": "Data Complete", + "componentID": 26772427, + "name": "Grayford", + "not_displayed": false, + "rank_data": "10", + "rank_data_group": "10", + "rank_data_loc": "11", + "rank_data_loc_group": "11", + "rank_loc": "11", + "rank_loc_group": "11", + "score_data": 0.524, + "score_data_group": 0.524, + "score_data_loc": 0.263, + "score_data_loc_group": 0.263, + "score_loc": 0.001, + "score_loc_group": 0.001 + }, { "component": "Jessietown", "componentData": "Data Complete", @@ -1214,69 +1214,69 @@ "rank_data_loc_group": "12", "rank_loc": "12", "rank_loc_group": "12", - "score_data": 0.531, - "score_data_group": 0.531, - "score_data_loc": 0.266, - "score_data_loc_group": 0.266, + "score_data": 0.508, + "score_data_group": 0.508, + "score_data_loc": 0.255, + "score_data_loc_group": 0.255, "score_loc": 0.001, "score_loc_group": 0.001 }, { "component": "Crosby", "componentData": "Data Complete", - "componentID": 26772444, - "name": "Crosby2", + "componentID": 26772436, + "name": "Crosby", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "3", + "rank_data_group": "4", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "2", - "rank_loc": "Not Displayed", + "rank_data_loc_group": "4", + "rank_loc": "4", "rank_loc_group": "4", - "score_data": 0.609, - "score_data_group": 0.651, - "score_data_loc": 0.328, - "score_data_loc_group": 0.349, + "score_data": 0.606, + "score_data_group": 0.637, + "score_data_loc": 0.327, + "score_data_loc_group": 0.342, "score_loc": 0.048, "score_loc_group": 0.048 }, { - "component": "Crosby", + "component": "Hennepin", "componentData": "Data Complete", - "componentID": 26772446, - "name": "Crosby3", + "componentID": 26772442, + "name": "Hennepin", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "3", + "rank_data_group": "6", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "2", - "rank_loc": "Not Displayed", - "rank_loc_group": "4", - "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 + "rank_data_loc_group": "3", + "rank_loc": "1", + "rank_loc_group": "1", + "score_data": 0.54, + "score_data_group": 0.624, + "score_data_loc": 0.301, + "score_data_loc_group": 0.343, + "score_loc": 0.061, + "score_loc_group": 0.061 }, { - "component": "Hennepin", + "component": "Crosby", "componentData": "Data Complete", - "componentID": 26772448, - "name": "Hennepin3", + "componentID": 26772444, + "name": "Crosby2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "9", + "rank_data_group": "4", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "5", + "rank_data_loc_group": "4", "rank_loc": "Not Displayed", - "rank_loc_group": "1", - "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 + "rank_loc_group": "4", + "score_data": 0.552, + "score_data_group": 0.637, + "score_data_loc": 0.3, + "score_data_loc_group": 0.342, + "score_loc": 0.048, + "score_loc_group": 0.048 }, { "component": "Hennepin", @@ -1285,15 +1285,15 @@ "name": "Hennepin2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "9", + "rank_data_group": "6", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "5", + "rank_data_loc_group": "3", "rank_loc": "Not Displayed", "rank_loc_group": "1", "score_data": 0.536, - "score_data_group": 0.582, + "score_data_group": 0.624, "score_data_loc": 0.299, - "score_data_loc_group": 0.322, + "score_data_loc_group": 0.343, "score_loc": 0.061, "score_loc_group": 0.061 }, @@ -1304,15 +1304,15 @@ "name": "Cyclone2", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "6", + "rank_data_group": "8", "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.614, - "score_data_loc": 0.283, - "score_data_loc_group": 0.312, + "score_data": 0.552, + "score_data_group": 0.618, + "score_data_loc": 0.281, + "score_data_loc_group": 0.314, "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 f9978fd..2cd7ed1 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 @@ -613,50 +613,69 @@ "rank_data_loc_group": "1", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.539, - "score_data_group": 0.539, - "score_data_loc": 0.403, - "score_data_loc_group": 0.403, + "score_data": 0.614, + "score_data_group": 0.614, + "score_data_loc": 0.44, + "score_data_loc_group": 0.44, "score_loc": 0.266, "score_loc_group": 0.266 }, { - "component": "Josephine", - "componentData": NaN, - "componentID": 27529612, - "name": "Josephine2", + "component": "Abegg", + "componentData": "Data Complete", + "componentID": 27529265, + "name": "Abegg", "not_displayed": false, "rank_data": "2", "rank_data_group": "2", "rank_data_loc": "2", "rank_data_loc_group": "2", + "rank_loc": "3", + "rank_loc_group": "3", + "score_data": 0.74, + "score_data_group": 0.74, + "score_data_loc": 0.405, + "score_data_loc_group": 0.405, + "score_loc": 0.069, + "score_loc_group": 0.069 + }, + { + "component": "Josephine", + "componentData": NaN, + "componentID": 27529612, + "name": "Josephine2", + "not_displayed": false, + "rank_data": "4", + "rank_data_group": "4", + "rank_data_loc": "3", + "rank_data_loc_group": "3", "rank_loc": "Not Displayed", "rank_loc_group": "2", - "score_data": 0.668, - "score_data_group": 0.668, - "score_data_loc": 0.397, - "score_data_loc_group": 0.397, + "score_data": 0.643, + "score_data_group": 0.643, + "score_data_loc": 0.384, + "score_data_loc_group": 0.384, "score_loc": 0.125, "score_loc_group": 0.125 }, { - "component": "Abegg", + "component": "Gregory", "componentData": "Data Complete", - "componentID": 27529265, - "name": "Abegg", + "componentID": 27529400, + "name": "Gregory", "not_displayed": false, "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.719, - "score_data_group": 0.719, - "score_data_loc": 0.394, - "score_data_loc_group": 0.394, - "score_loc": 0.069, - "score_loc_group": 0.069 + "rank_data_loc": "4", + "rank_data_loc_group": "4", + "rank_loc": "9", + "rank_loc_group": "9", + "score_data": 0.76, + "score_data_group": 0.76, + "score_data_loc": 0.383, + "score_data_loc_group": 0.383, + "score_loc": 0.007, + "score_loc_group": 0.007 }, { "component": "Pollard", @@ -666,111 +685,92 @@ "not_displayed": false, "rank_data": "3", "rank_data_group": "3", - "rank_data_loc": "4", - "rank_data_loc_group": "4", + "rank_data_loc": "5", + "rank_data_loc_group": "5", "rank_loc": "7", "rank_loc_group": "7", - "score_data": 0.665, - "score_data_group": 0.665, - "score_data_loc": 0.345, - "score_data_loc_group": 0.345, + "score_data": 0.683, + "score_data_group": 0.683, + "score_data_loc": 0.354, + "score_data_loc_group": 0.354, "score_loc": 0.025, "score_loc_group": 0.025 }, { - "component": "Gregory", - "componentData": "Data Complete", - "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.614, - "score_data_group": 0.614, - "score_data_loc": 0.311, - "score_data_loc_group": 0.311, - "score_loc": 0.007, - "score_loc_group": 0.007 - }, - { - "component": "Colestine", + "component": "Caris", "componentData": "Data Complete", - "componentID": 27529517, - "name": "Colestine", + "componentID": 27529223, + "name": "Caris", "not_displayed": false, "rank_data": "6", "rank_data_group": "6", "rank_data_loc": "6", "rank_data_loc_group": "6", - "rank_loc": "6", - "rank_loc_group": "6", - "score_data": 0.526, - "score_data_group": 0.526, - "score_data_loc": 0.276, - "score_data_loc_group": 0.276, - "score_loc": 0.025, - "score_loc_group": 0.025 + "rank_loc": "4", + "rank_loc_group": "4", + "score_data": 0.527, + "score_data_group": 0.527, + "score_data_loc": 0.288, + "score_data_loc_group": 0.288, + "score_loc": 0.05, + "score_loc_group": 0.05 }, { - "component": "Caris", + "component": "Colestine", "componentData": "Data Complete", - "componentID": 27529223, - "name": "Caris", + "componentID": 27529517, + "name": "Colestine", "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.476, - "score_data_group": 0.476, - "score_data_loc": 0.263, - "score_data_loc_group": 0.263, - "score_loc": 0.05, - "score_loc_group": 0.05 + "rank_loc": "6", + "rank_loc_group": "6", + "score_data": 0.516, + "score_data_group": 0.516, + "score_data_loc": 0.27, + "score_data_loc_group": 0.27, + "score_loc": 0.025, + "score_loc_group": 0.025 }, { - "component": "Offenbacher", - "componentData": "Data Complete", - "componentID": 27529224, - "name": "Offenbacher", + "component": "Beekman", + "componentData": NaN, + "componentID": 27529518, + "name": "Beekman", "not_displayed": false, "rank_data": "8", "rank_data_group": "8", "rank_data_loc": "8", "rank_data_loc_group": "8", - "rank_loc": "8", - "rank_loc_group": "8", - "score_data": 0.472, - "score_data_group": 0.472, - "score_data_loc": 0.245, - "score_data_loc_group": 0.245, - "score_loc": 0.017, - "score_loc_group": 0.017 + "rank_loc": "5", + "rank_loc_group": "5", + "score_data": 0.39, + "score_data_group": 0.39, + "score_data_loc": 0.218, + "score_data_loc_group": 0.218, + "score_loc": 0.046, + "score_loc_group": 0.046 }, { - "component": "Beekman", - "componentData": NaN, - "componentID": 27529518, - "name": "Beekman", + "component": "Offenbacher", + "componentData": "Data Complete", + "componentID": 27529224, + "name": "Offenbacher", "not_displayed": false, "rank_data": "9", "rank_data_group": "9", "rank_data_loc": "9", "rank_data_loc_group": "9", - "rank_loc": "5", - "rank_loc_group": "5", - "score_data": 0.365, - "score_data_group": 0.365, - "score_data_loc": 0.206, - "score_data_loc_group": 0.206, - "score_loc": 0.046, - "score_loc_group": 0.046 + "rank_loc": "8", + "rank_loc_group": "8", + "score_data": 0.361, + "score_data_group": 0.361, + "score_data_loc": 0.189, + "score_data_loc_group": 0.189, + "score_loc": 0.017, + "score_loc_group": 0.017 }, { "component": "Josephine", @@ -779,15 +779,15 @@ "name": "Josephine", "not_displayed": true, "rank_data": "Not Displayed", - "rank_data_group": "2", + "rank_data_group": "4", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "2", + "rank_data_loc_group": "3", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.542, - "score_data_group": 0.668, - "score_data_loc": 0.334, - "score_data_loc_group": 0.397, + "score_data": 0.58, + "score_data_group": 0.643, + "score_data_loc": 0.352, + "score_data_loc_group": 0.384, "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 b650423..71a95e5 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 @@ -434,23 +434,23 @@ }, "soilRank": [ { - "component": "Nicollet", + "component": "Clarion", "componentData": "Data Complete", - "componentID": 27398757, - "name": "Nicollet", + "componentID": 27398759, + "name": "Clarion", "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": 1, - "rank_loc_group": 1, - "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 + "rank_loc": 3, + "rank_loc_group": 3, + "score_data": 0.48, + "score_data_group": 0.48, + "score_data_loc": 0.34, + "score_data_loc_group": 0.34, + "score_loc": 0.2, + "score_loc_group": 0.2 }, { "component": "Webster", @@ -458,37 +458,37 @@ "componentID": 27398758, "name": "Webster", "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", + "rank_data": "4", + "rank_data_group": "4", "rank_data_loc": "2", "rank_data_loc_group": "2", "rank_loc": 2, "rank_loc_group": 2, - "score_data": 0.287, - "score_data_group": 0.287, - "score_data_loc": 0.309, - "score_data_loc_group": 0.309, + "score_data": 0.336, + "score_data_group": 0.336, + "score_data_loc": 0.333, + "score_data_loc_group": 0.333, "score_loc": 0.331, "score_loc_group": 0.331 }, { - "component": "Clarion", + "component": "Nicollet", "componentData": "Data Complete", - "componentID": 27398759, - "name": "Clarion", + "componentID": 27398757, + "name": "Nicollet", "not_displayed": false, - "rank_data": "4", - "rank_data_group": "4", + "rank_data": "7", + "rank_data_group": "7", "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 + "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_loc": 0.402, + "score_loc_group": 0.402 }, { "component": "Storden", @@ -496,16 +496,16 @@ "componentID": 27398742, "name": "Storden", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", + "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.433, - "score_data_group": 0.433, - "score_data_loc": 0.222, - "score_data_loc_group": 0.222, + "score_data": 0.458, + "score_data_group": 0.458, + "score_data_loc": 0.234, + "score_data_loc_group": 0.234, "score_loc": 0.011, "score_loc_group": 0.011 }, @@ -515,56 +515,56 @@ "componentID": 27398765, "name": "Glencoe", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "3", + "rank_data_group": "3", "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_data": 0.402, + "score_data_group": 0.402, + "score_data_loc": 0.206, + "score_data_loc_group": 0.206, "score_loc": 0.011, "score_loc_group": 0.011 }, { - "component": "Canisteo", - "componentData": "Data Complete", - "componentID": 27398763, - "name": "Canisteo", + "component": "Okoboji", + "componentData": "Missing Data", + "componentID": 27398760, + "name": "Okoboji", "not_displayed": false, "rank_data": "5", "rank_data_group": "5", "rank_data_loc": "6", "rank_data_loc_group": "6", - "rank_loc": 7, - "rank_loc_group": 7, - "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 + "rank_loc": 4, + "rank_loc_group": 4, + "score_data": 0.315, + "score_data_group": 0.315, + "score_data_loc": 0.177, + "score_data_loc_group": 0.177, + "score_loc": 0.04, + "score_loc_group": 0.04 }, { - "component": "Okoboji", - "componentData": "Missing Data", - "componentID": 27398760, - "name": "Okoboji", + "component": "Canisteo", + "componentData": "Data Complete", + "componentID": 27398763, + "name": "Canisteo", "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": 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 + "rank_loc": 7, + "rank_loc_group": 7, + "score_data": 0.268, + "score_data_group": 0.268, + "score_data_loc": 0.137, + "score_data_loc_group": 0.137, + "score_loc": 0.007, + "score_loc_group": 0.007 } ] } 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 2417112..624e047 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 @@ -546,42 +546,42 @@ }, "soilRank": [ { - "component": "Lonely", + "component": "Robson", "componentData": "Data Complete", - "componentID": 27631144, - "name": "Lonely", + "componentID": 27631143, + "name": "Robson", "not_displayed": false, - "rank_data": "6", - "rank_data_group": "6", + "rank_data": "1", + "rank_data_group": "1", "rank_data_loc": "1", "rank_data_loc_group": "1", - "rank_loc": 1, - "rank_loc_group": 1, - "score_data": 0.61, - "score_data_group": 0.61, - "score_data_loc": 0.439, - "score_data_loc_group": 0.439, - "score_loc": 0.267, - "score_loc_group": 0.267 + "rank_loc": 2, + "rank_loc_group": 2, + "score_data": 0.761, + "score_data_group": 0.761, + "score_data_loc": 0.474, + "score_data_loc_group": 0.474, + "score_loc": 0.187, + "score_loc_group": 0.187 }, { - "component": "Robson", + "component": "Lonely", "componentData": "Data Complete", - "componentID": 27631143, - "name": "Robson", + "componentID": 27631144, + "name": "Lonely", "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", + "rank_data": "5", + "rank_data_group": "5", "rank_data_loc": "2", "rank_data_loc_group": "2", - "rank_loc": 2, - "rank_loc_group": 2, - "score_data": 0.69, - "score_data_group": 0.69, - "score_data_loc": 0.438, - "score_data_loc_group": 0.438, - "score_loc": 0.187, - "score_loc_group": 0.187 + "rank_loc": 1, + "rank_loc_group": 1, + "score_data": 0.634, + "score_data_group": 0.634, + "score_data_loc": 0.451, + "score_data_loc_group": 0.451, + "score_loc": 0.267, + "score_loc_group": 0.267 }, { "component": "Actem", @@ -589,16 +589,16 @@ "componentID": 27631363, "name": "Actem", "not_displayed": false, - "rank_data": "1", - "rank_data_group": "1", + "rank_data": "2", + "rank_data_group": "2", "rank_data_loc": "3", "rank_data_loc_group": "3", "rank_loc": 5, "rank_loc_group": 5, - "score_data": 0.694, - "score_data_group": 0.694, - "score_data_loc": 0.404, - "score_data_loc_group": 0.404, + "score_data": 0.711, + "score_data_group": 0.711, + "score_data_loc": 0.412, + "score_data_loc_group": 0.412, "score_loc": 0.113, "score_loc_group": 0.113 }, @@ -608,38 +608,19 @@ "componentID": 27630911, "name": "Rinconflat", "not_displayed": false, - "rank_data": "5", - "rank_data_group": "5", + "rank_data": "7", + "rank_data_group": "7", "rank_data_loc": "4", "rank_data_loc_group": "4", "rank_loc": 4, "rank_loc_group": 4, - "score_data": 0.621, - "score_data_group": 0.621, - "score_data_loc": 0.367, - "score_data_loc_group": 0.367, + "score_data": 0.626, + "score_data_group": 0.626, + "score_data_loc": 0.37, + "score_data_loc_group": 0.37, "score_loc": 0.113, "score_loc_group": 0.113 }, - { - "component": "Brace", - "componentData": "Data Complete", - "componentID": 27630932, - "name": "Brace", - "not_displayed": false, - "rank_data": "3", - "rank_data_group": "3", - "rank_data_loc": "5", - "rank_data_loc_group": "5", - "rank_loc": 8, - "rank_loc_group": 8, - "score_data": 0.655, - "score_data_group": 0.655, - "score_data_loc": 0.351, - "score_data_loc_group": 0.351, - "score_loc": 0.046, - "score_loc_group": 0.046 - }, { "component": "Raz", "componentData": "Data Complete", @@ -648,14 +629,14 @@ "not_displayed": false, "rank_data": "4", "rank_data_group": "4", - "rank_data_loc": "6", - "rank_data_loc_group": "6", + "rank_data_loc": "5", + "rank_data_loc_group": "5", "rank_loc": 7, "rank_loc_group": 7, - "score_data": 0.629, - "score_data_group": 0.629, - "score_data_loc": 0.348, - "score_data_loc_group": 0.348, + "score_data": 0.644, + "score_data_group": 0.644, + "score_data_loc": 0.356, + "score_data_loc_group": 0.356, "score_loc": 0.067, "score_loc_group": 0.067 }, @@ -667,33 +648,52 @@ "not_displayed": false, "rank_data": "8", "rank_data_group": "8", - "rank_data_loc": "7", - "rank_data_loc_group": "7", + "rank_data_loc": "6", + "rank_data_loc_group": "6", "rank_loc": 3, "rank_loc_group": 3, - "score_data": 0.579, - "score_data_group": 0.579, - "score_data_loc": 0.346, - "score_data_loc_group": 0.346, + "score_data": 0.595, + "score_data_group": 0.595, + "score_data_loc": 0.354, + "score_data_loc_group": 0.354, "score_loc": 0.113, "score_loc_group": 0.113 }, + { + "component": "Brace", + "componentData": "Data Complete", + "componentID": 27630932, + "name": "Brace", + "not_displayed": false, + "rank_data": "3", + "rank_data_group": "3", + "rank_data_loc": "7", + "rank_data_loc_group": "7", + "rank_loc": 8, + "rank_loc_group": 8, + "score_data": 0.645, + "score_data_group": 0.645, + "score_data_loc": 0.346, + "score_data_loc_group": 0.346, + "score_loc": 0.046, + "score_loc_group": 0.046 + }, { "component": "Ausmus", "componentData": "Data Complete", "componentID": 27630924, "name": "Ausmus", "not_displayed": false, - "rank_data": "7", - "rank_data_group": "7", + "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.602, - "score_data_group": 0.602, - "score_data_loc": 0.303, - "score_data_loc_group": 0.303, + "score_data": 0.63, + "score_data_group": 0.63, + "score_data_loc": 0.318, + "score_data_loc_group": 0.318, "score_loc": 0.005, "score_loc_group": 0.005 }, @@ -709,10 +709,10 @@ "rank_data_loc_group": "9", "rank_loc": 6, "rank_loc_group": 6, - "score_data": 0.437, - "score_data_group": 0.437, - "score_data_loc": 0.262, - "score_data_loc_group": 0.262, + "score_data": 0.469, + "score_data_group": 0.469, + "score_data_loc": 0.278, + "score_data_loc_group": 0.278, "score_loc": 0.087, "score_loc_group": 0.087 } 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 995ee95..d05e276 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 @@ -148,10 +148,10 @@ "rank_data_loc_group": "1", "rank_loc": "Not Displayed", "rank_loc_group": "1", - "score_data": 0.37, - "score_data_group": 0.37, - "score_data_loc": 0.649, - "score_data_loc_group": 0.649, + "score_data": 0.54, + "score_data_group": 0.54, + "score_data_loc": 0.735, + "score_data_loc_group": 0.735, "score_loc": 0.929, "score_loc_group": 0.929 }, @@ -167,10 +167,10 @@ "rank_data_loc_group": "1", "rank_loc": "1", "rank_loc_group": "1", - "score_data": 0.312, - "score_data_group": 0.37, - "score_data_loc": 0.62, - "score_data_loc_group": 0.649, + "score_data": 0.488, + "score_data_group": 0.54, + "score_data_loc": 0.708, + "score_data_loc_group": 0.735, "score_loc": 0.929, "score_loc_group": 0.929 } 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 be13f50..d2ff1d3 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 @@ -389,32 +389,13 @@ "rank_data_loc_group": "1", "rank_loc": "2", "rank_loc_group": "2", - "score_data": 0.737, - "score_data_group": 0.737, - "score_data_loc": 0.521, - "score_data_loc_group": 0.521, + "score_data": 0.682, + "score_data_group": 0.682, + "score_data_loc": 0.494, + "score_data_loc_group": 0.494, "score_loc": 0.306, "score_loc_group": 0.306 }, - { - "component": "Elliottsville", - "componentData": "Data Complete", - "componentID": 26560911, - "name": "Elliottsville", - "not_displayed": false, - "rank_data": "2", - "rank_data_group": "2", - "rank_data_loc": "2", - "rank_data_loc_group": "2", - "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": "Knob lock", "componentData": "Data Complete", @@ -423,17 +404,36 @@ "not_displayed": false, "rank_data": "4", "rank_data_group": "4", - "rank_data_loc": "3", - "rank_data_loc_group": "3", + "rank_data_loc": "2", + "rank_data_loc_group": "2", "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_data": 0.529, + "score_data_group": 0.529, + "score_data_loc": 0.451, + "score_data_loc_group": 0.451, "score_loc": 0.372, "score_loc_group": 0.372 }, + { + "component": "Elliottsville", + "componentData": "Data Complete", + "componentID": 26560911, + "name": "Elliottsville", + "not_displayed": false, + "rank_data": "2", + "rank_data_group": "2", + "rank_data_loc": "3", + "rank_data_loc_group": "3", + "rank_loc": "3", + "rank_loc_group": "3", + "score_data": 0.65, + "score_data_group": 0.65, + "score_data_loc": 0.45, + "score_data_loc_group": 0.45, + "score_loc": 0.25, + "score_loc_group": 0.25 + }, { "component": "Monson", "componentData": "Data Complete", @@ -462,13 +462,13 @@ "rank_data": "Not Displayed", "rank_data_group": "2", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "2", + "rank_data_loc_group": "3", "rank_loc": "Not Displayed", "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_data": 0.583, + "score_data_group": 0.65, + "score_data_loc": 0.417, + "score_data_loc_group": 0.45, "score_loc": 0.25, "score_loc_group": 0.25 }, @@ -481,13 +481,13 @@ "rank_data": "Not Displayed", "rank_data_group": "4", "rank_data_loc": "Not Displayed", - "rank_data_loc_group": "3", + "rank_data_loc_group": "2", "rank_loc": "1", "rank_loc_group": "1", "score_data": 0.406, - "score_data_group": 0.475, + "score_data_group": 0.529, "score_data_loc": 0.389, - "score_data_loc_group": 0.424, + "score_data_loc_group": 0.451, "score_loc": 0.372, "score_loc_group": 0.372 }