From 64e44904a6b595d0253baa30fa36e8f67234ae2f Mon Sep 17 00:00:00 2001 From: alexeh Date: Wed, 30 Nov 2022 16:41:00 +0300 Subject: [PATCH] Fix spelling errors that are the cause of missing materials materials.csv datasetID is not equal to the file name used to get the dataset id. --- data/base_data_importer/data/4.material.csv | 2 +- data/h3_data_importer/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/base_data_importer/data/4.material.csv b/data/base_data_importer/data/4.material.csv index 5973519bf..f07770497 100644 --- a/data/base_data_importer/data/4.material.csv +++ b/data/base_data_importer/data/4.material.csv @@ -102,7 +102,7 @@ a5595226-1a93-48a1-ad6f-41cb5566bb31,4e6f186b-7452-4c58-a3f0-7de407db3545,"Flour b9ff88f0-d069-49d2-a5d1-4898103235c4,4e6f186b-7452-4c58-a3f0-7de407db3545,"Malt, whether or not roasted",Malt; whether or not roasted,1107,,,active,"{""name"": ""Global distribution of other cereals crops in 2010"",""resolution"": ""10km x 10km"",""geographic coverage"": ""Global coverage"",""source"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4"",""datasets"": [""SPAM 2010 v2.0 Global Data (Updated 2020-07-15)""],""frequency of updates"": """",""date of content"": ""2010"",""cautions"": ""Global distributions of other cereals crops in 2010 expressed in tonnes (T)."",""license"": ""CC0 1.0"",""overview"": ""'All crops' represent all of the crops that are included in the tool as displayed in the menu. Pixel colors are shaded by level of production. The crop layers displayed on the map reflect 2010 data regardless of the timeframe selected."",""citation"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4""}",spam_ocer,4e6f186b-7452-4c58-a3f0-7de407db3545.b9ff88f0-d069-49d2-a5d1-4898103235c4. 968bdaba-3641-4171-8100-dbd911ad56cf,4e6f186b-7452-4c58-a3f0-7de407db3545,Starches inulin,Starches; inulin,1108,,,active,"{""name"": ""Global distribution of other cereals crops in 2010"",""resolution"": ""10km x 10km"",""geographic coverage"": ""Global coverage"",""source"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4"",""datasets"": [""SPAM 2010 v2.0 Global Data (Updated 2020-07-15)""],""frequency of updates"": """",""date of content"": ""2010"",""cautions"": ""Global distributions of other cereals crops in 2010 expressed in tonnes (T)."",""license"": ""CC0 1.0"",""overview"": ""'All crops' represent all of the crops that are included in the tool as displayed in the menu. Pixel colors are shaded by level of production. The crop layers displayed on the map reflect 2010 data regardless of the timeframe selected."",""citation"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4""}",spam_ocer,4e6f186b-7452-4c58-a3f0-7de407db3545.968bdaba-3641-4171-8100-dbd911ad56cf. 008c759d-9901-416a-b607-92bccf362ea5,4e6f186b-7452-4c58-a3f0-7de407db3545,"Wheat, gluten whether or not dried",Wheat gluten; whether or not dried,1109,,,active,"{""name"": ""Global wheat distribution in 2010"",""resolution"": ""10km x 10km"",""geographic coverage"": ""Global coverage"",""source"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4"",""datasets"": [ ""SPAM 2010 v2.0 Global Data (Updated 2020-07-15)""],""frequency of updates"": """",""date of content"": ""2010"",""cautions"": ""Global distributions of wheat in 2010 expressed in tonnes (T)."",""license"": ""CC0 1.0"",""overview"": ""'All crops' represent all of the crops that are included in the tool as displayed in the menu. Pixel colors are shaded by level of production. The crop layers displayed on the map reflect 2010 data regardless of the timeframe selected."",""citation"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4""}",spam_whea,4e6f186b-7452-4c58-a3f0-7de407db3545.008c759d-9901-416a-b607-92bccf362ea5. -2ca7e810-7cf1-40eb-a393-d363730669db,,"Oil seeds and oleaginous fruits, nes","Oil seeds and oleaginous fruits; miscellaneous grains, seeds and fruit, industrial or medicinal plants; straw and fodder",12,,,active,"{""name"": ""Global distribution of oil seeds and oleaginous fruits crops in 2010"",""resolution"": ""10km x 10km"",""geographic coverage"": ""Global coverage"",""source"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4"",""datasets"": [""SPAM 2010 v2.0 Global Data (Updated 2020-07-15)""],""frequency of updates"": """",""date of content"": ""2010"",""cautions"": ""Global distributions of oil seeds and oleaginous fruits crops in 2010 expressed in tonnes (T)."",""license"": ""CC0 1.0"",""overview"": ""'All crops' represent all of the crops that are included in the tool as displayed in the menu. Pixel colors are shaded by level of production. The crop layers displayed on the map reflect 2010 data regardless of the timeframe selected."",""citation"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4""}",spam_soybgroucnutooilrapesunfooilrestocerooilsugb,2ca7e810-7cf1-40eb-a393-d363730669db. +2ca7e810-7cf1-40eb-a393-d363730669db,,"Oil seeds and oleaginous fruits, nes","Oil seeds and oleaginous fruits; miscellaneous grains, seeds and fruit, industrial or medicinal plants; straw and fodder",12,,,active,"{""name"": ""Global distribution of oil seeds and oleaginous fruits crops in 2010"",""resolution"": ""10km x 10km"",""geographic coverage"": ""Global coverage"",""source"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4"",""datasets"": [""SPAM 2010 v2.0 Global Data (Updated 2020-07-15)""],""frequency of updates"": """",""date of content"": ""2010"",""cautions"": ""Global distributions of oil seeds and oleaginous fruits crops in 2010 expressed in tonnes (T)."",""license"": ""CC0 1.0"",""overview"": ""'All crops' represent all of the crops that are included in the tool as displayed in the menu. Pixel colors are shaded by level of production. The crop layers displayed on the map reflect 2010 data regardless of the timeframe selected."",""citation"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4""}",spam_soybgroucnutooilrapesunfrestocersugb,2ca7e810-7cf1-40eb-a393-d363730669db. 2f35d36a-c692-44af-adaa-8181f27c9297,2ca7e810-7cf1-40eb-a393-d363730669db,Soya beans whether or not broken,"Soya beans, whether or not broken",1201,,,active,"{""name"": ""Global soybean distribution in 2010"",""resolution"": ""10km x 10km"",""geographic coverage"": ""Global coverage"",""source"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4"",""datasets"": [ ""SPAM 2010 v2.0 Global Data (Updated 2020-07-15)""],""frequency of updates"": """",""date of content"": ""2010"",""cautions"": ""Global distributions of soybean in 2010 expressed in tonnes (T)."",""license"": ""CC0 1.0"",""overview"": ""'All crops' represent all of the crops that are included in the tool as displayed in the menu. Pixel colors are shaded by level of production. The crop layers displayed on the map reflect 2010 data regardless of the timeframe selected."",""citation"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4""} ",spam_soyb,2ca7e810-7cf1-40eb-a393-d363730669db.2f35d36a-c692-44af-adaa-8181f27c9297. bdb24107-9124-4ad6-8766-d95c8d85c595,2ca7e810-7cf1-40eb-a393-d363730669db,"Ground-nuts, not roasted or otherwise cooked","Ground-nuts; not roasted or otherwise cooked, whether or not shelled or broken",1202,,,active,"{""name"": ""Global distribution of groundnut crops in 2010"",""resolution"": ""10km x 10km"",""geographic coverage"": ""Global coverage"",""source"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4"",""datasets"": [""SPAM 2010 v2.0 Global Data (Updated 2020-07-15)""],""frequency of updates"": """",""date of content"": ""2010"",""cautions"": ""Global distributions of groundnut crop in 2010 expressed in tonnes (T)."",""license"": ""CC0 1.0"",""overview"": ""'All crops' represent all of the crops that are included in the tool as displayed in the menu. Pixel colors are shaded by level of production. The crop layers displayed on the map reflect 2010 data regardless of the timeframe selected."",""citation"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4""}",spam_grou,2ca7e810-7cf1-40eb-a393-d363730669db.bdb24107-9124-4ad6-8766-d95c8d85c595. 7f0ce452-aa52-434d-92ac-a7efbd705cd9,2ca7e810-7cf1-40eb-a393-d363730669db,Copra,Copra,1203,,,active,"{""name"": ""Global coconut distribution in 2010"",""resolution"": ""10km x 10km"",""geographic coverage"": ""Global coverage"",""source"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4"",""datasets"": [ ""SPAM 2010 v2.0 Global Data (Updated 2020-07-15)""],""frequency of updates"": """",""date of content"": ""2010"",""cautions"": ""Global distributions of coconut in 2010 expressed in tonnes (T)."",""license"": ""CC0 1.0"",""overview"": ""'All crops' represent all of the crops that are included in the tool as displayed in the menu. Pixel colors are shaded by level of production. The crop layers displayed on the map reflect 2010 data regardless of the timeframe selected."",""citation"": ""International Food Policy Research Institute, 2019, “Global Spatially-Disaggregated Crop Production Statistics Data for 2010 Version 2.0”, https://doi.org/10.7910/DVN/PRFF8V, Harvard Dataverse, V4""} ",spam_cnut,2ca7e810-7cf1-40eb-a393-d363730669db.7f0ce452-aa52-434d-92ac-a7efbd705cd9. diff --git a/data/h3_data_importer/Makefile b/data/h3_data_importer/Makefile index fb7186b41..192f0cd10 100644 --- a/data/h3_data_importer/Makefile +++ b/data/h3_data_importer/Makefile @@ -148,7 +148,7 @@ extract-mapspam-crop-harvest: download-mapspam-crop-harvest -E $(WORKDIR_MAPSPAM)/spam2010v2r0_global_ha/spam2010V2r0_global_H_RICE_A.tif --E_band 1 \ -F $(WORKDIR_MAPSPAM)/spam2010v2r0_global_ha/spam2010V2r0_global_H_SORG_A.tif --F_band 1 \ -G $(WORKDIR_MAPSPAM)/spam2010v2r0_global_ha/spam2010V2r0_global_H_SMIL_A.tif --G_band 1 \ - --outfile $(WORKDIR_MAPSPAM)/spam2010v2r0_global_ha/spam2010V2r0_global_H_WheaOcerBarlMaizRiceSortSmil_A.tif + --outfile $(WORKDIR_MAPSPAM)/spam2010v2r0_global_ha/spam2010V2r0_global_H_WheaOcerBarlMaizRiceSorgSmil_A.tif gdal_calc.py --quiet --calc "A+B+C+D" --format GTiff --type Float32 \ -A $(WORKDIR_MAPSPAM)/spam2010v2r0_global_ha/spam2010V2r0_global_H_WHEA_A.tif --A_band 1 \ -B $(WORKDIR_MAPSPAM)/spam2010v2r0_global_ha/spam2010V2r0_global_H_OCER_A.tif --B_band 1 \