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

Nearby view support #655

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cef0cc2
feat(types): Add "stop" to Place type
daniel-heppner-ibigroup Aug 11, 2023
4857a56
feat(types): add otp2 types to stop type
daniel-heppner-ibigroup Aug 11, 2023
e85f08d
feat(itinerary-body): add full stop data to view stop button return
daniel-heppner-ibigroup Aug 11, 2023
fc1a706
fix(core-utils): add more data to stop object
daniel-heppner-ibigroup Aug 11, 2023
e58cf71
fix(map-popup): setViewedStop passes whole stop
daniel-heppner-ibigroup Aug 15, 2023
38aefe6
fix(otp2-tile-overlay): use new stop callback
daniel-heppner-ibigroup Aug 15, 2023
eb9b041
fix(stops-overlay): use new stop callback
daniel-heppner-ibigroup Aug 15, 2023
016f1d4
Merge branch 'master' into nearby-view-support
daniel-heppner-ibigroup Sep 13, 2023
97deeb8
Merge branch 'master' into nearby-view-support
daniel-heppner-ibigroup Sep 28, 2023
f52f435
fix: use alpha versions
daniel-heppner-ibigroup Sep 28, 2023
a4483f6
feat(stops-overlay): add highlighted stop support
daniel-heppner-ibigroup Oct 24, 2023
52cdc89
fix(stops-overlay): add support for custom highlight color
daniel-heppner-ibigroup Oct 25, 2023
b500a49
fix(stops-overlay): fix memoization on highlighted stop
daniel-heppner-ibigroup Oct 24, 2023
d3a51f5
Merge branch 'master' into nearby-view-support
daniel-heppner-ibigroup Nov 3, 2023
694575d
deps: update internal dependencies
daniel-heppner-ibigroup Nov 13, 2023
1354178
Merge branch 'master' into nearby-view-support
daniel-heppner-ibigroup Nov 13, 2023
d2ffb77
revert unneeded change to graphql query
daniel-heppner-ibigroup Nov 16, 2023
16b1e65
fix duplicate id in types
daniel-heppner-ibigroup Nov 16, 2023
7a178de
use new stopeventhandler
daniel-heppner-ibigroup Nov 16, 2023
8b59a21
add stopId to prevent breaking change
daniel-heppner-ibigroup Nov 16, 2023
bf4da86
fix(map-popup): use StopEventHandler
daniel-heppner-ibigroup Nov 16, 2023
f40bd02
fix(otp2-tile-overlay): use StopEventHandler
daniel-heppner-ibigroup Nov 16, 2023
e6fb544
fix(stops-overlay): use StopEventHandler type
daniel-heppner-ibigroup Nov 16, 2023
ff5b3db
deps: update internal dependencies
daniel-heppner-ibigroup Nov 18, 2023
b2cdbbf
deps: move deps into devdeps
daniel-heppner-ibigroup Nov 18, 2023
b6fa7aa
revert breaking change in itinerary body
daniel-heppner-ibigroup Nov 18, 2023
27ff939
sort props
daniel-heppner-ibigroup Nov 18, 2023
a710085
feat(map-popup): pass the whole Stop object on stop click
daniel-heppner-ibigroup Nov 20, 2023
8ba60ef
simplify types
daniel-heppner-ibigroup Nov 21, 2023
99213e1
Merge branch 'master' into nearby-view-support
daniel-heppner-ibigroup Nov 27, 2023
edbdc5d
deps: update internal dependencies
daniel-heppner-ibigroup Nov 27, 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
2 changes: 1 addition & 1 deletion packages/base-map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"react-map-gl": "^7.0.15"
},
"peerDependencies": {
"@opentripplanner/types": "^6.1.0",
"@opentripplanner/types": "^6.2.1",
"react": "^16.14.0",
"styled-components": "^5.3.0"
},
Expand Down
1 change: 1 addition & 0 deletions packages/building-blocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"module": "esm/index.js",
"private": false,
"devDependencies": {
"@opentripplanner/types": "^6.2.1",
"@opentripplanner/core-utils": "^11.1.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@conveyal/lonlat": "^1.4.1",
"@mapbox/polyline": "^1.1.0",
"@opentripplanner/geocoder": "^1.4.2",
"@opentripplanner/geocoder": "^2.0.0",
"@styled-icons/foundation": "^10.34.0",
"@turf/along": "^6.0.1",
"chroma-js": "^2.4.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/endpoints-overlay/i18n/tr.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
otpUi:
EndpointsOverlay:
forgetWork: İşi unut
swapLocation: '{locationType} konumuna değiştir'
saveAsWork: İşi Kaydet
clearLocation: "{locationType} konumu olarak kaldır"
coordinates: "{lat, number, ::.00000}, {lon, number, ::.00000}"
forgetHome: Evi unut
coordinates: '{lat, number, ::.00000}, {lon, number, ::.00000}'
clearLocation: '{locationType} konumu olarak kaldır'
forgetWork: İşi unut
saveAsHome: Evi kaydet
saveAsWork: İşi Kaydet
swapLocation: "{locationType} konumuna değiştir"
6 changes: 3 additions & 3 deletions packages/endpoints-overlay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
"url": "https://github.com/opentripplanner/otp-ui/issues"
},
"dependencies": {
"@opentripplanner/base-map": "^3.0.14",
"@opentripplanner/base-map": "^3.0.15",
"@opentripplanner/location-icon": "^1.4.1",
"@opentripplanner/core-utils": "^11.0.2",
"@opentripplanner/core-utils": "^11.1.3",
"flat": "^5.0.2",
"@styled-icons/fa-solid": "^10.34.0"
},
"devDependencies": {
"@opentripplanner/types": "^6.2.1",
"@types/flat": "^5.0.2"
},
"peerDependencies": {
"@opentripplanner/types": "^6.1.0",
"react": "^16.14.0",
"react-dom": "^16.8.6",
"react-intl": "^5.24.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/from-to-location-picker/i18n/tr.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
otpUi:
FromToLocationPicker:
planATrip: 'Bir yolculuk planla:'
from: Buradan
planATrip: "Bir yolculuk planla:"
to: Buraya
2 changes: 1 addition & 1 deletion packages/from-to-location-picker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"flat": "^5.0.2"
},
"devDependencies": {
"@opentripplanner/types": "^6.1.0"
"@opentripplanner/types": "^6.2.1"
},
"peerDependencies": {
"react": "^16.14.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "MIT",
"private": false,
"dependencies": {
"@opentripplanner/core-utils": "^11.0.2",
"@opentripplanner/core-utils": "^11.1.3",
"prop-types": "^15.7.2"
},
"peerDependencies": {
Expand Down
70 changes: 35 additions & 35 deletions packages/itinerary-body/i18n/ko.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,44 @@
otpUi:
AccessLegBody:
LegDiagramPreview:
elevationChart: 고도 차트
noElevationData: 사용 가능한 고도 데이터가 없습니다.
toggleElevationChart: 고도 차트 토글
RentedVehicleSubheader:
pickupRental: "{company} {vehicleType} {vehicleName} 픽업"
resumeRentalRide: 대여 서비스 이용 계속하기
vehicleType:
vehicle: 차량
bike: 자전거
bikeshare: 자전거
car: 자동차
escooter: 전기 스쿠터
vehicle: 차량
walkVehicle: "{place}을(를) 따라 차량을 움직이기"
LegDiagramPreview:
elevationChart: 고도 차트
noElevationData: 사용 가능한 고도 데이터가 없습니다.
toggleElevationChart: 고도 차트 토글
TncLeg:
bookRide: 승차 예약
bookRideLater: 예약하려면 {timeMillis, time, short}까지 대기
estimatedCost: "예상 비용: {minFare} - {maxFare}"
estimatedTravelTime: "예상 이동 시간: {duration} (교통사정을 고려하지 않음)"
waitForPickup: "{company} 승차까지 {minutes, plural, =0 {} other { # 분} } 대기"
mapillaryTooltip: 이 위치의 거리 이미지 보기
step:
circleClockwise: 시계 방향으로 원을 따라갑니다
circleCounterClockwise: 시계 반대 방향으로 서클을 따르십시오
continue: 계속
enterStation: 역 입력
exitStation: 역 나가기
hardLeft: 날카로운 왼쪽
hardRight: 날카로운 권리
left: 왼쪽
right: 오른
slightlyLeft: 약간 왼쪽
slightlyRight: 약간 오른쪽
uTurnLeft: 유턴
uTurnRight: 유턴
continue: 계속
circleCounterClockwise: 시계 반대 방향으로 서클을 따르십시오
left: 왼쪽
slightlyRight: 약간 오른쪽
enterStation: 역 입력
exitStation: 역 나가기
stepDepart: "{street} 에서 {heading}으로 향하다"
stepElevator: 엘리베이터를 타고 {street} 이동
stepFollowSigns: "다음까지 표지판을 따라가십시오: {street}"
stepGeneric: "{street} 에 {step}"
stepHeading:
east: 동쪽
north: 북쪽
Expand All @@ -37,43 +48,31 @@ otpUi:
southeast: 남동쪽
southwest: 남서쪽
west: 서쪽
stepGeneric: "{street} 에 {step}"
stepStation: "{step} 에서 {street}"
summary: "{place} 에 {mode}"
summaryAndDistance: "{place} 에 {mode} {distance}"
summaryMode:
bike: 자전거
bikeshare: 공유자전거
carDrive: 운전
walk: 걷기
bike: 자전거
carHail: 타다
escooter: 타다
TncLeg:
bookRide: 승차 예약
bookRideLater: 예약하려면 {timeMillis, time, short}까지 대기
estimatedCost: "예상 비용: {minFare} - {maxFare}"
estimatedTravelTime: "예상 이동 시간: {duration} (교통사정을 고려하지 않음)"
waitForPickup: "{company} 승차까지 {minutes, plural, =0 {} other { # 분} } 대기"
walk: 걷기
unnamedPath: 이름 없는 경로
unnamedRoad: 이름 없는 길
vehicleTitle: "{company} {vehicleType}"
vehicleType:
vehicle: 차량
bike: 자전거
bikeshare: 자전거
car: 자동차
escooter: 전기 스쿠터
unnamedRoad: 이름 없는 길
vehicleTitle: "{company} {vehicleType}"
stepDepart: "{street} 에서 {heading}으로 향하다"
stepElevator: 엘리베이터를 타고 {street} 이동
summaryAndDistance: "{place} 에 {mode} {distance}"
mapillaryTooltip: 이 위치의 거리 이미지 보기
summary: "{place} 에 {mode}"
stepFollowSigns: '다음까지 표지판을 따라가십시오: {street}'
stepStation: '{step} 에서 {street}'
vehicle: 차량
ItineraryBody:
common:
durationShort: "{hours, plural, =0 {} other {# 시간 }}{minutes} 분"
flexAdvanceNotice: " 최소 {leadDays}일 전에"
flexCallAhead: 미리 전화
flexCallNumber: "{phoneNumber}에 전화"
viewOnMap: 지도 보기
flexPickupMessage: 이 경로를 이용하려면 {advanceNotice}{action}야 합니다.
stayOnBoard: "{place}에서는 그대로 타고 계십시오"
travelBy: "{mode} 여행하다"
Expand All @@ -82,22 +81,23 @@ otpUi:
car: 차로
escooter: 전자 스쿠터로
walk: 걸어서
viewOnMap: 지도 보기
TransitLegBody:
agencyExternalLink: "{agencyName} (외부 링크)"
AlertsBody:
effectiveDate: "{dateTime, date, long}자로 유효"
effectiveTimeAndDate: "{day} {dateTime, time, short}자로 유효"
today: 오늘
tomorrow: 내일
yesterday: 어제
effectiveDate: "{dateTime, date, long}자로 유효"
effectiveTimeAndDate: "{day} {dateTime, time, short}자로 유효"
agencyExternalLink: "{agencyName} (외부 링크)"
alertsHeader: "{alertCount}개의 알림"
arriveAt: "{place} 시장에 도착하다"
disembarkAt: "{legDestination} 에서 하차"
expandDetails: (세부정보 펼치기)
fare: "운임: {fare}"
fromLocation: "{location}에서"
legDetails: 다리 세부 사항
operatedBy: '{agencyLink}에서 운영하는 서비스'
operatedBy: "{agencyLink}에서 운영하는 서비스"
ride: 타다
rideDurationAndStops: "승차 {duration}{numStops, plural, =1 {} other { / # 정거장}}"
routeDescription: "{routeName} <toPrefix>에</toPrefix> {headsign}"
Expand Down
Loading
Loading