Merge branch 'master' into param-agnostic-querygen

opentripplanner · Oct 10, 2024 · b67fe48 · b67fe48
2 parents 23622fe + 344a847
commit b67fe48
Show file tree

Hide file tree

Showing 44 changed files with 4,870 additions and 1,103 deletions.
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -27,7 +27,7 @@ module.exports = {
 
   stories: [
     "../packages/**/*.story.mdx",
-    "../packages/**/*.story.@(js|jsx|ts|tsx)"
+    "../packages/*/src/**/*.story.@(js|jsx|ts|tsx)"
   ],
   staticDirs: ['../public'],
 

diff --git a/.storybook/react-intl.ts b/.storybook/react-intl.ts
@@ -27,22 +27,25 @@ const messages = {};
 
 // Populate messages if not running snapshots.
 // (Message printouts would be unnecessary replicated in snapshots without that check.)
-packages.forEach((pkg) => {
-  locales.forEach((locale) => {
-    // Chinese-simplified is assigned a special file name by Weblate.
-    const localeFile = locale === "zh" ? "zh_Hans" : locale;
-    try {
-      messages[locale] = {
-        ...messages[locale],
-        ...flatten(require(`../packages/${pkg}/i18n/${localeFile}.yml`).default)
-      };
-    } catch (e) {
-      // There is no yml files for the "unknown" locale,
-      // so it should fail, and we won't display an error message in that case.
-      if (locale !== "unknown") console.error(e);
-    }    
+if (typeof window !== "undefined") {
+
+  packages.forEach((pkg) => {
+    locales.forEach((locale) => {
+      // Chinese-simplified is assigned a special file name by Weblate.
+      const localeFile = locale === "zh" ? "zh_Hans" : locale;
+      try {
+        messages[locale] = {
+          ...messages[locale],
+          ...flatten(require(`../packages/${pkg}/i18n/${localeFile}.yml`).default)
+        };
+      } catch (e) {
+        // There is no yml files for the "unknown" locale,
+        // so it should fail, and we won't display an error message in that case.
+        if (locale !== "unknown") console.error(e);
+      }    
+    });
   });
-});
+}
 
 // TODO: place any applicable (date, time, etc) format parameters here.
 const formats = {};

diff --git a/packages/base-map/package.json b/packages/base-map/package.json
@@ -12,7 +12,7 @@
     "mapbox-gl": "npm:[email protected]",
     "maplibre-gl": "^2.1.9",
     "react-map-gl": "^7.0.15",
-    "@opentripplanner/building-blocks": "^1.2.2"
+    "@opentripplanner/building-blocks": "^2.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",

diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json
@@ -10,7 +10,7 @@
   "private": false,
   "devDependencies": {
     "@opentripplanner/types": "^6.5.2",
-    "@opentripplanner/core-utils": "^11.4.4"
+    "@opentripplanner/core-utils": "^12.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",

diff --git a/packages/endpoints-overlay/package.json b/packages/endpoints-overlay/package.json
@@ -19,12 +19,12 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
+    "@opentripplanner/base-map": "^4.0.0",
     "@opentripplanner/location-icon": "^1.4.1",
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "^12.0.0",
     "flat": "^5.0.2",
     "@styled-icons/fa-solid": "^10.34.0",
-    "@opentripplanner/building-blocks": "^1.2.2"
+    "@opentripplanner/building-blocks": "^2.0.0"
   },
   "devDependencies": {
     "@opentripplanner/types": "^6.5.2",

diff --git a/packages/icons/package.json b/packages/icons/package.json
@@ -10,7 +10,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "^12.0.0",
     "prop-types": "^15.7.2"
   },
   "peerDependencies": {

diff --git a/packages/itinerary-body/i18n/en-US.yml b/packages/itinerary-body/i18n/en-US.yml
@@ -58,6 +58,7 @@ otpUi:
       carHail: Ride
       escooter: Ride
       walk: Walk
+    transfer: Transfer{duration, select, undefined {} other {, wait {duration}}}
     unnamedPath: Unnamed Path
     unnamedRoad: Unnamed Road
     vehicleTitle: "{company} {vehicleType}"

diff --git a/packages/itinerary-body/i18n/fr.yml b/packages/itinerary-body/i18n/fr.yml
@@ -62,6 +62,9 @@ otpUi:
       carHail: Course en voiture
       escooter: Trottinette
       walk: Marche
+    transfer: >-
+      Correspondance{duration, select, undefined {} other {, attente
+      {duration}}}
     unnamedPath: Chemin sans nom
     unnamedRoad: Route sans nom
     vehicleTitle: "{vehicleType} {company}"

diff --git a/packages/itinerary-body/package.json b/packages/itinerary-body/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/itinerary-body",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "A component for displaying an itinerary body of a trip planning result",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -10,9 +10,9 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "^12.0.0",
     "@opentripplanner/humanize-distance": "^1.2.0",
-    "@opentripplanner/icons": "^2.0.12",
+    "@opentripplanner/icons": "^3.0.0",
     "@opentripplanner/location-icon": "^1.4.1",
     "@styled-icons/fa-solid": "^10.34.0",
     "@styled-icons/foundation": "^10.34.0",

diff --git a/packages/itinerary-body/src/AccessLegBody/index.tsx b/packages/itinerary-body/src/AccessLegBody/index.tsx
@@ -125,63 +125,67 @@ class AccessLegBody extends Component<Props, State> {
             onSummaryClick={this.onSummaryClick}
             showLegIcon={showLegIcon}
           />
-          <S.LegDetails>
-            {hideDrivingDirections ? (
-              <S.StepsHeaderAndMapLink>
-                <S.StepsHeaderSpan>
-                  <Duration seconds={leg.duration} />
-                </S.StepsHeaderSpan>
-                {mapillary}
-              </S.StepsHeaderAndMapLink>
-            ) : (
-              <>
+          {leg.distance !== 0 && (
+            <S.LegDetails>
+              {hideDrivingDirections ? (
                 <S.StepsHeaderAndMapLink>
-                  <S.StepsHeaderButton
-                    aria-expanded={expanded}
-                    onClick={this.onStepsHeaderClick}
-                  >
-                    <Duration
-                      seconds={leg.duration}
-                      showApproximatePrefix={
-                        showApproximateTravelTime && !isTransit(leg.mode)
-                      }
-                    />
-                    {leg.steps && leg.steps.length > 0 && (
-                      <S.CaretToggle expanded={expanded} />
-                    )}
-
-                    <S.InvisibleAdditionalDetails>
-                      <FormattedMessage
-                        defaultMessage={
-                          defaultMessages["otpUi.TransitLegBody.expandDetails"]
-                        }
-                        description="Screen reader text added to expand steps"
-                        id="otpUi.TransitLegBody.expandDetails"
-                      />
-                    </S.InvisibleAdditionalDetails>
-                  </S.StepsHeaderButton>
+                  <S.StepsHeaderSpan>
+                    <Duration seconds={leg.duration} />
+                  </S.StepsHeaderSpan>
                   {mapillary}
                 </S.StepsHeaderAndMapLink>
-                <AnimateHeight
-                  duration={500}
-                  height={expanded ? "auto" : 0}
-                  style={{ gridColumn: "1 / span 2" }}
-                >
-                  <AccessLegSteps
-                    mapillaryCallback={mapillaryCallback}
-                    mapillaryKey={mapillaryKey}
-                    steps={leg.steps}
-                  />
-                </AnimateHeight>
-              </>
-            )}
-            <LegDiagramPreview
-              diagramVisible={diagramVisible}
-              leg={leg}
-              setLegDiagram={setLegDiagram}
-              showElevationProfile={showElevationProfile}
-            />
-          </S.LegDetails>
+              ) : (
+                <>
+                  <S.StepsHeaderAndMapLink>
+                    <S.StepsHeaderButton
+                      aria-expanded={expanded}
+                      onClick={this.onStepsHeaderClick}
+                    >
+                      <Duration
+                        seconds={leg.duration}
+                        showApproximatePrefix={
+                          showApproximateTravelTime && !isTransit(leg.mode)
+                        }
+                      />
+                      {leg.steps && leg.steps.length > 0 && (
+                        <S.CaretToggle expanded={expanded} />
+                      )}
+
+                      <S.InvisibleAdditionalDetails>
+                        <FormattedMessage
+                          defaultMessage={
+                            defaultMessages[
+                              "otpUi.TransitLegBody.expandDetails"
+                            ]
+                          }
+                          description="Screen reader text added to expand steps"
+                          id="otpUi.TransitLegBody.expandDetails"
+                        />
+                      </S.InvisibleAdditionalDetails>
+                    </S.StepsHeaderButton>
+                    {mapillary}
+                  </S.StepsHeaderAndMapLink>
+                  <AnimateHeight
+                    duration={500}
+                    height={expanded ? "auto" : 0}
+                    style={{ gridColumn: "1 / span 2" }}
+                  >
+                    <AccessLegSteps
+                      mapillaryCallback={mapillaryCallback}
+                      mapillaryKey={mapillaryKey}
+                      steps={leg.steps}
+                    />
+                  </AnimateHeight>
+                </>
+              )}
+              <LegDiagramPreview
+                diagramVisible={diagramVisible}
+                leg={leg}
+                setLegDiagram={setLegDiagram}
+                showElevationProfile={showElevationProfile}
+              />
+            </S.LegDetails>
+          )}
         </S.LegBody>
       </>
     );