fixing merge conflicts

This commit is contained in:
lucasmbrown-usds 2022-09-30 13:43:31 -04:00
commit 07c4c030d3
266 changed files with 1868 additions and 1811 deletions

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before After
Before After

View file

@ -9,7 +9,7 @@ graph LR
input --> Voting
Intake --> Evolution --> Voting
end
subgraph s["Hosted by Geoplatform.gov"]
subgraph dp["Data Pipeline (Justice40 Repo)"]
Voting --> a["Approved Datasets"]
@ -28,4 +28,4 @@ graph LR
ScoreCSV --"API (S3 Access)" --> DS["Data Scientists"]
GeoJSON -- "API (S3 Access)" --> 3["Third Party Apps"]
MVT -- "API (S3 Access)" --> 3["Third Party Apps"]
end
end

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

View file

@ -17,7 +17,7 @@ graph TD
TS3("TIGER GeoJSON State Files(S3)")-->CombineCensus["Combine Census State Files with Geopandas"]
CombineCensus-->NCS3("National Census GeoJSON (S3)")
end
CSV("Full CSV (S3)")-->CGJ
NCS3-->CGJ
CGJ["Combine with ogr2ogr + Create GeoJSON (score-geo)"]-->GeoJSON
@ -31,6 +31,6 @@ graph TD
Local("Locally stored tiles")--"Option 1"-->TS
Compressed("Compressed high and low .mbtile files (S3)")--"Option 2"-->TS[/Tileserver-GL/]
end
TS--"XYZ URL"-->Client
Uncompressed--"XYZ URL"-->Client["Gatsby+MapLibre"]