Merge pull request #44 from chihacknight/reorg

removed v1 folder and put all data into data folder
chihacknight · May 7, 2024 · 7e63a58 · 7e63a58
2 parents e244c69 + 54c7682
commit 7e63a58
Show file tree

Hide file tree

Showing 85 changed files with 15 additions and 61,336 deletions.
diff --git a/README.md b/README.md
@@ -19,11 +19,11 @@ pip install -r requirements.txt
 To run everything:
 
 ```bash
-cd data/v2/scripts
+cd data/scripts
 bash run_all.sh
 ```
 
-You can also run each script individually from the `data/v2/scripts` folder:
+You can also run each script individually from the `data/scripts` folder:
 
 ```bash
 # combine 3 source files into one

diff --git a/about.html b/about.html
@@ -97,7 +97,7 @@ <h2 id="map-explorer" class="mt-4">Advanced map explorer</h2>
 </p>
 
 <h2 id="data-sources" class="mt-4">Data sources</h2>
-<p>The raw data for this map is available to <a href="https://github.com/chihacknight/il-solar-map/tree/main/data/v2/final">view and download here</a>. The code for this website and to categorize and aggregate the project data by category and geography are open source at <a href="https://github.com/chihacknight/il-solar-map">github.com/chihacknight/il-solar-map</a>.</p>
+<p>The raw data for this map is available to <a href="https://github.com/chihacknight/il-solar-map/tree/main/data/final">view and download here</a>. The code for this website and to categorize and aggregate the project data by category and geography are open source at <a href="https://github.com/chihacknight/il-solar-map">github.com/chihacknight/il-solar-map</a>.</p>
 
 <p>Solar project sources</p>
 <ul>

diff --git a/data/v2/final/all-projects-w-districts.csv → data/final/all-projects-w-districts.csv b/data/v2/final/all-projects-w-districts.csv → data/final/all-projects-w-districts.csv
diff --git a/data/v2/final/all-projects.csv → data/final/all-projects.csv b/data/v2/final/all-projects.csv → data/final/all-projects.csv
diff --git a/data/v2/final/all_projects_summary.csv → data/final/all_projects_summary.csv b/data/v2/final/all_projects_summary.csv → data/final/all_projects_summary.csv
diff --git a/data/v2/final/monthly-aggregate.csv → data/final/monthly-aggregate.csv b/data/v2/final/monthly-aggregate.csv → data/final/monthly-aggregate.csv
diff --git a/...al/solar-projects-by-county-formatted.csv → ...al/solar-projects-by-county-formatted.csv b/...al/solar-projects-by-county-formatted.csv → ...al/solar-projects-by-county-formatted.csv
diff --git a/data/v2/final/solar-projects-by-county.csv → data/final/solar-projects-by-county.csv b/data/v2/final/solar-projects-by-county.csv → data/final/solar-projects-by-county.csv
diff --git a/...v2/final/solar-projects-by-county.geojson → data/final/solar-projects-by-county.geojson b/...v2/final/solar-projects-by-county.geojson → data/final/solar-projects-by-county.geojson
diff --git a/.../solar-projects-by-il-house-formatted.csv → .../solar-projects-by-il-house-formatted.csv b/.../solar-projects-by-il-house-formatted.csv → .../solar-projects-by-il-house-formatted.csv
diff --git a/data/v2/final/solar-projects-by-il-house.csv → data/final/solar-projects-by-il-house.csv b/data/v2/final/solar-projects-by-il-house.csv → data/final/solar-projects-by-il-house.csv
diff --git a/.../final/solar-projects-by-il-house.geojson → .../final/solar-projects-by-il-house.geojson b/.../final/solar-projects-by-il-house.geojson → .../final/solar-projects-by-il-house.geojson
diff --git a/...solar-projects-by-il-senate-formatted.csv → ...solar-projects-by-il-senate-formatted.csv b/...solar-projects-by-il-senate-formatted.csv → ...solar-projects-by-il-senate-formatted.csv
diff --git a/.../v2/final/solar-projects-by-il-senate.csv → data/final/solar-projects-by-il-senate.csv b/.../v2/final/solar-projects-by-il-senate.csv → data/final/solar-projects-by-il-senate.csv
diff --git a/...final/solar-projects-by-il-senate.geojson → ...final/solar-projects-by-il-senate.geojson b/...final/solar-projects-by-il-senate.geojson → ...final/solar-projects-by-il-senate.geojson
diff --git a/...nal/solar-projects-by-place-formatted.csv → ...nal/solar-projects-by-place-formatted.csv b/...nal/solar-projects-by-place-formatted.csv → ...nal/solar-projects-by-place-formatted.csv
diff --git a/data/v2/final/solar-projects-by-place.csv → data/final/solar-projects-by-place.csv b/data/v2/final/solar-projects-by-place.csv → data/final/solar-projects-by-place.csv
diff --git a/.../v2/final/solar-projects-by-place.geojson → data/final/solar-projects-by-place.geojson b/.../v2/final/solar-projects-by-place.geojson → data/final/solar-projects-by-place.geojson
diff --git a/data/v2/final/solar-projects-by-tract.csv → data/final/solar-projects-by-tract.csv b/data/v2/final/solar-projects-by-tract.csv → data/final/solar-projects-by-tract.csv
diff --git a/.../v2/final/solar-projects-by-tract.geojson → data/final/solar-projects-by-tract.geojson b/.../v2/final/solar-projects-by-tract.geojson → data/final/solar-projects-by-tract.geojson
diff --git a/data/v2/raw/eia860.csv → data/raw/eia860.csv b/data/v2/raw/eia860.csv → data/raw/eia860.csv
diff --git a/data/v2/raw/eia860.xlsx → data/raw/eia860.xlsx b/data/v2/raw/eia860.xlsx → data/raw/eia860.xlsx
diff --git a/data/v2/raw/eia860_raw.csv → data/raw/eia860_raw.csv b/data/v2/raw/eia860_raw.csv → data/raw/eia860_raw.csv
diff --git a/data/v2/raw/il_2020_census_tracts.geojson → data/raw/il_2020_census_tracts.geojson b/data/v2/raw/il_2020_census_tracts.geojson → data/raw/il_2020_census_tracts.geojson
diff --git a/data/v2/raw/il_counties.geojson → data/raw/il_counties.geojson b/data/v2/raw/il_counties.geojson → data/raw/il_counties.geojson
diff --git a/data/v2/raw/il_house_2023.geojson → data/raw/il_house_2023.geojson b/data/v2/raw/il_house_2023.geojson → data/raw/il_house_2023.geojson
diff --git a/data/v2/raw/il_house_2023_members.csv → data/raw/il_house_2023_members.csv b/data/v2/raw/il_house_2023_members.csv → data/raw/il_house_2023_members.csv
diff --git a/data/v2/raw/il_places.geojson → data/raw/il_places.geojson b/data/v2/raw/il_places.geojson → data/raw/il_places.geojson
diff --git a/data/v2/raw/il_senate_2023.geojson → data/raw/il_senate_2023.geojson b/data/v2/raw/il_senate_2023.geojson → data/raw/il_senate_2023.geojson
diff --git a/data/v2/raw/il_senate_2023_members.csv → data/raw/il_senate_2023_members.csv b/data/v2/raw/il_senate_2023_members.csv → data/raw/il_senate_2023_members.csv
diff --git a/data/v2/raw/ilabp.csv → data/raw/ilabp.csv b/data/v2/raw/ilabp.csv → data/raw/ilabp.csv
diff --git a/data/v2/raw/ilabp.xlsx → data/raw/ilabp.xlsx b/data/v2/raw/ilabp.xlsx → data/raw/ilabp.xlsx
diff --git a/data/v2/raw/ilabp_previous.csv → data/raw/ilabp_previous.csv b/data/v2/raw/ilabp_previous.csv → data/raw/ilabp_previous.csv
diff --git a/data/v2/raw/ilsfa.csv → data/raw/ilsfa.csv b/data/v2/raw/ilsfa.csv → data/raw/ilsfa.csv
diff --git a/data/v2/raw/ilsfa.xlsx → data/raw/ilsfa.xlsx b/data/v2/raw/ilsfa.xlsx → data/raw/ilsfa.xlsx
diff --git a/data/v2/raw/ilsfa_raw.csv → data/raw/ilsfa_raw.csv b/data/v2/raw/ilsfa_raw.csv → data/raw/ilsfa_raw.csv
diff --git a/data/v2/raw/unique-tracts.csv → data/raw/unique-tracts.csv b/data/v2/raw/unique-tracts.csv → data/raw/unique-tracts.csv
diff --git a/data/v2/scripts/abp_compare.py → data/scripts/abp_compare.py b/data/v2/scripts/abp_compare.py → data/scripts/abp_compare.py
diff --git a/data/v2/scripts/aggregate_data.py → data/scripts/aggregate_data.py b/data/v2/scripts/aggregate_data.py → data/scripts/aggregate_data.py
diff --git a/data/v2/scripts/aggregate_utils.py → data/scripts/aggregate_utils.py b/data/v2/scripts/aggregate_utils.py → data/scripts/aggregate_utils.py
diff --git a/data/v2/scripts/combine_projects.py → data/scripts/combine_projects.py b/data/v2/scripts/combine_projects.py → data/scripts/combine_projects.py
diff --git a/data/v2/scripts/geocoding_cache.sqlite → data/scripts/geocoding_cache.sqlite b/data/v2/scripts/geocoding_cache.sqlite → data/scripts/geocoding_cache.sqlite
diff --git a/data/v2/scripts/get_tract_districts.py → data/scripts/get_tract_districts.py b/data/v2/scripts/get_tract_districts.py → data/scripts/get_tract_districts.py
diff --git a/data/v2/scripts/run_all.sh → data/scripts/run_all.sh b/data/v2/scripts/run_all.sh → data/scripts/run_all.sh
diff --git a/.../AGStoShapefile/solar-communitysolar/solar-communitysolar_1677796784299.geojson b/.../AGStoShapefile/solar-communitysolar/solar-communitysolar_1677796784299.geojson
diff --git a/data/v1/AGStoShapefile/solar-communitysolar/solar-communitysolar_1677796784459.zip b/data/v1/AGStoShapefile/solar-communitysolar/solar-communitysolar_1677796784459.zip
diff --git a/.../AGStoShapefile/solar-communitysolar/solar-communitysolar_1677797469695.geojson b/.../AGStoShapefile/solar-communitysolar/solar-communitysolar_1677797469695.geojson
diff --git a/data/v1/AGStoShapefile/solar-communitysolar/solar-communitysolar_1677797469989.zip b/data/v1/AGStoShapefile/solar-communitysolar/solar-communitysolar_1677797469989.zip