feat: sort dining locations by distance (IN PROGRESS) #722
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| .sort-container { | ||
| display: flex; | ||
| align-items: center; | ||
| gap: 0.5rem; | ||
| } | ||
|
|
||
| .sort-label { | ||
| color: var(--text-primary); | ||
| font-family: var(--text-primary-font); | ||
| font-weight: 500; | ||
| font-size: 1rem; | ||
| white-space: nowrap; | ||
| } | ||
|
|
||
| @media screen and (min-width: 900px) { | ||
| .sort-label { | ||
| font-size: 1.2rem; | ||
| } | ||
| } | ||
|
|
||
| .sort-select { | ||
| width: 180px; | ||
| min-width: 0; | ||
| } | ||
|
|
||
| .Locations-header__filters .select:not(.sort-select) { | ||
| width: 220px; | ||
| } | ||
|
|
||
| @media screen and (min-width: 900px) { | ||
| .Locations-header__filters .select:not(.sort-select) { | ||
| width: 440px; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| import { useEffect } from 'react'; | ||
| import './SortBy.css'; | ||
| import { getUserToDestinationPath } from '../util/cmuMapsApi'; | ||
| import { IReadOnlyLocation_FromAPI_PostProcessed } from '../types/locationTypes'; | ||
|
|
||
| interface SortByProps { | ||
| setSortBy: (sortBy: string) => void; | ||
| sortBy: string; | ||
| locations?: IReadOnlyLocation_FromAPI_PostProcessed[]; | ||
| onLocationDistancesCalculated?: (distances: Map<number, number>) => void; | ||
| } | ||
|
|
||
| function SortBy({ setSortBy, sortBy, locations, onLocationDistancesCalculated }: SortByProps) { | ||
| useEffect(() => { | ||
| if (sortBy === 'location' && locations && onLocationDistancesCalculated) { | ||
| if ('geolocation' in navigator) { | ||
| navigator.geolocation.getCurrentPosition( | ||
| async (position) => { | ||
| const { latitude, longitude } = position.coords; | ||
| const distances = new Map<number, number>(); | ||
|
|
||
| const stackUnderground = locations.find((loc) => loc.name === "Stack'd Underground"); | ||
| const exchange = locations.find((loc) => loc.name === 'The Exchange'); | ||
| const tasteOfIndia = locations.find((loc) => loc.name === 'Taste Of India'); | ||
| const tepperTaqueria = locations.find((loc) => loc.name === 'Tepper Taqueria'); | ||
| const tahini = locations.find((loc) => loc.name === 'Tahini'); | ||
|
|
||
| const modifiedLocations = locations.map((location) => { | ||
| if (location.name === "Stack'd Dessert Bar" && stackUnderground?.coordinates) { | ||
| return { | ||
| ...location, | ||
| coordinates: stackUnderground.coordinates, | ||
| }; | ||
| } | ||
| if (location.name === 'Zebra Lounge' && exchange?.coordinates) { | ||
| return { | ||
| ...location, | ||
| coordinates: exchange.coordinates, | ||
| }; | ||
| } | ||
| if (location.name === 'Sweet Plantain' && tasteOfIndia?.coordinates) { | ||
| return { | ||
| ...location, | ||
| coordinates: tasteOfIndia.coordinates, | ||
| }; | ||
| } | ||
| if (location.name === "De Fer Coffee & Tea At Resnik" && tasteOfIndia?.coordinates) { | ||
| return { | ||
| ...location, | ||
| coordinates: tasteOfIndia.coordinates, | ||
| }; | ||
| } | ||
| if (location.name === 'E.a.t. (evenings At Tepper) - Rohr Commons' && tepperTaqueria?.coordinates) { | ||
| return { | ||
| ...location, | ||
| coordinates: tepperTaqueria.coordinates, | ||
| }; | ||
| } | ||
| if (location.name === 'Fire And Stone' && tahini?.coordinates) { | ||
| return { | ||
| ...location, | ||
| coordinates: tahini.coordinates, | ||
| }; | ||
| } | ||
| return location; | ||
| }); | ||
|
|
||
| const pathPromises = modifiedLocations | ||
| .filter((location) => location.coordinates) | ||
| .map(async (location) => { | ||
| try { | ||
| const pathData = await getUserToDestinationPath( | ||
| latitude, | ||
| longitude, | ||
| location.coordinates!.lat, | ||
| location.coordinates!.lng, | ||
| ); | ||
|
|
||
| if (pathData) { | ||
| return { | ||
| conceptId: location.conceptId, | ||
| distance: pathData.Fastest.path.distance, | ||
| }; | ||
| } | ||
| return null; | ||
| } catch (error) { | ||
| return null; | ||
| } | ||
| }); | ||
|
|
||
| const pathResults = await Promise.all(pathPromises); | ||
| pathResults.forEach((result) => { | ||
| if (result) { | ||
| distances.set(result.conceptId, result.distance); | ||
| } | ||
| }); | ||
|
|
||
| onLocationDistancesCalculated(distances); | ||
| }, | ||
| () => { | ||
| // Silently handle geolocation errors | ||
| }, | ||
| ); | ||
| } | ||
| } | ||
| }, [sortBy, locations, onLocationDistancesCalculated]); | ||
|
|
||
| return ( | ||
| <div className="sort-container"> | ||
| <span className="sort-label">Sort by:</span> | ||
| <select onChange={(e) => setSortBy(e.target.value)} value={sortBy} className="select sort-select"> | ||
| <option value="closing-time">Closing time</option> | ||
| <option value="location">Location</option> | ||
| </select> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default SortBy; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are these coordinate overwrites here because cmumaps can't accept the non-ovewritten coordinates?