Skip to content

Commit 4753fe5

Browse files
Merge pull request #463 from opentripplanner/dev
Release: October 5, 2021
2 parents 1d881bd + 71398a4 commit 4753fe5

File tree

88 files changed

+2671
-673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2671
-673
lines changed

Diff for: .github/workflows/codespell.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
- uses: codespell-project/actions-codespell@master
1313
with:
1414
check_filenames: true
15-
# The a11y test file has a false positive and the ignore list does not work
15+
# skip git, yarn, and i18n non-english resources.
16+
# Also, the a11y test file has a false positive and the ignore list does not work
1617
# see https://github.com/opentripplanner/otp-react-redux/pull/436/checks?check_run_id=3369380014
17-
skip: ./.git,yarn.lock,./a11y/a11y.test.js
18+
skip: ./.git,yarn.lock,./a11y/a11y.test.js,./i18n/fr*

Diff for: .github/workflows/node-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: Use Node.js 12.x
15+
- name: Use Node.js 14.x
1616
uses: actions/setup-node@v1
1717
with:
18-
node-version: 12.x
18+
node-version: 14.x
1919
- name: Install npm packages using cache
2020
uses: bahmutov/npm-install@v1
2121
- name: Copy example config

Diff for: __tests__/components/viewers/__snapshots__/stop-viewer.js.snap

+5-69
Large diffs are not rendered by default.

Diff for: __tests__/reducers/__snapshots__/create-otp-reducer.js.snap

+8
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Object {
9393
"rideEstimates": Object {},
9494
},
9595
"transitIndex": Object {
96+
"routes": Object {},
9697
"stops": Object {},
9798
"trips": Object {},
9899
},
@@ -102,6 +103,13 @@ Object {
102103
"localizedMessages": Object {},
103104
"mobileScreen": 1,
104105
"printView": false,
106+
"routeViewer": Object {
107+
"filter": Object {
108+
"agency": null,
109+
"mode": null,
110+
"search": "",
111+
},
112+
},
105113
},
106114
"useRealtime": true,
107115
"user": Object {

Diff for: example-config.yml

+32-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ api:
1515
# lon: -122.71607145667079
1616
# name: Oregon Zoo, Portland, OR
1717

18-
1918
### Define the strategies for how to handle auto-planning of a new trip when
2019
### different query parameters are changes in the form. The default config is
2120
### shown below, but if autoPlan is set to false, auto-plan will never occur.
@@ -30,7 +29,6 @@ api:
3029
# defaultQueryParams:
3130
# maxWalkDistance: 3219 # 2 miles in meters
3231

33-
3432
### The persistence setting is used to enable the storage of places (home, work),
3533
### recent searches/places, user overrides, and favorite stops.
3634
### Pick the strategy that best suits your needs.
@@ -60,13 +58,37 @@ persistence:
6058
# apiBaseUrl: https://otp-middleware.example.com
6159
# apiKey: your-middleware-api-key
6260

61+
### Adding additional menu items to the main menu items. Use the separator flag
62+
### to include a separator line if you have groups of menu items
63+
### If a Top level menu item contains submenu items (children) then use the 'children' flag.
64+
### Icon URL is preferable over iconType. If none are given then a 'bus' iconType is used.
65+
#App menu
66+
#extraMenuItems:
67+
# - id: link-list
68+
# label: List of Links
69+
# iconType: 'train'
70+
# iconUrl: ''
71+
# children:
72+
# - id: bus-website
73+
# # Label will be overridden by localization file and can be omitted if a localized version is present
74+
# # only one of iconType or iconUrl is needed
75+
# iconType: 'bus'
76+
# iconUrl: ''
77+
# href: ''
78+
# separator: 'true'
79+
# - id: car-website
80+
# label: Car Website
81+
# iconType: 'car'
82+
# iconUrl: ''
83+
# href: ''
84+
6385
map:
6486
initLat: 45.52
6587
initLon: -122.682
6688
baseLayers:
6789
- name: Streets
6890
url: //cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}@2x.png
69-
subdomains: 'abcd'
91+
subdomains: "abcd"
7092
attribution: 'Map tiles: &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, &copy; <a href="https://carto.com/attributions">CARTO</a>'
7193
maxZoom: 20
7294
hasRetinaSupport: true
@@ -123,6 +145,9 @@ geocoder:
123145
# This base URL is required as the libraries will default to using now-defunct
124146
# mapzen urls
125147
baseUrl: https://geocoder.example.com/pelias/v1
148+
# This allows the location field dropdown headers to be colored based on Pelias layer
149+
#resultsColors:
150+
# stops: "#007fae"
126151

127152
# example config for an ArcGIS geocoder
128153
# (https://developers.arcgis.com/rest/geocode/api-reference/overview-world-geocoding-service.htm)
@@ -294,14 +319,17 @@ itinerary:
294319
# common:
295320
# accessModes:
296321
# bikeshare: Blue Bike
322+
# . config:
323+
# menuItems:
324+
# demo-item: Demo Item
297325

298326
### Localization section to provide language/locale settings
299327
#localization:
300328
# # An ambient currency should be defined here (defaults to USD).
301329
# # In some components such as DefaultItinerary, we display a cost element
302330
# # that falls back to $0.00 (or its equivalent in the configured ambient currency
303331
# # and in the user-selected locale) if no fare or currency info is available.
304-
# currency: 'USD'
332+
# currency: 'USD'
305333
# defaultLocale: 'en-US'
306334

307335
### If using OTP Middleware, you can define the optional phone number options below.
@@ -317,7 +345,6 @@ itinerary:
317345
# Format the date time format for display.
318346
dateTime:
319347
longDateFormat: DD-MM-YYYY
320-
321348
# stopViewer:
322349
# # The max. number of departures to show for each trip pattern
323350
# # in the stop viewer Next Arrivals mode

Diff for: example.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
.sidebar {
4040
height: 100%;
41-
padding: 10px;
41+
padding: 0;
4242
box-shadow: 3px 0px 12px #00000052;
4343
z-index: 1000;
4444
}

Diff for: i18n/en-US.yml

+132-5
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,152 @@ _name: English
2222
# - In contrast, some strings are common to multiple components,
2323
# so it makes sense to group them by theme (e.g. accessModes) under the 'common' category.
2424

25-
2625
# Component-specific messages (e.g. button captions)
2726
# are defined for each component under the 'components' category.
2827
components:
28+
BatchRoutingPanel:
29+
shortTitle: Plan Trip
2930
DefaultItinerary:
3031
clickDetails: Click to view details
31-
# Use ordered placeholders for the departure-arrival string
32-
# (this will accommodate right-to-left languages by swapping the order in this string).
33-
departureArrivalTimes: "{startTime}—{endTime}"
3432
# Use ordered placeholders when multiple modes are involved
3533
# (this will accommodate right-to-left languages by swapping the order/separator in this string).
3634
multiModeSummary: "{accessMode} to {transitMode}"
3735
# If trip is less than one hour only display the minutes.
3836
tripDurationFormatZeroHours: "{minutes, number} min"
3937
# TODO: Distinguish between one hour (singular) and 2 hours or more?
4038
tripDurationFormat: "{hours, number} hr {minutes, number} min"
39+
RouteDetails:
40+
operatedBy: "Operated by {agencyName}"
41+
moreDetails: "More Details"
42+
stopsTo: "Towards"
43+
selectADirection: "Select a direction..."
44+
RouteViewer:
45+
allAgencies: All Agencies
46+
allModes: All Modes # Note to translator: This text is width-constrained.
47+
findARoute: Find A Route
48+
noFilteredRoutesFound: No routes match your filter!
49+
noRouteUrl: No route URL provided.
50+
title: Route Viewer
51+
shortTitle: View Routes
52+
agencyFilter: Agency Filter
53+
modeFilter: Mode Filter
54+
details: " " # If the string is left blank, React-Intl renders the id
55+
RouteRow:
56+
operatorLogoAltText: '{operatorName} logo'
57+
TransitVehicleOverlay:
58+
# keys designed to match API output
59+
incoming_at: "approaching {stop}"
60+
stopped_at: "doors open at {stop}"
61+
in_transit_to: "next stop {stop}"
62+
63+
vehicleName: "Vehicle {vehicleNumber}: "
64+
realtimeVehicleInfo: "<b>{vehicleNameOrBlank}</b>{relativeTime}"
65+
travelingAt: "traveling at {milesPerHour}"
66+
AppMenu:
67+
closeMenu: "Close Menu"
68+
openMenu: "Open Menu"
69+
menuItemIconAlt: "Icon for {label} menu item"
70+
callHistory: "Call History"
71+
fieldTrip: "Field Trip"
72+
mailables: "Mailables"
73+
ItinerarySummary:
74+
fareCost: "{useMaxFare, select,
75+
true {{minTotalFare} - {maxTotalFare}}
76+
other {{minTotalFare}}
77+
}"
78+
NarrativeItinerariesHeader:
79+
numIssues: "{issueNum, number} issues"
80+
resultText: "{pending, select,
81+
true {Finding your options...}
82+
other {
83+
{itineraryNum, number} {itineraryNum, plural,
84+
one {itinerary found}
85+
other {itineraries found}
86+
}
87+
}
88+
}"
89+
selectArrivalTime: Arrival time
90+
selectBest: Best option
91+
selectCost: Cost
92+
selectDepartureTime: Departure time
93+
selectDuration: Duration
94+
selectWalkTime: Walk time
95+
titleText: "{pending, select,
96+
true {Finding your options...}
97+
other {
98+
{itineraryNum, number} {itineraryNum, plural,
99+
one {itinerary}
100+
other {itineraries}}
101+
{issueNum, plural,
102+
=0 {found}
103+
one {(and {issueNum, number} issue) found}
104+
other {(and {issueNum, number} issues) found}
105+
}
106+
}
107+
}"
108+
viewAll: View all options
109+
PlanFirstLastButtons:
110+
# Note to translator: these values are width-constrained.
111+
first: First
112+
last: Last
113+
next: Next
114+
previous: Previous
115+
RealtimeAnnotation:
116+
ignoreServiceDelays: Apply service delays
117+
delaysNotShownInResults: "Your trip results are currently being affected by service delays.
118+
These delays do not factor into travel times shown below."
119+
delaysShownInResults: "Your trip results have been adjusted based on real-time
120+
information. Under normal conditions, this trip would take {normalDuration}
121+
using the following routes: {routes}."
122+
ignoreServiceDelays: Ignore service delays
123+
serviceUpdate: Service update
124+
SaveTripButton:
125+
cantSaveText: Cannot save
126+
cantSaveTooltip: Only itineraries that include transit and no rentals or ride hailing can be monitored.
127+
saveTripText: Save trip
128+
signInText: Sign in to save trip
129+
signInTooltip: Please sign in to save trip.
130+
SimpleRealtimeAnnotation:
131+
usingRealtimeInfo: This trip uses real-time traffic and delay information
132+
TabbedItineraries:
133+
optionNumber: "Option {optionNum, number}"
134+
fareCost: "{hasMaxFare, select,
135+
true {{minTotalFare}+}
136+
other {{minTotalFare}}
137+
}"
138+
TripTools:
139+
# Note to translator: copyLink, linkCopied, print, reportIssue,
140+
# and startOver are width-constrained.
141+
copyLink: Copy link
142+
# Text that replaces the copyLink button text after user clicks it.
143+
linkCopied: Copied
144+
print: Print
145+
reportIssue: Report Issue
146+
reportEmailSubject: Reporting an Issue with OpenTripPlanner
147+
reportEmailTemplate: " *** INSTRUCTIONS TO USER ***
148+
This feature allows you to email a report to site administrators for review.
149+
Please add any additional feedback for this trip under the 'Additional Comments'
150+
section below and send using your regular email program."
41151

42152
# Common messages that appear in multiple components and modules
43153
# are grouped below by topic.
44154
common:
155+
# Standard navigation
156+
navigation:
157+
back: Back
158+
startOver: Start Over
45159
# OTP access modes
46160
accessModes:
47161
bike: Bike
48162
bikeshare: Bikeshare
49163
drive: Drive
50164
micromobility: E-Scooter
51165
micromobilityRent: Rental E-Scooter
52-
walk: Walk
166+
walk: Walk
167+
168+
itineraryDescriptions:
169+
calories: "{calories, number} Cal"
170+
transfers: "{transfers, plural, =0 {} one {{transfers} transfer} other {{transfers} transfers}}"
53171

54172
# OTP transit modes
55173
# Note that identifiers are OTP modes converted to lowercase.
@@ -63,3 +181,12 @@ common:
63181
cable_car: Cable Car
64182
gondola: Gondola
65183
funicular: Funicular
184+
185+
time:
186+
# Use ordered placeholders for the departure-arrival string
187+
# (this will accommodate right-to-left languages by swapping the order in this string).
188+
departureArrivalTimes: "{startTime, time, short}—{endTime, time, short}"
189+
tripDurationFormat: "{hours, plural,
190+
=0 {{minutes, number} min}
191+
other {{hours, number} hr {minutes, number} min}}"
192+

0 commit comments

Comments
 (0)