Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #61

Merged
merged 28 commits into from
Mar 15, 2023
Merged

Dev #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
47f3bf6
Add a more descriptive legend title
dcjohnson24 Nov 21, 2022
2223187
Addressed content resize every time bus animation restarted
danielve4 Dec 11, 2022
6568ffb
Search input width is same as parent div
Rishav1707 Dec 13, 2022
14d1cf0
Merge pull request #38 from dcjohnson24/edit-legend-title
amy-corson Dec 14, 2022
83679cd
Search input width fixed
Rishav1707 Dec 15, 2022
033567c
Merge pull request #44 from danielve4/content-resize-fix
lauriemerrell Jan 4, 2023
5843672
Update _search.scss
Rishav1707 Jan 8, 2023
f9f38b8
Update _search.scss
Rishav1707 Jan 8, 2023
a5e5fb0
style: Change ranking color. Update legend text.
smacmullan Jan 27, 2023
534d866
style: Shifted map center west.
smacmullan Jan 27, 2023
2983b5a
style: Adjust legend layout. Remove map title.
smacmullan Jan 27, 2023
362eea4
fix: move css legend styling to scss
smacmullan Feb 9, 2023
9b6abec
style: switch to yellow-purple gradient
smacmullan Feb 9, 2023
f83f12d
build: add sass compiler
smacmullan Feb 9, 2023
c5f9136
fix: change css import to scss
smacmullan Feb 9, 2023
e4b6a9c
style: revert to original color scheme
smacmullan Feb 22, 2023
8e0b9e0
remove 74 bus
lauriemerrell Mar 6, 2023
c46df24
clarifications about the #74
lauriemerrell Mar 6, 2023
946e87e
Merge branch 'main' into dev
amy-corson Mar 8, 2023
fe7234e
Merge branch 'dev' into fullerton-74-updates
amy-corson Mar 8, 2023
b207f88
style: add note container to data note
amy-corson Mar 8, 2023
e92f9bb
style: compile scss to css
amy-corson Mar 8, 2023
b470cf4
Merge pull request #59 from chihacknight/fullerton-74-updates
lauriemerrell Mar 8, 2023
352e88f
Merge branch 'map-legend' into dev
smacmullan Mar 8, 2023
f5f5ed1
refactor: remove and replace data
amy-corson Mar 14, 2023
15cc062
Merge branch 'dev' into pr/48
amy-corson Mar 15, 2023
202a2f1
Merge pull request #48 from Rishav1707/input
amy-corson Mar 15, 2023
74046f2
Merge pull request #60 from chihacknight/file-change
amy-corson Mar 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
src/css/main.css
43 changes: 42 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "client",
"version": "0.1.0",
"version": "0.1.0",
"private": true,
"dependencies": {
"@axe-core/react": "^4.4.5",
Expand Down Expand Up @@ -42,6 +42,7 @@
]
},
"devDependencies": {
"gh-pages": "^4.0.0"
"gh-pages": "^4.0.0",
"sass": "^1.58.0"
}
}
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "./css/main.css";
import "./scss/main.scss";
import { Route, Routes } from "react-router-dom";

import Header from "./components/Header";
Expand Down
71 changes: 47 additions & 24 deletions src/Pages/InteractiveMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,27 @@ const InteractiveMap = () => {
<Map />

<h2>Welcome to the Map Beta!</h2>
<p>
Use the map above to explore Chicago's bus lines.
</p>
<p>Use the map above to explore Chicago's bus lines.</p>
<ul>
<li>Click a
route or use the search bar to open route-specific details.</li>
<li>Use the filter to compare the performance of different bus lines
across Chicago.</li>
<li>
Click a route or use the search bar to open route-specific details.
</li>
<li>
Use the filter to compare the performance of different bus lines
across Chicago.
</li>
</ul>
<div className="note">
<p>
<strong>Note:</strong> From November 2022 until early March 2023 we
showed the Fulleron #74 bus on the map. In early March 2023 we removed
it because we discovered that a data bug (in the source data from the
CTA) for that route is more widespread than we thought and it threw
the accuracy of the data displayed for the #74 into question. We may
add the #74 back to the map if we find a way to address the bug.
</p>
</div>

<h3> See a Bug? Have an Idea?</h3>
<p>
{" "}
Expand All @@ -29,31 +41,42 @@ const InteractiveMap = () => {
For a list of planned upcoming additions to this project, please visit
our GitHub pages.
</p>
<p>If you want to get involved, you can join our Tuesday Chi Hack Night breakout group.</p>
<p>
If you want to get involved, you can join our Tuesday Chi Hack Night
breakout group.
</p>
<p>
Finally, if you have feedback for us on this project, you can always
reach out to us on Twitter!
</p>
<div className="btn-container">
<a href="https://github.com/chihacknight/breakout-groups/issues/217" target="_blank" rel="noreferrer">
<button className="action-btn">
Breakout group information
</button>
<a
href="https://github.com/chihacknight/breakout-groups/issues/217"
target="_blank"
rel="noreferrer"
>
<button className="action-btn">Breakout group information</button>
</a>
<a href="https://github.com/chihacknight/ghost-buses-frontend" target="_blank" rel="noreferrer">
<button className="action-btn">
Frontend Repository
</button>
<a
href="https://github.com/chihacknight/ghost-buses-frontend"
target="_blank"
rel="noreferrer"
>
<button className="action-btn">Frontend Repository</button>
</a>
<a href="https://github.com/chihacknight/chn-ghost-buses/" target="_blank" rel="noreferrer">
<button className="action-btn">
Data Repository
</button>
<a
href="https://github.com/chihacknight/chn-ghost-buses/"
target="_blank"
rel="noreferrer"
>
<button className="action-btn">Data Repository</button>
</a>
<a href="https://twitter.com/ghostbuses" target="_blank" rel="noreferrer">
<button className="action-btn">
Ghost Bus Twitter
</button>
<a
href="https://twitter.com/ghostbuses"
target="_blank"
rel="noreferrer"
>
<button className="action-btn">Ghost Bus Twitter</button>
</a>
</div>
</div>
Expand Down
11 changes: 7 additions & 4 deletions src/Pages/Methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,14 @@ const Methods = () => {
</p>
<p>
This is an all-volunteer project, and for our current launch we have not done granular row-level
data cleaning. We observed, for example, that for a small number of trips on the 74 Fullerton bus,
the trip ID was missing and was only listed as a series of asterisks (like ********). We have not
data cleaning. We observed, for example, that for a small number of trips on the 66 Chicago bus,
the trip ID was missing in the source data from the API and was only listed as a series of asterisks (like ********). We have not
added any special handling or cleaning for that, so we may be slightly undercounting the number of
actual trips that occurred on that route. We have no reason to believe that these issues are widespread
or common enough to affect overall data trends or high-level conclusions.
actual trips that occurred on that route. We saw the same issue on the #74 Fullerton bus and assumed
it was not widespread; however, after the data had been displayed on the site for several months
we investigated further and realized that the data issue is common enough for the #74 that it made
our display inaccurate. We have removed the #74 bus for the time being; we are not sure whether we
will find a valid method to overcome the issue to reinstate the #74 bus on our map.
</p>
<p>
If you would like to help us improve our data cleaning, we would love to have you!
Expand Down
71 changes: 0 additions & 71 deletions src/Routes/bus_route_shapes_simplified_linestring.json
Original file line number Diff line number Diff line change
Expand Up @@ -11687,77 +11687,6 @@
]
}
},
{
"id": "226",
"type": "Feature",
"properties": {
"route_id": "74",
"shape_id": "64808422",
"direction": "East",
"trip_id": 252,
"route_short_name": "74",
"route_long_name": "Fullerton",
"route_type": "3",
"route_url": "http://www.transitchicago.com/bus/74/",
"route_color": "565a5c",
"route_text_color": "ffffff"
},
"geometry": {
"type": "LineString",
"coordinates": [
[-87.80164, 41.923798],
[-87.801631, 41.923523],
[-87.785697, 41.92359],
[-87.715205, 41.924617],
[-87.669423, 41.925062],
[-87.64875, 41.92546],
[-87.64865, 41.92182],
[-87.6439, 41.921894],
[-87.648713, 41.925497],
[-87.649468, 41.925481]
]
}
},
{
"id": "227",
"type": "Feature",
"properties": {
"route_id": "74",
"shape_id": "64708420",
"direction": "West",
"trip_id": 253,
"route_short_name": "74",
"route_long_name": "Fullerton",
"route_type": "3",
"route_url": "http://www.transitchicago.com/bus/74/",
"route_color": "565a5c",
"route_text_color": "ffffff"
},
"geometry": {
"type": "LineString",
"coordinates": [
[-87.649735, 41.925437],
[-87.672925, 41.925213],
[-87.67592, 41.92504],
[-87.67839, 41.92502],
[-87.678393, 41.925133],
[-87.67839, 41.92502],
[-87.68468, 41.92493],
[-87.69009, 41.92487],
[-87.68998, 41.924998],
[-87.75607, 41.924252],
[-87.783853, 41.923735],
[-87.792627, 41.923735],
[-87.79502, 41.92359],
[-87.800393, 41.923533],
[-87.80199, 41.923617],
[-87.802117, 41.923735],
[-87.802053, 41.924045],
[-87.801893, 41.924117],
[-87.801577, 41.92395]
]
}
},
{
"id": "228",
"type": "Feature",
Expand Down
Loading