From 96f49f9f7cee008178da11f0e4be5fe68e5dae85 Mon Sep 17 00:00:00 2001 From: Will Kocur Date: Tue, 19 May 2020 10:46:49 +0100 Subject: [PATCH 1/2] update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3f2e345f..e90a5bfb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ 1. Clone repo 1. `Bundle install` 1. `yarn install` +1. Add the `.env` file (another developer should have this) 1. Run `rails s` 1. Run `webpack-dev-server` \ No newline at end of file From e6258396efb26a1a7ab83b698ef411dbfb591130 Mon Sep 17 00:00:00 2001 From: Jonathan Feist Date: Tue, 19 May 2020 11:22:11 +0100 Subject: [PATCH 2/2] Update for May --- app/controllers/chapters_controller.rb | 2 +- lib/data/file/PP_Global_Monthly_Stats.csv | 14 -- lib/data/file/all_chapter_update_dates.csv | 11 -- lib/data/file/all_chapter_update_table.csv | 11 ++ .../file/chapter2_global_pa_statistics.csv | 14 ++ ...sv => chapter2_national_pa_statistics.csv} | 56 +++---- lib/modules/csv_map_parser.rb | 4 +- lib/modules/csv_parser.rb | 4 +- yarn.lock | 145 +----------------- 9 files changed, 65 insertions(+), 196 deletions(-) delete mode 100644 lib/data/file/PP_Global_Monthly_Stats.csv delete mode 100644 lib/data/file/all_chapter_update_dates.csv create mode 100644 lib/data/file/all_chapter_update_table.csv create mode 100644 lib/data/file/chapter2_global_pa_statistics.csv rename lib/data/file/map/{PP_National_Monthly_Stats.csv => chapter2_national_pa_statistics.csv} (89%) diff --git a/app/controllers/chapters_controller.rb b/app/controllers/chapters_controller.rb index 60dffe80..009a36c7 100644 --- a/app/controllers/chapters_controller.rb +++ b/app/controllers/chapters_controller.rb @@ -215,7 +215,7 @@ def chapter_2 @map_3 = { id: "map_3", - tiles_url: 'https://tiles.arcgis.com/tiles/Mj0hjvkNtV7NRhA7/arcgis/rest/services/PP_Live_Ch2_Fg5_Apr20/VectorTileServer/tile/{z}/{y}/{x}.pbf', + tiles_url: 'https://tiles.arcgis.com/tiles/Mj0hjvkNtV7NRhA7/arcgis/rest/services/PP_Live_Ch2_Fg5_May20/VectorTileServer/tile/{z}/{y}/{x}.pbf', layers: [ { id: 'over-ten-' + random_number, diff --git a/lib/data/file/PP_Global_Monthly_Stats.csv b/lib/data/file/PP_Global_Monthly_Stats.csv deleted file mode 100644 index 75c4a94c..00000000 --- a/lib/data/file/PP_Global_Monthly_Stats.csv +++ /dev/null @@ -1,14 +0,0 @@ -type,value -total_protected_areas,"245,133" -total_terrestrial_protected_areas,"228,205" -total_marine_protected_areas,"16,928" -total_land_pa_coverage_percentage,15.16 -total_land_area_protected,"20,455,273" -total_ocean_pa_coverage_percentage,7.431068215 -total_ocean_area_protected,"26,925,028" -national_waters_pa_coverage_percentage,17.21499411 -national_waters_pa_coverage_area,"24,306,876" -high_seas_pa_coverage_percentage,1.18 -high_seas_pa_coverage_area,"2,618,153" -national_waters_percentage,39 -global_ocean_percentage,61 \ No newline at end of file diff --git a/lib/data/file/all_chapter_update_dates.csv b/lib/data/file/all_chapter_update_dates.csv deleted file mode 100644 index 7f2c89e1..00000000 --- a/lib/data/file/all_chapter_update_dates.csv +++ /dev/null @@ -1,11 +0,0 @@ -chapter,last_updated,next_updated -1,Apr-20,May-20 -2,Apr-20,May-20 -3,Apr-20,Jun-20 -4,Sep-19,Jun-20 -5,Apr-20,May-20 -6,Sep-19,Jun-20 -7,Jul-18,Jun-20 -8,Jul-18,Jun-20 -9,Jul-18,Jun-20 -10,Apr-20,May-20 \ No newline at end of file diff --git a/lib/data/file/all_chapter_update_table.csv b/lib/data/file/all_chapter_update_table.csv new file mode 100644 index 00000000..6d3670e5 --- /dev/null +++ b/lib/data/file/all_chapter_update_table.csv @@ -0,0 +1,11 @@ +chapter,last_updated,next_updated +1,May-20,Jun-20 +2,May-20,Jun-20 +3,Apr-20,Sep-20 +4,Sep-19,Sep-20 +5,May-20,Jun-20 +6,Sep-19,Sep-20 +7,Jul-18,Sep-20 +8,Jul-18,Sep-20 +9,Jul-18,Sep-20 +10,May-20,Jun-20 \ No newline at end of file diff --git a/lib/data/file/chapter2_global_pa_statistics.csv b/lib/data/file/chapter2_global_pa_statistics.csv new file mode 100644 index 00000000..f2da00e3 --- /dev/null +++ b/lib/data/file/chapter2_global_pa_statistics.csv @@ -0,0 +1,14 @@ +type,value +total_protected_areas,245 +total_terrestrial_protected_areas,"228,205" +total_marine_protected_areas,"16,991" +total_land_pa_coverage_percentage,15.15 +total_land_area_protected,"20,445,062" +total_ocean_pa_coverage_percentage,7.43 +total_ocean_area_protected,"26,928,113" +national_waters_pa_coverage_percentage,17.22 +national_waters_pa_coverage_area,"24,309,960" +high_seas_pa_coverage_percentage,1.18 +high_seas_pa_coverage_area,"2,618,153" +national_waters_percentage,39 +global_ocean_percentage,61 \ No newline at end of file diff --git a/lib/data/file/map/PP_National_Monthly_Stats.csv b/lib/data/file/map/chapter2_national_pa_statistics.csv similarity index 89% rename from lib/data/file/map/PP_National_Monthly_Stats.csv rename to lib/data/file/map/chapter2_national_pa_statistics.csv index ffc36440..66b21384 100644 --- a/lib/data/file/map/PP_National_Monthly_Stats.csv +++ b/lib/data/file/map/chapter2_national_pa_statistics.csv @@ -4,7 +4,7 @@ ABW,0.026514,35.833833,25213.94735,189.420844,18.91758,0.000105,0,0,0,0,na,na,na AFG,0,673.16062,0,642899.1342,0.104707,0,0,597.988499,0,88.83295921,na,na,0,No information found in 5th National Report AGO,24.341169,87506.59246,493753.373,1255217.852,6.971426,0.00493,19.751236,32400.49499,81.14333375,37.02634748,12.5,na,5,https://www.cbd.int/doc/world/ao/ao-nr-05-en.pdf AIA,32.219534,6.274344,92653.59144,85.524417,7.336319,0.034774,0,0,0,0,na,na,na,0 -ALA,423.803835,26.105067,0,0,0,0,0,0,0,0,na,na,na,0 +ALA,428.806675,25.755232,0,0,0,0,0,0,0,0,na,na,na,0 ALB,317.982216,5343.929139,11199.39919,28746.5563,18.58981,2.839279,42.889141,45.148125,13.48790556,0.844848871,15.83,na,5,https://www.cbd.int/doc/world/al/al-nr-05-en.pdf AND,0,126.120308,0,471.870724,26.72772,0,0,26.105939,0,20.69923505,35.7,0,6,https://chm.cbd.int/pdf/documents/nationalReport6/241228/1 ARE,6166.123302,12733.89139,54711.04352,70921.45739,17.95492,11.27034,2157.773724,8709.828567,34.99400869,68.39879735,na,na,0,0 @@ -13,26 +13,26 @@ ARM,0,7215.157913,0,29685.40559,24.3054,0,0,3445.371044,0,47.75184529,13.1,na,5, ASM,35457.57732,33.371984,406816.029,210.578755,15.84774,8.715876,0,0,0,0,na,na,0,0 ATA,4774.711754,0,0,0,0,0,0,0,0,0,na,na,0,0 ATF,1703814.985,7851.105613,2277432,7855.43,99.94495,74.81299,0,0,0,0,na,na,0,0 -ATG,196.917827,84.536207,108492.3833,455.237976,18.56967,0.181504,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/ag/ag-nr-05-en.pdf +ATG,324.949537,95.612934,108492.3833,455.237976,21.00285,0.299514,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/ag/ag-nr-05-en.pdf AUS,3035629.909,1497070.275,7432133.367,7722102.022,19.38682,40.84467,378735.7251,303593.6712,12.47634713,20.27918637,16.25,36.2,5,https://www.cbd.int/doc/world/au/au-nr-05-en.pdf AUT,0,23845.24902,0,83912.25912,28.41688,0,0,471.966738,0,1.979290456,27,na,5,https://www.cbd.int/doc/world/at/at-nr-05-en.pdf AZE,345.314137,8798.362587,79032.11878,86639.62334,10.15513,0.436929,0.154514,2880.890839,0.044745924,32.74348847,10.3,na,5,https://www.cbd.int/doc/world/az/az-nr-05-en.pdf BDI,0,2065.705683,0,27210.87243,7.591472,0,0,1422.09236,0,68.84293206,na,na,5,https://www.cbd.int/doc/world/bi/bi-nr-05-fr.pdf BEL,1270.092259,7644.431069,3465.140147,30683.07213,24.91416,36.65342,6.573839,3866.765791,0.517587518,50.58278054,12.77,35.85,6,https://chm.cbd.int/database/record/190C2BA4-9F5C-AD89-32B5-778480AB2C5B BEN,0,34369.00255,30425.6792,116095.3632,29.60411,0,0,11330.99346,0,32.96864215,20.16,na,5,https://www.cbd.int/doc/world/bj/bj-nr-05-fr.pdf -BES,2755.525866,91.577774,25112.35272,322.852496,28.36521,10.97279,0,0,0,0,na,na,0,0 +BES,2755.525866,91.604646,25112.35272,322.852496,28.37353,10.97279,0,0,0,0,na,na,0,0 BFA,0,41157.73345,0,276403.7182,14.89044,0,0,4959.123073,0,12.04906747,na,na,0,0 BGD,4530.002605,6455.725175,84563.21214,140160.1678,4.605963,5.356943,738.144196,931.396849,16.29456449,14.42745507,1.8,2.05,5,https://www.cbd.int/doc/world/bd/bd-nr-05-en.pdf BGR,2851.95154,44996.05456,35171.8505,110862.7479,40.58717,8.10862,8.252788,4708.791844,0.28937336,10.4648994,34,na,5,https://www.cbd.int/doc/world/bg/bg-nr-05-en.pdf BHR,94.820117,45.481965,7632.763476,686.857403,6.621748,1.242278,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/bh/bh-nbsap-v2-en.pdf BHS,47355.48699,4930.158571,597705.1345,13458.00624,36.63365,7.922884,3460.290417,4215.672449,7.307052756,85.50784703,na,na,0,0 BIH,0,714.847791,12.763205,51225.15128,1.395502,0,0,692.468616,0,96.86937901,2,na,5,https://www.cbd.int/doc/world/ba/ba-nr-05-en.pdf -BLM,4243.890942,5.112057,4317.87991,25.109707,20.35888,98.28645,0,0,0,0,na,na,0,0 +BLM,4243.890942,5.112056,4317.87991,25.109707,20.35888,98.28645,0,0,0,0,na,na,0,0 BLR,0,19383.06377,0,207228.0654,9.353494,0,0,4035.285495,0,20.81861538,8.72,0,6,https://chm.cbd.int/pdf/documents/nationalReport6/241352/1 BLZ,3653.592533,8401.612777,36249.83866,22297.76618,37.67917,10.07892,2442.620226,7982.925278,66.85529938,95.01658181,36.6,19.8,6,https://chm.cbd.int/database/record/7E3D234F-E8AD-520C-C92B-490CE2806718 BMU,0.254821,1.507493,451643.6848,72.478422,2.079919,0.000056,0,0,0,0,na,na,0,0 BOL,0,336406.5863,0,1089908.94,30.86557,0,0,155396.1212,0,46.19294851,23,na,5,https://www.cbd.int/doc/world/bo/bo-nr-05-es.pdf -BRA,985041.6655,2582478.505,3672584.326,8529399.243,30.27738,26.82149,19837.36478,955287.1494,2.013860477,36.9910978,16,1.5,5,https://www.cbd.int/doc/world/br/br-nr-05-en.pdf +BRA,985041.6655,2582477.682,3672584.326,8529399.243,30.27737,26.82149,19837.36478,955287.1494,2.013860477,36.99110959,16,1.5,5,https://www.cbd.int/doc/world/br/br-nr-05-en.pdf BRB,10.321248,5.640151,185019.8485,444.068519,1.270108,0.005578,0,0,0,0,na,na,0,0 BRN,51.679209,2794.368892,25698.41824,5961.686662,46.87212,0.201099,0,0,0,0,41,na,5,https://www.cbd.int/doc/world/bn/bn-nr-05-en.pdf BTN,0,19171.20945,0,39933.48814,48.00785,0,0,15508.71277,0,80.89584964,51.44,na,6,https://chm.cbd.int/database/record/780672FC-714D-DCB8-463B-8C13757C89D1 @@ -43,9 +43,9 @@ CAN,178076.632,1099376.152,5698082.708,9955032.941,11.04342,3.125203,7810.065123 CCK,26.294474,0,470116.606,17.948331,0,0.005593,0,0,0,0,na,na,0,0 CHE,0,4132.807674,0,41355.27022,9.993424,0,0,2610.795789,0,63.17244825,12.5,0,6,https://chm.cbd.int/database/record/79437B02-8838-F9E7-B0BB-571AB9CB6F30 CHL,1506502.331,155154.8192,3657313.03,759820.962,20.41992,41.19151,1282.760609,43637.92495,0.085148266,28.12540737,20,4.3,5,https://www.cbd.int/doc/world/cl/cl-nr-05-es.pdf -CHN,47491.66492,1461913.138,878364.0892,9361608.881,15.61605,5.406831,832.712621,200412.8047,1.753386878,13.70894067,14.86,na,6,https://chm.cbd.int/database/record/C7B6BC32-C06D-B09C-BFF8-7D265F24DBE6 +CHN,48125.64643,1461913.138,878364.0892,9361608.881,15.61605,5.479009,832.712621,200412.8047,1.730288698,13.70894067,14.86,na,6,https://chm.cbd.int/database/record/C7B6BC32-C06D-B09C-BFF8-7D265F24DBE6 CIV,126.892829,74418.77849,174842.1752,324107.7064,22.96113,0.072576,0,18194.93691,0,24.44938936,na,na,6,https://chm.cbd.int/database/record/6C5CE2DC-C057-ADCB-6424-0F485C7DEFEA -CMR,1601.57256,51397.03962,14704.2551,469428.0915,10.94886,10.8919,1100.218999,35822.066,68.69616941,69.69674959,22,na,6,https://chm.cbd.int/database/record/9AC174A3-DA9D-FD8C-764C-E2691FA90EE8 +CMR,1601.57256,51397.03961,14704.2551,469428.0915,10.94886,10.8919,1100.218999,35822.066,68.69616941,69.6967496,22,na,6,https://chm.cbd.int/database/record/9AC174A3-DA9D-FD8C-764C-E2691FA90EE8 COD,31.363659,324289.6789,13265.40707,2344275.114,13.83326,0.236432,31.363659,155840.4141,100,48.05592784,11,na,5,https://www.cbd.int/doc/world/cd/cd-nr-05-fr.pdf COG,1280.314089,145566.9319,39863.59306,343736.7395,42.34838,3.211738,1197.464959,33631.09748,93.52899959,23.10352842,13.2,0,0,0 COK,1981949.229,67.100582,1972842.358,258.141911,25.99368,100,0,0,0,0,1,na,5,https://www.cbd.int/doc/world/ck/ck-nr-05-en.pdf @@ -53,7 +53,7 @@ COL,125341.5091,192183.8266,730741.8263,1145032.899,16.78413,17.15264,32065.6144 ",https://www.cbd.int/doc/world/co/co-nbsap-v3-es.pdf COM,619.779083,574.17537,165505.135,1701.123719,33.75271,0.374477,0,0,0,0,22,na,5,https://www.cbd.int/doc/world/km/km-nr-05-fr.pdf CPV,5.423162,120.123431,801065.1343,4148.996795,2.89524,0.000677,0,102.417916,0,85.26056503,na,na,0,0 -CRI,15061.68353,14608.87534,576110.183,51636.14199,28.29196,2.614376,4443.430402,10510.76419,29.50155202,71.94779848,26,2.7,6,https://chm.cbd.int/database/record/158F6797-D2D0-91DF-E1D1-55EF84D295E0 +CRI,15061.68353,14608.87532,576110.183,51636.14199,28.29196,2.614376,4443.430402,10510.76419,29.50155202,71.94779858,26,2.7,6,https://chm.cbd.int/database/record/158F6797-D2D0-91DF-E1D1-55EF84D295E0 CUB,14088.80485,18118.33616,365755.7493,111643.2783,16.22878,3.851971,0,0,0,0,na,na,0,0 CUW,11.656382,71.009581,30535.00449,450.975385,15.74578,0.038174,0,0,0,0,na,na,na,0 CXR,0.753374,87.645896,330035.5,142.416955,61.54176,0.000228,0,0,0,0,na,na,na,0 @@ -63,10 +63,10 @@ CZE,0,17266.26048,0,77916.89786,22.15984,0,0,7498.753016,0,43.43009318,na,na,6,h DEU,25575.48367,133664.4248,56357.93768,357584.3854,37.37983,45.38045,8265.143141,2011.829926,32.31666407,1.505134915,na,0,5,https://www.cbd.int/doc/world/de/de-nr-05-en.pdf Disputed,0,0,2199177.4,241966.7,0,0,0,0,0,0,,,, DJI,11.802761,343.960179,7031.12303,21843.65212,1.574646,0.167865,0,0,0,0,na,na,0,0 -DMA,10.012569,168.277831,28749.1828,766.22784,21.96185,0.034827,0,67.392445,0,40.04832045,na,20,5,https://www.cbd.int/doc/world/dm/dm-nbsap-v2-en.pdf -DNK,18004.01728,7809.222367,100469.7507,45314.39778,17.23342,17.91984,4093.084992,2949.070578,22.73428718,37.76394677,na,18,5,https://www.cbd.int/doc/world/dk/dk-nr-05-en.pdf +DMA,10.012497,168.277831,28749.1828,766.22784,21.96185,0.034827,0,67.392445,0,40.04832045,na,20,5,https://www.cbd.int/doc/world/dm/dm-nbsap-v2-en.pdf +DNK,18004.01728,7809.222362,100469.7507,45314.39778,17.23342,17.91984,4093.084992,2949.070578,22.73428718,37.7639468,na,18,5,https://www.cbd.int/doc/world/dk/dk-nr-05-en.pdf DOM,48624.97645,12727.39737,270774.1738,48509.80547,26.23675,17.95776,1471.48947,7154.422034,3.02620089,56.21276547,26,9.6,6,https://chm.cbd.int/database/record/4CAD6958-68E8-A0AB-E856-852720AD7CF8 -DZA,110.267218,174218.6183,128992.9935,2324458.588,7.495019,0.085483,0,144306.4858,0,82.83069124,na,na,6,https://chm.cbd.int/pdf/documents/nationalReport6/241357/1 +DZA,87.744377,107865.0166,128992.9935,2324458.588,4.640436,0.068023,0.01792,75789.68362,0.020422961,70.2634515,na,na,6,https://chm.cbd.int/pdf/documents/nationalReport6/241357/1 ECU,144122.6854,56270.15601,1079901.071,258138.6687,21.79842,13.34592,139291.1005,45578.70007,96.6475889,80.99977555,19.6,na,6,https://chm.cbd.int/database/record/6120BF7A-BD24-5225-9DEF-4D4BE3AD3799 EGY,11715.81678,129389.8156,236612.0565,984997.4881,13.13605,4.951488,11046.30476,76110.32685,94.28540039,58.82250199,14.6,na,0,0 ERI,0,5936.248417,78827.41736,121834.4031,4.872391,0,0,0,0,0,na,na,0,0 @@ -74,26 +74,26 @@ ESH,3709.980443,15269.89945,252024.2549,268339.2162,5.690521,1.472073,0,0,0,0,na ESP,127609.6912,142475.1257,1005717.296,507013.405,28.10086,12.68843,656.657062,13573.60027,0.514582439,9.526996522,27.3,8,0,0 EST,6773.117672,9345.372696,36346.36825,45416.48284,20.57705,18.63492,1158.222354,3248.983654,17.10028395,34.76569378,18.8,27,6,https://chm.cbd.int/database/record/E23CB1F7-405F-D3C8-C1A5-8D2912E49CCE ETH,0,200073.9753,0,1135429.227,17.621,0,0,34834.27392,0,17.41069715,14,na,6,https://chm.cbd.int/database/record/86A4EACE-5D8E-479D-CD33-319D77EA9032 -FIN,9624.050567,44842.7068,79467.83379,337725.5344,13.27785,12.11062,3011.529858,27574.25829,31.29170859,61.49106568,13.8,17,6,https://chm.cbd.int/database/record/8BC90B3F-3587-ED1A-0BE5-FBA1287318A4 +FIN,9520.564702,44757.31938,79467.83379,337725.5344,13.25257,11.9804,2995.031929,27572.55343,31.45855338,61.6045684,13.8,17,6,https://chm.cbd.int/database/record/8BC90B3F-3587-ED1A-0BE5-FBA1287318A4 FJI,11959.01476,1036.512388,1293034.72,19154.95614,5.411197,0.92488,111.434696,11.103878,0.931804988,1.071273062,2.7,na,5,https://www.cbd.int/doc/world/fj/fj-nr-05-en.pdf FLK,52.093517,61.100176,549091.6441,12400.947,0.492706,0.009487,0,0,0,0,na,na,0,0 FRA,168249.5995,144583.4054,343866.3878,548954.0701,26.33798,48.92877,113.230931,4994.572281,0.067299376,3.454457493,29.5,22.91,6,https://chm.cbd.int/database/record/C838741D-098B-3BAC-AE88-3EDACDB092EA FRO,28.889108,33.786873,266720.4336,1450.644909,2.329093,0.010831,0,0,0,0,na,na,0,0 FSM,475.050992,0.401738,3011916.98,817.158681,0.049163,0.015772,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/fm/fm-nr-05-en.pdf GAB,55720.64663,59707.74205,193292.3301,266044.6066,22.44276,28.82714,1408.687712,28707.11162,2.528125205,48.07937905,na,na,0,0 -GBR,210964.6496,70405.26617,723404.7034,245247.5873,28.70783,29.16274,128440.4738,27493.9475,60.88246256,39.05098155,28,24,6,https://chm.cbd.int/database/record/A8D6330F-38E5-1E72-50A3-406ABFBB9612 +GBR,210999.6661,70419.56457,723404.7034,245247.5873,28.71366,29.16758,128440.4738,27493.9475,60.87235879,39.04305241,28,24,6,https://chm.cbd.int/database/record/A8D6330F-38E5-1E72-50A3-406ABFBB9612 GEO,152.96289,6500.824045,22907.00911,69971.96837,9.290612,0.667756,152.961902,5585.098034,99.99935409,85.91369333,8.62,na,5,https://www.cbd.int/doc/world/ge/ge-nr-05-en.pdf GGY,33.480134,3.42847,8672.655691,85.559741,4.007107,0.386043,0,0,0,0,na,na,0,0 GHA,220.877347,36153.44517,226758.5827,240329.9832,15.04325,0.097406,218.290035,2627.975725,98.82862048,7.268949647,20.66,na,National Biodiversity Strategy and Action Plan (v.2),https://www.cbd.int/doc/world/gh/gh-nbsap-v2-en.pdf GIB,54.748776,2.426335,426.745945,7.483277,32.42342,12.82936,0,0,0,0,na,na,0,0 GIN,583.248819,88286.16984,110136.2872,246426.8074,35.82653,0.52957,450.561029,14861.3432,77.25022569,16.83314978,15,na,5,https://www.cbd.int/doc/world/gn/gn-nr-05-fr.pdf -GLP,90957.91357,1170.202238,91039.08888,1678.541217,69.71543,99.91084,0,0,0,0,na,na,0,0 +GLP,90957.91357,1170.202237,91039.08888,1678.541217,69.71543,99.91084,0,0,0,0,na,na,0,0 GMB,15.848759,441.86625,22745.53308,10757.9084,4.107362,0.069679,15.848759,439.347997,100,99.43008705,6.4,7.4,6,https://chm.cbd.int/database/record/72F99C09-A17F-497F-7B00-EE38CDE69E5D GNB,10660.72491,5667.921785,106506.6285,34015.72123,16.66265,10.00945,2108.862653,2195.713469,19.78160651,38.73930432,13.75,12.63,National Biodiversity Strategy and Action Plan (v.2),https://www.cbd.int/doc/world/gw/gw-nbsap-v2-en.pdf GNQ,729.714846,5228.231142,310365.4119,27136.01782,19.26676,0.235115,6.850682,3123.690636,0.938816311,59.74660552,na,na,0,0 GRC,22326.02501,46842.05403,494172.4508,133012.2689,35.21634,4.517861,408.342947,1857.398301,1.828999774,3.965236665,21,6,5,https://www.cbd.int/doc/world/gr/gr-nr-05-en.pdf GRD,22.668297,36.525372,26281.5155,373.565244,9.777508,0.086252,0.224225,9.543075,0.989156795,26.1272493,na,na,5,https://www.cbd.int/doc/world/gd/gd-nr-05-en.pdf -GRL,102254.1019,885525.0131,2264467.117,2154016.464,41.11041,4.515592,402.139927,5749.926976,0.393275105,0.649324061,na,na,0,0 +GRL,102254.1019,885525.0131,2264467.117,2154016.464,41.11041,4.515592,402.139927,5749.926977,0.393275105,0.649324061,na,na,0,0 GTM,1065.193984,22038.64399,118336.3927,109922.2585,20.0493,0.900141,1026.826696,11453.61015,96.39809381,51.97057566,31.06,na,5,https://www.cbd.int/doc/world/gt/gt-nr-05-es.pdf GUF,1365.477587,43587.5294,136563.8487,83034.50925,52.49327,0.999882,0,20378.74318,0,46.75360926,na,na,0,0 GUM,18.36469,126.105991,202535.0554,561.240901,22.46914,0.009067,0,0,0,0,na,na,0,0 @@ -111,7 +111,7 @@ IOT,642270.8732,68.952846,642744.6863,68.952846,100,99.92628,0,0,0,0,na,na,0,0 IRL,9945.228036,10125.513,426441.7422,70128.37704,14.43854,2.332142,85.631989,115.16912,0.861035953,1.137415161,14,1.4,5,https://www.cbd.int/doc/world/ie/ie-nr-05-en.pdf IRN,1808.644138,140225.7781,224800.6295,1627857.17,8.614133,0.804555,1150.567318,13309.78741,63.61490875,9.491683762,10.4,na,5,https://www.cbd.int/doc/world/ir/ir-nr-05-en.pdf IRQ,0,6713.746023,595.830425,437830.5052,1.533412,0,0,1377.958757,0,20.52443974,na,na,0,0 -ISL,2863.860454,19952.43084,752783.5116,102301.7663,19.50351,0.380436,31.664754,660.869357,1.105666792,3.312224773,na,na,0,https://chm.cbd.int/database/record/BF781FE9-A0CB-A201-0EAA-F59EC1EC1EFA +ISL,3168.275283,19976.67768,752783.5116,102301.7663,19.52721,0.420875,31.664754,660.869357,0.999431904,3.308204535,na,na,0,https://chm.cbd.int/database/record/BF781FE9-A0CB-A201-0EAA-F59EC1EC1EFA ISR,11.840292,5132.611984,27855.0403,20958.0329,24.48995,0.042507,0,0,0,0,21,na,5,https://www.cbd.int/doc/world/il/il-nr-05-en.pdf ITA,47302.59345,64739.17202,538880.953,301335.3097,21.4841,8.77793,323.314501,4307.4008,0.683502695,6.653469091,21,19.1,6,https://chm.cbd.int/database/record/075ADA4C-96AD-4864-9C6C-D252F644A314 JAM,1859.991697,1760.198539,246488.4991,11058.94539,15.91651,0.754596,1857.765027,1382.157305,99.88028602,78.52280719,18,15,5,https://www.cbd.int/doc/world/jm/jm-nr-05-en.pdf @@ -124,7 +124,7 @@ KGZ,0,13402.50539,0,199957.0236,6.702693,0,0,1304.758795,0,9.735185751,7.38,na,6 KHM,89.107039,47503.40661,47966.8519,182510.8526,26.02772,0.185768,83.487803,38597.11149,93.69383602,81.25124964,18,na,5,https://www.cbd.int/doc/world/kh/kh-nr-05-en.pdf KIR,408796.5464,230.885727,3459130.413,1032.564654,22.36041,11.8179,408247.3769,84.15276,99.8656619,36.44779653,na,na,0,0 KNA,408.210603,62.014371,10262.9088,270.825058,22.89831,3.977533,0,0,0,0,na,na,6,https://chm.cbd.int/database/record/C0A7116F-F642-2089-08C4-81605C16F1BC -KOR,7898.79136,15655.66184,324993.7978,99712.88376,15.70074,2.430444,3033.819389,5793.308585,38.40865331,37.00455876,11.57,1.4,6,https://chm.cbd.int/database/record/37C38AFC-AF9F-168E-B555-2EBA21CF2DCD +KOR,7979.400658,16692.13546,324993.7978,99712.88376,16.7402,2.455247,3033.831578,5793.669601,38.02079515,34.70897786,11.57,1.4,6,https://chm.cbd.int/database/record/37C38AFC-AF9F-168E-B555-2EBA21CF2DCD KWT,162.289134,2979.114917,11895.81218,17417.87587,17.10378,1.364254,0.803143,325.01945,0.494884026,10.90993329,20,3,5,https://www.cbd.int/doc/world/kw/kw-nr-05-ar.pdf LAO,0,38581.9612,0,231276.1399,16.68221,0,0,0,0,0,18,na,0,0 LBN,40.839545,268.277274,19315.84107,10329.04876,2.597309,0.21143,0,160.942124,0,59.99096442,na,na,0,0 @@ -139,36 +139,36 @@ LUX,0,1332.327975,0,2603.081524,51.18272,0,0,487.74825,0,36.60872241,27,na,6,htt LVA,4631.300837,11725.58524,28879.55287,64501.94768,18.17865,16.03661,87.727632,689.308959,1.894233069,5.87867424,17,na,5,https://www.cbd.int/doc/world/lv/lv-nr-05-en.pdf MAF,1030.53608,7.60907,1068.741983,59.578286,12.77155,96.42516,0,0,0,0,na,na,0,0 MAR,717.910689,125351.1662,276136.4075,407280.495,30.7776,0.259984,321.614941,913.477036,44.79873972,0.728734374,16.2,na,6,https://chm.cbd.int/database/record/650BA56F-8B7E-91A7-6622-56AEEEDD28CE -MCO,283.522868,0.528888,284.22031,1.595194,33.1551,99.75462,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/mc/mc-nr-05-fr.pdf +MCO,283.522868,0.528888,284.22031,1.595194,33.15511,99.75462,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/mc/mc-nr-05-fr.pdf MDA,0,1409.67766,0,33963.76161,4.150535,0,0,977.221645,0,69.32234742,5.8,0,6,https://chm.cbd.int/database/record/7320428F-D31E-FD33-F7FE-48CC53E2EB23 -MDG,8997.679013,33242.1381,1205824.849,594718.7259,5.589556,0.746185,2692.456031,28442.54711,29.92389512,85.56172598,na,na,5,https://www.cbd.int/doc/world/mg/mg-nr-05-en.pdf +MDG,11017.95793,44521.09838,1205824.849,594718.7259,7.486076,0.913728,4136.550457,37912.42071,37.54371258,85.15607676,na,na,5,https://www.cbd.int/doc/world/mg/mg-nr-05-en.pdf MDV,580.758998,6.118706,922109.9914,304.666095,2.008332,0.062982,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/mv/mv-nr-05-en.pdf MEX,707955.7545,284800.9268,3284659.67,1965284.828,14.49159,21.5534,27060.13537,50443.76209,3.822291887,17.71193748,12.9,21,6,https://www.cbd.int/doc/world/mx/mx-nr-05-es.pdf MHL,5388.396257,33.593723,2004587.264,281.928035,11.91571,0.268803,0,0,0,0,16,18,5,0 MKD,0,2279.092838,0,25443.14057,8.957592,0,0,1920.045873,0,84.24605795,na,0,0,0 MLI,0,103445.3359,0,1256684.114,8.23161,0,0,96284.8915,0,93.07804036,na,na,0,0 -MLT,4146.50397,98.043648,55696.65564,324.970466,30.17002,7.444799,0.114063,1.381179,0.002750823,1.408738891,13,na,5,https://www.cbd.int/doc/world/mt/mt-nr-05-en.pdf +MLT,4146.50397,97.973765,55696.65564,324.970466,30.14851,7.444799,0.114063,1.381179,0.002750823,1.409743721,13,na,5,https://www.cbd.int/doc/world/mt/mt-nr-05-en.pdf MMR,2456.796056,42746.75561,514147.2175,673078.5676,6.350931,0.477839,1774.688585,2480.137252,72.2358936,5.801930969,8.7,na,6,https://chm.cbd.int/database/record/F7636AF4-F0E7-CAAE-ED0A-CE0E9F3A7F9C MNE,10.436511,1460.642353,7459.237226,13847.56188,10.54801,0.139914,0,360.163693,0,24.65789741,9.05,na,5,https://www.cbd.int/doc/world/me/me-nr-05-en.pdf -MNG,0,277375.263,0,1565864.159,17.71388,0,0,191400.5021,0,69.00417147,17.4,0,5,https://www.cbd.int/doc/world/mn/mn-nr-05-en.pdf +MNG,0,310015.4251,0,1565864.159,19.79836,0,0,208433.1164,0,67.23314375,17.4,0,5,https://www.cbd.int/doc/world/mn/mn-nr-05-en.pdf MNP,257249.9205,38.441128,773667.8566,501.224059,7.66945,33.25069,2.717568,3.66404,0.001056392,9.531562133,na,na,na,0 MOZ,9762.687213,228501.7882,574409.6185,791081.8731,28.88472,1.699604,1322.104277,39375.24958,13.54242175,17.23192186,26,na,5,https://www.cbd.int/doc/world/mz/mz-nr-05-en.pdf MRT,6487.581023,6507.878451,156197.8626,1046302.522,0.621988,4.153438,6487.581024,6412.382649,100,98.53261239,na,na,5,https://www.cbd.int/doc/world/mr/mr-nr-05-fr.pdf MSR,0.000273,11.182345,7628.258983,100.664381,11.10854,0.000004,0,0,0,0,na,na,na,0 -MTQ,47915.67246,1280.736358,47644.30608,1149.925062,100,100,0,0,0,0,na,na,na,0 +MTQ,47915.67245,1280.736358,47644.30608,1149.925062,100,100,0,0,0,0,na,na,na,0 MUS,49.64392,97.460291,1280068.317,2062.481937,4.725389,0.003878,3.781151,63.292144,7.61654398,64.94146832,7.6,na,5,https://www.cbd.int/doc/world/mu/mu-nr-05-en.pdf MWI,0,27190.40931,0,118859.7323,22.87605,0,0,14516.39618,0,53.38792813,na,na,5,https://www.cbd.int/doc/world/mw/mw-nr-05-en.pdf MYS,7437.982303,63419.10151,451741.5382,331700.5726,19.11938,1.646513,488.888147,159.639473,6.572859777,0.251721436,na,1.4,5,https://www.cbd.int/doc/world/my/my-nr-05-en.pdf MYT,68829.3328,44.436072,63362.33751,396.377408,11.21055,100,0,0,0,0,na,na,0,0 NAM,9646.27499,313534.3569,562727.6243,827465.4339,37.89093,1.7142,243.836272,129581.956,2.527776497,41.32942791,16.7,na,5,https://www.cbd.int/doc/world/na/na-nr-05-en.pdf NCL,1320501.093,11419.19727,1371803.153,19141.03171,59.65821,96.26025,15558.31027,193.965358,1.178212601,1.698590132,na,na,na,0 -NER,0,206090.4851,0,1190098.655,17.31709,0,0,185159.7879,0,89.84392841,15.21,0,6,https://chm.cbd.int/database/record/AB3C2537-889F-115F-3B85-E42EA3C3B1EC +NER,0,216586.306,0,1190098.655,18.19902,0,0,188561.1294,0,87.06050391,15.21,0,6,https://chm.cbd.int/database/record/AB3C2537-889F-115F-3B85-E42EA3C3B1EC NFK,189083.8871,19.607996,432638.0836,42.778966,45.8356,43.70486,1.490433,0.437185,0.000788239,2.229626118,na,na,na,0 NGA,30.555979,127359.0343,182868.1867,914306.1122,13.92958,0.016709,0,14587.9616,0,11.45420243,6,na,5,https://www.cbd.int/doc/world/ng/ng-nr-05-en.pdf NIC,6660.345162,48104.12745,223935.2389,129222.3127,37.22587,2.974228,15.247216,6264.978855,0.228925313,13.0237865,na,na,0,0 NIU,4.383517,54.720321,318243.6931,267.755527,20.43667,0.001377,0,0,0,0,23,na,5,https://www.cbd.int/doc/world/nu/nu-nr-05-en.pdf -NLD,17246.96067,7912.898274,64204.97933,35205.61182,22.47624,26.86234,0,0,0,0,21.7,19,5,https://www.cbd.int/doc/world/nl/nl-nr-05-en.pdf -NOR,7716.854324,54748.73211,926317.7348,325287.8156,16.83086,0.833068,100.448365,1144.665339,1.301675019,2.090761365,17.2,3.1,6,https://chm.cbd.int/database/record/D874F120-974C-0CFE-32C4-6BCBE13146B5 +NLD,17246.96067,7912.898261,64204.97933,35205.61182,22.47624,26.86234,0,0,0,0,21.7,19,5,https://www.cbd.int/doc/world/nl/nl-nr-05-en.pdf +NOR,7716.917492,54748.74145,926317.7348,325287.8156,16.83086,0.833075,100.448365,1144.665339,1.301664364,2.090761009,17.2,3.1,6,https://chm.cbd.int/database/record/D874F120-974C-0CFE-32C4-6BCBE13146B5 NPL,0,34897.91838,0,147709.5419,23.62604,0,0,25086.47133,0,71.88529429,23.39,0,6,https://chm.cbd.int/database/record/A6B3AF62-55F8-F0D0-7106-76D42630A951 NZL,1249447.107,88464.44129,4106953.859,269651.6705,32.80693,30.42272,14582.23041,26072.78157,1.167094656,29.47261203,36.73,7,5,https://www.cbd.int/doc/world/nz/nz-nr-05-en.pdf OMN,663.989764,7985.072834,538980.1915,310373.1429,2.572733,0.123194,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/om/om-nr-05-en.pdf @@ -182,7 +182,7 @@ PNG,3343.51192,17247.55939,2407381.818,467405.9203,3.69006,0.138886,3029.710822, POL,7210.906655,123950.3184,31945.64308,311923.5191,39.73741,22.57243,7155.25597,48405.35756,99.22824289,39.05222527,19.6,24,6,https://chm.cbd.int/database/record/4ACD5165-ABFA-57D0-CAB0-4FC82FB386DD PRI,3077.928815,657.215588,176163.0606,9041.14294,7.269165,1.747204,0,0,0,0,na,na,0,0 PRK,25.611911,2975.649808,115967.2688,122186.1412,2.435342,0.022085,0,0,0,0,7.2,na,5,https://www.cbd.int/doc/world/kp/kp-nr-05-en.pdf -PRT,285599.5569,21115.27815,1724156.15,92141.09473,22.91624,16.5646,1009.099824,10817.02969,0.353326817,51.22844991,22,na,5,https://www.cbd.int/doc/world/pt/pt-nr-05-pt.pdf +PRT,285599.6213,21115.27815,1724156.15,92141.09473,22.91624,16.5646,1009.099824,10817.02969,0.353326737,51.22844991,22,na,5,https://www.cbd.int/doc/world/pt/pt-nr-05-pt.pdf PRY,0,57473.37524,0,401498.4235,14.31472,0,0,9793.229867,0,17.03959412,15,0,6,https://chm.cbd.int/database/record/4406F62E-6E7A-1826-E2B9-082208FCC685 PSE,0,516.767863,0,6181.987004,8.359252,0,0,0,0,0,9,0,5,https://www.cbd.int/doc/world/ps/ps-nr-05-en.pdf PYF,206.943116,73.831954,4795468.095,3780.061341,1.953195,0.004315,6.700815,8.888061,3.237998504,12.03823076,na,na,0,0 @@ -233,7 +233,7 @@ UGA,0,39053.54918,0,243144.8535,16.06185,0,0,16000.01107,0,40.96941611,18,0,5,ht UKR,4606.122844,23854.95209,134873.1664,598828.7966,3.983601,3.415151,130.023291,7084.633604,2.822835938,29.6987962,6.05,na,5,https://www.cbd.int/doc/world/ua/ua-nr-05-en.pdf UMI,1278997.392,363.497911,1964384.514,363.495,100.0008,65.10932,2305.16164,1.457914,0.180231927,0.401079059,na,na,0,0 URY,978.887181,6556.762923,130097.9744,178459.889,3.674082,0.752423,666.038675,1880.016442,68.04039198,28.67293608,8.6,na,6,https://chm.cbd.int/database/record/50CCF748-F428-8010-744B-D5B1BD5F3A66 -USA,1646302.243,1222239.667,8591493.148,9490391.294,12.87871,19.162,1537642.006,154799.8198,93.39973948,12.66525903,0,0,0,0 +USA,1646302.243,1222239.664,8591493.148,9490391.294,12.87871,19.162,1537642.006,154799.8198,93.39973948,12.66525906,0,0,0,0 UZB,0,15200.69725,0,450362.5106,3.375214,0,0,2345.749366,0,15.43185373,5,0,5,https://www.cbd.int/doc/world/uz/uz-nr-05-en.pdf VCT,80.359651,91.899504,36510.93366,409.906569,22.41962,0.220098,50.385389,49.16401,62.69986041,53.49757927,na,8.5,5,https://www.cbd.int/doc/world/vc/vc-nr-05-en.pdf VEN,16499.94,496700.9958,473325.0963,917367.6523,54.14416,3.485964,7759.711633,146352.8809,47.02872637,29.46498641,na,na,5,https://www.cbd.int/doc/world/ve/ve-nr-05-es.pdf @@ -244,6 +244,6 @@ VUT,47.509867,528.222229,622073.2227,12575.12729,4.200532,0.007637,0.802327,30.0 WLF,0,0.301679,259805.4408,180.605517,0.167037,0,0,0,0,0,na,na,na,0 WSM,190.537751,238.023346,132305.5976,2893.945283,8.224874,0.144013,0,0,0,0,na,na,5,https://www.cbd.int/doc/world/ws/ws-nr-05-en.pdf YEM,2562.368242,3519.593039,548013.9807,455938.919,0.771944,0.467573,1234.214383,2874.019964,48.16694036,81.6577352,na,na,5,https://www.cbd.int/doc/world/ye/ye-nr-05-en.pdf -ZAF,224640.2547,103323.7576,1542559.897,1224384.577,8.438832,14.56282,3232.346533,63548.24111,1.438899069,61.50399732,12.96,10,6,https://chm.cbd.int/database/record/33303CBE-1BB9-9034-35F8-283CC0A1D63F +ZAF,224640.2547,103817.9578,1542559.897,1224384.577,8.479196,14.56282,3232.346533,63548.24113,1.438899069,61.21122249,12.96,10,6,https://chm.cbd.int/database/record/33303CBE-1BB9-9034-35F8-283CC0A1D63F ZMB,0,311772.6865,0,755640.3907,41.2594,0,0,117488.5099,0,37.6840291,37.8,0,6,https://chm.cbd.int/database/record/AB99C119-FDF3-C589-9CBB-B0B2C39A58C8 ZWE,0,106837.8044,0,392573.2003,27.21475,0,0,24345.91666,0,22.78773586,28,0,5,https://www.cbd.int/doc/world/zw/zw-nr-05-en.pdf \ No newline at end of file diff --git a/lib/modules/csv_map_parser.rb b/lib/modules/csv_map_parser.rb index cc87cac1..30a7e942 100644 --- a/lib/modules/csv_map_parser.rb +++ b/lib/modules/csv_map_parser.rb @@ -5,12 +5,12 @@ ch2_map2_categorical: { boundaries: [0,5,10,17], header_name: 'percentage_pa_land_cover', - csv: 'PP_National_Monthly_Stats.csv' + csv: 'chapter2_national_pa_statistics.csv' }, ch5_map_categorical: { boundaries: [0,10,30,60], header_name: 'pame_percentage_pa_land_cover', - csv: 'PP_National_Monthly_Stats.csv' + csv: 'chapter2_national_pa_statistics.csv' }, ch7_map1_categorical: { boundaries: [4,8,12,17,25], diff --git a/lib/modules/csv_parser.rb b/lib/modules/csv_parser.rb index c1890214..66e47e79 100644 --- a/lib/modules/csv_parser.rb +++ b/lib/modules/csv_parser.rb @@ -3,7 +3,7 @@ module CsvParser def self.chapter_dates dates = {} - CSV.parse(file_reader('all_chapter_update_dates.csv'), headers: true) do |row| + CSV.parse(file_reader('all_chapter_update_table.csv'), headers: true) do |row| dates["chapter_#{row['chapter']}"] = { 'last_updated' => row['last_updated'], 'next_updated' => row['next_updated'] @@ -14,7 +14,7 @@ def self.chapter_dates def self.pp_global_monthly_stats stats = {} - CSV.parse(file_reader('PP_Global_Monthly_Stats.csv'), headers: true) do |row| + CSV.parse(file_reader('chapter2_global_pa_statistics.csv'), headers: true) do |row| stats[row['type']] = row['value'] end stats diff --git a/yarn.lock b/yarn.lock index e82b6da4..b5de3cbc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1371,7 +1371,7 @@ chokidar@^2.0.0, chokidar@^2.0.2: optionalDependencies: fsevents "^1.2.7" -chownr@^1.0.1, chownr@^1.1.1: +chownr@^1.0.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -2072,7 +2072,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6. dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.0, debug@^3.1.1: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2101,11 +2101,6 @@ deep-equal@^1.0.1: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -2192,11 +2187,6 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-node@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -2948,13 +2938,6 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" @@ -3357,7 +3340,7 @@ iconv-lite@0.2: resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8" integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg= -iconv-lite@0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3386,13 +3369,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -3468,11 +3444,6 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== - internal-ip@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c" @@ -4347,21 +4318,6 @@ minimist@^1.1.3, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mississippi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f" @@ -4463,15 +4419,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -needle@^2.2.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528" - integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -4539,22 +4486,6 @@ node-libs-browser@^2.0.0: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.49: version "1.1.49" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e" @@ -4592,14 +4523,6 @@ node-sass@^4.9.2: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -4642,27 +4565,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -4670,7 +4572,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -4887,7 +4789,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6190,16 +6092,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-cache@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" @@ -6496,7 +6388,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -6566,7 +6458,7 @@ sass-loader@^6.0.7: neo-async "^2.5.0" pify "^3.0.0" -sax@^1.2.4, sax@~1.2.1, sax@~1.2.4: +sax@~1.2.1, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7119,11 +7011,6 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - style-loader@^0.21.0: version "0.21.0" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852" @@ -7220,19 +7107,6 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - through2@^2.0.0, through2@~2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -7886,11 +7760,6 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - yargs-parser@^4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"