Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
WKocur committed Dec 16, 2019
2 parents 6e3d42a + 7bedec1 commit 00dcc71
Show file tree
Hide file tree
Showing 8 changed files with 784 additions and 775 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
### 3.2.2
### 3.2.5

* Add download tracking for links in CMS (e.g. OECM downloads)

### 3.2.1
### 3.2.4

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

### 3.2.3

* Update reference on Target 11 Dashboard to DOPA - again

### 3.2.2

* Update reference on Target 11 Dashboard to DOPA

Expand Down
346 changes: 173 additions & 173 deletions lib/data/seeds/country_statistics.csv

Large diffs are not rendered by default.

494 changes: 247 additions & 247 deletions lib/data/seeds/country_statistics_old.csv

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions lib/data/seeds/marine_statistics.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"type","value"
"total_marine_protected_areas","16916"
"total_ocean_pa_coverage_percentage",7.5
"total_ocean_area_protected","27185099"
"national_waters_pa_coverage_percentage",17.4
"national_waters_pa_coverage_area","24566946"
"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
Loading

0 comments on commit 00dcc71

Please sign in to comment.