Merge remote-tracking branch 'origin/release-0.2.13'

unepwcmc · May 20, 2020 · 4f94f73 · 4f94f73
2 parents 89e6e2a + 1457089
commit 4f94f73
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 197 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -62,4 +62,10 @@ March 2020 stats updates
 
 0.2.12
 
-April 2020 stats updates
+April 2020 stats updates
+
+0.2.13
+
+May 2020 stats updates i.a...
+Some files have been renamed to reflect the 
+format on Sharepoint
diff --git 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`
diff --git 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
diff --git a/lib/data/file/all_chapter_update_dates.csv b/lib/data/file/all_chapter_update_dates.csv
diff --git a/lib/data/file/all_chapter_update_table.csv 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
diff --git a/lib/data/file/chapter2_global_pa_statistics.csv 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
diff --git a/...ta/file/map/PP_National_Monthly_Stats.csv → ...e/map/chapter2_national_pa_statistics.csv b/...ta/file/map/PP_National_Monthly_Stats.csv → ...e/map/chapter2_national_pa_statistics.csv
diff --git 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
@@ -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