Skip to content

Commit

Permalink
Merge branch 'master' into release-3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stacytalbot authored Sep 9, 2019
2 parents d914baa + fec5973 commit 50bd1ea
Show file tree
Hide file tree
Showing 11 changed files with 28,995 additions and 28,557 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
* Remove dependency on the protectedplanet-frontend repo and move styles in asset folder
* Add docker for local development

### 2.6.1

* Add country, pame_country and marine stats (WDPA September 2019 release).

### 2.6.0

* Add National Report stats to countries
Expand Down
494 changes: 246 additions & 248 deletions lib/data/seeds/country_statistics.csv

Large diffs are not rendered by default.

493 changes: 248 additions & 245 deletions lib/data/seeds/country_statistics_old.csv

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions lib/data/seeds/marine_statistics.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"type","value"
"total_marine_protected_areas","15059"
"total_ocean_pa_coverage_percentage","7.68"
"total_ocean_area_protected","27841368"
"national_waters_pa_coverage_percentage","17.86"
"national_waters_pa_coverage_area","25223215"
"high_seas_pa_coverage_percentage","1.18"
"total_marine_protected_areas","16927"
"total_ocean_pa_coverage_percentage",8
"total_ocean_area_protected","28189691"
"national_waters_pa_coverage_percentage",18
"national_waters_pa_coverage_area","25571538"
"high_seas_pa_coverage_percentage",1
"high_seas_pa_coverage_area","2618153"
"national_waters_percentage","39"
"global_ocean_percentage","61"
"national_waters_percentage",39
"global_ocean_percentage",61
Loading

0 comments on commit 50bd1ea

Please sign in to comment.