Skip to content

Commit 90c2eb9

Browse files
committed
fix: change E-scooter wording
Fixes ibi-group/trimet-mod-otp#246
1 parent 016275a commit 90c2eb9

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

Diff for: lib/components/form/settings-selector-panel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ class SettingsSelectorPanel extends Component {
326326
icons={icons}
327327
mode={'MICROMOBILITY'}
328328
height={36}
329-
label={'eScooter Only'}
329+
label={'E-scooter Only'}
330330
inlineLabel
331331
onClick={this._setMicromobilityOnly}
332332
/>

Diff for: lib/components/map/vehicle-rental-overlay.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class VehicleRentalOverlay extends MapLayer {
6868
} else if (station.isFloatingCar) {
6969
stationName = `${stationNetworks} ${stationName}`
7070
} else if (station.isFloatingVehicle) {
71-
// assumes that all floating vehicles are eScooters
71+
// assumes that all floating vehicles are E-scooters
7272
stationName = `${stationNetworks} E-scooter`
7373
} else {
7474
stationIsHub = true

Diff for: lib/components/narrative/line-itin/place-row.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class RentedVehicleLeg extends PureComponent {
176176
let vehicleName = ''
177177
// TODO allow more flexibility in customizing these mode strings
178178
let modeString = leg.rentedVehicle
179-
? 'eScooter'
179+
? 'E-scooter'
180180
: leg.rentedBike
181181
? 'bike'
182182
: 'car'
@@ -192,7 +192,7 @@ class RentedVehicleLeg extends PureComponent {
192192
configCompanies
193193
)
194194
rentalDescription += ` ${companiesLabel}`
195-
// Only show vehicle name for car rentals. For bikes and eScooters, these
195+
// Only show vehicle name for car rentals. For bikes and E-scooters, these
196196
// IDs/names tend to be less relevant (or entirely useless) in this context.
197197
if (leg.rentedCar && leg.from.name) {
198198
vehicleName = leg.from.name
@@ -205,7 +205,7 @@ class RentedVehicleLeg extends PureComponent {
205205
rentalDescription += ` ${modeString} ${vehicleName}`
206206
}
207207
// e.g., Pick up REACHNOW rented car XYZNDB OR
208-
// Pick up SPIN eScooter
208+
// Pick up SPIN E-scooter
209209
// Pick up shared bike
210210
return (
211211
<div className='place-subheader'>

Diff for: lib/components/narrative/printable/printable-itinerary.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class AccessLeg extends Component {
156156
leg.from.networks,
157157
configCompanies
158158
)
159-
legModeLabel = `Ride ${companiesLabel} eScooter`
159+
legModeLabel = `Ride ${companiesLabel} E-scooter`
160160
}
161161

162162
return (

Diff for: lib/util/itinerary.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ export function getModeForPlace (place) {
441441
case 'CARSHARE':
442442
return 'car'
443443
case 'VEHICLERENTAL':
444-
return 'eScooter'
444+
return 'E-scooter'
445445
// TODO: Should the type change depending on bike vertex type?
446446
case 'BIKESHARE':
447447
case 'BIKEPARK':
@@ -457,7 +457,7 @@ export function getPlaceName (place, companies) {
457457
if (place.address) return place.address.split(',')[0]
458458
if (place.networks && place.vertexType === 'VEHICLERENTAL') {
459459
// For vehicle rental pick up, do not use the place name. Rather, use
460-
// company name + vehicle type (e.g., SPIN eScooter). Place name is often just
460+
// company name + vehicle type (e.g., SPIN E-scooter). Place name is often just
461461
// a UUID that has no relevance to the actual vehicle. For bikeshare, however,
462462
// there are often hubs or bikes that have relevant names to the user.
463463
const company = getCompanyForNetwork(place.networks[0], companies)

Diff for: lib/util/query-params.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ const queryParams = [
388388
},
389389

390390
{ /* maxEScooterDistance - the maximum distance in meters the user will ride
391-
* an eScooter. Not actually an OTP parameter (maxWalkDistance doubles for
391+
* an E-scooter. Not actually an OTP parameter (maxWalkDistance doubles for
392392
* any non-transit mode except for car) but we store it separately
393393
* internally in order to allow different default values, options, etc.
394394
* Translated to 'maxWalkDistance' via the rewrite function.
@@ -398,7 +398,7 @@ const queryParams = [
398398
applicable: query => query.mode && hasTransit(query.mode) && hasMicromobility(query.mode),
399399
default: 4828, // 3 mi.
400400
selector: 'DROPDOWN',
401-
label: 'Maximum eScooter Distance',
401+
label: 'Maximum E-scooter Distance',
402402
options: [
403403
{
404404
text: '1/4 mile',
@@ -444,9 +444,9 @@ const queryParams = [
444444
routingTypes: [ 'ITINERARY', 'PROFILE' ],
445445
default: 250,
446446
selector: 'DROPDOWN',
447-
label: 'eScooter Power',
448-
// this configuration should only be allowed for personal eScooters as these
449-
// settings will be defined by the vehicle type of an eScooter being rented
447+
label: 'E-scooter Power',
448+
// this configuration should only be allowed for personal E-scooters as these
449+
// settings will be defined by the vehicle type of an E-scooter being rented
450450
applicable: query => (
451451
query.mode &&
452452
query.mode.indexOf('MICROMOBILITY') !== -1 &&
@@ -460,10 +460,10 @@ const queryParams = [
460460
text: 'Entry-level scooter (11mph)',
461461
value: 250
462462
}, {
463-
text: 'Robust eScooter (18mph)',
463+
text: 'Robust E-scooter (18mph)',
464464
value: 500
465465
}, {
466-
text: 'Powerful eScooter (24mph)',
466+
text: 'Powerful E-scooter (24mph)',
467467
value: 1500
468468
}
469469
],

0 commit comments

Comments
 (0)