Skip to content

Commit

Permalink
Merge branch 'release-3.2.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucacug
lucacug committed Jun 1, 2020
2 parents c0406b6 + d938c42 commit b3ab433
Show file tree
Hide file tree
Showing 13 changed files with 547 additions and 38,993 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 3.2.13

* Add country, pame_country and marine stats (WDPA June 2020 release).

### 3.2.12

* Fix PAME evaluations count mismatch between country page and API
Expand Down
307 changes: 154 additions & 153 deletions lib/data/seeds/country_statistics.csv
View file

Large diffs are not rendered by default.

488 changes: 244 additions & 244 deletions lib/data/seeds/country_statistics_old.csv
View file

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions lib/data/seeds/green_list_sites.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
147283
147297
147302
15089
168201
17231
17360
17709
17744
220034
18805
18807
20299
256
Expand Down Expand Up @@ -49,6 +50,7 @@
36534
388659
4044
4114
555514399
555525592
555525849
Expand Down Expand Up @@ -104,6 +106,3 @@
95349
95996
9782
18805
4114
15089
138 changes: 94 additions & 44 deletions lib/data/seeds/green_list_sites_old.csv
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,109 @@
site
"site"
10279
106711
18998
62716
3981
15260
10754
108125
12223
13165
13966
143
147283
147297
147302
168201
17231
902497
555558374
17360
17709
17744
220034
18807
20299
256
26625
26654
3014
303038
303045
303072
303317
303320
303552
306777
306779
306780
306808
30697
309970
3215
555526032
345942
555539507
354414
311888
313091
32674
330608
345888
345942
365025
36534
388659
4044
62735
7523
555514399
555525592
555525849
555526032
555526036
555526045
555526606
555526767
555539517
303038
303320
555542446
555544085
555547502
20299
168201
555548807
555555490
555555499
555555513
555555517
555558374
555577562
555577562
555582988
555599909
555624257
365025
555624365
555637437
555697546
61595
6271
62735
62990
6307
63136
63642
64511
659
17744
12223
10754
147297
330608
15089
388659
662
663
67860
68137
718
721
7523
767
768
769
7873
819
555526036
555555490
303552
83037
555542446
108125
555544085
63136
9739
13966
555555517
555555499
26625
83268
68137
555526606
61595
662
902487
902497
915
95349
95996
9782
345888
306808
721
18805
4114
303045
6307
555624365
902487
15089
10 changes: 5 additions & 5 deletions lib/data/seeds/marine_statistics.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"type","value"
"total_marine_protected_areas","16991"
"total_ocean_pa_coverage_percentage",7.43
"total_ocean_area_protected","26928113"
"national_waters_pa_coverage_percentage",17.22
"national_waters_pa_coverage_area","24309960"
"total_marine_protected_areas","17042"
"total_ocean_pa_coverage_percentage",7.44
"total_ocean_area_protected","26947375"
"national_waters_pa_coverage_percentage",17.23
"national_waters_pa_coverage_area","24329222"
"high_seas_pa_coverage_percentage",1.18
"high_seas_pa_coverage_area","2618153"
"national_waters_percentage",39
Expand Down
34 changes: 17 additions & 17 deletions lib/data/seeds/pame_country_stats.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"AUT",0,471.966738,0,0.562453
"AZE",0.154514,2880.890839,0.000196,3.325142
"BDI",0,1422.09236,0,5.226192
"BEL",6.573839,3866.765791,0.189714,12.60228
"BEL",6.573838,3866.765791,0.189714,12.60228
"BEN",0,11330.99346,0,9.760074
"BES",0,0,0,0
"BFA",0,4959.123073,0,1.794159
Expand All @@ -28,7 +28,7 @@
"BHS",3460.290417,4215.672449,0.578929,31.32464
"BIH",0,692.468616,0,1.351814
"BLM",0,0,0,0
"BLR",0,4035.285495,0,1.947268
"BLR",0,4035.285494,0,1.947268
"BLZ",2442.620226,7982.925278,6.738293,35.80146
"BMU",0,0,0,0
"BOL",0,155396.1212,0,14.25772
Expand Down Expand Up @@ -58,29 +58,29 @@
"CXR",0,0,0,0
"CYM",0,0,0,0
"CYP",0.045238,1157.122558,4.6E-05,12.76693
"CZE",0,7498.753016,0,9.62404
"CZE",0,7498.753013,0,9.62404
"DEU",8265.143141,2011.829926,14.66545,0.562617
"Disputed",0,0,0,0
"DJI",0,0,0,0
"DMA",0,67.392445,0,8.795353
"DNK",4093.084992,2949.070578,4.073947,6.508021
"DNK",4100.198031,2812.166008,4.081028,6.2059
"DOM",1471.48947,7154.422034,0.543438,14.7484
"DZA",0.01792,75789.68362,1.4E-05,3.260531
"ECU",139291.1005,45578.70007,12.89851,17.65667
"EGY",11046.30476,76110.32685,4.66853,7.726956
"ERI",0,0,0,0
"ESH",0,0,0,0
"ESP",656.657062,13573.60027,0.065292,2.677168
"ESH",469.943801,142.988855,0.186468,0.053287
"ESP",656.657061,13573.60027,0.065292,2.677168
"EST",1158.222354,3248.983654,3.186625,7.153754
"ETH",0,34834.27392,0,3.067939
"FIN",2995.031929,27572.55343,3.768861,8.164189
"FIN",2995.031934,27572.55343,3.768861,8.164189
"FJI",111.434696,11.103878,0.008618,0.057969
"FLK",0,0,0,0
"FRA",113.230931,4994.572281,0.032929,0.909834
"FRA",113.230931,4994.572283,0.032929,0.909834
"FRO",0,0,0,0
"FSM",0,0,0,0
"GAB",1408.687712,28707.11162,0.728786,10.79034
"GBR",128440.4738,27493.9475,17.755,11.21069
"GBR",128484.2393,27494.35769,17.76105,11.21086
"GEO",152.961902,5585.098034,0.667752,7.981908
"GGY",0,0,0,0
"GHA",218.290035,2627.975725,0.096265,1.093486
Expand All @@ -90,7 +90,7 @@
"GMB",15.848759,439.347997,0.069679,4.083954
"GNB",2108.862653,2195.713469,1.980029,6.454996
"GNQ",6.850682,3123.690636,0.002207,11.51123
"GRC",408.342947,1857.398301,0.082632,1.396411
"GRC",408.342947,1857.398302,0.082632,1.396411
"GRD",0.224225,9.543075,0.000853,2.554594
"GRL",402.139927,5749.926977,0.017759,0.26694
"GTM",1026.826696,11453.61015,0.867718,10.41974
Expand All @@ -107,7 +107,7 @@
"IMN",0,0,0,0
"IND",1415.361164,101826.7364,0.061505,3.326374
"IOT",0,0,0,0
"IRL",85.631989,115.16912,0.020081,0.164226
"IRL",85.869291,115.222584,0.020136,0.164302
"IRN",1150.567318,13309.78741,0.511817,0.817626
"IRQ",0,1377.958757,0,0.314724
"ISL",31.664754,660.869357,0.004206,0.646
Expand All @@ -118,7 +118,7 @@
"JOR",0,1110.121003,0,1.237733
"JPN",0,0,0,0
"KAZ",0,19251.39769,0,0.707817
"KEN",88.068371,30229.52898,0.078352,5.151853
"KEN",74.396515,30215.12489,0.066189,5.149398
"KGZ",0,1304.758795,0,0.65252
"KHM",83.487803,38597.11149,0.174053,21.14784
"KIR",408247.3769,84.15276,11.80202,8.149878
Expand All @@ -137,7 +137,7 @@
"LUX",0,487.74825,0,18.73734
"LVA",87.727632,689.308959,0.303771,1.068664
"MAF",0,0,0,0
"MAR",321.614941,913.477036,0.11647,0.224287
"MAR",332.169944,1085.296971,0.120292,0.266474
"MCO",0,0,0,0
"MDA",0,977.221645,0,2.877248
"MDG",4136.550457,37912.42071,0.343047,6.374849
Expand All @@ -146,7 +146,7 @@
"MHL",0,0,0,0
"MKD",0,1920.045873,0,7.546419
"MLI",0,96284.8915,0,7.661821
"MLT",0.114063,1.381179,0.000205,0.425017
"MLT",0.114063,1.381175,0.000205,0.425015
"MMR",1774.688585,2480.137252,0.345171,0.368477
"MNE",0,360.163693,0,2.600918
"MNG",0,208433.1164,0,13.31106
Expand Down Expand Up @@ -178,10 +178,10 @@
"PHL",1523.50019,5807.692147,0.083023,1.943835
"PLW",78.312924,14.523867,0.012877,2.898389
"PNG",3029.710822,13093.64518,0.125851,2.801343
"POL",7155.25597,48405.35756,22.39822,15.51834
"POL",7155.255844,47922.94541,22.39822,15.36368
"PRI",0,0,0,0
"PRK",0,0,0,0
"PRT",1009.099824,10817.02969,0.058527,11.73964
"PRT",2140.348902,10801.45398,0.124139,11.72273
"PRY",0,9793.229867,0,2.43917
"PSE",0,0,0,0
"PYF",6.700815,8.888061,0.00014,0.23513
Expand All @@ -207,7 +207,7 @@
"STP",0,0,0,0
"SUR",1980.333327,20899.47606,1.54276,14.16352
"SVK",0,10893.15729,0,22.25764
"SVN",0.405681,2453.068141,0.21774,12.07899
"SVN",0.405681,2453.068142,0.21774,12.07899
"SWE",1079.94217,10548.05226,0.696825,2.347193
"SWZ",0,0,0,0
"SXM",0,0,0,0
Expand Down
Loading

0 comments on commit b3ab433

Please sign in to comment.