refactor: create MapContent component #743
There are no files selected for viewing
This file contains 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,94 @@ | ||
| import { Marker, Polyline, Popup, TileLayer } from 'react-leaflet' | ||
| import { Icon, IconOptions } from 'leaflet' | ||
| import { useAgencyList } from 'src/api/agencyList' | ||
| import { busIcon, busIconPath } from '../utils/BusIcon' | ||
| import { BusToolTip } from './MapLayers/BusToolTip' | ||
| import { t } from 'i18next' | ||
| import '../../Map.scss' | ||
| import { MapProps } from './MapWithLocationsAndPath' | ||
| import { useRecenterOnDataChange } from './useRecenterOnDataChange' | ||
| import { MapIndex } from './MapIndex' | ||
|
|
||
| export function MapContent({ positions, plannedRouteStops }: MapProps) { | ||
| useRecenterOnDataChange({ positions, plannedRouteStops }) | ||
|
|
||
| const agencyList = useAgencyList() | ||
|
|
||
| const getIcon = (path: string, width: number = 10, height: number = 10): Icon<IconOptions> => { | ||
| return new Icon<IconOptions>({ | ||
| iconUrl: path, | ||
| iconSize: [width, height], | ||
| }) | ||
| } | ||
| // configs for planned & actual routes - line color & marker icon | ||
| const actualRouteStopMarkerPath = '/marker-dot.png' | ||
| const plannedRouteStopMarkerPath = '/marker-bus-stop.png' | ||
| const actualRouteLineColor = 'orange' | ||
| const plannedRouteLineColor = 'black' | ||
| const actualRouteStopMarker = getIcon(actualRouteStopMarkerPath, 20, 20) | ||
| const plannedRouteStopMarker = getIcon(plannedRouteStopMarkerPath, 20, 25) | ||
|
|
||
| return ( | ||
| <> | ||
| <TileLayer | ||
| attribution='© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors' | ||
| url="https://tile-a.openstreetmap.fr/hot/{z}/{x}/{y}.png" | ||
| /> | ||
| <div className="map-index"> | ||
| <MapIndex | ||
| lineColor={actualRouteLineColor} | ||
| imgSrc={actualRouteStopMarkerPath} | ||
| title={t('actualRoute')} | ||
| /> | ||
| <MapIndex | ||
| lineColor={plannedRouteLineColor} | ||
| imgSrc={plannedRouteStopMarkerPath} | ||
| title={t('plannedRoute')} | ||
| /> | ||
| </div> | ||
| {positions.map((pos, i) => { | ||
| const icon = | ||
| i === 0 | ||
| ? busIcon({ | ||
| operator_id: pos.operator?.toString() || 'default', | ||
| name: agencyList.find((agency) => agency.operator_ref === pos.operator) | ||
| ?.agency_name, | ||
| }) | ||
| : actualRouteStopMarker | ||
| return ( | ||
| <Marker position={pos.loc} icon={icon} key={i}> | ||
| <Popup minWidth={300} maxWidth={700}> | ||
| <BusToolTip position={pos} icon={busIconPath(pos.operator!)} /> | ||
| </Popup> | ||
| </Marker> | ||
| ) | ||
| })} | ||
|
|
||
| {plannedRouteStops?.length && ( | ||
| <Polyline | ||
| pathOptions={{ color: plannedRouteLineColor }} | ||
| positions={plannedRouteStops.map((stop) => [ | ||
| stop.location.latitude, | ||
| stop.location.longitude, | ||
| ])} | ||
| /> | ||
| )} | ||
| {plannedRouteStops?.length && | ||
| plannedRouteStops.map((stop) => { | ||
| const { latitude, longitude } = stop.location | ||
| return ( | ||
| <Marker | ||
| key={'' + latitude + longitude} | ||
| position={[latitude, longitude]} | ||
| icon={plannedRouteStopMarker}></Marker> | ||
| ) | ||
| })} | ||
| {positions.length && ( | ||
| <Polyline | ||
| pathOptions={{ color: actualRouteLineColor }} | ||
| positions={positions.map((position) => position.loc)} | ||
| /> | ||
| )} | ||
| </> | ||
| ) | ||
| } |
This file contains 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,23 @@ | ||
| export function MapIndex({ | ||
| lineColor, | ||
| imgSrc, | ||
| title, | ||
| }: { | ||
| lineColor: string | ||
| imgSrc: string | ||
| title: string | ||
| }) { | ||
| return ( | ||
| <div className="map-index-item"> | ||
| <div className="map-index-item-config"> | ||
| <p className="map-index-item-line" style={{ backgroundColor: lineColor }}></p> | ||
| <p className="map-index-item-icon" style={{ backgroundImage: `url(${imgSrc})` }}> | ||
| {/* <img src={imgSrc} alt="planned route stop icon" /> */} | ||
| </p> | ||
| </div> | ||
| <div className="map-index-item-title"> | ||
| <h3>{title}</h3> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } |
This file contains 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 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,28 @@ | ||
| import { useEffect } from 'react' | ||
| import { LatLngTuple } from 'leaflet' | ||
| import { useMap } from 'react-leaflet' | ||
| import { MapProps, position } from './MapWithLocationsAndPath' | ||
|
|
||
| export function useRecenterOnDataChange({ positions, plannedRouteStops }: MapProps) { | ||
| const map = useMap() | ||
| const positionsSum = positions.reduce( | ||
| (acc, { loc }) => [acc[0] + loc[0], acc[1] + loc[1]], | ||
| [0, 0], | ||
| ) | ||
| const mean: LatLngTuple = [ | ||
| positionsSum[0] / positions.length || position.loc[0], | ||
| positionsSum[1] / positions.length || position.loc[1], | ||
NoamGaash marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ] | ||
| useEffect(() => { | ||
| // const positionsSum = positions.reduce( | ||
| // (acc, { loc }) => [acc[0] + loc[0], acc[1] + loc[1]], | ||
| // [0, 0], | ||
| // ) | ||
| // const mean: LatLngTuple = [ | ||
| // positionsSum[0] / positions.length || position.loc[0], | ||
| // positionsSum[1] / positions.length || position.loc[1], | ||
| // ] | ||
|
There was a problem hiding this comment. great! let's just remove the comments |
||
|
|
||
| map.setView(mean, map.getZoom(), { animate: true }) | ||
| }, [positions, plannedRouteStops]) | ||
NoamGaash marked this conversation as resolved.
Show resolved
Hide resolved
NoamGaash marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
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.
this cause a circular dependency error -