diff --git a/pipeline_resources/EastAfrica/configs/advisory_builder/config_EastAfrica_variety_names_tidy.json b/pipeline_resources/EastAfrica/configs/advisory_builder/config_EastAfrica_variety_names_tidy.json
index 9b00940e79ce5151988896e306acfbe727d44866..dc39ed0fe12cc4436f68ad6baaf1f7e0828ad850 100644
--- a/pipeline_resources/EastAfrica/configs/advisory_builder/config_EastAfrica_variety_names_tidy.json
+++ b/pipeline_resources/EastAfrica/configs/advisory_builder/config_EastAfrica_variety_names_tidy.json
@@ -11,27 +11,50 @@
[
"AAAFC CANADA#162"
],
- "Alidoro":
+ "Adaptation trial plot #11":
[
- "Alidoro"
+ "Adaptation trial plot#11"
+ ],
+ "Abay":
+ [
+ "Abay"
+ ],
+ "Alidoro":
+ [
+ "Alidoro",
+ "Alido"
],
"Amibara 2":
[
- "Amibara_2"
+ "Amibara_2",
+ "Amibara2"
+ ],
+ "Balcha":
+ [
+ "Balcha"
+ ],
+ "Biftu":
+ [
+ "Biftu"
],
- "Boru":
+ "Boru":
[
"Boru"
],
- "Bulala":
+ "Bulala":
+ [
+ "Bulala",
+ "Bullala"
+ ],
+ "Candidate varity VVT":
[
- "Bulala"
+ "Candidate varity VVT"
],
- "CD 21 #16815":
+ "CD 21 #16815":
[
"CD 21 # 16815"
],
- "CD 21 #16296":
+ "CD 21 #16296":
[
"CD 21 #16296"
],
@@ -39,25 +62,30 @@
[
"CD22#761 -ELTSR"
],
- "Daka":
+ "Daka":
[
"Daka",
- "Deka"
+ "Deka",
+ "DAKA",
+ "Daka "
],
- "Dambal":
+ "Dambal":
[
"Dambal",
- "Dambel"
+ "Dambel",
+ "Danbal"
],
- "Damphe":
+ "Damphe":
[
"Damphe",
"Danfe",
"Denfe"
],
- "Danda'a":
+ "Danda'a":
[
"Danda'a",
+ "Danda'a ",
+ "Danda",
"danda'",
"danda'a",
"Danda,a",
@@ -72,34 +100,58 @@
"Dende'a",
"Dendea",
"Dendy",
- "Debdea"
- ],
- "Db1899":
+ "Debdea",
+ "Denidea",
+ "Danada'a",
+ "Dandaya",
+ "Dehnadea",
+ "Danadaha",
+ "Deamda",
+ "Denda'a ",
+ "Danda’",
+ "Dendáa",
+ "Dandaa",
+ "Damda'a",
+ "Damdaha"
+ ],
+ "Db1899":
[
"Db1899"
],
- "Deneba":
+ "Deneba":
[
"Deneba"
],
- "Digalu":
+ "Dersolgn":
+ [
+ "Dersolgn"
+ ],
+ "Digalu":
[
"Digalu",
- "Digelu"
+ "Digelu",
+ "Degelu"
],
"Duma":
[
- "Duma"
+ "Duma",
+ "Duma ",
+ " Duma"
],
- "Durum CD21 ELTSR #1382":
+ "Durum CD21 ELTSR #1382":
[
"Durum CD21 ELTSR#1382"
],
- "Eagle 10":
+ "Dursa":
+ [
+ "Dursa",
+ "Dursaa"
+ ],
+ "Eagle 10":
[
"Eagle 10"
],
- "Eldo Baraka":
+ "Eldo Baraka":
[
"Eldo Baraka"
],
@@ -121,44 +173,44 @@
[
"ELITEBW-KENYA#21"
],
- "Enikoy":
+ "Enikoy":
[
"Enikoy",
"Enkoy"
],
- "EPCBW #122":
+ "EPCBW #122":
[
"EPCBW#122",
"EPCBW #122",
"EPCBW #122"
],
- "EPCBW #207":
+ "EPCBW #207":
[
"EPCBW#207",
"EPCBW #207",
"EPCBW #207"
],
- "EPCBW #320":
+ "EPCBW #320":
[
"EPCBW#320",
"EPCBW #320",
"EPCBW #320"
],
- "EPCBW #1002":
+ "EPCBW #1002":
[
"EPCBW#1002",
"EPCBW #1002",
"EPCBW #1002"
],
- "EPCHPLUS # KEN#58":
+ "EPCHPLUS # KEN#58":
[
"EPCHPLUS # KEN#58"
],
- "EPCHPLUS #154":
+ "EPCHPLUS #154":
[
"EPCHPLUS#154"
],
- "EPCHPLUS- KEN#120":
+ "EPCHPLUS- KEN#120":
[
"EPCHPLUS- KEN#120"
],
@@ -166,14 +218,14 @@
[
"EPCHPZN#11"
],
- "Et 13":
+ "Et 13":
[
"Et 13",
"ET13",
"Et13",
"Ey13"
],
- "ETHIOPIA #238":
+ "ETHIOPIA #238":
[
"ETHIOPIA #238"
],
@@ -193,7 +245,7 @@
[
"F2HPZN#38"
],
- "F2HPLUS-KEN #111":
+ "F2HPLUS-KEN #111":
[
"F2HPLUS-KEN #111"
],
@@ -201,11 +253,11 @@
[
"F3BW#9"
],
- "F3BW #360":
+ "F3BW #360":
[
"F3BW #360"
],
- "F3HPLUS- KEN #59":
+ "F3HPLUS- KEN #59":
[
"F3HPLUS- KEN #59"
],
@@ -213,7 +265,7 @@
[
"F3HPZN#59"
],
- "F4 HPLUS KEN":
+ "F4 HPLUS KEN":
[
"F4 HPLUS KEN"
],
@@ -221,200 +273,336 @@
[
"F5RG#357"
],
- "F5 RG BW (A) #73":
+ "F5 RG BW (A) #73":
[
"F5 RG BW (A)#73"
],
- "F5RG (A) #336":
+ "F5RG (A) #336":
[
"F5RG (A)#336"
],
- "F5RG (A) #757":
+ "F5RG (A) #757":
[
"F5RG (A)#757"
],
- "F5RG (B) #1026":
+ "F5RG (B) #1026":
[
"F5RG (B) #1026"
],
- "F5RGBW #181 (A)":
+ "F5RGBW #181 (A)":
[
"F5RGBW#181 (A)"
],
- "Farasi":
+ "Farasi":
[
- "Farasi"
+ "Farasi",
+ "KS. Farasi"
],
- "Farlly":
+ "Farlly":
[
"Farlly"
],
- "Fentale-2":
+ "Fentale-2":
[
"Fentale-2",
"Fentale_2"
],
- "Galane":
+ "Galane":
[
"Galane",
- "Gelan"
+ "Gelan",
+ "Galan",
+ "Gelana"
],
- "Genotypes":
+ "Ganda":
+ [
+ "Ganda"
+ ],
+ "Gembo":
+ [
+ "Gembo"
+ ],
+ "Genotypes":
[
"Genotypes"
],
- "Grace":
+ "Grace":
[
"Grace"
],
- "Hachalu":
+ "Hachalu":
[
"Hachalu"
],
- "Hidassie":
+ "Harato":
+ [
+ "Harato"
+ ],
+ "Hawi":
+ [
+ "Hawi"
+ ],
+ "HB13":
+ [
+ "HB13"
+ ],
+ "Hidassie":
[
"Hidassie",
+ "Hidassie ",
"Hidasse",
"Hidase",
"Hidasie",
"hidassie",
"Hiddasie",
"Hisasie",
- "Hisasse"
+ "Hisasse",
+ "Hiddase",
+ "Hidassee"
],
- "HR1685":
+ "Hoggana":
+ [
+ "Hoggana"
+ ],
+ "HR1685":
[
"HR1685"
],
- "Huluka":
+ "Huluka":
[
"Huluka",
- "Huluqa"
+ "Huluqa",
+ "Hulaka",
+ "Hulka",
+ "Hululka",
+ "Buluka",
+ "Huluka "
],
- "Hyrax":
+ "Hydero":
+ [
+ "Hydero"
+ ],
+ "Hyrax":
[
"Hyrax"
],
- "Improved":
+ "Improved":
[
"Improved"
],
- "Iran#66":
+ "Iran#66":
[
"Iran#66"
],
- "Israel":
+ "Israel":
[
"Israel"
],
- "Jacana":
+ "Jacana":
[
"Jacana",
- "JACANA"
+ "JACANA",
+ "Jalane"
],
- "K. Korongo":
+ "K. Kasuku":
+ [
+ "Kenya Kasuku",
+ "Kenya Kasuku ",
+ "Kasuku",
+ "KASUKU",
+ "Kasuku",
+ " Kasuku",
+ "K.kasuku",
+ "K. kasuku",
+ "K .kasuku",
+ "K.Kasuku",
+ "K. Kasuku",
+ "K .Kasuku"
+ ],
+ "K. Korongo":
[
"K. Korongo",
"K. Korongo ",
"Korongo",
- "Korongo "
- ],
- "KS. Chui":
+ "Korongo ",
+ "K . Korongo",
+ "K. KORONGO",
+ "K.Korongo",
+ "K Korongo",
+ "K Korongo ",
+ "Kenya Korongo",
+ "Kenya Korongo ",
+ "K .Korongo",
+ "K.korongo"
+ ],
+ "KS. Chui":
[
"Chui",
"KS. Chui",
+ "KS Chui",
"KS.CHUI",
- "KS.Chui"
+ "KS.Chui",
+ "KS. Chui",
+ "Ks. Chui",
+ "Ks.Chui",
+ "Ks.Chui "
+ ],
+ "KS. Farasi":
+ [
+ "KS Farasi",
+ "KS. Farasi"
+ ],
+ "KS. Kanga":
+ [
+ "Kanga",
+ " Kanga",
+ "KS. Kanga",
+ "Ks. Kanga"
],
- "K624A":
+ "KS. Ndume":
+ [
+ "Ndume",
+ "Ks. Ndume",
+ "KS. Ndume",
+ "Ks. Ndume ",
+ "KS. Ndume ",
+ "Ks.Ndume",
+ "KS.Ndume"
+ ],
+ "KS. Mwamba":
+ [
+ "KS Mwamba ",
+ "KS.MWAMBA",
+ "Ks.Mwamba"
+ ],
+ "K624A":
[
"K624A",
"K62 4A"
],
- "K924A":
+ "K924A":
[
"K924A"
],
- "Kakaba":
+ "Kakaba":
[
"Kakab",
"Kakaba",
+ "Kakaba ",
"Kekeaba",
"Kekeb",
"KEKEBA",
"Kekeba",
"kekeba",
- "Kekebw"
+ "kakaba",
+ "Kekebw",
+ "Kekekeba",
+ "Kebeka"
],
- "Kebaba":
+ "Kebaba":
[
- "Kebaba"
+ "Kebaba",
+ "Kebab"
],
- "Kenya Impala":
+ "Kenya Impala":
[
"Kenya Impala"
],
- "Kenya Kasuku":
+ "Kenya Jacana":
[
- "Kenya Kasuku",
- "Kasuku",
- "KASUKU"
+ "Kenya Jacana"
],
- "Kenya Pweza":
+ "Kenya Pweza":
[
"Kenya Pweza"
],
- "Kenya Turaco":
+ "Kenya Turaco":
[
- "Kenya Turaco"
+ "Kenya Turaco",
+ "Kenya Turaco "
],
- "Kenya wren":
+ "Kenya wren":
[
"Kenya wren"
],
- "Kingbird":
+ "Kingbird":
[
"Kingbird",
"King Bird",
"King bird",
- "Kingbirds"
- ],
- "Kubsa":
+ "Kingbirds",
+ "Kimgbard",
+ "Kinbird",
+ "Kingbard",
+ "Kingbird ",
+ "King be",
+ "King bir",
+ "KingBird",
+ "Kigbird",
+ "Kingbord",
+ "Kinberd",
+ "Kingberd",
+ "kingbird"
+ ],
+ "Kubsa":
[
"Kubsa",
"kubsa",
- "Kubssa"
+ "Kubssa",
+ "Kubsa ",
+ "Kubsa (1685)",
+ "Kibsa"
],
- "Kwale":
+ "Kwale":
[
"Kwale",
"Kwale "
],
- "Lemu":
+ "Lemu":
[
- "Lemu"
+ "Lemu",
+ "Limu"
],
- "Liben":
+ "Liben":
[
"Liben"
],
- "Local":
+ "Local":
[
"Local",
- "From local market(Unknown)"
+ "Local ",
+ "From local market(Unknown)",
+ "Emer wheat local",
+ "local"
+ ],
+ "Mandoyu":
+ [
+ "Mandoyu",
+ "Mandoyo"
],
- "Mangudo":
+ "Mangudo":
[
"Mangudo",
- "mangudo"
+ "mangudo",
+ "Mangudo "
],
- "Mixed":
+ "Mekale 02":
+ [
+ "Mekale 02",
+ "Mekale 02 "
+ ],
+ "Miju":
+ [
+ "Miju"
+ ],
+ "Mixed":
[
"Mixed",
"Digalu mixture with Hidasie",
"Kingbird (mixed)",
"mixed",
"Mixed variety",
+ "Mixed hidase and danda'a",
"Hidassie with danda'a",
"Kingbird, wane ogolchoo",
"israel+Et 13",
@@ -429,18 +617,74 @@
"Mixed crop (Kwale& Njoro II )",
"Mixed crop (Njoro II & KS.CHUI )",
"Mixed crop (Njoro II & unknown )",
- "Mixed crop (Njoro II& Korongo )"
- ],
- "Mwamba":
+ "Mixed crop (Njoro II& Korongo )",
+ "Mixed(Njoro II & Mwamba)",
+ "Mixed crop (Korongo &Njoro II )",
+ "Mixed crop (Ndume & Farasi)",
+ "Mixed crop (Njoro II & Mwamba )",
+ "Mixed crop (Njoro II & Farasi)",
+ "Mixed: Danda'a and Kakaba",
+ "Mixed varieties",
+ "Wane mixture",
+ "Dembel and Denda",
+ "Mixed ",
+ "Mixed (Korongo and old varieties )",
+ "Mixed (kasuku, Korongo )",
+ "Mixed (korongo, kasuku, old varieties)",
+ "Mixed crop ( Korongo & barley )",
+ "Mixed crop (Chui & Korongo )",
+ "Mixed crop (K . Korongo &Uknown )",
+ "Mixed crop (Korongo & Uknown)",
+ "Mixed crop( Njoro II, Korongo, old varieties )",
+ "Mixed crop(KingBird, Korongo )",
+ "Korongo & Njoro 2",
+ "Korongo& Eagle 10 (mixed )",
+ "Mixed (K. Korongo/barely)",
+ "Mixed (Robin, Korongo)",
+ "Mixed( Njoro 2 & Korongo)",
+ "Njoro 2 & Korongo",
+ "Korongo, Robin, Kwale",
+ "Mixed (Njoro II, Korongo )",
+ "Mixed (Korongo, ks chui)",
+ "Mixed (Njoro II, Korongo )",
+ "Mixed (Njoro II, Korongo)",
+ "Tallo diff#44,tallo diff#24,yr diff#4",
+ "Differentials",
+ "Kubsa + daka",
+ "Mixed (Korongo&Uknown)",
+ "Mixed varieties ( Korongo and KS Chui)",
+ "King bird ,limu and sofmer",
+ "Mixed crop (K.kasuku &K.Korongo. )",
+ "Mixed crop (K.korongo & Duma)",
+ "Mixed crop (K.korongo & duma)",
+ "Mixed crop (K.korongo & K. kasuku)",
+ "Mixed crop (K.korongo & K. kasuku. )",
+ "Mixed crop (K.korongo & Kasuku )",
+ "Mixed crop (K.korongo & uknown variety)",
+ "Mixed crop (K.Korongo & unknown )",
+ "Mixed crop (K.Korongo & unknown variety )",
+ "Mixed crop (K.korongo & unknown)",
+ "Mixed crop (K.Korongo &unknown )",
+ "Mixed crop (kwale &unknown )",
+ "Mixed crop (Njoro 2 & unknown )",
+ "Mixed crop (Njoroll & Korongo )",
+ "Mixed variety (K.Korongo and Kwale)",
+ "Uknown mixed crop"
+ ],
+ "Mulifa":
+ [
+ "Mulifa"
+ ],
+ "Mwamba":
[
"Mwamba"
],
- "Ndume":
+ "Ndume":
[
"Ndume",
"Ndume "
],
- "NJORO BW II":
+ "Njoro BW II":
[
"NJORO BW II",
"Njoro BW II",
@@ -451,43 +695,69 @@
"NJORO BWIl ",
"NjoroBWII",
"NjoroBWII ",
- "Njoro Il"
+ "Njoro II",
+ "Njoro II ",
+ "Njoro Il",
+ "Njoro Il ",
+ "Njoro ll",
+ "Njoro2",
+ "Njoro ll",
+ "Njoro ll",
+ "Njoroll",
+ "Njoro ll ",
+ "Njoroll "
+ ],
+ "Oat":
+ [
+ "Oat"
+ ],
+ "Oborra":
+ [
+ "Oborra"
],
- "Ogolcho":
+ "Ogolcho":
[
+ "Ogolcho",
+ "Ogolcho ",
+ "ogolcho",
+ "Ogolccho",
"Ogelcho",
"Oglcho",
"Ogocho",
+ "Ogoocho",
"Ogol cho",
"Ogolchi",
"OGOLCHO",
- "Ogolcho",
- "ogolcho",
"Ogolicho",
"OGOLOCHO",
"Ogilcho",
"Ogolch",
- "Ogolucho"
+ "Ogolucho",
+ "Ogolcha"
],
- "One":
+ "One":
[
"One"
],
- "Otuba":
+ "Otuba":
[
"Otuba",
"Utuba"
],
- "Paven 76":
+ "Paven 76":
[
"Paven 76",
"Paven76",
"Pavo-76",
"Pavon",
"Pavan",
- "Pavon_76"
+ "Pavon_76",
+ "Pavon 76",
+ "Pavon-76",
+ "pavan",
+ "Pavin"
],
- "PCBW #560":
+ "PCBW #560":
[
"PCBW# 560"
],
@@ -495,7 +765,7 @@
[
"PCBW#1387"
],
- "PCBW #1877":
+ "PCBW #1877":
[
"PCBW#1877"
],
@@ -507,15 +777,15 @@
[
"PCBW#4556"
],
- "PCBWSR #2431":
+ "PCBWSR #2431":
[
"PCBWSR#2431"
],
- "PCBWSR #3421":
+ "PCBWSR #3421":
[
"PCBWSR#3421"
],
- "PCBWSR #4409":
+ "PCBWSR #4409":
[
"PCBWSR4409"
],
@@ -523,59 +793,83 @@
[
"PCHZNSR #585"
],
- "PCHPLUSSR #198":
+ "PCHPLUSSR #198":
[
"PCHPLUSSR#198"
],
- "Robin":
+ "Robin":
[
- "Robin"
+ "Robin",
+ "Robin "
],
- "Senate":
+ "Senate":
[
"Sanate",
- "Senate"
+ "Senate",
+ "Sanate ",
+ "Senata "
+ ],
+ "Shaki":
+ [
+ "Shaki",
+ "shaki"
],
- "Shorima":
+ "Shorima":
[
"SHORIMA",
"Shorima",
+ "Shorima ",
"Shorimo",
- "Shoroma"
+ "Shoroma",
+ "Shorina"
],
- "Simba":
+ "Simba":
[
"Simba",
"Sinba"
],
- "SR DIFFERENTIAL #27":
+ "Sofumer":
+ [
+ "Sofumer"
+ ],
+ "SR DIFFERENTIAL #27":
[
"SR DIFFERENTIAL # 27",
"Sr differentials #27"
],
- "SR DIFFERENTIAL #51":
+ "SR DIFFERENTIAL #51":
[
"SR DIFFERENTIAL # 51",
"SR Differential#51"
],
- "SR DIFFERENTIAL #33":
+ "SR DIFFERENTIAL #33":
[
"Sr differential #33"
],
- "SR DIFFERENTIAL #20":
+ "SR DIFFERENTIAL #20":
[
"SR Differentials#20"
],
- "Sydney Australia #83":
+ "Sydney Australia #83":
[
"Sydney Australia #83"
],
- "Tsehay":
+ "Tate":
+ [
+ "Tate"
+ ],
+ "Triticale":
+ [
+ "Triticale",
+ "Triticale ",
+ "Tritical"
+ ],
+ "Tsehay":
[
"Tsehay"
],
- "Unknown":
+ "Unknown":
[
"Unknown",
"Uknown",
@@ -586,102 +880,146 @@
"Unkown",
"unkown",
"Unkwon",
- "Unkwown"
- ],
- "USDA #105":
+ "Unkwown",
+ "Unkwown ",
+ "Unknown (observation nursery)",
+ "unknow",
+ "Kenya Hawk?",
+ "I known",
+ "UnKnown",
+ "unknown ",
+ "Unkwon ",
+ "Inknown",
+ "Known",
+ "Ubknown",
+ "Ujknown",
+ "Ukown",
+ "UNKNOWN",
+ "Unknown (Duma?)",
+ "Unkowb",
+ "Unlnown",
+ "Uninown",
+ "Unko",
+ "Variety",
+ "Uknown old Kenyan variety",
+ "Uknown variety",
+ "Uknown awnless variety",
+ "Uknown variety",
+ "Unknown variety"
+ ],
+ "USDA #105":
[
"USDA#105"
],
- "USDA #112":
+ "USDA #112":
[
"USDA#112"
],
- "USDA #547":
+ "USDA #547":
[
"USDA#547"
],
- "USDA #747":
+ "USDA #747":
[
"USDA#747"
],
- "USDA #823":
+ "USDA #823":
[
"USDA#823"
],
- "USDA #994":
+ "USDA #994":
[
"USDA#994",
"USDA #994"
],
- "USDA #1061":
+ "USDA #1061":
[
"USDA#1061",
"USDA #1061"
],
- "USDA #1135":
+ "USDA #1135":
[
"USDA#1135",
"USDA #1135"
],
- "USDA #1458":
+ "USDA #1458":
[
"USDA#1458",
"USDA #1458"
],
- "USDA #1588":
+ "USDA #1588":
[
"USDA#1588",
"USDA #1588"
],
- "USDA #1612":
+ "USDA #1612":
[
"USDA #1612"
],
- "USDA #1762":
+ "USDA #1762":
[
"USDA#1762"
],
- "Wane":
+ "Wane":
[
"Wane",
- "Wanie"
+ "Wanie",
+ "wane"
],
- "YR DIFFERENTIAL #1":
+ "YR DIFFERENTIAL #1":
[
"YR DIFFERENTIAL#1",
"YR DIFFERENTIAL #1"
],
- "YR DIFFERENTIAL #8":
+ "YR DIFFERENTIAL #4":
+ [
+ "YR DIFFERENTIAL#4",
+ "YR DIFFERENTIAL #4",
+ "Yr differential #4"
+ ],
+ "YR DIFFERENTIAL #8":
[
"YR DIFFERENTIAL#8",
"YR DIFFERENTIAL #8"
],
- "YR DIFFERENTIAL #10":
+ "YR DIFFERENTIAL #10":
[
"YR DIFFERENTIAL#10",
"YR DIFFERENTIAL #10"
],
- "YR DIFFERENTIAL #15":
+ "YR DIFFERENTIAL #15":
[
"YR DIFFERENTIAL#15",
"YR DIFFERENTIAL #15"
],
- "YR DIFFERENTIAL #24":
+ "YR DIFFERENTIAL #24":
[
"YR DIFFERENTIAL#24",
"YR DIFFERENTIAL #24"
],
- "YR DIFFERENTIAL #27":
+ "YR DIFFERENTIAL #27":
[
"YR DIFFERENTIAL#27",
"YR DIFFERENTIAL #27"
],
- "YR27/6*AOC":
+ "YR DIFFERENTIAL #38":
+ [
+ "YR DIFFERENTIAL#38",
+ "YR DIFFERENTIAL #38",
+ "Yr Differential 38"
+ ],
+ "YR DIFFERENTIAL #40":
+ [
+ "YR DIFFERENTIAL#40",
+ "YR DIFFERENTIAL #40",
+ "Yr DIFF 40"
+ ],
+ "YR27/6*AOC":
[
"YR27/6*AOC"
],
- "YR8/6*AOC":
+ "YR8/6*AOC":
[
"YR8/6*AOC"
]
-}
\ No newline at end of file
+}
diff --git a/pipeline_resources/EastAfrica/configs/coordinator/an/env_suit_config_EastAfrica_an_live.json b/pipeline_resources/EastAfrica/configs/coordinator/an/env_suit_config_EastAfrica_an_live.json
index 3dd1a159b30ebf902220875f2a09aec2eab8e546..a1991b53a23b407b8d6dc7db78b7f2ad97ccf63e 100644
--- a/pipeline_resources/EastAfrica/configs/coordinator/an/env_suit_config_EastAfrica_an_live.json
+++ b/pipeline_resources/EastAfrica/configs/coordinator/an/env_suit_config_EastAfrica_an_live.json
@@ -19,7 +19,7 @@
"LeafRust": {
"suitability_modules": ["semibool_dewperiod"],
"past_steps": 0,
- "future_steps": 7,
+ "future_steps": 2,
"thresholds": {
"temperature": [2,15,20,30],
"precipitation": 0,
@@ -29,7 +29,7 @@
"StemRust": {
"suitability_modules": ["semibool_dewperiod"],
"past_steps": 0,
- "future_steps": 7,
+ "future_steps": 2,
"thresholds": {
"temperature": [2,15,24,30],
"precipitation": 0,
@@ -49,7 +49,7 @@
"LeafRust_TempOnly": {
"suitability_modules": ["semibool_dewperiod"],
"past_steps": 0,
- "future_steps": 7,
+ "future_steps": 2,
"thresholds": {
"temperature": [2,15,20,30],
"precipitation": -1,
@@ -59,7 +59,7 @@
"StemRust_TempOnly": {
"suitability_modules": ["semibool_dewperiod"],
"past_steps": 0,
- "future_steps": 7,
+ "future_steps": 2,
"thresholds": {
"temperature": [2,15,24,30],
"precipitation": -1,
diff --git a/pipeline_resources/EastAfrica/configs/coordinator/fc/advisory_config_EastAfrica_fc_live.json b/pipeline_resources/EastAfrica/configs/coordinator/fc/advisory_config_EastAfrica_fc_live.json
index ae89125c60a3f8e3b348a7619f0dd4140b0a4fba..1b42456e8e27a38712a8c7388a4b6f815c0fc85e 100644
--- a/pipeline_resources/EastAfrica/configs/coordinator/fc/advisory_config_EastAfrica_fc_live.json
+++ b/pipeline_resources/EastAfrica/configs/coordinator/fc/advisory_config_EastAfrica_fc_live.json
@@ -2,12 +2,11 @@
"ProcessPreJob" : "query_past_successes",
"ProcessInJob" : "process_in_job_advisory",
"ProcessEWSPlotting" : "do_nothing",
- "seasonStartString" : "20230801",
+ "seasonStartString" : "20240131",
"SurveyPathTemplate" : "${WorkspacePath}/SURVEYDATA_${dateString}/Groups/surveys_PROD.csv",
"DependentComponents" : [
"Deposition",
- "Environment",
- "Epidemiology"
+ "Environment"
],
"Environment" : {
"SuccessFileTemplate" : "${WorkspacePath}/ENVIRONMENT_2.0_${StartString}/STATUS_SUCCESS",
diff --git a/pipeline_resources/EastAfrica/configs/coordinator/fc/env_suit_config_EastAfrica_fc_live.json b/pipeline_resources/EastAfrica/configs/coordinator/fc/env_suit_config_EastAfrica_fc_live.json
index 86f080ca898154ada68965b9b996e0ec7783f032..2901e12bdf822e94b25692f6adb43fdb73fd2294 100644
--- a/pipeline_resources/EastAfrica/configs/coordinator/fc/env_suit_config_EastAfrica_fc_live.json
+++ b/pipeline_resources/EastAfrica/configs/coordinator/fc/env_suit_config_EastAfrica_fc_live.json
@@ -95,6 +95,10 @@
"Zambia" : {
"ChartConfig" : "${ConfigsPath}/plotting/chart/CHART_CONFIG_ZAMBIA_PINE.json",
"FilterForCountry" : "True"
+ },
+ "Tanzania" : {
+ "ChartConfig" : "${ConfigsPath}/plotting/chart/CHART_CONFIG_TANZANIA_EPI.json",
+ "FilterForCountry" : "True"
}
}
}
diff --git a/pipeline_resources/EastAfrica/configs/coordinator/fc/epi_config_EastAfrica_fc_live.json b/pipeline_resources/EastAfrica/configs/coordinator/fc/epi_config_EastAfrica_fc_live.json
index 9fc3b756c6d47d27b97ee8d9d73194d430d2215f..537285090320d9d626b880a0de5a4a2dff1087fa 100644
--- a/pipeline_resources/EastAfrica/configs/coordinator/fc/epi_config_EastAfrica_fc_live.json
+++ b/pipeline_resources/EastAfrica/configs/coordinator/fc/epi_config_EastAfrica_fc_live.json
@@ -1,7 +1,7 @@
{
"DiseaseNames" : ["StemRust"],
- "CalculationSpanDays" : ["20231130",5],
- "continue" : false,
+ "CalculationSpanDays" : ["20230715",5],
+ "continue" : true,
"TimeStep_hours": "3",
"ProcessPreJob" : "process_pre_job_epi",
"ProcessInJob" : "process_in_job_epi",
diff --git a/pipeline_resources/EastAfrica/configs/coordinator/fc/survey_config_EastAfrica_fc_live.json b/pipeline_resources/EastAfrica/configs/coordinator/fc/survey_config_EastAfrica_fc_live.json
index 82070885d709ad3b79d942db11477e21441bb327..aad5a586dee9a7b7dce21729dc2eae9795bb0530 100644
--- a/pipeline_resources/EastAfrica/configs/coordinator/fc/survey_config_EastAfrica_fc_live.json
+++ b/pipeline_resources/EastAfrica/configs/coordinator/fc/survey_config_EastAfrica_fc_live.json
@@ -3,7 +3,7 @@
"ProcessInJob": "process_in_job_survey",
"ProcessEWSPlotting": "process_EWS_plotting_survey",
"AcceptableDowntimeDays": 70,
- "SeasonStartString": "20220815",
+ "SeasonStartString": "20230815",
"ServerCredentialsFile": "${ConfigsPath}/coordinator/Cred-WRT.json",
"Groups": {
"PROD": {
diff --git a/pipeline_resources/EastAfrica/configs/met_extractor/FIELD_NAME_CONSTANTS.csv b/pipeline_resources/EastAfrica/configs/met_extractor/FIELD_NAME_CONSTANTS.csv
index b956e9ea5bea945fc1cd23418bc942a3a7d73c49..27982bad32ac58c84c50d2fc286f8c96b5ef5e2d 100644
--- a/pipeline_resources/EastAfrica/configs/met_extractor/FIELD_NAME_CONSTANTS.csv
+++ b/pipeline_resources/EastAfrica/configs/met_extractor/FIELD_NAME_CONSTANTS.csv
@@ -16,9 +16,3 @@ NAME,TOPOGRAPHY,_TOPOGRAPHY,TOPOGRAPHY
NAME,RELATIVE_HUMIDITY,_RELATIVE_HUMIDITY_(%),RELATIVE_HUMIDITY
NAME,TEMP,_TEMPERATURE_(C),TEMP
NAME,SURFACE_AIR_PRESSURE,_PRESSURE_(PA),PRESSURE_PA
-NAME,SPECIFIC_HUMIDITY,SPECIFIC_HUMIDITY,SPECIFIC_HUMIDITY
-NAME_NEW,PRECIPITATION_RATE,PRECIPITATION_RATE,PRECIPITATION_RATE
-NAME_NEW,SOIL_MOISTURE,SOIL_MOISTURE,SOIL_MOISTURE
-NAME_NEW,TOPOGRAPHY,TOPOGRAPHY,TOPOGRAPHY
-NAME_NEW,RELATIVE_HUMIDITY,RELATIVE_HUMIDITY,RELATIVE_HUMIDITY
-NAME_NEW,TEMP,TEMPERATURE,TEMP
diff --git a/pipeline_resources/EastAfrica/configs/met_extractor/template_new_extract_config.json b/pipeline_resources/EastAfrica/configs/met_extractor/template_new_extract_config.json
deleted file mode 100644
index d5aa01c6630a5ea5203d8f13f57c11e52f21acb2..0000000000000000000000000000000000000000
--- a/pipeline_resources/EastAfrica/configs/met_extractor/template_new_extract_config.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "MET_DATA_TYPE": "NAME",
- "DATA_TYPES": [
- "TEMP",
- "PRECIPITATION_RATE",
- "RELATIVE_HUMIDITY"
- ],
- "METO_PARAMS": {
- "METO_PARTS": [
- "no_part"
- ]
- },
- "POST_PROCESSING": {
- "PROCESSORS": [
- {
- "PROCESSOR_NAME": "RIE",
- "OUT_FILE_NAME": "RIE",
- "PYTHONPATH": "/home/lb584/git/ews_environmental_suitability_v2/",
- "CLASSPATH": "ewses_vectorised_timepoint_processor",
- "CLASSNAME": "EnvSuitColTimePointProcessor",
- "DEPENDS": [],
- "TIMEPOINTS_FILE_PATH": "#",
- "FUTURE_FIELDS": [
- {
- "PROCESSOR_NAME": "TEMP",
- "DURATION": 7,
- "ENABLED": "TRUE"
- },
- {
- "PROCESSOR_NAME": "PRECIPITATION_RATE",
- "DURATION": 7,
- "ENABLED": "TRUE"
- },
- {
- "PROCESSOR_NAME": "RELATIVE_HUMIDITY",
- "DURATION": 7,
- "ENABLED": "TRUE"
- }
- ],
- "PARAMS": {
- "suitability_modules": ["#"],
- "thresholds": {
- "temperature": [2,30],
- "precipitation": 0,
- "relative_humidity": 90
- }
- }
- }
- ]
- },
- "TIMEPOINTS_FILE_PATH": "#",
- "TIME_INCREMENT": 4,
- "MERGE_CHUNK_SIZE": 400,
- "OUTPUT_DIR": "#",
- "SPATIAL_POINTS_FILE_PATH": "#",
- "SLURM": "TRUE",
- "FIELD_NAME_CONSTANTS_PATH": "#",
- "NCDF_DIR_PATH": "#",
- "RECURSIVE_SEARCH": "FALSE"
-}
diff --git a/pipeline_resources/EastAfrica/configs/met_extractor/template_operational_config.json b/pipeline_resources/EastAfrica/configs/met_extractor/template_operational_config.json
index ecc2a4886d63d0a328cba9a527d9ad6917641278..e6f6e049f6fe9ac9a74b914f5cd0091681a7741b 100644
--- a/pipeline_resources/EastAfrica/configs/met_extractor/template_operational_config.json
+++ b/pipeline_resources/EastAfrica/configs/met_extractor/template_operational_config.json
@@ -5,11 +5,6 @@
"PRECIPITATION_RATE",
"RELATIVE_HUMIDITY"
],
- "METO_PARAMS": {
- "METO_PARTS": [
- "no_part"
- ]
- },
"POST_PROCESSING": {
"PROCESSORS": [
{
diff --git a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ETHIOPIA_EPI_PINE.json b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ETHIOPIA_EPI_PINE.json
index b23f4bafe986c44ca9bdc71493b559ede357617c..529b72b9086978566785adfd65777d07da2bfa0f 100644
--- a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ETHIOPIA_EPI_PINE.json
+++ b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ETHIOPIA_EPI_PINE.json
@@ -11,7 +11,7 @@
"LEGEND_ALPHA": 0,
"TITLE_FONT_SIZE": 30,
"COUNTRY_LANDPOINTS_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/gis_data/ethiopia/ethiopia_points_epi.csv",
- "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/images/logos_Ethiopia_plotting.png",
+ "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/images/logos_EastAfrica_plotting.png",
"COUNTRY_STRING": "ethiopia",
"PLACES_TO_PLOT": ["CAPITAL","LARGE","MEDIUM"],
"PLACES_TO_EXCLUDE": ["Bandarbeyla","Al Hudaydah"],
diff --git a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ETHIOPIA_PINE.json b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ETHIOPIA_PINE.json
index 1aae202e59908f04679f952eb202eed34f175080..63991dd88a0179cc24e360b6201a9405b8ff685e 100644
--- a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ETHIOPIA_PINE.json
+++ b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ETHIOPIA_PINE.json
@@ -11,7 +11,7 @@
"LEGEND_ALPHA": 0,
"TITLE_FONT_SIZE": 30,
"COUNTRY_LANDPOINTS_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/gis_data/ethiopia/ethiopia_points.csv",
- "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/images/logos_Ethiopia_plotting.png",
+ "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/images/logos_EastAfrica_plotting.png",
"COUNTRY_STRING": "ethiopia",
"PLACES_TO_PLOT": ["CAPITAL","LARGE","MEDIUM"],
"PLACES_TO_EXCLUDE": ["Bandarbeyla","Al Hudaydah"],
diff --git a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_KENYA_PINE.json b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_KENYA_PINE.json
index d4e368abc94e6d92b1199be249c72dfc7c8839ce..1dbbf46d2cd76f1fae40084d367a5c36420f8ee3 100644
--- a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_KENYA_PINE.json
+++ b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_KENYA_PINE.json
@@ -12,7 +12,7 @@
"LEGEND_ALPHA": 0.4,
"TITLE_FONT_SIZE": 30,
"COUNTRY_LANDPOINTS_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/gis_data/kenya/kenya_points.csv",
- "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/images/logos_Kenya_plotting.png",
+ "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/images/logos_EastAfrica_plotting.png",
"COUNTRY_STRING": "kenya",
"PLACES_TO_PLOT": ["CAPITAL","LARGE", "MEDIUM"],
"PLACES_X_LIMIT": 0.99
diff --git a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_TANZANIA_EPI.json b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_TANZANIA_EPI.json
index 67eea920ca25d07045cfe3d61d0385acd11e2a7e..9633a9291fc72a53b9f4b0664712eef1ff7fe150 100644
--- a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_TANZANIA_EPI.json
+++ b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_TANZANIA_EPI.json
@@ -11,7 +11,7 @@
"LEGEND_ALPHA": 0,
"TITLE_FONT_SIZE": 30,
"COUNTRY_LANDPOINTS_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/gis_data/tanzania/tanzania_points.csv",
- "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/images/logos_Ethiopia_plotting.png",
+ "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/images/logos_EastAfrica_plotting.png",
"COUNTRY_STRING": "tanzania",
"PLACES_TO_PLOT": ["CAPITAL","LARGE","MEDIUM"],
"PLACES_TO_EXCLUDE": [],
diff --git a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ZAMBIA_PINE.json b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ZAMBIA_PINE.json
index f44c22ab866a69f67e61b50971715df5562f79fe..1f9d72737b8f86599013a1c145a620f6deec3053 100644
--- a/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ZAMBIA_PINE.json
+++ b/pipeline_resources/EastAfrica/configs/plotting/chart/CHART_CONFIG_ZAMBIA_PINE.json
@@ -11,8 +11,8 @@
"LEGEND_ALPHA": 0,
"TITLE_FONT_SIZE": 30,
"COUNTRY_LANDPOINTS_FILE": "${ProjectRoot}/regions/EastAfrica/resources/assets/plotting/gis_data/zambia/zambia_points.csv",
+ "COUNTRY_LOGO_FILE": "${ProjectRoot}/regions/EastAfrica/resources/plotting/assets/images/logos_EastAfrica_plotting.png",
"COUNTRY_STRING": "zambia",
"PLACES_TO_PLOT": ["CAPITAL","LARGE","MEDIUM"],
- "PLACES_TO_EXCLUDE": ["Bandarbeyla","Al Hudaydah"],
"PLACES_X_LIMIT": 1
}
diff --git a/pipeline_resources/EastAfrica/configs/plotting/env_suit/RUN_CONFIG_ENV.json b/pipeline_resources/EastAfrica/configs/plotting/env_suit/RUN_CONFIG_ENV.json
index ab5e800db2f12f69b2d6634af8d0b3baf26ffe8a..e3b72b4e1d2e7520af1e478fff6d3dff9618d255 100644
--- a/pipeline_resources/EastAfrica/configs/plotting/env_suit/RUN_CONFIG_ENV.json
+++ b/pipeline_resources/EastAfrica/configs/plotting/env_suit/RUN_CONFIG_ENV.json
@@ -8,8 +8,8 @@
"MAP_TITLE": "OVERRIDDEN",
"RUN_PREFIX": "OVERRIDDEN",
"LEGEND_TITLE": "relative infection\nefficiency %",
- "PLOT_TIFS": "true",
"PLOT_SHAPES": "false",
+ "PLOT_TIFS": "true",
"PLOT_IMAGES": "true",
"PLOT_DAILY_IMAGES": "false",
"PLOT_HOURLY_IMAGES": "false",
diff --git a/pipeline_resources/EastAfrica/configs/source_gen/config_EastAfrica_mapspam2017.json b/pipeline_resources/EastAfrica/configs/source_gen/config_EastAfrica_mapspam2017.json
index 0a5f7eeb33b1b703c8325437aa450370e8a98050..1b9643d101c156df4604aa2b69e110fbeca73f71 100644
--- a/pipeline_resources/EastAfrica/configs/source_gen/config_EastAfrica_mapspam2017.json
+++ b/pipeline_resources/EastAfrica/configs/source_gen/config_EastAfrica_mapspam2017.json
@@ -5,9 +5,9 @@
"wheat_rasters_bydate" : {
"20170101" : "${AssetsPath}/source_gen/spam2017V1r1_SSA_gr_H_WHEA_A_clipEastAfrica.tif"
},
- "cluster_poly_file" : "${AssetsPath}/source_gen/boundaries/EastAfrica_clusters.shp",
- "id_col" : "id",
- "region_file" : "${AssetsPath}/source_gen/boundaries/EastAfrica_9regions.shp",
+ "cluster_poly_file" : "${AssetsPath}/source_gen/UMG_Mk11_grid_EastAfrica_withregions.shp",
+ "id_col" : "cluster_id",
+ "region_file" : "${AssetsPath}/source_gen/UMG_Mk11_grid_EastAfrica_withregions.shp",
"region_id_col" : "REGION_ID",
"wheat_stages_file" : "${AssetsPath}/source_gen/approx_growth_timing_cleaned.csv"
}
diff --git a/pipeline_resources/SouthAsia/configs/advisory_builder/config_SouthAsia_variety_names_tidy.json b/pipeline_resources/SouthAsia/configs/advisory_builder/config_SouthAsia_variety_names_tidy.json
index 9fd6f03aeaaf0135bd1bb7c0edec1e6044b6b0a0..a612922c41660ff73382e8405aaf5a2ce7701803 100755
--- a/pipeline_resources/SouthAsia/configs/advisory_builder/config_SouthAsia_variety_names_tidy.json
+++ b/pipeline_resources/SouthAsia/configs/advisory_builder/config_SouthAsia_variety_names_tidy.json
@@ -1,9 +1,20 @@
{
+ "Abdul Sattar":
+ [
+ "Abdul Sattar"
+ ],
+ "Abdul Sattar 02":
+ [
+ "Abdul Sattar 02",
+ "Abdul Sattar _02",
+ "Abdul Sattar_02",
+ "Abdul sattar_02"
+ ],
"Achyut" :
[
"Achyut"
],
- "Aditya" :
+ "Aditya" :
[
"Aditya",
"Aaditya"
@@ -18,13 +29,19 @@
"AKBAR 19 ",
"AKBAR 19",
"Akber",
- "Akber 19"
+ "Akber 19",
+ "Akbar 19,",
+ "Akbar.19",
+ "Akber19",
+ "Akber_19"
],
"Anaj-17":
[
"Anaj",
"Anaj 17",
- "Anaj-17"
+ "Anaj-17",
+ "Anaj17"
+
],
"Annapurna-1":
[
@@ -33,22 +50,32 @@
"Annapurna 1",
"Annapurna-1"
],
- "Banganga" :
+ "Bajosokha":
+ [
+ "Bajo Sokha (check)",
+ "Bajo Sokha kaa",
+ "Bajoka 1"
+ ],
+ "Banganga" :
[
"Banganga",
"Bandganga",
- "Banaganga"
+ "Banaganga",
+ "Badganga"
],
"BARI Gom 17" :
[
"BARI Gom 17",
- "Bari gom 17"
+ "Bari gom 17",
+ "Barigom 17",
+ "Barigom17",
+ "Bari gom17"
],
"BARI Gom 20" :
[
"BARI Gom 20"
],
- "BARI Gom 21 (Shatabdi)" :
+ "BARI Gom 21 (Shatabdi)" :
[
"Satapdi",
"Shatabdi",
@@ -56,7 +83,7 @@
"Sotabthe",
"Sotabthi"
],
- "BARI Gom 24" :
+ "BARI Gom 24" :
[
"BARI Gom 24",
"Prodip",
@@ -65,7 +92,7 @@
"Bari gom24",
"BARI gom 24"
],
- "BARI Gom 25" :
+ "BARI Gom 25" :
[
"BARI Gom 25",
"Bari gom 25",
@@ -73,7 +100,7 @@
"BARI Gom25",
"BARI Gom25"
],
- "BARI Gom 26" :
+ "BARI Gom 26" :
[
"26",
"Bari 26",
@@ -94,9 +121,13 @@
"BARI Gpm26",
"BAR Gon26",
"BARI Gom. 26",
- "BARI 26"
+ "BARI 26",
+ "Bari Gam 26",
+ "Bari gom26",
+ "Bhari Gam 26",
+ "বারি ২৬"
],
- "BARI Gom 27" :
+ "BARI Gom 27" :
[
"BARI GOM 27",
"BARI Gom 27",
@@ -108,7 +139,7 @@
"BARI GOM27",
"BARIGOM27"
],
- "BARI Gom 28" :
+ "BARI Gom 28" :
[
"Bari Gam 28",
"Bari gam 28",
@@ -137,9 +168,11 @@
"BARi Gom 28",
"BARI Gom 28.",
"BARI GOM28",
- "BARI gom28"
+ "BARI gom28",
+ "BARIGom 28",
+ "Barigom28"
],
- "BARI Gom 29" :
+ "BARI Gom 29" :
[
"BARI Gom 29",
"Bari Gom 29",
@@ -149,7 +182,7 @@
"BARI gom 29",
"RARI Gom 29"
],
- "BARI Gom 30" :
+ "BARI Gom 30" :
[
"30",
"BAR Gom 30",
@@ -193,14 +226,25 @@
"BARRI Gom 30",
"Brri gom 30",
"BARIGom30",
- "VARI Gom 30"
- ],
- "BARI Gom 31" :
+ "VARI Gom 30",
+ "Bari Gam 30",
+ "Bari GOM 30",
+ "BARIG 30",
+ "BARIGOM 30",
+ "BARRI Gum30",
+ "Bari Gom30",
+ "Bhari Gam 30",
+ "BAARIGom 30",
+ "BARRI Ggom 30",
+ "BRRI Gom 30"
+ ],
+ "BARI Gom 31" :
[
"BARI Gom31",
- "Barigom,31"
+ "Barigom,31",
+ "Barigom31"
],
- "BARI Gom 32" :
+ "BARI Gom 32" :
[
"32",
"Baarigom 32",
@@ -223,9 +267,22 @@
"BARI gom32",
"BARIG Gom 32",
"BARIGom 32",
- "BARRI Gom 32"
- ],
- "BARI Gom 33" :
+ "BARRI Gom 32",
+ "BARI Gom -32",
+ "BARI Gam 32",
+ "BARI Gom -32",
+ "BARI Gom- 32",
+ "Bari Gom32",
+ "BARRI Gum 32",
+ "BARRI Gum32",
+ "BARIGom32",
+ "বারি গম ৩২",
+ "৩২",
+ "BRRI Gom 32",
+ "BRRRI gom 32",
+ "BRRRI Gom32"
+ ],
+ "BARI Gom 33" :
[
"33",
"ba 33",
@@ -291,14 +348,39 @@
"BARRI Gum 33",
"BARRI gum 33",
"BRRI GOM 33",
- "Brri Gom 33"
+ "Brri Gom 33",
+ "BARRI Gum33",
+ "BARU Gom 33",
+ "BATIGom 33",
+ "BARI Gam 33",
+ "BARIGOM 33",
+ "Bari Gom-33",
+ "BARI GOm33",
+ "BARI33",
+ "BRRI Gom 33",
+ "BRRI Gon 33",
+ "Bsri gom 33",
+ "বারি গম ৩৩",
+ "BARl Gom 33",
+ "BSRIGom 33"
+ ],
+ "BARI Gom 34":
+ [
+ "BARI Gom 34",
+ "BARI GOM 34"
],
- "BARI GOM Sonali" :
+ "BARI GOM Sonali" :
[
"BARI GOM Sonali",
"BARI Gom sonali",
"BARI Gom Sonali"
],
+ "Bhakhar star":
+ [
+ "Bhakhar star",
+ "Bhakkar star",
+ "Bhkar Star"
+ ],
"Bhaskar (Indian)":
[
"Bhaskar (Indian)"
@@ -307,27 +389,221 @@
[
"Bheriganga"
],
- "Bhirkuti" :
+ "Bhirkuti" :
[
"Bhirkuti",
"Bhrikuti"
],
- "BL 4341" :
+ "BL 4341" :
[
"BL 4341",
"BL4341!",
"BL4341"
],
- "BL 4669" :
+ "BL 4669" :
[
"BL 4669",
"BL 4669(pipeline variety)"
],
- "BL 4682" :
+ "BL 4682" :
[
"BL 4682"
],
+ "Bumthang Ka Drukchu":
+ [
+ "Bumthang ka Drukchu",
+ "Bumthang ka drukchu",
+ "Bumthangka drukchu",
+ "Bumthang Ka Drukchu"
+ ],
+ "BWMRI Gom 1" :
+ [
+ "BWMRI 1",
+ "BWMRI Gom 1",
+ "WMRI Gom 1",
+ "WMRI Gom -1",
+ "WMRI 1",
+ "WMRI,Gom 1",
+ "BWMRI GOM 1",
+ "BWMRI Gom1",
+ "BWMRI-1",
+ "wmri 1",
+ "WMRI Gom 1",
+ "WMRIGom 1"
+ ],
+ "BWMRI Gom 2" :
+ [
+ "WMRI Gom 2",
+ "BWMRI Gom 2",
+ "BWMRI Gom2",
+ "BWMRI Gom-2",
+ "BWMRI 2",
+ "WMRI Gom 2",
+ "BWMRI GOM 2",
+ "WMRIGom 2"
+ ],
+ "BWMRI Gom 3" :
+ [
+ "BWMRI Gom 3",
+ "BARI BWMRI 3",
+ "BMRI 3",
+ "BWMRI3",
+ "WMRI Gom 3",
+ "WMRI-3",
+ "BWMRI 3",
+ "WMRI 3"
+ ],
+ "CIMMYT line 1":
+ [
+ "CIMMYT line 1",
+ "CIMMYT Line 1",
+ "CIMMYT LINE 1"
+ ],
+ "CIMMYT line 2":
+ [
+ "CIMMYT line 2",
+ "CIMMYT Line 2",
+ "CIMMYT LINE 2"
+ ],
+ "CIMMYT line 3":
+ [
+ "CIMMYT line 3",
+ "CIMMYT Line 3",
+ "CIMMYT LINE 3"
+ ],
+ "CIMMYT line 4":
+ [
+ "CIMMYT line 4",
+ "CIMMYT Line 4",
+ "CIMMYT LINE 4"
+ ],
+ "CIMMYT line 5":
+ [
+ "CIMMYT line 5",
+ "CIMMYT Line 5",
+ "CIMMYT LINE 5"
+ ],
+ "CIMMYT line 6":
+ [
+ "CIMMYT line 6",
+ "CIMMYT Line 6",
+ "CIMMYT LINE 6"
+ ],
+ "CIMMYT line 7":
+ [
+ "CIMMYT line 7",
+ "CIMMYT Line 7",
+ "CIMMYT LINE 7"
+ ],
+ "CIMMYT line 8":
+ [
+ "CIMMYT line 8",
+ "CIMMYT Line 8",
+ "CIMMYT LINE 8"
+ ],
+ "CIMMYT line 9":
+ [
+ "CIMMYT line 9",
+ "CIMMYT Line 9",
+ "CIMMYT LINE 9"
+ ],
+ "CIMMYT line 10":
+ [
+ "CIMMYT line 10",
+ "CIMMYT Line 10",
+ "CIMMYT LINE 10"
+ ],
+ "CIMMYT line 11":
+ [
+ "CIMMYT line 11",
+ "CIMMYT Line 11",
+ "CIMMYT LINE 11"
+ ],
+ "CIMMYT line 12":
+ [
+ "CIMMYT line 12",
+ "CIMMYT Line 12",
+ "CIMMYT LINE 12"
+ ],
+ "CIMMYT line 13":
+ [
+ "CIMMYT line 13",
+ "CIMMYT Line 13",
+ "CIMMYT LINE 13"
+ ],
+ "CIMMYT line 14":
+ [
+ "CIMMYT line 14",
+ "CIMMYT Line 14",
+ "CIMMYT LINE 14"
+ ],
+ "CIMMYT line 15":
+ [
+ "CIMMYT line 15",
+ "CIMMYT Line 15",
+ "CIMMYT LINE 15"
+ ],
+ "CIMMYT line 16":
+ [
+ "CIMMYT line 16",
+ "CIMMYT Line 16",
+ "CIMMYT LINE 16"
+ ],
+ "CIMMYT line 17":
+ [
+ "CIMMYT line 17",
+ "CIMMYT Line 17",
+ "CIMMYT LINE 17"
+ ],
+ "CIMMYT line 18":
+ [
+ "CIMMYT line 18",
+ "CIMMYT Line 18",
+ "CIMMYT LINE 18"
+ ],
+ "CIMMYT line 19":
+ [
+ "CIMMYT line 19",
+ "CIMMYT Line 19",
+ "CIMMYT LINE 19"
+ ],
+ "CIMMYT line 20":
+ [
+ "CIMMYT line 20",
+ "CIMMYT Line 20",
+ "CIMMYT LINE 20"
+ ],
+ "CIMMYT line 21":
+ [
+ "CIMMYT line 21",
+ "CIMMYT Line 21",
+ "CIMMYT LINE 21"
+ ],
+ "CIMMYT line 22":
+ [
+ "CIMMYT line 22",
+ "CIMMYT Line 22",
+ "CIMMYT LINE 22"
+ ],
+ "CIMMYT line 23":
+ [
+ "CIMMYT line 23",
+ "CIMMYT Line 23",
+ "CIMMYT LINE 23"
+ ],
+ "CIMMYT line 24":
+ [
+ "CIMMYT line 24",
+ "CIMMYT Line 24",
+ "CIMMYT LINE 24"
+ ],
+ "CIMMYT line 25":
+ [
+ "CIMMYT line 25",
+ "CIMMYT Line 25",
+ "CIMMYT LINE 25"
+ ],
"Danphe" :
[
"Danphe"
@@ -344,12 +620,23 @@
"Dilkash-20",
"Dilkash 20",
"DILKASH-20",
- "SILKASH 20"
+ "SILKASH 20",
+ "Dilkash20",
+ "Dilkkash 20"
],
"Dilkash-21":
[
"Dilkash-21",
- "DILKASH-21"
+ "DILKASH-21",
+ "DILKASH 21",
+ "Dilkash 21"
+ ],
+ "Durum wheat":
+ [
+ "Dura. Wheat",
+ "Duram",
+ "Durum",
+ "Durum wheat line imported from Indian market"
],
"Faisalabad-08" :
[
@@ -361,7 +648,18 @@
"Fsd08",
"Fsd_08",
"Fsd-08",
- "Faisalabad 08"
+ "Faisalabad 08",
+ "Faisalabad _08",
+ "Faisalabad_08"
+ ],
+ "Fakhar e Bhakar":
+ [
+ "Fakhar e Bhakar",
+ "Fakhar e Bhakkar",
+ "Fakhra bkhar",
+ "Fakhrabkhar",
+ "Falhrabhakhar",
+ "Fakhar Bakhar"
],
"Gaffar":
[
@@ -374,21 +672,42 @@
"Galaxy-13",
"Galaxy-13 ",
"GALAXY-13",
- "GALAXY-13 "
+ "GALAXY-13 ",
+ "Galaxy",
+ "Galaxy_13"
],
- "Gautam" :
+ "Gautam" :
[
"GAUTAM",
"Gautam",
"Gautum",
- "Gautan"
+ "Gautan",
+ "Guatam"
+ ],
+ "Gulzar":
+ [
+ "Gulzar"
],
- "HD 2967" :
+ "Guma Sokha":
+ [
+ "Guma Sokha",
+ "Guma sokha (check)",
+ "Guma sokha ka",
+ "Guma sokha- kaap",
+ "Guma sokha-kaa",
+ "Gumasokha",
+ "Gumasokha kaa"
+ ],
+ "HD 2204":
+ [
+ "HD 2204"
+ ],
+ "HD 2967" :
[
"HD 2967",
"HD2967"
],
- "HD 3086" :
+ "HD 3086" :
[
"HD 3086"
],
@@ -396,16 +715,21 @@
[
"HIMGANGA"
],
- "Indian (China 3)" :
+ "Imdad-05":
+ [
+ "Imdad_05"
+ ],
+ "Indian (China 3)" :
[
"Indian ( china 3)",
"IIndian(china 3)",
"Indian( china 3)",
"Indian(china 3)",
+ "Indian (china 3)",
"China 3",
"Indian China 3"
],
- "Indian (China 4)" :
+ "Indian (China 4)" :
[
"Indian ( china 4)",
"Indian(china 4)",
@@ -413,18 +737,27 @@
"IIndian (china 4)",
"Indian( china 4)",
"Indian (china4)",
- "indian(china 4)"
+ "indian(china 4)",
+ "Chaina 4",
+ "Indian ( china 4)"
],
- "Kanchan" :
+ "Jaga kaa":
+ [
+ "Jaga kaa"
+ ],
+ "Kanchan" :
[
"Kanchan",
- "Kanchon"
+ "Kanchon",
+ "KANCHAN",
+ "KANCHON",
+ "kanchon"
],
"Kanti" :
[
"Kanti"
],
- "Khumal Shakti" :
+ "Khumal Shakti" :
[
"Khumal Shakti"
],
@@ -432,15 +765,15 @@
[
"Kundan"
],
- "Lok-1" :
+ "Lok-1" :
[
"Lok-1"
],
- "Munal" :
+ "Munal" :
[
"Munal"
],
- "Mudule" :
+ "Mudule" :
[
"Mudule",
"Mudule-1"
@@ -448,34 +781,85 @@
"NAL-52":
[
"NAL -52",
- "NAL-52"
+ "NAL-52",
+ "NAL52"
+ ],
+ "Nawab-21":
+ [
+ "Nawab 21",
+ "Nawab8_21"
],
"NL 1179":
[
"NL 1179",
"NL 1179, pipeline variety for mid hill, yellow rust resistant, disseminated by NWRP, Bhairahawa from last season in Pyuthan"
],
+ "NL 1446" :
+ [
+ "NL1446",
+ "NL 1446"
+ ],
+ "NL 1488":
+ [
+ "NL 1488"
+ ],
+ "NL 1612" :
+ [
+ "NL1612"
+ ],
"NL 1616" :
[
"NL 1616"
],
- "NL 971" :
+ "NL 1716":
[
- "NL 971",
- "NL-971"
+ "NL 1716",
+ "NL1716"
],
- "NL1446" :
+ "NL 1835":
[
- "NL1446"
+ "NL 1835",
+ "NL1835"
],
- "NL1612" :
+ "NL 971" :
[
- "NL1612"
+ "NL 971",
+ "NL-971",
+ "NL971"
],
"Nepal 297" :
[
"Nepal 297",
- "NL297"
+ "NL297",
+ "NL 297"
+ ],
+ "NWDSN 03":
+ [
+ "NWDSN 03"
+ ],
+ "NWDSN 148":
+ [
+ "NWDSN 148"
+ ],
+ "NWDSN 21":
+ [
+ "NWDSN 21"
+ ],
+ "NWDSN 79":
+ [
+ "NWDSN 79"
+ ],
+ "NWDSN 806":
+ [
+ "NWDSN 806"
+ ],
+ "NWDSN 172":
+ [
+ "NWDSN172"
+ ],
+ "NWDSN 588":
+ [
+ "NWDSN588"
],
"Pasang lhamu" :
[
@@ -495,28 +879,32 @@
"RR 21" :
[
"RR 21",
- "RR-21"
+ "RR-21",
+ "RR21"
+ ],
+ "Sadiq-21":
+ [
+ "Sadiq 21",
+ "Sadiq21"
+ ],
+ "Saher-06":
+ [
+ "Saher",
+ "Seher 06"
],
- "Saher":
+ "Sehet-06":
[
- "Saher"
+ "Sehet06"
],
"Siddhartha":
[
"Siddhartha"
],
- "Sonalika" :
+ "Sonalika" :
[
"Sonalika"
],
- "Sworgadwari" :
- [
- "Sorgadwari",
- "Sworgadwari",
- "Sworgdwari",
- "swogadwari"
- ],
- "Subhani 21":
+ "Subhani-21":
[
"Subhani 21",
"Subhani 21 ",
@@ -533,15 +921,30 @@
"Surma",
"Suruma"
],
+ "Sworgadwari" :
+ [
+ "Sorgadwari",
+ "Sworgadwari",
+ "Sworgdwari",
+ "swogadwari",
+ "Sorghadwari",
+ "Swargadwari"
+ ],
"SW-2" :
[
"SW-2"
],
+ "Ujalla-16":
+ [
+ "Ujala",
+ "Ujalla 16",
+ "Ujjala 16"
+ ],
"Vaskar" :
[
"Vaskar"
],
- "Vijay" :
+ "Vijay" :
[
"Vijay",
"Vijaya",
@@ -559,9 +962,10 @@
"Wattan (unapproved)",
"Wattan (Unapproved)",
"Wattan (unapproved)",
- "Wattan,"
+ "Wattan",
+ "Watan"
],
- "WK 1204" :
+ "WK 1204" :
[
"WK 1204",
"WK1204",
@@ -570,72 +974,54 @@
"Wk 1204",
"we 1204"
],
- "WK 1481" :
+ "WK 1481" :
[
"WK1481"
],
- "WK 2748 (Bheri-Ganga)" :
+ "WK 2748 (Bheri-Ganga)" :
[
"Bheri-Ganga (WK 2748)"
],
- "WK 3413" :
- [
- "WK3413",
- "WK 3413"
- ],
- "WK 3639" :
- [
- "WK3639",
- "WK 3639"
- ],
- "WK 2891" :
+ "WK 2891" :
[
"WK2891",
"WK 2891"
],
- "WMRI Gom 1" :
+ "WK 3152":
[
- "BWMRI 1",
- "BWMRI Gom 1",
- "WMRI Gom 1",
- "WMRI Gom -1",
- "WMRI 1",
- "WMRI,Gom 1",
- "BWMRI GOM 1",
- "BWMRI Gom1",
- "BWMRI-1",
- "wmri 1",
- "WMRI Gom 1"
+ "WK3152"
],
- "WMRI Gom 2" :
+ "WK 3413" :
[
- "WMRI Gom 2",
- "BWMRI Gom 2",
- "BWMRI Gom2",
- "BWMRI Gom-2",
- "BWMRI 2",
- "WMRI Gom 2"
+ "WK3413",
+ "WK 3413"
],
- "WMRI Gom 3" :
+ "WK 3639" :
[
- "BWMRI Gom 3",
- "BARI BWMRI 3",
- "BMRI 3",
- "BWMRI3",
- "WMRI Gom 3",
- "WMRI-3"
+ "WK3639",
+ "WK 3639"
+ ],
+ "WK 3927":
+ [
+ "WK3927"
],
- "ZINC Gahun 1" :
+ "ZINC Gahun 1" :
[
"ZINC 1",
"ZINC Gagun 1",
- "Zinc Gahun 1"
+ "Zinc Gahun 1",
+ "Zinc gahu 1"
],
- "ZINC Gahun 2" :
+ "ZINC Gahun 2" :
[
"Zinc Gahun 2"
],
- "Local" :
+ "Zincole-16":
+ [
+ "Zincol 16",
+ "Zincole 16"
+ ],
+ "Local" :
[
"local",
"LOCAL",
@@ -645,9 +1031,18 @@
"Local landraces",
"Local landraces(awnless)",
"Local mudule",
- "Loc al"
+ "Loc al",
+ "Agra local",
+ "Annapurna (Local)",
+ "Local variety",
+ "local mulure",
+ "local murule",
+ "own less local",
+ "Loca",
+ "Local bread wheat",
+ "Local(janath)"
],
- "Mixed" :
+ "Mixed" :
[
"HD2967 and HD3086",
"Mixed",
@@ -687,9 +1082,76 @@
"Dilkash, Arooj, Akbar",
"Dilkash, Arooj, Nishan",
"Dilkash, Faisalabad-2008",
- "Wl-711, Shafaq-06, Morocco"
- ],
- "Unknown" :
+ "Wl-711, Shafaq-06, Morocco",
+ "531, NRN 67",
+ "600, WVD16",
+ "Abdul Sat tar+ TD_1",
+ "Akbar 19, Bhakar star",
+ "Akbar 19, Dilkas20, Anaj 17",
+ "Akbar 19, Dilkash 20, Bhakar star",
+ "Akbar 19, Faisalabad 08",
+ "Akbar 19, Nawab 21",
+ "Akbar with",
+ "Akbar, Arooj",
+ "Akber-19, Fakhre Bhakker, Dilkash and Mixtureof dofferent varities",
+ "Akber_19+Abdul Sattar_02",
+ "Anaj17, Akbar 19",
+ "Arooj, Akbar, Dilkash",
+ "BARI Gom 33 and",
+ "Anaj' Akbar",
+ "As_02+Akbet_19",
+ "Bhakar e Bhakar, Bhakar star, Akbar 19",
+ "Bhakhar star + Abdul sattar",
+ "Borlauge 16+ Markez+ NARC Supet",
+ "Different advance and candidate lines",
+ "Different but samples were collected from MOROCCO",
+ "Different enteries under disease sceerning Nurseries (Akbar19)",
+ "Dilkas 20 Akbar 19",
+ "Dilkash 20, Akbar 19",
+ "Dilkash 20, Nawab 21, Bhakar star",
+ "Dilkash and Arooj",
+ "Dilkash and Fakhr e Bhajker",
+ "Dilkash, Arooj and Akber19",
+ "Dilksh21, Akbar 19, Faisalabad 08,",
+ "Faisalabad 08 and unknown variety",
+ "Fakhar e Bhakkar, Akbar, Unknown",
+ "Fakhr e Bhakkar' Akbar, Ujala",
+ "Galaxy 13, Akbar 19, Dilkash20",
+ "Galaxy 13,_Akbar 19",
+ "Galaxy' Faisalabad' Akbar",
+ "Nawab 21, Akbar 19, Dilkash 20,",
+ "Nawab 21, Akbar 19, Fakhar e Bhakar",
+ "Seher 06, Faisalabad 08",
+ "TF_1+Abdul Sattar_02",
+ "Trap nurseries and historical lines",
+ "Trial+ Susceptible check",
+ "Unknown, Mixture",
+ "Mixed",
+ "Mixture. Unknown",
+ "Mixtutr",
+ "Morrocco + others",
+ "Trap nirseries",
+ "Trap nurseries",
+ "Trials",
+ "Different genotypes",
+ "Ujala, Akbar",
+ "Akber-19, Arooj, Dilkash, Subhani, Nishan, Fakhr e Bhakkar, Ghazi 19. Wafaq22. and Shahenshah",
+ "Akber19 and Dilkash",
+ "Akber19, As-2002, Dilkash and Nawab-21",
+ "Akber19. Dilkash. Subhani. Arooj . Fakhr e Bhakkar and Nawab 21",
+ "Akber_19+ Imdad_05+benazir_13",
+ "Akber_19. Dikash . Bakhar star",
+ "Arooj-21 and advance line",
+ "Bhakker Star. Nawab. Dilkash",
+ "Bhakhar and mixture",
+ "Dilkash. Akber 19. Nawab and Arooj",
+ "Faisalabad 08 and mixtures of different varities",
+ "Faisalabad 2008, Fakhre Bhakkar and Dilkash",
+ "mixture",
+ "Mixturr",
+ "Shahenshah, Akber,19, and Nawab21"
+ ],
+ "Unknown" :
[
"Unknown",
"Unknown (Mix)",
@@ -738,18 +1200,36 @@
"2430",
"66",
"35",
+ "40",
+ "50",
"Advance material",
- "Different genotypes",
"Na",
"NS",
"??",
"???? ??",
"Annon",
"Dilkash",
- "local mulure",
- "local murule",
"na",
- "own less local",
- "WMRI Gom 29"
+ "WMRI Gom 29",
+ "Bari Gom",
+ "BARI GOM E",
+ "Bb",
+ "BWAVTH19",
+ "Dilash",
+ "Dilkas",
+ "Un known",
+ "Un non",
+ "un non",
+ "Unknown",
+ "Unkonwn",
+ "UNKWON",
+ "Unnon",
+ "Dilkush",
+ "Dilkusj",
+ "Dilquash",
+ "H",
+ "TD_1",
+ "???? ?? ??",
+ "Unknown (Local awnless)"
]
}
diff --git a/pipeline_resources/SouthAsia/configs/coordinator/fc/survey_config_SouthAsia_fc_live.json b/pipeline_resources/SouthAsia/configs/coordinator/fc/survey_config_SouthAsia_fc_live.json
index c610037f40350889c5e2d3d04c5344d89573702c..8f79ce077e3730e7e5df7bfecd1eefabc933b416 100755
--- a/pipeline_resources/SouthAsia/configs/coordinator/fc/survey_config_SouthAsia_fc_live.json
+++ b/pipeline_resources/SouthAsia/configs/coordinator/fc/survey_config_SouthAsia_fc_live.json
@@ -7,11 +7,13 @@
"ServerCredentialsFile" : "${ConfigsPath}/coordinator/Cred-WRT.json",
"Groups" : {
"PROD" : {
- "Origin" : ["CSV_01", "CSV_02", "ODK_01", "ODK_02", "CSV-CAM"]
+ "Origin" : ["CSV_01", "CSV_02", "ODK_01", "ODK_02", "CSV-CAM"],
+ "site_information-survey_site" : ["Farmer", "farmer_field", "Seed_production", "Weed", "Road", "VCU", "Sentinel", "Other"]
},
"WRT-Publ" : {
"Origin" : ["CSV_01", "CSV_02", "ODK_01", "ODK_02"],
- "PublishedLevel" : ["Publ"]
+ "PublishedLevel" : ["Publ"],
+ "site_information-survey_site" : ["Farmer", "farmer_field", "Seed_production", "Weed", "Road", "VCU", "Sentinel", "Other"]
},
"Trial-sites" : {
"Origin" : ["CSV_01", "CSV_02", "ODK_01", "ODK_02", "CSV-CAM"],