Merge branch 'dev' into remove-native-select

opentripplanner · Jul 20, 2023 · 7d99510 · 7d99510
2 parents efcd6ca + bf9307b
commit 7d99510
Show file tree

Hide file tree

Showing 28 changed files with 257 additions and 194 deletions.
diff --git a/__tests__/components/__snapshots__/date-time-options.js.snap b/__tests__/components/__snapshots__/date-time-options.js.snap
@@ -78,7 +78,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="12a"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -91,9 +90,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="12:00 AM"
           />
         </OverlayTrigger>
         <input
@@ -195,7 +195,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="12p"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -208,9 +207,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="12:00 PM"
           />
         </OverlayTrigger>
         <input
@@ -312,7 +312,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="133"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -325,9 +324,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="1:03 PM"
           />
         </OverlayTrigger>
         <input
@@ -429,7 +429,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="133p"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -442,9 +441,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="1:33 PM"
           />
         </OverlayTrigger>
         <input
@@ -546,7 +546,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="135p"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -559,9 +558,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="1:35 PM"
           />
         </OverlayTrigger>
         <input
@@ -663,7 +663,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="1335"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -676,9 +675,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="1:35 PM"
           />
         </OverlayTrigger>
         <input
@@ -780,7 +780,6 @@ exports[`components > form > call-taker > date time options should render 1`] =
         >
           <input
             className="datetime-slim"
-            defaultValue="12:34"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -793,9 +792,10 @@ exports[`components > form > call-taker > date time options should render 1`] =
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="12:34 PM"
           />
         </OverlayTrigger>
         <input

diff --git a/example-config.yml b/example-config.yml
@@ -177,6 +177,8 @@ geocoder:
   # This allows the location field dropdown headers to be colored based on Pelias layer
   #resultsColors:
   #  stops: "#007fae"
+  # Override the default number (3) of suggestions returned per category
+  #resultsCount: 5
 
 # example config for an ArcGIS geocoder
 # (https://developers.arcgis.com/rest/geocode/api-reference/overview-world-geocoding-service.htm)

diff --git a/i18n/en-US.yml b/i18n/en-US.yml
@@ -223,6 +223,7 @@ components:
     shortTitle: Plan Trip
   BatchSearchScreen:
     header: Plan Your Trip
+    modeSelectorLabel: Select a transit mode
   BatchSettings:
     dateTimeSettingsLabel: Date/Time Settings
     destination: destination

diff --git a/i18n/es.yml b/i18n/es.yml
@@ -169,10 +169,7 @@ components:
     tooManyPlaces: Se alcanzó el máximo de lugares intermedios
   AdvancedOptions:
     bannedRoutes: Seleccionar rutas prohibidas…
-    maxBike: Máx de bicicleta {unitsString}
-    maxWalk: Máx caminando {unitsString}
     preferredRoutes: Seleccionar rutas preferidas…
-    walkReluctance: Evasión de caminata
   AfterSignInScreen:
     mainTitle: Redirigiendo…
     message: >-
@@ -230,10 +227,8 @@ components:
     header: Planifique su viaje
   BatchSettings:
     destination: destino
-    modeSelector: Selector de modos
     origin: origen
     planTripTooltip: Planificar viaje
-    settings: Preferencias de viaje
     validationMessage: "Por favor, defina los siguientes campos para planificar un viaje: {issues}"
   BeforeSignInScreen:
     mainTitle: Iniciando sesión
@@ -328,8 +323,6 @@ components:
     timeWalking: "{time} caminando"
   MobileOptions:
     header: Configurar las opciones de búsqueda
-  ModeDropdown:
-    exclusiveMode: Solo {mode}
   NarrativeItinerariesHeader:
     changeSortDir: Cambiar la dirección de clasificación
     howToFindResults: >-
@@ -339,13 +332,18 @@ components:
       {itineraryNum, plural, one {# itinerario encontrado} other {# itinerarios
       encontrados}}
     numIssues: "{issueNum, plural, one {# problema} other {# problemas}}"
+    resultsSortedBy: >-
+      Los resultados del viaje están actualmente ordenados por {sortSelected}.
+      Para cambiar la forma en que se ordenan los resultados, utiliza el botón
+      "Ordenar resultados" que aparece a continuación.
     searching: Buscando tus opciones…
     selectArrivalTime: Hora de llegada
     selectBest: La mejor opción
     selectCost: Costo
     selectDepartureTime: Hora de salida
     selectDuration: Duración
     selectWalkTime: Tiempo de caminata
+    sortResults: Ordenar los resultados
     viewAll: Ver todas las opciones
   NavLoginButton:
     help: Ayuda
@@ -463,8 +461,8 @@ components:
       Sólo se pueden controlar los itinerarios que incluyan ride hailing y no
       los alquileres o los viajes en coche.
     saveTripText: Salvar el viaje
-    signInText: Iniciar sesión para guardar el viaje
-    signInTooltip: Por favor, inicie sesión para guardar un viaje.
+    signInText: Inicia sesión para guardar el viaje
+    signInTooltip: Por favor, inicia sesión para guardar el viaje.
   SavedTripEditor:
     editSavedTrip: Editar el viaje guardado
     saveNewTrip: Guardar un nuevo viaje
@@ -480,6 +478,8 @@ components:
     pause: Pausa
     resume: Reanudar
   SavedTripScreen:
+    itineraryLoaded: Itinerario cargado
+    itineraryLoading: Cargando el itinerario
     tooManyTrips: >
       Ya ha alcanzado el máximo de cinco viajes guardados. Por favor, elimine
       los viajes no utilizados de sus viajes guardados e inténtelo de nuevo.

diff --git a/i18n/fr.yml b/i18n/fr.yml
@@ -234,6 +234,7 @@ components:
     shortTitle: Planifier un trajet
   BatchSearchScreen:
     header: Votre trajet
+    modeSelectorLabel: Sélectionnez un mode de transport
   BatchSettings:
     dateTimeSettingsLabel: Paramètres Date/Heure
     destination: destination

diff --git a/i18n/ko.yml b/i18n/ko.yml
@@ -155,10 +155,7 @@ components:
     tooManyPlaces: 중간 경유지의 최대 수에 도달함
   AdvancedOptions:
     bannedRoutes: 금지된 경로 선택…
-    maxBike: 최대 자전거 {unitsString}
-    maxWalk: 최대 도보 {unitsString}
     preferredRoutes: 선호 경로 선택…
-    walkReluctance: 걷기 제외
   AfterSignInScreen:
     mainTitle: 경로 재설정 중...
     message: 몇 초 후에도 페이지가 로드되지 않는 경우, <redirectLink>여기를 클릭</redirectLink>하십시오.
@@ -216,7 +213,6 @@ components:
     destination: 목적지
     origin: 출발지
     planTripTooltip: 트립 계획
-    settings: 여행 설정
     validationMessage: "트립 계획을 위해 다음 필드를 정의하세요: {issues}"
   BeforeSignInScreen:
     mainTitle: 로그인 중
@@ -291,7 +287,6 @@ components:
     stops: 대중 교통 정류장
     streets: 거리
   MetroUI:
-    arriveAtTime: 도착
     fromStop: "{stop}에서부터"
     itineraryDescription: "{routes}을(를) 이용한 {time} 일정"
     leaveAt: 출발
@@ -300,8 +295,6 @@ components:
     timeWalking: "{time} 걷기"
   MobileOptions:
     header: 검색 옵션 설정
-  ModeDropdown:
-    exclusiveMode: "{mode} 전용"
   NarrativeItinerariesHeader:
     changeSortDir: 정렬 방향 변경
     itinerariesFound: "{itineraryNum} 개의 여정을 찾았습니다"

diff --git a/i18n/nb_NO.yml b/i18n/nb_NO.yml
@@ -67,7 +67,6 @@ components:
   BatchSettings:
     destination: mål
     planTripTooltip: Planlegg tur
-    settings: Turinnstillinger
   CallTakerPanel:
     advancedOptions: Avanserte innstillinger
     groupSize: "Gruppestørrelse:"
@@ -102,7 +101,6 @@ components:
   NewAccountWizard:
     createNewAccount: Opprett ny konto
     places: Legg til dine steder
-    terms: Opprett ny konto
     verify: Bekreft din e-postadresse
   PhoneNumberEditor:
     invalidPhone: Skriv inn et gyldig telefonnummer.

diff --git a/i18n/vi.yml b/i18n/vi.yml
@@ -103,7 +103,6 @@ common:
   itineraryDescriptions:
     calories: "{calories, number} calo"
     noItineraryToDisplay: Không có hành trình để hiển thị.
-    noTransitFareProvided: Không có thông tin giá vé
     relativeCo2: |
       {co2} CO₂ {isMore, select, true {nhiều} other {ít} } hơn so với xe hơi
     transfers: "{transfers, plural, =0 {} other {# chuyển}}"
@@ -165,10 +164,7 @@ components:
     tooManyPlaces: Địa điểm trung gian tối đa đạt được
   AdvancedOptions:
     bannedRoutes: Chọn các tuyến đường bị cấm…
-    maxBike: Đạp xe tối đa {unitsString}
-    maxWalk: Đi bộ tối đa {unitsString}
     preferredRoutes: Chọn các tuyến đường ưa thích…
-    walkReluctance: Tránh đi bộ
   AfterSignInScreen:
     mainTitle: Chuyển hướng...
     message: >-
@@ -224,7 +220,6 @@ components:
     destination: điểm đến
     origin: điểm xuất phát
     planTripTooltip: Lên kế hoạch cho chuyến đi
-    settings: Cài đặt chuyến đi
     validationMessage: >-
       Vui lòng xác định các khu vực sau để lên kế hoạch cho một chuyến đi:
       {issues}
@@ -313,8 +308,6 @@ components:
     timeWalking: "{time} đi bộ"
   MobileOptions:
     header: Cài đặt tùy chọn tìm kiếm
-  ModeDropdown:
-    exclusiveMode: Chỉ {mode}
   NarrativeItinerariesHeader:
     changeSortDir: Thay đổi hướng sắp xếp
     itinerariesFound: "{itineraryNum} hành trình được tìm thấy"

diff --git a/i18n/zh.yml b/i18n/zh.yml
@@ -155,10 +155,7 @@ components:
     tooManyPlaces: 已达到最多中途地点
   AdvancedOptions:
     bannedRoutes: 选择禁行路线…
-    maxBike: 最大骑自行车 {unitsString}
-    maxWalk: 最大步行 {unitsString}
     preferredRoutes: 选择首选路线…
-    walkReluctance: 避免步行
   AfterSignInScreen:
     mainTitle: 重新定向…
     message: 如果几秒钟后页面没有加载, 请 <redirectLink>点击这里</redirectLink>.
@@ -216,7 +213,6 @@ components:
     destination: 目的地
     origin: 出发地
     planTripTooltip: 计划行程
-    settings: 行程设置
     validationMessage: "请定义以下字段来计划旅行: {issues}"
   BeforeSignInScreen:
     mainTitle: 签到
@@ -300,8 +296,6 @@ components:
     timeWalking: "{time} 步行"
   MobileOptions:
     header: 设置搜索选项
-  ModeDropdown:
-    exclusiveMode: 仅 {mode}
   NarrativeItinerariesHeader:
     changeSortDir: 改变排序方向
     itinerariesFound: 发现{itineraryNum}条行程

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
@@ -609,6 +609,7 @@ export const findRoute = (params) =>
       
           patterns {
             id
+            headsign
             name
             patternGeometry {
               points

diff --git a/lib/actions/narrative.js b/lib/actions/narrative.js
@@ -12,6 +12,12 @@ export function setActiveItinerary(payload) {
     // Update URL params.
     const urlParams = coreUtils.query.getUrlParams()
     urlParams.ui_activeItinerary = payload.index
+    if (payload.index === -1 || payload.index === '-1') {
+      // Remove the ui_itineraryView param if changing to another itinerary.
+      // Note: set to undefined instead of deleting so that it merges with the other search params.
+      urlParams.ui_itineraryView = undefined
+    }
+
     dispatch(setUrlSearch(urlParams))
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -609,6 +609,7 @@ export const findRoute = (params) => @@
               patterns {
                 id
+                headsign
                 name
                 patternGeometry {
                   points
@@ Expand Down @@