Merge pull request #156 from Chicago/dev

Modify to accommodate changes needed for technical paper peer review
Chicago · Aug 30, 2018 · dd07219 · dd07219
2 parents 1005bd5 + 86f8e33
commit dd07219
Show file tree

Hide file tree

Showing 21 changed files with 41,910 additions and 37,631 deletions.
diff --git a/CSVs/Beach_Water_Levels.csv b/CSVs/Beach_Water_Levels.csv
diff --git a/CSVs/cleanbeachnames.csv b/CSVs/cleanbeachnames.csv
@@ -35,6 +35,7 @@ Foster,Foster,NA,Foster,7,41.9785,-87.6515,1,1,3
 Foster-Beach,Foster,NA,Foster,7,41.9785,-87.6515,1,1,3
 Front 1 & 2*,NA,1,NA,NA,NA,NA,NA,NA,NA
 Hartigan,Hartigan,NA,Albion,5,42.0027,-87.6564,2,1,4
+Hartigan (Albion),Hartigan,NA,Albion,5,42.0027,-87.6564,2,1,4
 Hartigan-Beach,Hartigan,NA,Albion,5,42.0027,-87.6564,2,1,4
 Hollywood,Osterman,NA,Osterman,6,41.9877,-87.6545,1,1,8
 Hollywood/Osterman,Osterman,NA,Osterman,6,41.9877,-87.6545,1,1,8
@@ -69,8 +70,11 @@ Loyola1,NA,1,NA,NA,NA,NA,NA,NA,NA
 Loyola2,NA,1,NA,NA,NA,NA,NA,NA,NA
 Loyola-Beach,Loyola,NA,Leone,4,42.0131,-87.6635,1,1,4
 Margaret T Burroughs,Margaret T Burroughs,NA,31st,13,41.8393,-87.6072,4,0,1
+Margaret T Burroughs (31st),Margaret T Burroughs,NA,31st,13,41.8393,-87.6072,4,0,1
 Marion Mahoney Griffin,Marion Mahoney Griffin,NA,Jarvis,3,42.0161,-87.6647,2,1,4
 Marion-Mahoney-Griffin-Beach,Marion Mahoney Griffin,NA,Jarvis,3,42.0161,-87.6647,2,1,4
+Marion Mahony Griffin (Jarvis),Marion Mahoney Griffin,NA,Jarvis,3,42.0161,-87.6647,2,1,4
+Marion Mahony Griffin,Marion Mahoney Griffin,NA,Jarvis,3,42.0161,-87.6647,2,1,4
 Montrose,Montrose,NA,Montrose,8,41.9655,-87.6385,1,1,5
 Montrose Dog,NA,366,NA,NA,NA,NA,NA,NA,NA
 Montrose-Beach,Montrose,NA,Montrose,8,41.9655,-87.6385,1,1,5

diff --git a/CSVs/lock_openings.csv b/CSVs/lock_openings.csv
@@ -1,4 +1,6 @@
 begin_date,end_date,days_lock_open,O'Brien,CRCW,Wilmette,total_volume
+10/14/2017,10/15/2017,2,0,2456.40,289.80,2746.20
+7/25/2016,7/24/2016,2,0,0,34.01,34.01
 6/15/2015,6/16/2015,2,0,997.5,167.2,1164.7
 6/30/2014,7/1/2014,2,0,632,163,795
 4/18/2013,4/19/2013,2,3185.6,6104.7,1429.2,10719.5