Skip to content

Commit

Permalink
Merge branch 'release-3.2.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucacug
lucacug committed Jan 14, 2020
2 parents 00dcc71 + 17185d8 commit d266c40
Show file tree
Hide file tree
Showing 11 changed files with 617 additions and 611 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.6

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

### 3.2.5

* Add download tracking for links in CMS (e.g. OECM downloads)
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ gem 'turnout', '~> 2.5.0'

gem 'bystander', '2.0.0', git: 'https://github.com/unepwcmc/bystander'

gem 'devise', '~> 4.6.2' # MAJOR VERSION CHANGE, CHECK DOCS
gem 'devise', '~> 4.7.1' # MAJOR VERSION CHANGE, CHECK DOCS

gem 'comfortable_mexican_sofa', '1.12.10'
gem 'nokogiri', '~> 1.10.1'
gem 'nokogiri', '~> 1.10.4'
gem 'tinymce-rails', '~> 4.3.2'
gem 'phantompdf', '~> 1.2.2'
24 changes: 12 additions & 12 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,17 +837,17 @@ GEM
connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
crass (1.0.5)
css_parser (1.7.0)
addressable
dalli (2.7.9)
database_cleaner (1.7.0)
dbf (2.0.13)
fastercsv (~> 1.5)
devise (4.6.2)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
docile (1.3.1)
Expand Down Expand Up @@ -914,7 +914,7 @@ GEM
json (2.2.0)
kramdown (2.1.0)
levenshtein (0.2.2)
loofah (2.2.3)
loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -938,7 +938,7 @@ GEM
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
nio4r (2.3.1)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
paperclip (6.1.0)
Expand All @@ -963,7 +963,7 @@ GEM
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
public_suffix (3.0.3)
rack (2.0.7)
rack (2.0.8)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cache (1.9.0)
Expand Down Expand Up @@ -993,8 +993,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
Expand All @@ -1004,7 +1004,7 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.3)
rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
Expand All @@ -1018,7 +1018,7 @@ GEM
rgeo (>= 1.0.0)
ruby_parser (3.13.0)
sexp_processor (~> 4.9)
rubyzip (1.2.2)
rubyzip (1.3.0)
safe_yaml (1.0.5)
sass (3.7.3)
sass-listen (~> 4.0.0)
Expand Down Expand Up @@ -1138,7 +1138,7 @@ DEPENDENCIES
dalli (~> 2.7.2)
database_cleaner
dbf (~> 2.0.7)
devise (~> 4.6.2)
devise (~> 4.7.1)
dotenv (~> 0.11.1)
dotenv-deployment
ejs
Expand All @@ -1152,7 +1152,7 @@ DEPENDENCIES
levenshtein (~> 0.2.2)
minitest (~> 5.10, != 5.10.2)
mocha (~> 1.0.0)
nokogiri (~> 1.10.1)
nokogiri (~> 1.10.4)
pg (~> 0.21)
phantompdf (~> 1.2.2)
premailer-rails
Expand Down
429 changes: 215 additions & 214 deletions lib/data/seeds/country_statistics.csv
View file

Large diffs are not rendered by default.

346 changes: 173 additions & 173 deletions lib/data/seeds/country_statistics_old.csv
View file

Large diffs are not rendered by default.

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,10 +1,10 @@
"type","value"
"total_marine_protected_areas","16977"
"total_ocean_pa_coverage_percentage",7.63
"total_ocean_area_protected","27631644"
"national_waters_pa_coverage_percentage",17.72
"total_marine_protected_areas","16928"
"total_ocean_pa_coverage_percentage",7.91
"total_ocean_area_protected","28665325"
"national_waters_pa_coverage_percentage",18.45
"national_waters_pa_coverage_area","25013491"
"high_seas_pa_coverage_percentage",1.18
"high_seas_pa_coverage_area","2618153"
"high_seas_pa_coverage_area","26047173"
"national_waters_percentage",39
"global_ocean_percentage",61
10 changes: 5 additions & 5 deletions lib/data/seeds/marine_statistics_old.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"type","value"
"total_marine_protected_areas","16908"
"total_ocean_pa_coverage_percentage",7.78
"total_ocean_area_protected","28188975"
"national_waters_pa_coverage_percentage",18.11
"national_waters_pa_coverage_area","25570822"
"total_marine_protected_areas","16977"
"total_ocean_pa_coverage_percentage",7.63
"total_ocean_area_protected","27631644"
"national_waters_pa_coverage_percentage",17.72
"national_waters_pa_coverage_area","25013491"
"high_seas_pa_coverage_percentage",1.18
"high_seas_pa_coverage_area","2618153"
"national_waters_percentage",39
Expand Down
53 changes: 27 additions & 26 deletions lib/data/seeds/pame_country_stats.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,64 @@
"ABNJ",0,0,0,0
"ABW",0,0,0,0
"AFG",0,597.988499,0,0.093014
"AGO",19.751236,32400.49499,0.004000223,2.581265
"AGO",19.751236,32400.49499,0.004,2.581265
"AIA",0,0,0,0
"ALA",0,0,0,0
"ALB",42.889141,45.148125,0.382959302,0.157056
"ALB",42.889141,45.148125,0.382959,0.157056
"AND",0,26.105939,0,5.532434
"ARE",2157.773724,8709.828567,3.943945473,12.28095
"ARG",2419.277559,64069.04353,0.223355598,2.300234
"ARE",2157.773724,8709.828567,3.943945,12.28095
"ARG",2419.277559,64069.04353,0.223356,2.300234
"ARM",0,3445.371044,0,11.60628
"ASM",0,0,0,0
"ATA",0,0,0,0
"ATF",0,0,0,0
"ATG",0,0,0,0
"AUS",378130.1755,303142.4146,5.087774356,3.925646
"AUS",378735.7251,303593.6712,5.095922,3.93149
"AUT",0,471.966738,0,0.562453
"AZE",0.154514,2880.890839,0.000195508,3.325142
"AZE",0.154514,2880.890839,0.000196,3.325142
"BDI",0,1422.09236,0,5.226192
"BEL",6.573839,3866.765791,0.18971351,12.60228
"BEL",6.573839,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
"BGD",738.144196,931.396849,0.872890442,0.664523
"BGR",8.252788,4708.791844,0.023464185,4.247407
"BGD",738.144196,931.396849,0.87289,0.664523
"BGR",8.252788,4708.791844,0.023464,4.247407
"BHR",0,0,0,0
"BHS",3460.290417,4215.672449,0.578929344,31.32464
"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
"BLZ",2442.620226,7982.925278,6.738292683,35.80146
"BLZ",2442.620226,7982.925278,6.738293,35.80146
"BMU",0,0,0,0
"BOL",0,155396.1212,0,14.25772
"BRA",18353.70672,954460.8295,0.499749089,11.19025
"BRA",19837.36478,955287.1494,0.540147,11.19993
"BRB",0,0,0,0
"BRN",0,0,0,0
"BTN",0,15508.71277,0,38.83636
"BVT",0,0,0,0
"BWA",0,111968.2861,0,19.26625
"CAF",0,38632.06062,0,6.185405
"CAN",7809.517784,318230.9586,0.137055185,3.196684
"CAN",7810.065123,318230.0765,0.137065,3.196675
"CCK",0,0,0,0
"CHE",0,2610.795789,0,6.313091
"CHL",1282.760609,43637.92495,0.035073853,5.743185
"CHN",832.712621,200412.8047,0.094802671,2.140795
"CIV",3.723091,17647.95855,0.002129401,5.445091
"CMR",1184.14415,35645.82916,8.053071316,7.593459
"COD",31.363659,158805.5811,0.236431938,6.774187
"COG",1197.464959,33631.09748,3.003906239,9.78397
"CHL",1282.760609,43637.92495,0.035074,5.743185
"CHN",832.712621,200412.8047,0.094803,2.140795
"CIV",0,18194.93691,0,5.613855
"CMR",1184.14415,35645.82916,8.053071,7.593459
"COD",31.363659,158805.5811,0.236432,6.774187
"COG",1197.464959,33631.09748,3.003906,9.78397
"COK",0,0,0,0
"COL",32065.61446,132998.5605,4.388090747,11.61526
"COL",32065.61446,132998.5605,4.388091,11.61526
"COM",0,0,0,0
"CPV",0,102.417916,0,2.468498
"CRI",4443.430402,10510.76419,0.771281351,20.35544
"CRI",4443.430402,10510.76419,0.771281,20.35544
"CUB",0,0,0,0
"CUW",0,0,0,0
"CXR",0,0,0,0
"CYM",0,0,0,0
"CYP",0.045238,1157.122558,4.60299E-05,12.76693
"CYP",0.045238,1157.122558,4.6E-05,12.76693
"CZE",0,7498.753016,0,9.62404
"DEU",8265.143141,2011.829926,14.6654464,0.562617
"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
Expand All @@ -85,7 +85,7 @@
"GGY",0,0,0,0
"GHA",218.290035,2627.975725,0.096265,1.093486
"GIB",0,0,0,0
"GIN",450.561029,14861.02776,0.409094,6.030605
"GIN",450.561029,14861.3432,0.409094,6.030733
"GLP",0,0,0,0
"GMB",15.848759,439.347997,0.069679,4.083954
"GNB",2108.862653,2195.713469,1.980029,6.454996
Expand Down Expand Up @@ -127,7 +127,7 @@
"KWT",0.803143,325.01945,0.006751,1.866011
"LAO",0,0,0,0
"LBN",0,160.942124,0,1.558151
"LBR",251.813348,2410.410591,0.101633,2.49436
"LBR",251.813348,2411.817204,0.101633,2.495816
"LBY",0,0,0,0
"LCA",3.375011,16.034291,0.02169,2.576571
"LIE",0,19.078751,0,11.42
Expand Down Expand Up @@ -200,6 +200,7 @@
"SLB",519.261187,308.937747,0.032257,1.058309
"SLE",122.954659,2637.099469,0.07663,3.626922
"SLV",206.773048,84.110066,0.219416,0.408831
"SOM",0,0,0,0
"SPM",0,0,0,0
"SRB",0,4074.584863,0,4.603577
"SSD",0,59270.90155,0,9.354913
Expand Down Expand Up @@ -231,7 +232,7 @@
"UKR",130.023291,7084.633604,0.096404,1.183082
"UMI",2305.16164,1.457914,0.117348,0.401082
"URY",666.038675,1732.364584,0.511952,0.970731
"USA",1537642.023,154799.9749,17.89726,1.631123
"USA",1537642.023,154799.8198,17.89726,1.631122
"UZB",0,2345.749366,0,0.520858
"VCT",50.385389,49.16401,0.138001,11.99395
"VEN",7759.711633,146352.8809,1.639404,15.95357
Expand Down
Loading

0 comments on commit d266c40

Please sign in to comment.