Merge pull request #17 from dataforgoodfr/fix-maps

Fix maps
dataforgoodfr · Jun 13, 2024 · df0cf52 · df0cf52
2 parents 26bf4ea + 34d492f
commit df0cf52
Show file tree

Hide file tree

Showing 118 changed files with 7,725 additions and 8,974 deletions.
diff --git a/.gitignore b/.gitignore
@@ -166,3 +166,6 @@ cython_debug/
 
 *.DS_Store
 .DS_Store
+
+# avoid committing changes to hmtl graphs produced for local checking
+pinkbombs/graphs/test_html/
diff --git a/README.md b/README.md
@@ -99,12 +99,16 @@ The function needs to be added in the following dictionary entry format:
 
 Do not skip any argument to the function as these need to be in the correct order.
 
-## Python scripts for testing your visualizations
+## Temporary Python scripts for testing locally
 To run the plotly graphs locally and generate html files you can view in your browser, you can use the script:
 
     python3 pinkbombs/graphs/test_graphs.py 
 
+Note that the changes to the html files in this folder won't be included in git as the folder `pinkbombs/graphs/test_html/` is included in `.gitignore`.  
+
 To translate the data and zip the csv files for download, run locally: 
 
     python3 pinkbombs/graphs/translate_data.py
-    python3 pinkbombs/graphs/zip_data.py
+    python3 pinkbombs/graphs/zip_data.py
+
+Note that this will regenerate all files and may not be adapted
diff --git a/data/atlantic_salmon-aquaculture_tonnes_live_weight_by_country_by_year.xlsx b/data/atlantic_salmon-aquaculture_tonnes_live_weight_by_country_by_year.xlsx
diff --git a/data/carbon_bombs_pie_chart_5.1.csv b/data/carbon_bombs_pie_chart_5.1.csv
diff --git a/data/discrease_wild_salmon_1.1_fr.csv b/data/discrease_wild_salmon_1.1_fr.csv
@@ -1,64 +1,64 @@
-,Année,Saumons pêchés dans l'Atlantique en tonnes
-0,1960,16869
-1,1961,14823
-2,1962,20603
-3,1963,19963
-4,1964,22504
-5,1965,20679
-6,1966,20425
-7,1967,25293
-8,1968,20157
-9,1969,21369
-10,1970,20454
-11,1971,18888
-12,1972,21011
-13,1973,24197
-14,1974,23574
-15,1975,23766
-16,1976,18641
-17,1977,18592
-18,1978,16167
-19,1979,15420
-20,1980,18915
-21,1981,17299
-22,1982,15128
-23,1983,18150
-24,1984,14120
-25,1985,16322
-26,1986,19054
-27,1987,15809
-28,1988,16224
-29,1989,12634
-30,1990,9918
-31,1991,7646
-32,1992,8472
-33,1993,8027
-34,1994,9391
-35,1995,8367
-36,1996,7074
-37,1997,5671
-38,1998,5841
-39,1999,5400
-40,2000,7060
-41,2001,7472
-42,2002,6485
-43,2003,5872
-44,2004,5210
-45,2005,5125
-46,2006,4691
-47,2007,3426
-48,2008,3699
-49,2009,2814
-50,2010,3548
-51,2011,3654
-52,2012,3112
-53,2013,2757
-54,2014,2416
-55,2015,2665
-56,2016,2520
-57,2017,2447
-58,2018,2157
-59,2019,1820
-60,2020,1795
-61,2021,1242
-62,2022,1391
+Année,Saumons pêchés dans l'Atlantique en tonnes
+1960,16869
+1961,14823
+1962,20603
+1963,19963
+1964,22504
+1965,20679
+1966,20425
+1967,25293
+1968,20157
+1969,21369
+1970,20454
+1971,18888
+1972,21011
+1973,24197
+1974,23574
+1975,23766
+1976,18641
+1977,18592
+1978,16167
+1979,15420
+1980,18915
+1981,17299
+1982,15128
+1983,18150
+1984,14120
+1985,16322
+1986,19054
+1987,15809
+1988,16224
+1989,12634
+1990,9918
+1991,7646
+1992,8472
+1993,8027
+1994,9391
+1995,8367
+1996,7074
+1997,5671
+1998,5841
+1999,5400
+2000,7060
+2001,7472
+2002,6485
+2003,5872
+2004,5210
+2005,5125
+2006,4691
+2007,3426
+2008,3699
+2009,2814
+2010,3548
+2011,3654
+2012,3112
+2013,2757
+2014,2416
+2015,2665
+2016,2520
+2017,2447
+2018,2157
+2019,1820
+2020,1795
+2021,1242
+2022,1391