FAQ | This is a LIVE service | Changelog

Skip to content
Snippets Groups Projects
Commit 78e5b686 authored by J.W. Smith's avatar J.W. Smith
Browse files

feat: Handle dynamic host capability

...to reflect recent changes in ews-source-calc commit e162c48.
parent 08f2dc2e
No related branches found
No related tags found
No related merge requests found
...@@ -339,8 +339,10 @@ class ProcessorSurveys(Processor): ...@@ -339,8 +339,10 @@ class ProcessorSurveys(Processor):
Path(output_directory).mkdir(parents=True, exist_ok=True) Path(output_directory).mkdir(parents=True, exist_ok=True)
sources_path = run_case( sources_path = run_case(
config_path = config['Survey']['pySourcesConfigFilename'], config_path = config['Survey']['SourcesConfigFilename'],
survey_path = group_surveys_filepath, survey_path = group_surveys_filepath,
survey_format = config['Survey']['SurveyFormat'],
surveyor_name_col = config['Survey']['SurveyorNameCol'],
reference_date = config['StartString'], reference_date = config['StartString'],
# Day 0 (current day) is always included # Day 0 (current day) is always included
# Days -2,-1 and 0 are needed to initialise spores in NAME # Days -2,-1 and 0 are needed to initialise spores in NAME
...@@ -376,8 +378,10 @@ class ProcessorSurveys(Processor): ...@@ -376,8 +378,10 @@ class ProcessorSurveys(Processor):
Path(output_directory).mkdir(parents=True, exist_ok=True) Path(output_directory).mkdir(parents=True, exist_ok=True)
sources_path = run_case( sources_path = run_case(
config_path = config['Survey']['pySourcesConfigFilename'], config_path = config['Survey']['SourcesConfigFilename'],
survey_path = processed_surveys_filepath, survey_path = processed_surveys_filepath,
survey_format = config['Survey']['SurveyFormat'],
surveyor_name_col = config['Survey']['SurveyorNameCol'],
reference_date = config['StartString'], reference_date = config['StartString'],
# Day 0 (current day) is always included # Day 0 (current day) is always included
# Days -2,-1 and 0 are needed to initialise spores in NAME # Days -2,-1 and 0 are needed to initialise spores in NAME
......
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
}, },
"GroupBy" : ["Origin"], "GroupBy" : ["Origin"],
"GroupsToIgnore" : ["ODK-server", "kobo-server", "newODK", "newODK2", "CSV-CAM"], "GroupsToIgnore" : ["ODK-server", "kobo-server", "newODK", "newODK2", "CSV-CAM"],
"SurveyFormat" : "ODK",
"SurveyorNameCol" : "surveyor_infromation-surveyor_name",
"SourcesRegionName" : "EastAfrica", "SourcesRegionName" : "EastAfrica",
"SourcesConfigFilename" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/configs/config_EastAfrica_mapspam2017.json" "SourcesConfigFilename" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/configs/config_EastAfrica_mapspam2017.json"
}, },
......
{ {
"config_name" : "EastAfrica", "config_name" : "EastAfrica",
"region_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/boundaries/EastAfrica_regions_small.shp",
"wheat_source_name" : "MAPSPAM2017", "wheat_source_name" : "MAPSPAM2017",
"wheat_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/spam2017V1r1_SSA_gr_H_WHEA_A.tif", "wheat_file" : "NA",
"wheat_file_rescaled" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/preprocessed/spam2017V1r1_SSA_gr_H_WHEA_A_rescaled_oneliner.tif", "wheat_rasters_bydate" : {
"cluster_poly_file_no_wheat" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/boundaries/EastAfrica_clusters.shp", "20170101" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/spam2017V1r1_SSA_gr_H_WHEA_A_small.tif"
"cluster_poly_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/preprocessed/EastAfrica_clusters_with_wheat_ha_MAPSPAM2017.shp", },
"surveyor_name_col" : "surveyor_infromation-surveyor_name", "cluster_poly_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/boundaries/EastAfrica_clusters_small.shp",
"id_col" : "id", "id_col" : "id",
"region_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/boundaries/EastAfrica_regions_small.shp",
"region_id_col" : "REGION_ID", "region_id_col" : "REGION_ID",
"wheat_stages_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/approx_growth_timing_cleaned.csv" "wheat_stages_file" : "../../test_data/test_deployment/regions/EastAfrica/resources/source_gen/assets/approx_growth_timing_cleaned.csv"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment